# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1227633234 -3600
# Node ID d75b1455090e288ec75daa2233a27c9edd38913c
# Parent  a93358a05b8034a7ccc0961d10826eac99bdbcdf# Parent  51296bd1652f83e08a641eda94409e1169cd8ca3
(stable) merge with default

diff -r a93358a05b80 -r d75b1455090e hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Nov 14 19:10:09 2008 +0100
+++ b/hgkw/keyword.py	Tue Nov 25 18:13:54 2008 +0100
@@ -167,14 +167,12 @@
 
     def overwrite(self, node, expand, files):
         '''Overwrites selected files expanding/shrinking keywords.'''
+        ctx = self.repo[node]
+        mf = ctx.manifest()
         if node is not None:     # commit
-            ctx = self.repo[node]
-            mf = ctx.manifest()
             files = [f for f in ctx.files() if f in mf]
             notify = self.ui.debug
         else:                    # kwexpand/kwshrink
-            ctx = self.repo[None]
-            mf = ctx.manifest()
             notify = self.ui.note
         candidates = [f for f in files if self.iskwfile(f, ctx.flags)]
         if candidates: