This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1682

unamend: allow unamending if allowunstable is set
ClosedPublic

Authored by martinvonz on Dec 13 2017, 8:27 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf01101100043: unamend: allow unamending if allowunstable is set
rHGc1c55291e6ff: unamend: allow unamending if allowunstable is set
Summary

I don't see why unamend should be disallowed when allowunstable is
set. By switching to rewriteutil.precheck() we fix that and get more
consistent error messages (and some additional ones).

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.Dec 13 2017, 8:27 PM
Closed by commit rHGc1c55291e6ff: unamend: allow unamending if allowunstable is set (authored by martinvonz). · Explain WhyDec 15 2017, 1:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (6 lines)
Mtests/test-unamend.t (11 lines)

Diff 4491

hgext/uncommit.py

""" """
unfi = repo.unfiltered() unfi = repo.unfiltered()
with repo.wlock(), repo.lock(), repo.transaction('unamend'): with repo.wlock(), repo.lock(), repo.transaction('unamend'):
# identify the commit from which to unamend # identify the commit from which to unamend
curctx = repo['.'] curctx = repo['.']
if not curctx.mutable(): rewriteutil.precheck(repo, [curctx.rev()], 'unamend')
raise error.Abort(_('cannot unamend public changesets'))
# 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 = _("changeset must have one predecessor, found %i predecessors") e = _("changeset must have one predecessor, found %i predecessors")
raise error.Abort(e % len(markers)) raise error.Abort(e % len(markers))
prednode = markers[0].prednode() prednode = markers[0].prednode()
predctx = unfi[prednode] predctx = unfi[prednode]
if curctx.children():
raise error.Abort(_("cannot unamend a changeset with children"))
# add an extra so that we get a new hash # add an extra so that we get a new hash
# note: allowing unamend to undo an unamend is an intentional feature # note: allowing unamend to undo an unamend is an intentional feature
extras = predctx.extra() extras = predctx.extra()
extras['unamend_source'] = curctx.hex() extras['unamend_source'] = curctx.hex()
def filectxfn(repo, ctx_, path): def filectxfn(repo, ctx_, path):
try: try:
return predctx.filectx(path) return predctx.filectx(path)

tests/test-unamend.t

| |
o 2:28ad74487de9 Added c o 2:28ad74487de9 Added c
| |
o 1:29becc82797a Added b o 1:29becc82797a Added b
| |
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
$ hg unamend $ hg --config experimental.evolution=createmarkers unamend
abort: cannot unamend a changeset with children abort: cannot unamend changeset with children
[255] [255]
$ hg unamend
Trying to unamend a public changeset Trying to unamend a public changeset
$ hg up $ hg up -C 23
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg phase -r . -p $ hg phase -r . -p
$ hg unamend $ hg unamend
abort: cannot unamend public changesets abort: cannot unamend public changesets
(see 'hg help phases' for details)
[255] [255]
Testing whether unamend retains copies or not Testing whether unamend retains copies or not
$ hg status $ hg status
? bar ? bar
$ hg mv a foo $ hg mv a foo