Show More
@@ -639,22 +639,21 b' def reposetup(ui, repo):' | |||
|
639 | 639 | return n |
|
640 | 640 | |
|
641 | 641 | def rollback(self, dryrun=False, force=False): |
|
642 |
w |
|
|
643 | origrestrict = kwt.restrict | |
|
644 | try: | |
|
645 | if not dryrun: | |
|
646 | changed = self['.'].files() | |
|
647 | ret = super(kwrepo, self).rollback(dryrun, force) | |
|
648 | if not dryrun: | |
|
649 | ctx = self['.'] | |
|
650 | modified, added = _preselect(ctx.status(), changed) | |
|
651 | kwt.restrict = False | |
|
652 | kwt.overwrite(ctx, modified, True, True) | |
|
653 | kwt.overwrite(ctx, added, True, False) | |
|
654 | return ret | |
|
655 | finally: | |
|
656 | kwt.restrict = origrestrict | |
|
657 | wlock.release() | |
|
642 | with self.wlock(): | |
|
643 | origrestrict = kwt.restrict | |
|
644 | try: | |
|
645 | if not dryrun: | |
|
646 | changed = self['.'].files() | |
|
647 | ret = super(kwrepo, self).rollback(dryrun, force) | |
|
648 | if not dryrun: | |
|
649 | ctx = self['.'] | |
|
650 | modified, added = _preselect(ctx.status(), changed) | |
|
651 | kwt.restrict = False | |
|
652 | kwt.overwrite(ctx, modified, True, True) | |
|
653 | kwt.overwrite(ctx, added, True, False) | |
|
654 | return ret | |
|
655 | finally: | |
|
656 | kwt.restrict = origrestrict | |
|
658 | 657 | |
|
659 | 658 | # monkeypatches |
|
660 | 659 | def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None): |
General Comments 0
You need to be logged in to leave comments.
Login now