This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12390

unamend: abort if commit was not created by `hg [un]amend`
ClosedPublic

Authored by martinvonz on Mon, Mar 21, 6:23 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9120c0cd935c: unamend: abort if commit was not created by `hg [un]amend`
Summary

hg unamend can currently undo any kind of rewrite, as long as it has
an obsmarker. However, that has quite unexpected results if you run it
after e.g. hg rebase (expecting it to behave like a generic `hg
undo` command), because it updates to the predecessor and leaves the
old changes in the working copy. I think it's better to allow `hg
unamend` only after hg amend (and after hg unamend because that's
documented as being supported).

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.

Event Timeline

martinvonz created this revision.Mon, Mar 21, 6:23 PM
nancydrew added a subscriber: nancydrew.Mon, Mar 21, 11:16 PM

Thank you for your sharing. Recently, I discovered a great website to entertain anywhere. subway surfers

Alphare accepted this revision.Tue, Mar 22, 4:46 AM
This revision is now accepted and ready to land.Tue, Mar 22, 4:46 AM

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (9 lines)
Mtests/test-unamend.t (15 lines)

Diff 32688

hgext/uncommit.py

# 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: if len(curctx.parents()) > 1:
raise error.InputError(_(b"cannot unamend merge changeset")) raise error.InputError(_(b"cannot unamend merge changeset"))
expected_keys = (b'amend_source', b'unamend_source')
if not any(key in curctx.extra() for key in expected_keys):
raise error.InputError(
_(
b"working copy parent was not created by 'hg amend' or "
b"'hg unamend'"
)
)
# 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()
predctx = unfi[prednode] predctx = unfi[prednode]

tests/test-unamend.t

| |
o 1:29becc82797a Added b o 1:29becc82797a Added b
| |
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
Trying to unamend when there was no amend done Trying to unamend when there was no amend done
$ hg unamend $ hg unamend
abort: working copy parent was not created by 'hg amend' or 'hg unamend'
[10]
$ echo "bar" >> h
Trying to unamend when the obsmarker is missing
$ hg amend
$ hg debugobsolete --delete 0
deleted 1 obsolescence markers
$ hg unamend
abort: changeset must have one predecessor, found 0 predecessors abort: changeset must have one predecessor, found 0 predecessors
[10] [10]
$ hg strip tip --config extensions.strip=
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c9fa1a715c1b-06e5c233-backup.hg
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Unamend on clean wdir and tip Unamend on clean wdir and tip
$ echo "bar" >> h $ echo "bar" >> h
$ hg amend $ hg amend
$ hg exp $ hg exp
# HG changeset patch # HG changeset patch