diff -r f3514954d3c6 -r 22a306a7b411 hgkw/keyword.py --- a/hgkw/keyword.py Sun Aug 24 20:13:45 2008 +0200 +++ b/hgkw/keyword.py Wed Dec 17 15:22:45 2008 +0100 @@ -517,8 +517,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) @@ -569,9 +569,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 % _pathto(repo, f, cwd)) + ui.write(fmt % _pathto(repo, f, cwd)) def shrink(ui, repo, *pats, **opts): '''revert expanded keywords in working directory