# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1227688538 -3600
# Node ID ee27d91bacae98756eb75d6c5662450401f7634e
# Parent  d75b1455090e288ec75daa2233a27c9edd38913c# Parent  16b690351c0d4f2bbccfbf70d0f12901ff52267d
(stable) merge with default

diff -r d75b1455090e -r ee27d91bacae hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Nov 25 18:13:54 2008 +0100
+++ b/hgkw/keyword.py	Wed Nov 26 09:35:38 2008 +0100
@@ -350,8 +350,8 @@
     ui.note(_('unhooked all commit hooks\n'))
     ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
     repo.commit(text=msg)
-    format = ui.verbose and ' in %s' % path or ''
-    demostatus('%s keywords expanded%s' % (kwstatus, format))
+    fmt = ui.verbose and ' in %s' % path or ''
+    demostatus('%s keywords expanded%s' % (kwstatus, fmt))
     ui.write(repo.wread(fn))
     ui.debug(_('\nremoving temporary repo %s\n') % tmpdir)
     shutil.rmtree(tmpdir, ignore_errors=True)
@@ -384,9 +384,9 @@
     if opts.get('all') or opts.get('ignore'):
         kwfstats += (('I', [f for f in files if f not in kwfiles]),)
     for char, filenames in kwfstats:
-        format = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
+        fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
         for f in filenames:
-            ui.write(format % repo.pathto(f, cwd))
+            ui.write(fmt % repo.pathto(f, cwd))
 
 def shrink(ui, repo, *pats, **opts):
     '''revert expanded keywords in working directory