Show More
@@ -177,7 +177,6 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 | action = expand and 'expanding' or 'shrinking' |
|
|||
181 | for f in candidates: |
|
180 | for f in candidates: | |
182 | fp = self.repo.file(f) |
|
181 | fp = self.repo.file(f) | |
183 | data = fp.read(mf[f]) |
|
182 | data = fp.read(mf[f]) | |
@@ -191,7 +190,11 b' class kwtemplater(object):' | |||||
191 | else: |
|
190 | else: | |
192 | found = self.re_kw.search(data) |
|
191 | found = self.re_kw.search(data) | |
193 | if found: |
|
192 | if found: | |
194 | notify(_('overwriting %s %s keywords\n') % (f, action)) |
|
193 | if expand: | |
|
194 | msg = _('overwriting %s expanding keywords\n') | |||
|
195 | else: | |||
|
196 | msg = _('overwriting %s shrinking keywords\n') | |||
|
197 | notify(msg % f) | |||
195 | self.repo.wwrite(f, data, mf.flags(f)) |
|
198 | self.repo.wwrite(f, data, mf.flags(f)) | |
196 | self.repo.dirstate.normal(f) |
|
199 | self.repo.dirstate.normal(f) | |
197 | self.restrict = False |
|
200 | self.restrict = False |
General Comments 0
You need to be logged in to leave comments.
Login now