##// END OF EJS Templates
tests: replace `hg id --debug -i` command substitution with non-debug command...
tests: replace `hg id --debug -i` command substitution with non-debug command The censor and convert tests were failing on Windows because the `--debug` flag also prints debug messages, and at least some of these were outputting: skip updating dirstate: identity mismatch ${node} Obviously that causes cascading problems. The other tests were OK, but it's better to use a non debug command for stability.

File last commit:

r47783:c4dbbaec default
r52837:2eeca9a8 default
Show More
test-uncommit.t
596 lines | 15.1 KiB | text/troff | Tads3Lexer
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 Test uncommit - set up the config
$ cat >> $HGRCPATH <<EOF
> [experimental]
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 > evolution.createmarkers=True
Boris Feld
config: use 'experimental.evolution.allowunstable'...
r34868 > evolution.allowunstable=True
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 > [extensions]
> uncommit =
> drawdag=$TESTDIR/drawdag.py
> EOF
Build up a repo
$ hg init repo
$ cd repo
$ hg bookmark foo
Help for uncommit
$ hg help uncommit
hg uncommit [OPTION]... [FILE]...
uncommit part or all of a local changeset
This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain
modified in the working directory.
Martin von Zweigbergk
uncommit: document when the commit will be pruned...
r36991 If no files are specified, the commit will be pruned, unless --keep is
given.
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 (use 'hg help -e uncommit' to show help for the uncommit extension)
options ([+] can be repeated):
Matt Harbison
uncommit: fix typo in help text...
r43244 --keep allow an empty commit after uncommitting
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 --allow-dirty-working-copy allow uncommit with outstanding changes
Matt Harbison
uncommit: enable support for adding a note...
r43206 -n --note TEXT store a note on uncommit
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
Matt Harbison
uncommit: add support to modify the commit message and date...
r43172 -m --message TEXT use text as commit message
-l --logfile FILE read commit message from file
-d --date DATE record the specified date as commit date
-u --user USER record the specified user as committer
Matt Harbison
uncommit: drop the hyphen from --current-user and --current-date...
r43190 -D --currentdate record the current date as commit date
-U --currentuser record the current user as committer
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
(some details hidden, use --verbose to show complete help)
Uncommit with no commits should fail
$ hg uncommit
Martin von Zweigbergk
rewriteutil: replace "null changeset" by "the null revision" in error message...
r47779 abort: cannot uncommit the null revision
Pulkit Goyal
rewriteutil: use precheck() in uncommit and amend commands...
r35244 (no changeset checked out)
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 [10]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
Create some commits
$ touch files
$ hg add files
$ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
Joerg Sonnenberger
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems...
r45218 $ ls -A
.hg
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 file-a
file-ab
file-abc
file-abcd
file-abcde
files
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
|
o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
|
o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
|
o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
Simple uncommit off the top, also moves bookmark
$ hg bookmark
* foo 4:6c4fd43ed714
$ hg uncommit
$ hg status
M files
A file-abcde
$ hg bookmark
* foo 3:6db330d65db4
$ hg log -G -T '{rev}:{node} {desc}' --hidden
x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
|
@ 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
|
o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
|
o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
Recommit
$ hg commit -m 'new change abcde'
$ hg status
$ hg heads -T '{rev}:{node} {desc}'
5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde (no-eol)
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 Uncommit of non-existent and unchanged files aborts
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg uncommit nothinghere
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 abort: cannot uncommit "nothinghere"
(file does not exist)
Martin von Zweigbergk
errors: use InputError in uncommit extension...
r47192 [10]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
$ hg uncommit file-abc
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 abort: cannot uncommit "file-abc"
(file was not changed in working directory parent)
Martin von Zweigbergk
errors: use InputError in uncommit extension...
r47192 [10]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
Try partial uncommit, also moves bookmark
$ hg bookmark
* foo 5:0c07a3ccda77
$ hg uncommit files
$ hg status
M files
$ hg bookmark
* foo 6:3727deee06f7
$ hg heads -T '{rev}:{node} {desc}'
6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde (no-eol)
$ hg log -r . -p -T '{rev}:{node} {desc}'
6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcdediff -r 6db330d65db4 -r 3727deee06f7 file-abcde
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/file-abcde Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+abcde
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
|
| x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
|/
| x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
|/
o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
|
o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
|
o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
$ hg commit -m 'update files for abcde'
Uncommit with dirty state
$ echo "foo" >> files
$ cat files
abcde
foo
$ hg status
M files
Pulkit Goyal
uncommit: don't allow bare uncommit on dirty working directory...
r34285 $ hg uncommit
abort: uncommitted changes
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 (requires --allow-dirty-working-copy to uncommit)
Martin von Zweigbergk
errors: introduce StateError and use it from commands and cmdutil...
r46444 [20]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg uncommit files
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 abort: uncommitted changes
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 (requires --allow-dirty-working-copy to uncommit)
Martin von Zweigbergk
errors: introduce StateError and use it from commands and cmdutil...
r46444 [20]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ cat files
abcde
foo
Martin von Zweigbergk
uncommit: leave empty commit if all files are uncommitted...
r36990 $ hg commit --amend -m "files abcde + foo"
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
Pulkit Goyal
uncommit: add an experimental.uncommitondirtywdir config...
r34286 Testing the 'experimental.uncommitondirtywdir' config
$ echo "bar" >> files
$ hg uncommit
abort: uncommitted changes
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 (requires --allow-dirty-working-copy to uncommit)
Martin von Zweigbergk
errors: introduce StateError and use it from commands and cmdutil...
r46444 [20]
Pulkit Goyal
uncommit: add an experimental.uncommitondirtywdir config...
r34286 $ hg uncommit --config experimental.uncommitondirtywdir=True
$ hg commit -m "files abcde + foo"
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 Uncommit in the middle of a stack, does not move bookmark
$ hg checkout '.^^^'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark foo)
$ hg log -r . -p -T '{rev}:{node} {desc}'
2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abcdiff -r 69a232e754b0 -r abf2df566fc1 file-abc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/file-abc Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+abc
diff -r 69a232e754b0 -r abf2df566fc1 files
--- a/files Thu Jan 01 00:00:00 1970 +0000
+++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-ab
+abc
$ hg bookmark
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 foo 9:48e5bd7cd583
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg uncommit
Martin von Zweigbergk
evolution: report new unstable changesets...
r35727 3 new orphan changesets
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
M files
A file-abc
$ hg heads -T '{rev}:{node} {desc}'
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg bookmark
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 foo 9:48e5bd7cd583
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg commit -m 'new abc'
created new head
Partial uncommit in the middle, does not move bookmark
$ hg checkout '.^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r . -p -T '{rev}:{node} {desc}'
1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/file-ab Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+ab
diff -r 3004d2d9b508 -r 69a232e754b0 files
--- a/files Thu Jan 01 00:00:00 1970 +0000
+++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-a
+ab
$ hg bookmark
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 foo 9:48e5bd7cd583
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg uncommit file-ab
Martin von Zweigbergk
evolution: report new unstable changesets...
r35727 1 new orphan changesets
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
A file-ab
$ hg heads -T '{rev}:{node} {desc}\n'
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
$ hg bookmark
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 foo 9:48e5bd7cd583
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg commit -m 'update ab'
$ hg status
$ hg heads -T '{rev}:{node} {desc}\n'
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
$ hg log -G -T '{rev}:{node} {desc}' --hidden
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 @ 12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 |
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 |
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 | * 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 | |
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 | | * 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 | | |
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 | | | x 8:84beeba0ac30e19521c036e4d2dd3a5fa02586ff files abcde + foo
Pulkit Goyal
uncommit: add an experimental.uncommitondirtywdir config...
r34286 | | |/
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 | | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
| | |/
av6
graphlog: add another graph node type, unstable, using character "*" (BC)
r35524 | | * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 | | |
| | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
| | |/
| | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
| | |/
av6
graphlog: add another graph node type, unstable, using character "*" (BC)
r35524 | | * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 | | |
| | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
| |/
| x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|/
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
Uncommit with draft parent
$ hg uncommit
$ hg phase -r .
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 11: draft
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg commit -m 'update ab again'
Martin von Zweigbergk
tests: add test of uncommit with default phase as secret...
r38441 Phase is preserved
$ hg uncommit --keep --config phases.new-commit=secret
Martin von Zweigbergk
uncommit: inform user if the commit is empty after uncommit...
r41911 note: keeping empty commit
Martin von Zweigbergk
tests: add test of uncommit with default phase as secret...
r38441 $ hg phase -r .
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 14: draft
Martin von Zweigbergk
tests: add test of uncommit with default phase as secret...
r38441 $ hg commit --amend -m 'update ab again'
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 Uncommit with public parent
$ hg phase -p "::.^"
$ hg uncommit
$ hg phase -r .
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 11: public
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
Partial uncommit with public parent
$ echo xyz > xyz
$ hg add xyz
$ hg commit -m "update ab and add xyz"
$ hg uncommit xyz
$ hg status
A xyz
$ hg phase -r .
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 17: draft
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg phase -r ".^"
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 11: public
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
Martin von Zweigbergk
uncommit: add config option to keep commit by default...
r41916 Uncommit with --keep or experimental.uncommit.keep leaves an empty changeset
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
$ cd $TESTTMP
$ hg init repo1
$ cd repo1
$ hg debugdrawdag <<'EOS'
> Q
> |
> P
> EOS
$ hg up Q -q
Pulkit Goyal
uncommit: rename the flag 'empty' to 'keep' which retains empty changeset...
r34284 $ hg uncommit --keep
Martin von Zweigbergk
uncommit: inform user if the commit is empty after uncommit...
r41911 note: keeping empty commit
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg log -G -T '{desc} FILES: {files}'
@ Q FILES:
|
| x Q FILES: Q
|/
o P FILES: P
Martin von Zweigbergk
uncommit: add config option to keep commit by default...
r41916 $ cat >> .hg/hgrc <<EOF
> [experimental]
> uncommit.keep=True
> EOF
$ hg ci --amend
$ hg uncommit
note: keeping empty commit
$ hg log -G -T '{desc} FILES: {files}'
@ Q FILES:
|
| x Q FILES: Q
|/
o P FILES: P
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
A Q
Martin von Zweigbergk
uncommit: add config option to keep commit by default...
r41916 $ hg ci --amend
$ hg uncommit --no-keep
$ hg log -G -T '{desc} FILES: {files}'
x Q FILES: Q
|
@ P FILES: P
$ hg status
A Q
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ cd ..
$ rm -rf repo1
Testing uncommit while merge
$ hg init repo2
$ cd repo2
Create some history
$ touch a
$ hg add a
$ for i in 1 2 3; do echo $i > a; hg commit -m "a $i"; done
$ hg checkout 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ touch b
$ hg add b
$ for i in 1 2 3; do echo $i > b; hg commit -m "b $i"; done
created new head
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
|
o 4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
|
o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
|
| o 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
| |
| o 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
|/
o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
Add and expect uncommit to fail on both merge working dir and merge changeset
$ hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg uncommit
Pulkit Goyal
uncommit: don't allow bare uncommit on dirty working directory...
r34285 abort: outstanding uncommitted merge
Navaneeth Suresh
uncommit: add flag --allow-dirty-working-copy...
r42026 (requires --allow-dirty-working-copy to uncommit)
Martin von Zweigbergk
errors: introduce StateError and use it from commands and cmdutil...
r46444 [20]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
Pulkit Goyal
uncommit: add a test for uncommit with uncommitondirtywdir config in merge...
r34305 $ hg uncommit --config experimental.uncommitondirtywdir=True
Martin von Zweigbergk
rewriteutil: adapt "cannot %s while merging" to work with "change branch of"...
r47783 abort: cannot uncommit changesets while merging
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 [20]
Pulkit Goyal
uncommit: add a test for uncommit with uncommitondirtywdir config in merge...
r34305
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193 $ hg status
M a
$ hg commit -m 'merge a and b'
$ hg uncommit
abort: cannot uncommit merge changeset
Martin von Zweigbergk
errors: use InputError in uncommit extension...
r47192 [10]
Pulkit Goyal
uncommit: move fb-extension to core which uncommits a changeset...
r34193
$ hg status
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 6:c03b9c37bc67bf504d4912061cfb527b47a63c6e merge a and b
|\
| o 5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
| |
| o 4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
| |
| o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
| |
o | 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
| |
o | 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
|/
o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
Martin von Zweigbergk
tests: add more tests of uncommit/unamend with copies...
r41369
Rename a->b, then remove b in working copy. Result should remove a.
$ hg co -q 0
$ hg mv a b
$ hg ci -qm 'move a to b'
$ hg rm b
$ hg uncommit --config experimental.uncommitondirtywdir=True
$ hg st --copies
R a
$ hg revert a
Rename a->b, then rename b->c in working copy. Result should rename a->c.
$ hg co -q 0
$ hg mv a b
$ hg ci -qm 'move a to b'
$ hg mv b c
$ hg uncommit --config experimental.uncommitondirtywdir=True
$ hg st --copies
A c
a
R a
$ hg revert a
$ hg forget c
$ rm c
Copy a->b1 and a->b2, then rename b1->c in working copy. Result should copy a->b2 and a->c.
$ hg co -q 0
$ hg cp a b1
$ hg cp a b2
$ hg ci -qm 'move a to b1 and b2'
$ hg mv b1 c
$ hg uncommit --config experimental.uncommitondirtywdir=True
$ hg st --copies
A b2
a
A c
a
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 $ cd ..
Martin von Zweigbergk
tests: fix a stale reference to experimental.uncommitondirtywdir...
r42053 --allow-dirty-working-copy should also work on a dirty PATH
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025
$ hg init issue5977
$ cd issue5977
$ echo 'super critical info!' > a
$ hg ci -Am 'add a'
adding a
$ echo 'foo' > b
$ hg add b
$ hg status
A b
Martin von Zweigbergk
tests: use full `uncommit` command name in tests...
r44694 $ hg uncommit a
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 note: keeping empty commit
$ cat a
super critical info!
$ hg log
changeset: 1:656ba143d384
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
$ hg ci -Am 'add b'
$ echo 'foo bar' > b
Martin von Zweigbergk
tests: use full `uncommit` command name in tests...
r44694 $ hg uncommit b
Martin von Zweigbergk
tests: clarify test setup test in test-uncommit.t...
r42054 abort: uncommitted changes
(requires --allow-dirty-working-copy to uncommit)
Martin von Zweigbergk
errors: introduce StateError and use it from commands and cmdutil...
r46444 [20]
Martin von Zweigbergk
tests: use full `uncommit` command name in tests...
r44694 $ hg uncommit --allow-dirty-working-copy b
Navaneeth Suresh
uncommit: don't allow dirty working copy with PATH (issue5977)...
r42025 $ hg log
changeset: 3:30fa958635b2
tag: tip
parent: 1:656ba143d384
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add b
changeset: 1:656ba143d384
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 Removes can be uncommitted
$ hg ci -m 'modified b'
$ hg rm b
$ hg ci -m 'remove b'
$ hg uncommit b
note: keeping empty commit
$ hg status
R b
Uncommitting a directory won't run afoul of the checks that an explicit file
can be uncommitted.
$ mkdir dir
$ echo 1 > dir/file.txt
$ hg ci -Aqm 'add file in directory'
Matt Harbison
uncommit: add support to modify the commit message and date...
r43172 $ hg uncommit dir -m 'uncommit with message' -u 'different user' \
> -d 'Jun 30 12:12:12 1980 +0000'
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 $ hg status
A dir/file.txt
Matt Harbison
uncommit: add support to modify the commit message and date...
r43172 $ hg log -r .
changeset: 8:b4dd26dc42e0
tag: tip
parent: 6:2278a4c24330
user: different user
date: Mon Jun 30 12:12:12 1980 +0000
summary: uncommit with message
Matt Harbison
uncommit: make -D/--date and -U/--user mutually exclusive...
r43191 Bad option combinations
$ hg rollback -q --config ui.rollback=True
$ hg uncommit -U --user 'user'
Martin von Zweigbergk
commit: use cmdutil.check_at_most_one_arg()...
r44345 abort: cannot specify both --user and --currentuser
Martin von Zweigbergk
errors: introduce InputError and use it from commands and cmdutil...
r46431 [10]
Matt Harbison
uncommit: make -D/--date and -U/--user mutually exclusive...
r43191 $ hg uncommit -D --date today
Martin von Zweigbergk
commit: use cmdutil.check_at_most_one_arg()...
r44345 abort: cannot specify both --date and --currentdate
Martin von Zweigbergk
errors: introduce InputError and use it from commands and cmdutil...
r46431 [10]
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218
`uncommit <dir>` and `cd <dir> && uncommit .` behave the same...
$ echo 2 > dir/file2.txt
$ hg ci -Aqm 'add file2 in directory'
$ hg uncommit dir
note: keeping empty commit
$ hg status
A dir/file2.txt
$ hg rollback -q --config ui.rollback=True
$ cd dir
Matt Harbison
uncommit: enable support for adding a note...
r43206 $ hg uncommit . -n 'this is a note'
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 note: keeping empty commit
$ hg status
A dir/file2.txt
$ cd ..
... and errors out the same way when nothing can be uncommitted
$ hg rollback -q --config ui.rollback=True
$ mkdir emptydir
$ hg uncommit emptydir
abort: cannot uncommit "emptydir"
(file was untracked in working directory parent)
Martin von Zweigbergk
errors: use InputError in uncommit extension...
r47192 [10]
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218
$ cd emptydir
$ hg uncommit .
abort: cannot uncommit "emptydir"
(file was untracked in working directory parent)
Martin von Zweigbergk
errors: use InputError in uncommit extension...
r47192 [10]
Matt Harbison
uncommit: abort if an explicitly given file cannot be uncommitted (BC)...
r42218 $ hg status
$ cd ..