##// END OF EJS Templates
histedit: unifying the way replacements are computed for abort and success...
Kostia Balytskyi -
r28179:2e11f675 default
parent child Browse files
Show More
@@ -1147,7 +1147,7 b' def _finishhistedit(ui, repo, state):'
1147 def _aborthistedit(ui, repo, state):
1147 def _aborthistedit(ui, repo, state):
1148 try:
1148 try:
1149 state.read()
1149 state.read()
1150 tmpnodes, leafs = newnodestoabort(state)
1150 __, leafs, tmpnodes, __ = processreplacement(state)
1151 ui.debug('restore wc to old parent %s\n'
1151 ui.debug('restore wc to old parent %s\n'
1152 % node.short(state.topmost))
1152 % node.short(state.topmost))
1153
1153
@@ -1386,25 +1386,6 b' def verifyactions(actions, state, ctxs):'
1386 hint=_('use "drop %s" to discard, see also: '
1386 hint=_('use "drop %s" to discard, see also: '
1387 '"hg help -e histedit.config"') % missing[0][:12])
1387 '"hg help -e histedit.config"') % missing[0][:12])
1388
1388
1389 def newnodestoabort(state):
1390 """process the list of replacements to return
1391
1392 1) the list of final node
1393 2) the list of temporary node
1394
1395 This is meant to be used on abort as less data are required in this case.
1396 """
1397 replacements = state.replacements
1398 allsuccs = set()
1399 replaced = set()
1400 for rep in replacements:
1401 allsuccs.update(rep[1])
1402 replaced.add(rep[0])
1403 newnodes = allsuccs - replaced
1404 tmpnodes = allsuccs & replaced
1405 return newnodes, tmpnodes
1406
1407
1408 def processreplacement(state):
1389 def processreplacement(state):
1409 """process the list of replacements to return
1390 """process the list of replacements to return
1410
1391
General Comments 0
You need to be logged in to leave comments. Login now