# HG changeset patch
# User Jun Wu <qu...@fb.com>
# Date 1489468746 25200
# Mon Mar 13 22:19:06 2017 -0700
# Node ID e9c84e5081e18d67e061bae2a77e7465d8a6f685
# Parent 19a0f5164fcd28240327beffc3c90cdddfb17123
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/quark-zju/hg-draft -r e9c84e5081e1
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
@@ -1126,11 +1126,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:
@@ -1138,15 +1132,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()
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
