( )⚙ D12087 unamend: error out when running on merge commit

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12087

unamend: error out when running on merge commit
ClosedPublic

Authored by martinvonz on Jan 25 2022, 12:17 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG4f01821fa0ec: unamend: error out when running on merge commit
Summary

It's better to error out than to produce a bad commit. We do that same
in hg uncommit. I haven't looked into how much work it is to make
them work instead.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 25 2022, 12:17 AM
Alphare accepted this revision.Jan 25 2022, 4:49 AM
Alphare added a subscriber: Alphare.

Agreed that this is strictly better. I'll queue both for stable

This revision is now accepted and ready to land.Jan 25 2022, 4:49 AM
martinvonz added a commit: rHG4f01821fa0ec: unamend: error out when running on merge commit.Jan 25 2022, 4:53 AM
Closed by commit rHG4f01821fa0ec: unamend: error out when running on merge commit (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (2 lines)
Mtests/test-unamend.t (7 lines)

Diff 31901

hgext/uncommit.py

unfi = repo.unfiltered() unfi = repo.unfiltered()
with repo.wlock(), repo.lock(), repo.transaction(b'unamend'): with repo.wlock(), repo.lock(), repo.transaction(b'unamend'):
# identify the commit from which to unamend # identify the commit from which to unamend
curctx = repo[b'.'] curctx = repo[b'.']
rewriteutil.precheck(repo, [curctx.rev()], b'unamend') rewriteutil.precheck(repo, [curctx.rev()], b'unamend')
if len(curctx.parents()) > 1:
raise error.InputError(_(b"cannot unamend merge changeset"))
# identify the commit to which to unamend # identify the commit to which to unamend
markers = list(predecessormarkers(curctx)) markers = list(predecessormarkers(curctx))
if len(markers) != 1: if len(markers) != 1:
e = _(b"changeset must have one predecessor, found %i predecessors") e = _(b"changeset must have one predecessor, found %i predecessors")
raise error.InputError(e % len(markers)) raise error.InputError(e % len(markers))
prednode = markers[0].prednode() prednode = markers[0].prednode()

tests/test-unamend.t

$ hg ci -m merge $ hg ci -m merge
$ echo accidental > initial $ echo accidental > initial
$ hg st --rev 1 --rev . $ hg st --rev 1 --rev .
A right A right
$ hg st --rev 2 --rev . $ hg st --rev 2 --rev .
A left A left
$ hg amend $ hg amend
$ hg unamend $ hg unamend
$ hg st --rev 1 --rev . abort: cannot unamend merge changeset
A right [10]
R left (known-bad-output !)
$ hg st --rev 2 --rev .
A left (missing-correct-output !)