# HG changeset patch # User Christian Ebert # Date 1285521521 -7200 # Node ID f14ab0ca530dd93f120bf6386774be534a3acb20 # Parent a0dc79015ddf69bc77a1a09091c68997623dc26d 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 a0dc79015ddf -r f14ab0ca530d hgkw/keyword.py --- a/hgkw/keyword.py Sun Sep 26 19:18:41 2010 +0200 +++ b/hgkw/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.'''