# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1276679323 -7200
# Node ID 25fcb8ed70c40a07d29254e6c1f536e40e45f17e
# Parent  0492a5acf652ba3a7d0199d11f78a54e45b61bcc# Parent  3bf3212b13bc3572a53e636d7b3838f32f162f53
(stable) merge

diff -r 0492a5acf652 -r 25fcb8ed70c4 hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Jun 06 17:25:00 2010 +0900
+++ b/hgkw/keyword.py	Wed Jun 16 11:08:43 2010 +0200
@@ -191,12 +191,12 @@
 
     def overwrite(self, ctx, candidates, iswctx, expand):
         '''Overwrites selected files expanding/shrinking keywords.'''
-        mf = ctx.manifest()
         if self.record:
-            candidates = [f for f in ctx.files() if f in mf]
+            candidates = [f for f in ctx.files() if f in ctx]
         candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)]
         if candidates:
             self.restrict = True        # do not expand when reading
+            mf = ctx.manifest()
             msg = (expand and _('overwriting %s expanding keywords\n')
                    or _('overwriting %s shrinking keywords\n'))
             for f in candidates: