[PATCH 2 of 4] histedit: use safecleanupnode in _finishhistedit
Jun Wu
quark at fb.com
Tue Mar 14 01:36:17 EDT 2017
# HG changeset patch
# User Jun Wu <quark at fb.com>
# Date 1489468746 25200
# Mon Mar 13 22:19:06 2017 -0700
# Node ID 990c1dcccd1aad7e8a7c3ecdedcc79c6d98ff169
# Parent b4cf155f7a41ebf314407000f6948716ae0a64e2
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/quark-zju/hg-draft -r 990c1dcccd1a
histedit: use safecleanupnode in _finishhistedit
This simplifies code a lot.
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1133,11 +1133,5 @@ def _finishhistedit(ui, repo, state):
ui.debug(m % node.short(n))
- supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
- if supportsmarkers:
- # Only create markers if the temp nodes weren't already removed.
- obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes)
- if t in repo))
- else:
- cleanupnode(ui, repo, 'temp', tmpnodes)
+ safecleanupnode(ui, repo, 'temp', tmpnodes)
if not state.keep:
@@ -1145,15 +1139,5 @@ def _finishhistedit(ui, repo, state):
movebookmarks(ui, repo, mapping, state.topmost, ntm)
# TODO update mq state
- if supportsmarkers:
- markers = []
- # sort by revision number because it sound "right"
- for prec in sorted(mapping, key=repo.changelog.rev):
- succs = mapping[prec]
- markers.append((repo[prec],
- tuple(repo[s] for s in succs)))
- if markers:
- obsolete.createmarkers(repo, markers)
- else:
- cleanupnode(ui, repo, 'replaced', mapping)
+ safecleanupnode(ui, repo, 'replaced', mapping)
state.clear()
More information about the Mercurial-devel
mailing list