This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2431

histedit: resolve revs before evaluating %ld revset
ClosedPublic

Authored by indygreg on Feb 24 2018, 2:30 PM.

Details

Reviewers
durin42
yuja
Group Reviewers
hg-reviewers
Commits
rHG72da480db4a5: histedit: resolve revs before evaluating %ld revset
Summary

We want to stop relying on basectx.int. That means we can't
use the %ld revset operator with an iterable of contexts. So
we expand an iterable of contexts into a list of revs before calling
into the revset.

Perhaps it would be worthwhile to add a revset format operator
that recognizes context instances so we can just pass contexts
as revset arguments?

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 24 2018, 2:30 PM
yuja accepted this revision.Feb 24 2018, 8:36 PM
This revision is now accepted and ready to land.Feb 24 2018, 8:36 PM
Closed by commit rHG72da480db4a5: histedit: resolve revs before evaluating %ld revset (authored by indygreg). · Explain WhyFeb 24 2018, 8:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (5 lines)

Diff 6063

hgext/histedit.py

return state return state
def between(repo, old, new, keep): def between(repo, old, new, keep):
"""select and validate the set of revision to edit """select and validate the set of revision to edit
When keep is false, the specified set can't have children.""" When keep is false, the specified set can't have children."""
ctxs = list(repo.set('%n::%n', old, new)) ctxs = list(repo.set('%n::%n', old, new))
if ctxs and not keep: if ctxs and not keep:
revs = [ctx.rev() for ctx in ctxs]
if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and 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 ' raise error.Abort(_('can only histedit a changeset together '
'with all its descendants')) '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')) raise error.Abort(_('cannot edit history that contains merges'))
root = ctxs[0] # list is already sorted by repo.set root = ctxs[0] # list is already sorted by repo.set
if not root.mutable(): if not root.mutable():
raise error.Abort(_('cannot edit public changeset: %s') % root, raise error.Abort(_('cannot edit public changeset: %s') % root,
hint=_("see 'hg help phases' for details")) hint=_("see 'hg help phases' for details"))
return [c.node() for c in ctxs] return [c.node() for c in ctxs]
def ruleeditor(repo, ui, actions, editcomment=""): def ruleeditor(repo, ui, actions, editcomment=""):