This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2862

uncommit: leave empty commit if all files are uncommitted
ClosedPublic

Authored by martinvonz on Mar 14 2018, 2:21 PM.

Details

Reviewers
durham
ryanmce
Group Reviewers
hg-reviewers
Commits
rHG28ba7d111337: uncommit: leave empty commit if all files are uncommitted
rHG29b9325d7f4d: uncommit: leave empty commit if all files are uncommitted
Summary

We had instructions for our internal users to add copy information
after commit like this:

hg uncommit <srcfile> <dstfile>
hg cp --after <srcfile> <dstfile>
hg amend

That usually works, but if the rename was the only change in that
commit, then the commit would get pruned. It's easy to fix the recipe:
just pass the --keep option. However, it seems too subtle, so I think
this is an indication that the commit should not be pruned if any
patterns were given.

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.Mar 14 2018, 2:21 PM
pulkit added a subscriber: pulkit.Mar 17 2018, 7:45 AM

Queuing this many thanks. Can you please send a followup with documenting the behavior of command related to pruning the empty changeset?

Closed by commit rHG29b9325d7f4d: uncommit: leave empty commit if all files are uncommitted (authored by martinvonz). · Explain WhyMar 17 2018, 7:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (3 lines)
Mtests/test-uncommit.t (44 lines)

Diff 7088

hgext/uncommit.py

cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
old = repo['.'] old = repo['.']
rewriteutil.precheck(repo, [old.rev()], 'uncommit') rewriteutil.precheck(repo, [old.rev()], 'uncommit')
if len(old.parents()) > 1: if len(old.parents()) > 1:
raise error.Abort(_("cannot uncommit merge changeset")) raise error.Abort(_("cannot uncommit merge changeset"))
with repo.transaction('uncommit'): with repo.transaction('uncommit'):
match = scmutil.match(old, pats, opts) match = scmutil.match(old, pats, opts)
newid = _commitfiltered(repo, old, match, opts.get('keep')) allowempty = opts.get('keep') or pats
newid = _commitfiltered(repo, old, match, allowempty)
if newid is None: if newid is None:
ui.status(_("nothing to uncommit\n")) ui.status(_("nothing to uncommit\n"))
return 1 return 1
mapping = {} mapping = {}
if newid != old.p1().node(): if newid != old.p1().node():
# Move local changes on filtered changeset # Move local changes on filtered changeset
mapping[old.node()] = (newid,) mapping[old.node()] = (newid,)

tests/test-uncommit.t

M files M files
$ hg uncommit $ hg uncommit
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg uncommit files $ hg uncommit files
$ cat files $ cat files
abcde abcde
foo foo
$ hg commit -m "files abcde + foo" $ hg commit --amend -m "files abcde + foo"
Testing the 'experimental.uncommitondirtywdir' config Testing the 'experimental.uncommitondirtywdir' config
$ echo "bar" >> files $ echo "bar" >> files
$ hg uncommit $ hg uncommit
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg uncommit --config experimental.uncommitondirtywdir=True $ hg uncommit --config experimental.uncommitondirtywdir=True
diff -r 69a232e754b0 -r abf2df566fc1 files diff -r 69a232e754b0 -r abf2df566fc1 files
--- a/files Thu Jan 01 00:00:00 1970 +0000 --- a/files Thu Jan 01 00:00:00 1970 +0000
+++ b/files Thu Jan 01 00:00:00 1970 +0000 +++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-ab -ab
+abc +abc
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 10:48e5bd7cd583
$ hg uncommit $ hg uncommit
3 new orphan changesets 3 new orphan changesets
$ hg status $ hg status
M files M files
A file-abc A file-abc
$ hg heads -T '{rev}:{node} {desc}' $ hg heads -T '{rev}:{node} {desc}'
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol) 10:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 10:48e5bd7cd583
$ hg commit -m 'new abc' $ hg commit -m 'new abc'
created new head created new head
Partial uncommit in the middle, does not move bookmark Partial uncommit in the middle, does not move bookmark
$ hg checkout '.^' $ hg checkout '.^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r . -p -T '{rev}:{node} {desc}' $ hg log -r . -p -T '{rev}:{node} {desc}'
1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab 1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/file-ab Thu Jan 01 00:00:00 1970 +0000 +++ b/file-ab Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ab +ab
diff -r 3004d2d9b508 -r 69a232e754b0 files diff -r 3004d2d9b508 -r 69a232e754b0 files
--- a/files Thu Jan 01 00:00:00 1970 +0000 --- a/files Thu Jan 01 00:00:00 1970 +0000
+++ b/files Thu Jan 01 00:00:00 1970 +0000 +++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-a -a
+ab +ab
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 10:48e5bd7cd583
$ hg uncommit file-ab $ hg uncommit file-ab
1 new orphan changesets 1 new orphan changesets
$ hg status $ hg status
A file-ab A file-ab
$ hg heads -T '{rev}:{node} {desc}\n' $ hg heads -T '{rev}:{node} {desc}\n'
11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab 12:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc 11:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo 10:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 10:48e5bd7cd583
$ hg commit -m 'update ab' $ hg commit -m 'update ab'
$ hg status $ hg status
$ hg heads -T '{rev}:{node} {desc}\n' $ hg heads -T '{rev}:{node} {desc}\n'
12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab 13:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc 11:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo 10:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
$ hg log -G -T '{rev}:{node} {desc}' --hidden $ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab @ 13:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
| |
o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab o 12:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
| |
| * 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc | * 11:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
| | | |
| | * 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo | | * 10:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
| | | | | |
| | | x 8:83815831694b1271e9f207cb1b79b2b19275edcb files abcde + foo | | | x 9:8a6b58c173ca6a2e3745d8bd86698718d664bc6c files abcde + foo
| | |/
| | | x 8:39ad452c7f684a55d161c574340c5766c4569278 update files for abcde
| | |/ | | |/
| | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde | | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
| | |/ | | |/
| | * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde | | * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
| | | | | |
| | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde | | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
| | |/ | | |/
| | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde | | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
| | |/ | | |/
| | * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd | | * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
| | | | | |
| | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc | | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
| |/ | |/
| x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab | x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|/ |/
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
Uncommit with draft parent Uncommit with draft parent
$ hg uncommit $ hg uncommit
$ hg phase -r . $ hg phase -r .
11: draft 12: draft
$ hg commit -m 'update ab again' $ hg commit -m 'update ab again'
Uncommit with public parent Uncommit with public parent
$ hg phase -p "::.^" $ hg phase -p "::.^"
$ hg uncommit $ hg uncommit
$ hg phase -r . $ hg phase -r .
11: public 12: public
Partial uncommit with public parent Partial uncommit with public parent
$ echo xyz > xyz $ echo xyz > xyz
$ hg add xyz $ hg add xyz
$ hg commit -m "update ab and add xyz" $ hg commit -m "update ab and add xyz"
$ hg uncommit xyz $ hg uncommit xyz
$ hg status $ hg status
A xyz A xyz
$ hg phase -r . $ hg phase -r .
15: draft 16: draft
$ hg phase -r ".^" $ hg phase -r ".^"
11: public 12: public
Uncommit leaving an empty changeset Uncommit leaving an empty changeset
$ cd $TESTTMP $ cd $TESTTMP
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> Q > Q