Show More
@@ -1171,13 +1171,13 b' def _finishhistedit(ui, repo, state):' | |||||
1171 | for n in succs[1:]: |
|
1171 | for n in succs[1:]: | |
1172 | ui.debug(m % node.short(n)) |
|
1172 | ui.debug(m % node.short(n)) | |
1173 |
|
1173 | |||
1174 |
safecleanupnode(ui, repo, |
|
1174 | safecleanupnode(ui, repo, tmpnodes) | |
1175 |
|
1175 | |||
1176 | if not state.keep: |
|
1176 | if not state.keep: | |
1177 | if mapping: |
|
1177 | if mapping: | |
1178 | movebookmarks(ui, repo, mapping, state.topmost, ntm) |
|
1178 | movebookmarks(ui, repo, mapping, state.topmost, ntm) | |
1179 | # TODO update mq state |
|
1179 | # TODO update mq state | |
1180 |
safecleanupnode(ui, repo, |
|
1180 | safecleanupnode(ui, repo, mapping) | |
1181 |
|
1181 | |||
1182 | state.clear() |
|
1182 | state.clear() | |
1183 | if os.path.exists(repo.sjoin('undo')): |
|
1183 | if os.path.exists(repo.sjoin('undo')): | |
@@ -1207,8 +1207,8 b' def _aborthistedit(ui, repo, state):' | |||||
1207 | if repo.unfiltered().revs('parents() and (%n or %ln::)', |
|
1207 | if repo.unfiltered().revs('parents() and (%n or %ln::)', | |
1208 | state.parentctxnode, leafs | tmpnodes): |
|
1208 | state.parentctxnode, leafs | tmpnodes): | |
1209 | hg.clean(repo, state.topmost, show_stats=True, quietempty=True) |
|
1209 | hg.clean(repo, state.topmost, show_stats=True, quietempty=True) | |
1210 |
cleanupnode(ui, repo, |
|
1210 | cleanupnode(ui, repo, tmpnodes) | |
1211 |
cleanupnode(ui, repo, |
|
1211 | cleanupnode(ui, repo, leafs) | |
1212 | except Exception: |
|
1212 | except Exception: | |
1213 | if state.inprogress(): |
|
1213 | if state.inprogress(): | |
1214 | ui.warn(_('warning: encountered an exception during histedit ' |
|
1214 | ui.warn(_('warning: encountered an exception during histedit ' | |
@@ -1589,7 +1589,7 b' def movebookmarks(ui, repo, mapping, old' | |||||
1589 | finally: |
|
1589 | finally: | |
1590 | release(tr, lock) |
|
1590 | release(tr, lock) | |
1591 |
|
1591 | |||
1592 |
def cleanupnode(ui, repo, |
|
1592 | def cleanupnode(ui, repo, nodes): | |
1593 | """strip a group of nodes from the repository |
|
1593 | """strip a group of nodes from the repository | |
1594 |
|
1594 | |||
1595 | The set of node to strip may contains unknown nodes.""" |
|
1595 | The set of node to strip may contains unknown nodes.""" | |
@@ -1609,7 +1609,7 b' def cleanupnode(ui, repo, name, nodes):' | |||||
1609 | # This would reduce bundle overhead |
|
1609 | # This would reduce bundle overhead | |
1610 | repair.strip(ui, repo, c) |
|
1610 | repair.strip(ui, repo, c) | |
1611 |
|
1611 | |||
1612 |
def safecleanupnode(ui, repo, |
|
1612 | def safecleanupnode(ui, repo, nodes): | |
1613 | """strip or obsolete nodes |
|
1613 | """strip or obsolete nodes | |
1614 |
|
1614 | |||
1615 | nodes could be either a set or dict which maps to replacements. |
|
1615 | nodes could be either a set or dict which maps to replacements. | |
@@ -1635,7 +1635,7 b' def safecleanupnode(ui, repo, name, node' | |||||
1635 | if markers: |
|
1635 | if markers: | |
1636 | obsolete.createmarkers(repo, markers, operation='histedit') |
|
1636 | obsolete.createmarkers(repo, markers, operation='histedit') | |
1637 | else: |
|
1637 | else: | |
1638 |
return cleanupnode(ui, repo, |
|
1638 | return cleanupnode(ui, repo, nodes) | |
1639 |
|
1639 | |||
1640 | def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): |
|
1640 | def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): | |
1641 | if isinstance(nodelist, str): |
|
1641 | if isinstance(nodelist, str): |
General Comments 0
You need to be logged in to leave comments.
Login now