##// END OF EJS Templates
histedit: pass state to processreplacement
David Soria Parra -
r22981:aa1ad959 default
parent child Browse files
Show More
@@ -572,8 +572,7 b' def _histedit(ui, repo, *freeargs, **opt'
572 572 state = bootstrapcontinue(ui, state, opts)
573 573 elif goal == 'abort':
574 574 state = readstate(repo)
575 mapping, tmpnodes, leafs, _ntm = processreplacement(repo,
576 state.replacements)
575 mapping, tmpnodes, leafs, _ntm = processreplacement(repo, state)
577 576 ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
578 577 # check whether we should update away
579 578 parentnodes = [c.node() for c in repo[None].parents()]
@@ -649,8 +648,7 b' def _histedit(ui, repo, *freeargs, **opt'
649 648
650 649 hg.update(repo, state.parentctx.node())
651 650
652 mapping, tmpnodes, created, ntm = processreplacement(repo,
653 state.replacements)
651 mapping, tmpnodes, created, ntm = processreplacement(repo, state)
654 652 if mapping:
655 653 for prec, succs in mapping.iteritems():
656 654 if not succs:
@@ -841,12 +839,13 b' def verifyrules(rules, repo, ctxs):'
841 839 hint=_('do you want to use the drop action?'))
842 840 return parsed
843 841
844 def processreplacement(repo, replacements):
842 def processreplacement(repo, state):
845 843 """process the list of replacements to return
846 844
847 845 1) the final mapping between original and created nodes
848 846 2) the list of temporary node created by histedit
849 847 3) the list of new commit created by histedit"""
848 replacements = state.replacements
850 849 allsuccs = set()
851 850 replaced = set()
852 851 fullmapping = {}
General Comments 0
You need to be logged in to leave comments. Login now