This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1579

unamend: drop unused vars, query after taking lock, use ctx.hex() for extras
ClosedPublic

Authored by pulkit on Dec 2 2017, 2:06 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG9e339c97fabb: unamend: drop unused vars, query after taking lock, use ctx.hex() for extras
Summary

This is the followup of review on D821.

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

pulkit created this revision.Dec 2 2017, 2:06 PM
yuja accepted this revision.Dec 3 2017, 1:43 AM
yuja added a subscriber: yuja.

Queued, thanks.

This revision is now accepted and ready to land.Dec 3 2017, 1:43 AM
Closed by commit rHG9e339c97fabb: unamend: drop unused vars, query after taking lock, use ctx.hex() for extras (authored by pulkit). · Explain WhyDec 3 2017, 2:16 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 4086

hgext/uncommit.py

This command will roll back to the previous version of a changeset, This command will roll back to the previous version of a changeset,
leaving working directory in state in which it was before running leaving working directory in state in which it was before running
`hg amend` (e.g. files modified as part of an amend will be `hg amend` (e.g. files modified as part of an amend will be
marked as modified `hg status`) marked as modified `hg status`)
""" """
unfi = repo.unfiltered() unfi = repo.unfiltered()
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['.']
with repo.wlock(), repo.lock(), repo.transaction('unamend'):
if not curctx.mutable(): if not curctx.mutable():
raise error.Abort(_('cannot unamend public changesets')) 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(): if curctx.children():
raise error.Abort(_("cannot unamend a changeset with 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.node() 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)
except KeyError: except KeyError:
return None return None
# Make a new commit same as predctx # Make a new commit same as predctx
newctx = context.memctx(repo, newctx = context.memctx(repo,
parents=(predctx.p1(), predctx.p2()), parents=(predctx.p1(), predctx.p2()),
text=predctx.description(), text=predctx.description(),
files=predctx.files(), files=predctx.files(),
filectxfn=filectxfn, filectxfn=filectxfn,
user=predctx.user(), user=predctx.user(),
date=predctx.date(), date=predctx.date(),
extra=extras) extra=extras)
# phase handling # phase handling
commitphase = curctx.phase() commitphase = curctx.phase()
overrides = {('phases', 'new-commit'): commitphase} overrides = {('phases', 'new-commit'): commitphase}
with repo.ui.configoverride(overrides, 'uncommit'): with repo.ui.configoverride(overrides, 'uncommit'):
newprednode = repo.commitctx(newctx) newprednode = repo.commitctx(newctx)
newpredctx = repo[newprednode] newpredctx = repo[newprednode]
changedfiles = []
wctx = repo[None]
wm = wctx.manifest()
cm = newpredctx.manifest()
dirstate = repo.dirstate dirstate = repo.dirstate
diff = cm.diff(wm)
changedfiles.extend(diff.iterkeys())
with dirstate.parentchange(): with dirstate.parentchange():
dirstate.setparents(newprednode, node.nullid) dirstate.setparents(newprednode, node.nullid)
s = repo.status(predctx, curctx) s = repo.status(predctx, curctx)
_fixdirstate(repo, curctx, newpredctx, s) _fixdirstate(repo, curctx, newpredctx, s)
mapping = {curctx.node(): (newprednode,)} mapping = {curctx.node(): (newprednode,)}
scmutil.cleanupnodes(repo, mapping, 'unamend') scmutil.cleanupnodes(repo, mapping, 'unamend')

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 unamend
$ hg glog --hidden $ hg glog --hidden
@ 9:8da14a1fd653 Added h @ 9:46d02d47eec6 Added h
| |
| x 8:c9fa1a715c1b Added h | x 8:c9fa1a715c1b Added h
|/ |/
| x 7:ec2426147f0e Added h | x 7:ec2426147f0e Added h
|/ |/
o 6:87d6d6676308 Added g o 6:87d6d6676308 Added g
| |
o 5:825660c69f0c Added f o 5:825660c69f0c Added f
| |
o 4:aa98ab95a928 Added e o 4:aa98ab95a928 Added e
| |
o 3:62615734edd5 Added d o 3:62615734edd5 Added d
| |
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 diff $ hg diff
diff -r 8da14a1fd653 h diff -r 46d02d47eec6 h
--- a/h Thu Jan 01 00:00:00 1970 +0000 --- a/h Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000 +++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
foo foo
+bar +bar
$ hg exp $ hg exp
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 8da14a1fd653c3f07fdad5760511c9e12652a306 # Node ID 46d02d47eec6ca096b8dcab3f8f5579c40c3dd9a
# Parent 87d6d66763085b629e6d7ed56778c79827273022 # Parent 87d6d66763085b629e6d7ed56778c79827273022
Added h Added h
diff -r 87d6d6676308 -r 8da14a1fd653 h diff -r 87d6d6676308 -r 46d02d47eec6 h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000 +++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+foo +foo
$ hg status $ hg status
M h M h
$ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log
branch=default branch=default
unamend_source=\xc9\xfa\x1aq\\\x1bva\xc0\xfa\xfb6*\x9f0\xbdu\x87\x8d} unamend_source=c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
Using unamend to undo an unamed (intentional) Using unamend to undo an unamed (intentional)
$ hg unamend $ hg unamend
$ hg exp $ hg exp
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 1c09887216571a9755fc9d2e7f0e41c2b49e341b # Node ID 850ddfc1bc662997ec6094ada958f01f0cc8070a
# Parent 87d6d66763085b629e6d7ed56778c79827273022 # Parent 87d6d66763085b629e6d7ed56778c79827273022
Added h Added h
diff -r 87d6d6676308 -r 1c0988721657 h diff -r 87d6d6676308 -r 850ddfc1bc66 h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000 +++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+foo +foo
+bar +bar
$ hg diff $ hg diff
Unamend on a dirty working directory Unamend on a dirty working directory
$ echo "bar" >> a $ echo "bar" >> a
$ hg amend $ hg amend
$ echo "foobar" >> a $ echo "foobar" >> a
$ echo "bar" >> b $ echo "bar" >> b
$ hg status $ hg status
M a M a
M b M b
$ hg unamend $ hg unamend
$ hg status $ hg status
M a M a
M b M b
$ hg diff $ hg diff
diff -r 956548224719 a diff -r ec338db45d51 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,3 @@ @@ -1,1 +1,3 @@
foo foo
+bar +bar
+foobar +foobar
diff -r 956548224719 b diff -r ec338db45d51 b
--- a/b Thu Jan 01 00:00:00 1970 +0000 --- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
foo foo
+bar +bar
Unamending an added file Unamending an added file
$ echo bar >> bar $ echo bar >> bar
$ hg status $ hg status
M bar M bar
$ hg unamend $ hg unamend
$ hg status $ hg status
A bar A bar
$ hg diff $ hg diff
diff -r ff917aa01c86 bar diff -r 7f79409af972 bar
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bar Thu Jan 01 00:00:00 1970 +0000 +++ b/bar Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+foo +foo
+bar +bar
$ hg revert --all $ hg revert --all
forgetting bar forgetting bar
Unamending in middle of a stack Unamending in middle of a stack
$ hg glog $ hg glog
@ 19:ff917aa01c86 Added things to a and b @ 19:7f79409af972 Added things to a and b
| |
o 12:956548224719 Added h o 12:ec338db45d51 Added h
| |
o 6:87d6d6676308 Added g o 6:87d6d6676308 Added g
| |
o 5:825660c69f0c Added f o 5:825660c69f0c Added f
| |
o 4:aa98ab95a928 Added e o 4:aa98ab95a928 Added e
| |
o 3:62615734edd5 Added d o 3:62615734edd5 Added d
| |
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 up 5 $ hg up 5
2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar >> f $ echo bar >> f
$ hg amend $ hg amend
$ hg rebase -s 6 -d . -q $ hg rebase -s 6 -d . -q
$ hg glog $ hg glog
o 23:2b41b42e192a Added things to a and b o 23:03ddd6fc5af1 Added things to a and b
| |
o 22:1860df151f01 Added h o 22:3e7b64ee157b Added h
| |
o 21:49635b68477e Added g o 21:49635b68477e Added g
| |
@ 20:93f0e8ffab32 Added f @ 20:93f0e8ffab32 Added f
| |
o 4:aa98ab95a928 Added e o 4:aa98ab95a928 Added e
| |
o 3:62615734edd5 Added d o 3:62615734edd5 Added d
$ hg mv a foo $ hg mv a foo
$ hg ci -m "Moved a to foo" $ hg ci -m "Moved a to foo"
$ hg exp --git $ hg exp --git
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID b087c66cada118d6c5487d3d7cb29cac239bd98a # Node ID cfef290346fbee5126313d7e1aab51d877679b09
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231
Moved a to foo Moved a to foo
diff --git a/a b/foo diff --git a/a b/foo
rename from a rename from a
rename to foo rename to foo
$ hg mv b foobar $ hg mv b foobar
$ hg diff --git $ hg diff --git
diff --git a/b b/foobar diff --git a/b b/foobar
rename from b rename from b
rename to foobar rename to foobar
$ hg amend $ hg amend
$ hg exp --git $ hg exp --git
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 9fa06fb09a83a86ec7368d15004dbc52ac1a5d2e # Node ID eca050985275bb271ce3092b54e56ea5c85d29a3
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231
Moved a to foo Moved a to foo
diff --git a/a b/foo diff --git a/a b/foo
rename from a rename from a
rename to foo rename to foo
diff --git a/b b/foobar diff --git a/b b/foobar
rename from b rename from b
rename to foobar rename to foobar
$ hg mv c wat $ hg mv c wat
$ hg unamend $ hg unamend
Retained copies in new prdecessor commit Retained copies in new prdecessor commit
$ hg exp --git $ hg exp --git
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 4cf9987c9b941f615930e7c46307b4dbf35697cf # Node ID 552e3af4f01f620f88ca27be1f898316235b736a
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231
Moved a to foo Moved a to foo
diff --git a/a b/foo diff --git a/a b/foo
rename from a rename from a
rename to foo rename to foo
Retained copies in working directoy Retained copies in working directoy
$ hg diff --git $ hg diff --git
diff --git a/b b/foobar diff --git a/b b/foobar
rename from b rename from b
rename to foobar rename to foobar
diff --git a/c b/wat diff --git a/c b/wat
rename from c rename from c
rename to wat rename to wat