Show More
@@ -191,10 +191,10 b' class kwtemplater(object):' | |||||
191 | Caveat: localrepository._link fails on Windows.''' |
|
191 | Caveat: localrepository._link fails on Windows.''' | |
192 | return self.match(path) and not 'l' in flagfunc(path) |
|
192 | return self.match(path) and not 'l' in flagfunc(path) | |
193 |
|
193 | |||
194 |
def overwrite(self, ctx, candidates, iswctx, expand, c |
|
194 | def overwrite(self, ctx, candidates, iswctx, expand, changed): | |
195 | '''Overwrites selected files expanding/shrinking keywords.''' |
|
195 | '''Overwrites selected files expanding/shrinking keywords.''' | |
196 |
if c |
|
196 | if changed is not None: | |
197 |
candidates = [f for f in candidates if f in c |
|
197 | candidates = [f for f in candidates if f in changed] | |
198 | candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)] |
|
198 | candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)] | |
199 | if candidates: |
|
199 | if candidates: | |
200 | restrict = self.restrict |
|
200 | restrict = self.restrict | |
@@ -510,13 +510,13 b' def reposetup(ui, repo):' | |||||
510 | wlock = repo.wlock() |
|
510 | wlock = repo.wlock() | |
511 | try: |
|
511 | try: | |
512 | if not dryrun: |
|
512 | if not dryrun: | |
513 |
c |
|
513 | changed = self['.'].files() | |
514 | ret = super(kwrepo, self).rollback(dryrun) |
|
514 | ret = super(kwrepo, self).rollback(dryrun) | |
515 | if not dryrun: |
|
515 | if not dryrun: | |
516 | ctx = self['.'] |
|
516 | ctx = self['.'] | |
517 | modified, added = super(kwrepo, self).status()[:2] |
|
517 | modified, added = super(kwrepo, self).status()[:2] | |
518 |
kwt.overwrite(ctx, added, True, False, c |
|
518 | kwt.overwrite(ctx, added, True, False, changed) | |
519 |
kwt.overwrite(ctx, modified, True, True, c |
|
519 | kwt.overwrite(ctx, modified, True, True, changed) | |
520 | return ret |
|
520 | return ret | |
521 | finally: |
|
521 | finally: | |
522 | wlock.release() |
|
522 | wlock.release() |
General Comments 0
You need to be logged in to leave comments.
Login now