keyword: 1 variable name for overwriting candidates
authorChristian Ebert <blacktrash@gmx.net>
Tue, 16 Mar 2010 22:28:23 +0100
changeset 10712 fbe138da6b38
parent 10711 2df044888693
child 10713 b9c3f8e88e4f
keyword: 1 variable name for overwriting candidates
hgext/keyword.py
--- a/hgext/keyword.py	Tue Mar 16 22:27:22 2010 +0100
+++ b/hgext/keyword.py	Tue Mar 16 22:28:23 2010 +0100
@@ -162,13 +162,13 @@
         Caveat: localrepository._link fails on Windows.'''
         return self.match(path) and not 'l' in flagfunc(path)
 
-    def overwrite(self, node, expand, files):
+    def overwrite(self, node, expand, candidates):
         '''Overwrites selected files expanding/shrinking keywords.'''
         ctx = self.repo[node]
         mf = ctx.manifest()
         if node is not None:     # commit
-            files = [f for f in ctx.files() if f in mf]
-        candidates = [f for f in files if self.iskwfile(f, ctx.flags)]
+            candidates = [f for f in ctx.files() if f in mf]
+        candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)]
         if candidates:
             self.restrict = True # do not expand when reading
             msg = (expand and _('overwriting %s expanding keywords\n')