This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7684

histedit: use rewriteutil.precheck() instead of reimplementing it
ClosedPublic

Authored by martinvonz on Dec 17 2019, 2:36 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbde97bee321f: histedit: use rewriteutil.precheck() instead of reimplementing it
Summary

We have had this nice utility since 490df753894d (rewriteutil: add a
precheck function to check if revs can be rewritten, 2017-11-24). We
got two callers soon thereafter, in 98f97eb20597 (rewriteutil: use
precheck() in uncommit and amend commands, 2017-11-28). It's about
time we use it in other places.

rewriteutil.precheck() looks unfortunate for i18n (it seems to rely on
an English verb for the action making sense in other languages), but
hopefully not bad enough that we should avoid using it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (17 lines)
Mtests/test-histedit-obsolete.t (2 lines)

Diff 18859

hgext/histedit.py

logcmdutil, logcmdutil,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
node, node,
obsolete, obsolete,
pycompat, pycompat,
registrar, registrar,
repair, repair,
rewriteutil,
scmutil, scmutil,
state as statemod, state as statemod,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
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."""
revs = repo.revs(b'%n::%n', old, new) revs = repo.revs(b'%n::%n', old, new)
if revs and not keep: if revs and not keep:
if not obsolete.isenabled( rewriteutil.precheck(repo, revs, b'edit')
repo, obsolete.allowunstableopt
) and repo.revs(b'(%ld::) - (%ld)', revs, revs):
raise error.Abort(
_(
b'can only histedit a changeset together '
b'with all its descendants'
)
)
if repo.revs(b'(%ld) and merge()', revs): if repo.revs(b'(%ld) and merge()', revs):
raise error.Abort(_(b'cannot edit history that contains merges')) raise error.Abort(_(b'cannot edit history that contains merges'))
root = repo[revs.first()] # list is already sorted by repo.revs()
if not root.mutable():
raise error.Abort(
_(b'cannot edit public changeset: %s') % root,
hint=_(b"see 'hg help phases' for details"),
)
return pycompat.maplist(repo.changelog.node, revs) return pycompat.maplist(repo.changelog.node, revs)
def ruleeditor(repo, ui, actions, editcomment=b""): def ruleeditor(repo, ui, actions, editcomment=b""):
"""open an editor to edit rules """open an editor to edit rules
rules are in the format [ [act, ctx], ...] like in state.rules rules are in the format [ [act, ctx], ...] like in state.rules
""" """

tests/test-histedit-obsolete.t

$ hg log -G $ hg log -G
@ 13:b449568bf7fc (draft) f @ 13:b449568bf7fc (draft) f
| |
o 12:40db8afa467b (public) c o 12:40db8afa467b (public) c
| |
o 0:cb9a9f314b8b (public) a o 0:cb9a9f314b8b (public) a
$ hg histedit -r '.~2' $ hg histedit -r '.~2'
abort: cannot edit public changeset: cb9a9f314b8b abort: cannot edit public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
Prepare further testing Prepare further testing
------------------------------------------- -------------------------------------------
$ for x in g h i j k ; do $ for x in g h i j k ; do