This is an archive of the discontinued Mercurial Phabricator instance.

Differential D821

unamend: move fb extension unamend to core
ClosedPublic

Authored by pulkit on Sep 26 2017, 4:46 PM.
Tags
None
Subscribers
yuja, quark, durin42 and 4 others

Details

Reviewers
durham
Group Reviewers
hg-reviewers
Commits
rHG867990238dc6: unamend: move fb extension unamend to core
Summary

unamend extension adds an unamend command which undoes the effect of the amend
command. This patch moves the unamend command from that extension to uncommit
extension and this one does not completely undoes the effect of amend command as
it creates a new commit, rather than reviving the old one back.

This also adds tests for the same.

.. feature::

A new unamend command in uncommit extension which undoes the effect of the
amend command by creating a new changeset which was there before amend and
moving the changes that were amended to the working directory.

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.Sep 26 2017, 4:46 PM
durham added a subscriber: durham.Sep 27 2017, 5:23 AM
durham added inline comments.
hgext/uncommit.py
269

This should be in a with statement probably? Can we just have it be as part of the top level lock with statement?

durham requested changes to this revision.Sep 27 2017, 10:27 AM

Generally looks good. Just need to fix the transaction thing.

This revision now requires changes to proceed.Sep 27 2017, 10:27 AM
pulkit updated this revision to Diff 2128.Sep 27 2017, 1:32 PM
singhsrb added a subscriber: singhsrb.EditedSep 28 2017, 2:28 PM

I just wanted to mention that unamend command does not track copytrace information properly. For example, if we do:

  1. touch dummy
  2. hg commit -Aqm 'dummy'
  3. hg cp dummy dummy2
  4. hg commit -Aqm 'dummy2'
  5. hg cp dummy2 dummy3
  6. hg amend
  7. hg log -f dummy3
  8. hg unamend
  9. hg amend
  10. hg log -f dummy3

Notice the difference in output on step 10 and 7. While 7 correctly records the copy information indicating that dummy3 was copied from dummy, 10 considers dummy3 a new file.

We may want to fix this before taking unamend to core because the corresponding amend command does handle copytracing properly.

pulkit planned changes to this revision.Sep 29 2017, 9:20 AM
In D821#14116, @singhsrb wrote:

I just wanted to mention that unamend command does not track copytrace information properly.

That's a pretty good catch. Thanks a lot.

ryanmce added a subscriber: ryanmce.Sep 29 2017, 9:53 AM
ryanmce added inline comments.
hgext/uncommit.py
269

Test test

ryanmce added inline comments.Oct 11 2017, 10:46 AM
hgext/uncommit.py
269

Tested nested comments, sorry for the spam.

pulkit added a comment.Nov 2 2017, 2:15 PM

This is lying here from a long time. It will be good some feedback is given. :)

durham accepted this revision.Nov 10 2017, 6:45 PM

Overall looks good to me. My one comment is probably not enough to block this going in.

hgext/uncommit.py
269

Might be worth doing the predecessor check in the lock as well, since the result of this verification could technically change between now and when the lock is taken.

pulkit updated this revision to Diff 3421.Nov 11 2017, 9:11 AM
durin42 added a subscriber: durin42.Nov 13 2017, 5:25 PM
durin42 added inline comments.
hgext/uncommit.py
247

undo the _most recent_ amend? or can I run this iteratively and undo many amends in sequence?

265

Should we also look for unamend_source in the extra, and potentially refuse to unamend an unamend? Or not?

273

cannot unamend a changeset with children

pulkit added a subscriber: quark.Nov 17 2017, 9:14 AM
pulkit added inline comments.
hgext/uncommit.py
247

Nice catch, it should be undo the _most recent_ amend. Thanks!

265

I don't think users will run unamend(1) and then will try to run unamend(2) again to unamend the first unamend. It's not intuitive in my opinion. @durham @quark what do you guys think here?

pulkit added inline comments.Nov 17 2017, 3:06 PM
hgext/uncommit.py
265

Okay while trying to add this condition, I found we cannot refuse to unamend a changeset on the basis of unamend_source, for e.g
a -amend-> b -unamend-> a' -amend-> c -unamend-> a''

But if we refuse on basis on unamend_source, unamend c will refuse. We need to be more smart here but when I think the other way around, I think it's okay to unamend an unamend. I am open to suggestion and will go with what you guys prefer is good.

durham added inline comments.Nov 20 2017, 1:16 PM
hgext/uncommit.py
265

I'd just let unamend undo an unamend. Letting unamend toggle back and forth between the two states seems like it might grant the user more confidence in the command, even.

durin42 added inline comments.Nov 20 2017, 1:42 PM
hgext/uncommit.py
265

Works for me. Add some documentation/testing of this so we know it's intentional in the future?

pulkit updated this revision to Diff 3671.Nov 20 2017, 3:04 PM
pulkit added a comment.Nov 27 2017, 3:22 PM

Any updates on this?

durham accepted this revision.Nov 27 2017, 3:59 PM
Closed by commit rHG867990238dc6: unamend: move fb extension unamend to core (authored by pulkit). · Explain WhyDec 1 2017, 12:32 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Dec 2 2017, 8:39 AM

Can you send a follow-up to fix these issues?

hgext/uncommit.py
259

Probably better to query curctx after locks are taken.

280

This should be curctx.hex(). It's highly discouraged to store blob in extras.

311

Mostly unused variables?

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (122 lines)
AMtests/test-unamend.t (366 lines)

Diff 4054

hgext/uncommit.py

from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
context, context,
copies, copies,
error, error,
node, node,
obsolete, obsolete,
obsutil,
pycompat, pycompat,
registrar, registrar,
scmutil, scmutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
# Fully removed the old commit # Fully removed the old commit
mapping[old.node()] = () mapping[old.node()] = ()
scmutil.cleanupnodes(repo, mapping, 'uncommit') scmutil.cleanupnodes(repo, mapping, 'uncommit')
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.dirstate.setparents(newid, node.nullid) repo.dirstate.setparents(newid, node.nullid)
_uncommitdirstate(repo, old, match) _uncommitdirstate(repo, old, match)
def predecessormarkers(ctx):
"""yields the obsolete markers marking the given changeset as a successor"""
for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
yield obsutil.marker(ctx.repo(), data)
def _unamenddirstate(repo, predctx, curctx):
""""""
s = repo.status(predctx, curctx)
ds = repo.dirstate
copies = dict(ds.copies())
for f in s.modified:
if ds[f] == 'r':
# modified + removed -> removed
continue
ds.normallookup(f)
for f in s.added:
if ds[f] == 'r':
# added + removed -> unknown
ds.drop(f)
elif ds[f] != 'a':
ds.add(f)
for f in s.removed:
if ds[f] == 'a':
# removed + added -> normal
ds.normallookup(f)
elif ds[f] != 'r':
ds.remove(f)
# Merge old parent and old working dir copies
oldcopies = {}
for f in (s.modified + s.added):
src = curctx[f].renamed()
if src:
oldcopies[f] = src[0]
oldcopies.update(copies)
copies = dict((dst, oldcopies.get(src, src))
for dst, src in oldcopies.iteritems())
# Adjust the dirstate copies
for dst, src in copies.iteritems():
if (src not in predctx or dst in predctx or ds[dst] != 'a'):
src = None
ds.copy(src, dst)
@command('^unamend', [])
def unamend(ui, repo, **opts):
"""
durin42Unsubmitted
Not Done

undo the _most recent_ amend? or can I run this iteratively and undo many amends in sequence?

durin42: undo the _most recent_ amend? or can I run this iteratively and undo many amends in sequence?
pulkitAuthorUnsubmitted
Not Done

Nice catch, it should be undo the _most recent_ amend. Thanks!

pulkit: Nice catch, it should be undo the _most recent_ amend. Thanks!
undo the most recent amend operation on a current changeset
This command will roll back to the previous version of a changeset,
leaving working directory in state in which it was before running
`hg amend` (e.g. files modified as part of an amend will be
marked as modified `hg status`)
"""
unfi = repo.unfiltered()
# identify the commit from which to unamend
curctx = repo['.']
yujaUnsubmitted
Not Done

Probably better to query curctx after locks are taken.

yuja: Probably better to query `curctx` after locks are taken.
with repo.wlock(), repo.lock(), repo.transaction('unamend'):
if not curctx.mutable():
raise error.Abort(_('cannot unamend public changesets'))
# identify the commit to which to unamend
durin42Unsubmitted
Not Done

Should we also look for unamend_source in the extra, and potentially refuse to unamend an unamend? Or not?

durin42: Should we also look for unamend_source in the extra, and potentially refuse to unamend an…
pulkitAuthorUnsubmitted
Not Done

I don't think users will run unamend(1) and then will try to run unamend(2) again to unamend the first unamend. It's not intuitive in my opinion. @durham @quark what do you guys think here?

pulkit: I don't think users will run unamend(1) and then will try to run unamend(2) again to unamend…
pulkitAuthorUnsubmitted
Not Done

Okay while trying to add this condition, I found we cannot refuse to unamend a changeset on the basis of unamend_source, for e.g
a -amend-> b -unamend-> a' -amend-> c -unamend-> a''

But if we refuse on basis on unamend_source, unamend c will refuse. We need to be more smart here but when I think the other way around, I think it's okay to unamend an unamend. I am open to suggestion and will go with what you guys prefer is good.

pulkit: Okay while trying to add this condition, I found we cannot refuse to unamend a changeset on the…
durhamUnsubmitted
Not Done

I'd just let unamend undo an unamend. Letting unamend toggle back and forth between the two states seems like it might grant the user more confidence in the command, even.

durham: I'd just let unamend undo an unamend. Letting unamend toggle back and forth between the two…
durin42Unsubmitted
Not Done

Works for me. Add some documentation/testing of this so we know it's intentional in the future?

durin42: Works for me. Add some documentation/testing of this so we know it's intentional in the future?
markers = list(predecessormarkers(curctx))
if len(markers) != 1:
e = _("changeset must have one predecessor, found %i predecessors")
raise error.Abort(e % len(markers))
durhamUnsubmitted
Not Done

This should be in a with statement probably? Can we just have it be as part of the top level lock with statement?

durham: This should be in a with statement probably? Can we just have it be as part of the top level…
ryanmceUnsubmitted
Not Done

Test test

ryanmce: Test test
ryanmceUnsubmitted
Not Done

Tested nested comments, sorry for the spam.

ryanmce: Tested nested comments, sorry for the spam.
durhamUnsubmitted
Not Done

Might be worth doing the predecessor check in the lock as well, since the result of this verification could technically change between now and when the lock is taken.

durham: Might be worth doing the predecessor check in the lock as well, since the result of this…
prednode = markers[0].prednode()
predctx = unfi[prednode]
durin42Unsubmitted
Not Done

cannot unamend a changeset with children

durin42: cannot unamend a changeset with children
if curctx.children():
raise error.Abort(_("cannot unamend a changeset with children"))
# add an extra so that we get a new hash
# note: allowing unamend to undo an unamend is an intentional feature
extras = predctx.extra()
extras['unamend_source'] = curctx.node()
yujaUnsubmitted
Not Done

This should be curctx.hex(). It's highly discouraged to store blob in extras.

yuja: This should be `curctx.hex()`. It's highly discouraged to store blob in extras.
def filectxfn(repo, ctx_, path):
try:
return predctx.filectx(path)
except KeyError:
return None
# Make a new commit same as predctx
newctx = context.memctx(repo,
parents=(predctx.p1(), predctx.p2()),
text=predctx.description(),
files=predctx.files(),
filectxfn=filectxfn,
user=predctx.user(),
date=predctx.date(),
extra=extras)
# phase handling
commitphase = curctx.phase()
overrides = {('phases', 'new-commit'): commitphase}
with repo.ui.configoverride(overrides, 'uncommit'):
newprednode = repo.commitctx(newctx)
newpredctx = repo[newprednode]
changedfiles = []
wctx = repo[None]
wm = wctx.manifest()
cm = newpredctx.manifest()
dirstate = repo.dirstate
diff = cm.diff(wm)
changedfiles.extend(diff.iterkeys())
yujaUnsubmitted
Not Done

Mostly unused variables?

yuja: Mostly unused variables?
with dirstate.parentchange():
dirstate.setparents(newprednode, node.nullid)
_unamenddirstate(repo, newpredctx, curctx)
mapping = {curctx.node(): (newprednode,)}
scmutil.cleanupnodes(repo, mapping, 'unamend')

tests/test-unamend.t

  • This file was added.
Test for command `hg unamend` which lives in uncommit extension
===============================================================
$ cat >> $HGRCPATH << EOF
> [alias]
> glog = log -G -T '{rev}:{node|short} {desc}'
> [experimental]
> evolution = createmarkers, allowunstable
> [extensions]
> rebase =
> amend =
> uncommit =
> EOF
Repo Setup
$ hg init repo
$ cd repo
$ for ch in {a..h}; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
$ hg glog
@ 7:ec2426147f0e Added h
|
o 6:87d6d6676308 Added g
|
o 5:825660c69f0c Added f
|
o 4:aa98ab95a928 Added e
|
o 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
Trying to unamend when there was no amend done
$ hg unamend
abort: changeset must have one predecessor, found 0 predecessors
[255]
Unamend on clean wdir and tip
$ echo "bar" >> h
$ hg amend
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
# Parent 87d6d66763085b629e6d7ed56778c79827273022
Added h
diff -r 87d6d6676308 -r c9fa1a715c1b h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+foo
+bar
$ hg glog --hidden
@ 8:c9fa1a715c1b Added h
|
| x 7:ec2426147f0e Added h
|/
o 6:87d6d6676308 Added g
|
o 5:825660c69f0c Added f
|
o 4:aa98ab95a928 Added e
|
o 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
$ hg unamend
$ hg glog --hidden
@ 9:8da14a1fd653 Added h
|
| x 8:c9fa1a715c1b Added h
|/
| x 7:ec2426147f0e Added h
|/
o 6:87d6d6676308 Added g
|
o 5:825660c69f0c Added f
|
o 4:aa98ab95a928 Added e
|
o 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
$ hg diff
diff -r 8da14a1fd653 h
--- a/h Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@
foo
+bar
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 8da14a1fd653c3f07fdad5760511c9e12652a306
# Parent 87d6d66763085b629e6d7ed56778c79827273022
Added h
diff -r 87d6d6676308 -r 8da14a1fd653 h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
$ hg status
M h
$ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log
branch=default
unamend_source=\xc9\xfa\x1aq\\\x1bva\xc0\xfa\xfb6*\x9f0\xbdu\x87\x8d}
Using unamend to undo an unamed (intentional)
$ hg unamend
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 1c09887216571a9755fc9d2e7f0e41c2b49e341b
# Parent 87d6d66763085b629e6d7ed56778c79827273022
Added h
diff -r 87d6d6676308 -r 1c0988721657 h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/h Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+foo
+bar
$ hg diff
Unamend on a dirty working directory
$ echo "bar" >> a
$ hg amend
$ echo "foobar" >> a
$ echo "bar" >> b
$ hg status
M a
M b
$ hg unamend
$ hg status
M a
M b
$ hg diff
diff -r 956548224719 a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,3 @@
foo
+bar
+foobar
diff -r 956548224719 b
--- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@
foo
+bar
Unamending an added file
$ hg ci -m "Added things to a and b"
$ echo foo > bar
$ hg add bar
$ hg amend
$ hg unamend
$ hg status
A bar
$ hg revert --all
forgetting bar
Unamending a removed file
$ hg remove a
$ hg amend
$ hg unamend
$ hg status
R a
? bar
$ hg revert --all
undeleting a
Unamending an added file with dirty wdir status
$ hg add bar
$ hg amend
$ echo bar >> bar
$ hg status
M bar
$ hg unamend
$ hg status
A bar
$ hg diff
diff -r ff917aa01c86 bar
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bar Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+foo
+bar
$ hg revert --all
forgetting bar
Unamending in middle of a stack
$ hg glog
@ 19:ff917aa01c86 Added things to a and b
|
o 12:956548224719 Added h
|
o 6:87d6d6676308 Added g
|
o 5:825660c69f0c Added f
|
o 4:aa98ab95a928 Added e
|
o 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
$ hg up 5
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar >> f
$ hg amend
$ hg rebase -s 6 -d . -q
$ hg glog
o 23:2b41b42e192a Added things to a and b
|
o 22:1860df151f01 Added h
|
o 21:49635b68477e Added g
|
@ 20:93f0e8ffab32 Added f
|
o 4:aa98ab95a928 Added e
|
o 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
$ hg unamend
abort: cannot unamend a changeset with children
[255]
Trying to unamend a public changeset
$ hg up
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg phase -r . -p
$ hg unamend
abort: cannot unamend public changesets
[255]
Testing whether unamend retains copies or not
$ hg status
? bar
$ hg mv a foo
$ hg ci -m "Moved a to foo"
$ hg exp --git
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID b087c66cada118d6c5487d3d7cb29cac239bd98a
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add
Moved a to foo
diff --git a/a b/foo
rename from a
rename to foo
$ hg mv b foobar
$ hg diff --git
diff --git a/b b/foobar
rename from b
rename to foobar
$ hg amend
$ hg exp --git
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 9fa06fb09a83a86ec7368d15004dbc52ac1a5d2e
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add
Moved a to foo
diff --git a/a b/foo
rename from a
rename to foo
diff --git a/b b/foobar
rename from b
rename to foobar
$ hg mv c wat
$ hg unamend
Retained copies in new prdecessor commit
$ hg exp --git
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 4cf9987c9b941f615930e7c46307b4dbf35697cf
# Parent 2b41b42e192adc425b106643c3fc89170d6b8add
Moved a to foo
diff --git a/a b/foo
rename from a
rename to foo
Retained copies in working directoy
$ hg diff --git
diff --git a/b b/foobar
rename from b
rename to foobar
diff --git a/c b/wat
rename from c
rename to wat