D2431: histedit: resolve revs before evaluating %ld revset
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sat Feb 24 20:54:12 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG72da480db4a5: histedit: resolve revs before evaluating %ld revset (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2431?vs=6063&id=6076
REVISION DETAIL
https://phab.mercurial-scm.org/D2431
AFFECTED FILES
hgext/histedit.py
CHANGE DETAILS
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1356,11 +1356,12 @@
When keep is false, the specified set can't have children."""
ctxs = list(repo.set('%n::%n', old, new))
if ctxs and not keep:
+ revs = [ctx.rev() for ctx in ctxs]
if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
- repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
+ repo.revs('(%ld::) - (%ld)', revs, revs)):
raise error.Abort(_('can only histedit a changeset together '
'with all its descendants'))
- if repo.revs('(%ld) and merge()', ctxs):
+ if repo.revs('(%ld) and merge()', revs):
raise error.Abort(_('cannot edit history that contains merges'))
root = ctxs[0] # list is already sorted by repo.set
if not root.mutable():
To: indygreg, durin42, #hg-reviewers, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list