equal
deleted
inserted
replaced
778 |
778 |
779 def __contains__(self, node): |
779 def __contains__(self, node): |
780 return self._revcontains(self._torev(node)) |
780 return self._revcontains(self._torev(node)) |
781 |
781 |
782 def cleanupnodes(repo, replacements, operation, moves=None, metadata=None, |
782 def cleanupnodes(repo, replacements, operation, moves=None, metadata=None, |
783 fixphase=False, targetphase=None): |
783 fixphase=False, targetphase=None, backup=True): |
784 """do common cleanups when old nodes are replaced by new nodes |
784 """do common cleanups when old nodes are replaced by new nodes |
785 |
785 |
786 That includes writing obsmarkers or stripping nodes, and moving bookmarks. |
786 That includes writing obsmarkers or stripping nodes, and moving bookmarks. |
787 (we might also want to move working directory parent in the future) |
787 (we might also want to move working directory parent in the future) |
788 |
788 |
903 metadata=metadata) |
903 metadata=metadata) |
904 else: |
904 else: |
905 from . import repair # avoid import cycle |
905 from . import repair # avoid import cycle |
906 tostrip = list(replacements) |
906 tostrip = list(replacements) |
907 if tostrip: |
907 if tostrip: |
908 repair.delayedstrip(repo.ui, repo, tostrip, operation) |
908 repair.delayedstrip(repo.ui, repo, tostrip, operation, |
|
909 backup=backup) |
909 |
910 |
910 def addremove(repo, matcher, prefix, opts=None): |
911 def addremove(repo, matcher, prefix, opts=None): |
911 if opts is None: |
912 if opts is None: |
912 opts = {} |
913 opts = {} |
913 m = matcher |
914 m = matcher |