Show More
@@ -177,6 +177,8 b' class kwtemplater(object):' | |||||
177 | candidates = [f for f in files if self.iskwfile(f, ctx.flags)] |
|
177 | candidates = [f for f in files if self.iskwfile(f, ctx.flags)] | |
178 | if candidates: |
|
178 | if candidates: | |
179 | self.restrict = True # do not expand when reading |
|
179 | self.restrict = True # do not expand when reading | |
|
180 | msg = (expand and _('overwriting %s expanding keywords\n') | |||
|
181 | or _('overwriting %s shrinking keywords\n')) | |||
180 | for f in candidates: |
|
182 | for f in candidates: | |
181 | fp = self.repo.file(f) |
|
183 | fp = self.repo.file(f) | |
182 | data = fp.read(mf[f]) |
|
184 | data = fp.read(mf[f]) | |
@@ -190,10 +192,6 b' class kwtemplater(object):' | |||||
190 | else: |
|
192 | else: | |
191 | found = self.re_kw.search(data) |
|
193 | found = self.re_kw.search(data) | |
192 | if found: |
|
194 | if found: | |
193 | if expand: |
|
|||
194 | msg = _('overwriting %s expanding keywords\n') |
|
|||
195 | else: |
|
|||
196 | msg = _('overwriting %s shrinking keywords\n') |
|
|||
197 | notify(msg % f) |
|
195 | notify(msg % f) | |
198 | self.repo.wwrite(f, data, mf.flags(f)) |
|
196 | self.repo.wwrite(f, data, mf.flags(f)) | |
199 | self.repo.dirstate.normal(f) |
|
197 | self.repo.dirstate.normal(f) |
General Comments 0
You need to be logged in to leave comments.
Login now