[PATCH 4 of 5] histedit: simplify computation of edited set
pierre-yves.david at logilab.fr
pierre-yves.david at logilab.fr
Tue Oct 2 04:42:10 CDT 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1348786949 -7200
# Node ID a25a24d3e16123af480243a29b58d4f642d19b42
# Parent 1e4d478adb0b377447a0eefba190ec03ff750a57
histedit: simplify computation of edited set
This complex code can be replaced by two simple revset calls.
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -584,26 +584,14 @@ def bootstrapcontinue(ui, repo, parentct
def between(repo, old, new, keep):
"""select and validate the set of revision to edit
When keep is false, the specified set can't have children."""
- revs = [old]
- current = old
- while current != new:
- ctx = repo[current]
- if not keep and len(ctx.children()) > 1:
- raise util.Abort(_('cannot edit history that would orphan nodes'))
- if len(ctx.parents()) != 1 and ctx.parents()[1] != node.nullid:
- raise util.Abort(_("can't edit history with merges"))
- if not ctx.children():
- current = new
- else:
- current = ctx.children()[0].node()
- revs.append(current)
- if len(repo[current].children()) and not keep:
+ revs = list(repo.set('%n::%n', old, new))
+ if not keep and repo.revs('(%ld::) - %ld', revs, revs):
raise util.Abort(_('cannot edit history that would orphan nodes'))
- return revs
+ return [c.node() for c in revs]
def writestate(repo, parentnode, rules, keep, topmost, replacements):
fp = open(os.path.join(repo.path, 'histedit-state'), 'w')
pickle.dump((parentnode, rules, keep, topmost, replacements), fp)
More information about the Mercurial-devel
mailing list