Show More
@@ -194,7 +194,7 b' class kwtemplater(object):' | |||||
194 | '''Overwrites selected files expanding/shrinking keywords.''' |
|
194 | '''Overwrites selected files expanding/shrinking keywords.''' | |
195 | ctx = self.repo[node] |
|
195 | ctx = self.repo[node] | |
196 | mf = ctx.manifest() |
|
196 | mf = ctx.manifest() | |
197 | if node is not None: # commit, record |
|
197 | if self.record: | |
198 | candidates = [f for f in ctx.files() if f in mf] |
|
198 | candidates = [f for f in ctx.files() if f in mf] | |
199 | candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)] |
|
199 | candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)] | |
200 | if candidates: |
|
200 | if candidates: | |
@@ -209,7 +209,7 b' class kwtemplater(object):' | |||||
209 | if util.binary(data): |
|
209 | if util.binary(data): | |
210 | continue |
|
210 | continue | |
211 | if expand: |
|
211 | if expand: | |
212 | if node is None: |
|
212 | if node is None: # kwexpand/kwshrink | |
213 | ctx = self.repo.filectx(f, fileid=mf[f]).changectx() |
|
213 | ctx = self.repo.filectx(f, fileid=mf[f]).changectx() | |
214 | data, found = self.substitute(data, f, ctx, |
|
214 | data, found = self.substitute(data, f, ctx, | |
215 | self.re_kw.subn) |
|
215 | self.re_kw.subn) | |
@@ -499,7 +499,7 b' def reposetup(ui, repo):' | |||||
499 | n = super(kwrepo, self).commitctx(ctx, error) |
|
499 | n = super(kwrepo, self).commitctx(ctx, error) | |
500 | # no lock needed, only called from repo.commit() which already locks |
|
500 | # no lock needed, only called from repo.commit() which already locks | |
501 | if not kwt.record: |
|
501 | if not kwt.record: | |
502 |
kwt.overwrite(n, True, |
|
502 | kwt.overwrite(n, True, sorted(ctx.added() + ctx.modified())) | |
503 | return n |
|
503 | return n | |
504 |
|
504 | |||
505 | # monkeypatches |
|
505 | # monkeypatches |
General Comments 0
You need to be logged in to leave comments.
Login now