comparison mercurial/scmutil.py @ 38799:2002c193f2bc

rebase: support "history-editing-backup" config option If you don't want to store any backup while rebasing, you can use `history-editing-backup` config option. [ui] history-editing-backup = # True or False Current status of list of commands which supports this config: 1. histedit 2. rebase Differential Revision: https://phab.mercurial-scm.org/D3887
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 05 Jul 2018 10:42:48 +0530
parents e7aa113b14f7
children df0873ab5c14
comparison
equal deleted inserted replaced
38798:d58958676b3c 38799:2002c193f2bc
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