# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1285521521 -7200
# Node ID 0b5d7da3bb785a55a20a98fa28d74bd7a670e547
# Parent  6401e854742734c0983e067cc801be153f3c466b
keyword: restore restricted read mode value after overwriting

Even though just enforcing expansion after overwriting files in
the working directory caused no problems that we know of, this avoids
a potential source of problems (e.g. in collaboration other extensions)
at no costs.

diff -r 6401e8547427 -r 0b5d7da3bb78 hgext/keyword.py
--- a/hgext/keyword.py	Sun Sep 26 19:18:41 2010 +0200
+++ b/hgext/keyword.py	Sun Sep 26 19:18:41 2010 +0200
@@ -198,6 +198,7 @@
             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:
+            restrict = self.restrict
             self.restrict = True        # do not expand when reading
             mf = ctx.manifest()
             msg = (expand and _('overwriting %s expanding keywords\n')
@@ -223,7 +224,7 @@
                         self.repo.dirstate.normal(f)
                     elif self.record:
                         self.repo.dirstate.normallookup(f)
-            self.restrict = False
+            self.restrict = restrict
 
     def shrinktext(self, text):
         '''Unconditionally removes all keyword substitutions from text.'''