test-commit-amend.t
1319 lines
| 32.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-commit-amend.t
|
r16458 | $ hg init | ||
Setup: | ||||
$ echo a >> a | ||||
$ hg ci -Am 'base' | ||||
adding a | ||||
Refuse to amend public csets: | ||||
$ hg phase -r . -p | ||||
$ hg ci --amend | ||||
abort: cannot amend public changesets | ||||
|
r35244 | (see 'hg help phases' for details) | ||
|
r46457 | [10] | ||
|
r16458 | $ hg phase -r . -f -d | ||
$ echo a >> a | ||||
$ hg ci -Am 'base1' | ||||
Nothing to amend: | ||||
|
r26750 | $ hg ci --amend -m 'base1' | ||
|
r16458 | nothing changed | ||
[1] | ||||
|
r17060 | $ cat >> $HGRCPATH <<EOF | ||
> [hooks] | ||||
|
r17462 | > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE" | ||
|
r17060 | > EOF | ||
|
r17049 | |||
|
r16458 | Amending changeset with changes in working dir: | ||
|
r17924 | (and check that --message does not trigger an editor) | ||
|
r16458 | |||
$ echo a >> a | ||||
|
r17924 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' | ||
|
r17811 | pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 | ||
43f1ba15f28a tip | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg | ||
|
r17049 | $ echo 'pretxncommit.foo = ' >> $HGRCPATH | ||
|
r16458 | $ hg diff -c . | ||
|
r17811 | diff -r ad120869acf0 -r 43f1ba15f28a a | ||
|
r16458 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,3 @@ | ||||
|
r30432 | a | ||
|
r30431 | +a | ||
|
r16458 | +a | ||
$ hg log | ||||
|
r17811 | changeset: 1:43f1ba15f28a | ||
|
r16458 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: amend base1 | ||||
changeset: 0:ad120869acf0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: base | ||||
|
r18197 | Check proper abort for empty message | ||
|
r16458 | |||
|
r18197 | $ cat > editor.sh << '__EOF__' | ||
> #!/bin/sh | ||||
> echo "" > "$1" | ||||
> __EOF__ | ||||
|
r34087 | |||
Update the existing file to ensure that the dirstate is not in pending state | ||||
(where the status of some files in the working copy is not known yet). This in | ||||
turn ensures that when the transaction is aborted due to an empty message during | ||||
the amend, there should be no rollback. | ||||
$ echo a >> a | ||||
|
r16458 | $ echo b > b | ||
|
r18197 | $ hg add b | ||
$ hg summary | ||||
parent: 1:43f1ba15f28a tip | ||||
amend base1 | ||||
branch: default | ||||
|
r34087 | commit: 1 modified, 1 added, 1 unknown | ||
|
r18197 | update: (current) | ||
|
r25382 | phases: 2 draft | ||
|
r18197 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend | ||
abort: empty commit message | ||||
|
r46431 | [10] | ||
|
r18197 | $ hg summary | ||
parent: 1:43f1ba15f28a tip | ||||
amend base1 | ||||
branch: default | ||||
|
r34087 | commit: 1 modified, 1 added, 1 unknown | ||
|
r18197 | update: (current) | ||
|
r25382 | phases: 2 draft | ||
|
r18197 | |||
|
r34087 | Add new file along with modified existing file: | ||
|
r18197 | $ hg ci --amend -m 'amend base1 new file' | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg | ||
|
r16458 | |||
Remove file that was added in amended commit: | ||||
|
r17863 | (and test logfile option) | ||
|
r17924 | (and test that logfile option do not trigger an editor) | ||
|
r16458 | |||
$ hg rm b | ||||
|
r17863 | $ echo 'amend base1 remove new file' > ../logfile | ||
|
r17924 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg | ||
|
r16458 | |||
$ hg cat b | ||||
|
r34087 | b: no such file in rev 47343646fa3d | ||
|
r16458 | [1] | ||
No changes, just a different message: | ||||
$ hg ci -v --amend -m 'no changes, new message' | ||||
|
r34087 | amending changeset 47343646fa3d | ||
copying changeset 47343646fa3d to ad120869acf0 | ||||
|
r23749 | committing files: | ||
|
r16458 | a | ||
|
r23749 | committing manifest | ||
committing changelog | ||||
|
r16458 | 1 changesets found | ||
|
r23748 | uncompressed size of bundle content: | ||
|
r30211 | 254 (changelog) | ||
|
r26927 | 163 (manifests) | ||
|
r34087 | 131 a | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg | ||
|
r16458 | 1 changesets found | ||
|
r23748 | uncompressed size of bundle content: | ||
|
r30211 | 250 (changelog) | ||
|
r26927 | 163 (manifests) | ||
|
r34087 | 131 a | ||
|
r16458 | adding branch | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34087 | committed changeset 1:401431e913a1 | ||
|
r16458 | $ hg diff -c . | ||
|
r34087 | diff -r ad120869acf0 -r 401431e913a1 a | ||
|
r16458 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r34087 | @@ -1,1 +1,4 @@ | ||
|
r30432 | a | ||
|
r30431 | +a | ||
|
r16458 | +a | ||
|
r34087 | +a | ||
|
r16458 | $ hg log | ||
|
r34087 | changeset: 1:401431e913a1 | ||
|
r16458 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: no changes, new message | ||||
changeset: 0:ad120869acf0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: base | ||||
Disable default date on commit so when -d isn't given, the old date is preserved: | ||||
$ echo '[defaults]' >> $HGRCPATH | ||||
$ echo 'commit=' >> $HGRCPATH | ||||
Test -u/-d: | ||||
|
r22249 | $ cat > .hg/checkeditform.sh <<EOF | ||
> env | grep HGEDITFORM | ||||
> true | ||||
> EOF | ||||
$ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0' | ||||
HGEDITFORM=commit.amend.normal | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg | ||
|
r16458 | $ echo a >> a | ||
$ hg ci --amend -u foo -d '1 0' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg | ||
|
r16458 | $ hg log -r . | ||
|
r34087 | changeset: 1:a9a13940fc03 | ||
|
r16458 | tag: tip | ||
user: foo | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: no changes, new message | ||||
Open editor with old commit message if a message isn't given otherwise: | ||||
|
r16901 | $ cat > editor.sh << '__EOF__' | ||
|
r16458 | > #!/bin/sh | ||
> cat $1 | ||||
> echo "another precious commit message" > "$1" | ||||
> __EOF__ | ||||
|
r20771 | |||
at first, test saving last-message.txt | ||||
$ cat > .hg/hgrc << '__EOF__' | ||||
> [hooks] | ||||
> pretxncommit.test-saving-last-message = false | ||||
> __EOF__ | ||||
$ rm -f .hg/last-message.txt | ||||
$ hg commit --amend -v -m "message given from command line" | ||||
|
r34087 | amending changeset a9a13940fc03 | ||
copying changeset a9a13940fc03 to ad120869acf0 | ||||
|
r23749 | committing files: | ||
|
r20771 | a | ||
|
r23749 | committing manifest | ||
committing changelog | ||||
|
r20771 | running hook pretxncommit.test-saving-last-message: false | ||
transaction abort! | ||||
rollback completed | ||||
abort: pretxncommit.test-saving-last-message hook exited with status 1 | ||||
|
r47145 | [40] | ||
|
r20771 | $ cat .hg/last-message.txt | ||
message given from command line (no-eol) | ||||
$ rm -f .hg/last-message.txt | ||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||||
|
r34087 | amending changeset a9a13940fc03 | ||
copying changeset a9a13940fc03 to ad120869acf0 | ||||
|
r20771 | no changes, new message | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
|
r23749 | committing files: | ||
|
r20771 | a | ||
|
r23749 | committing manifest | ||
committing changelog | ||||
|
r20771 | running hook pretxncommit.test-saving-last-message: false | ||
transaction abort! | ||||
rollback completed | ||||
abort: pretxncommit.test-saving-last-message hook exited with status 1 | ||||
|
r47145 | [40] | ||
|
r20771 | |||
$ cat .hg/last-message.txt | ||||
another precious commit message | ||||
$ cat > .hg/hgrc << '__EOF__' | ||||
> [hooks] | ||||
> pretxncommit.test-saving-last-message = | ||||
> __EOF__ | ||||
then, test editing custom commit message | ||||
|
r16901 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||
|
r34087 | amending changeset a9a13940fc03 | ||
copying changeset a9a13940fc03 to ad120869acf0 | ||||
|
r16458 | no changes, new message | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
|
r23749 | committing files: | ||
|
r16458 | a | ||
|
r23749 | committing manifest | ||
committing changelog | ||||
|
r16458 | 1 changesets found | ||
|
r23748 | uncompressed size of bundle content: | ||
|
r30211 | 249 (changelog) | ||
|
r26927 | 163 (manifests) | ||
|
r34087 | 133 a | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg | ||
|
r16458 | 1 changesets found | ||
|
r23748 | uncompressed size of bundle content: | ||
|
r30211 | 257 (changelog) | ||
|
r26927 | 163 (manifests) | ||
|
r34087 | 133 a | ||
|
r16458 | adding branch | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34087 | committed changeset 1:64a124ba1b44 | ||
|
r16458 | |||
Same, but with changes in working dir (different code path): | ||||
$ echo a >> a | ||||
|
r16901 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||
|
r34087 | amending changeset 64a124ba1b44 | ||
|
r16458 | another precious commit message | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
|
r23749 | committing files: | ||
|
r16458 | a | ||
|
r23749 | committing manifest | ||
committing changelog | ||||
|
r16458 | 1 changesets found | ||
|
r23748 | uncompressed size of bundle content: | ||
|
r30211 | 257 (changelog) | ||
|
r26927 | 163 (manifests) | ||
|
r30432 | 133 a | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg | ||
|
r34087 | 1 changesets found | ||
uncompressed size of bundle content: | ||||
257 (changelog) | ||||
163 (manifests) | ||||
135 a | ||||
|
r16458 | adding branch | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34087 | committed changeset 1:7892795b8e38 | ||
|
r16458 | |||
|
r16901 | $ rm editor.sh | ||
|
r16458 | $ hg log -r . | ||
|
r34087 | changeset: 1:7892795b8e38 | ||
|
r16458 | tag: tip | ||
user: foo | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: another precious commit message | ||||
Moving bookmarks, preserve active bookmark: | ||||
$ hg book book1 | ||||
$ hg book book2 | ||||
$ hg ci --amend -m 'move bookmarks' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg | ||
|
r16458 | $ hg book | ||
|
r34087 | book1 1:8311f17e2616 | ||
* book2 1:8311f17e2616 | ||||
|
r16458 | $ echo a >> a | ||
$ hg ci --amend -m 'move bookmarks' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg | ||
|
r16458 | $ hg book | ||
|
r34087 | book1 1:a3b65065808c | ||
* book2 1:a3b65065808c | ||||
|
r16458 | |||
|
r18198 | abort does not loose bookmarks | ||
$ cat > editor.sh << '__EOF__' | ||||
> #!/bin/sh | ||||
> echo "" > "$1" | ||||
> __EOF__ | ||||
$ echo a >> a | ||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend | ||||
abort: empty commit message | ||||
|
r46431 | [10] | ||
|
r18198 | $ hg book | ||
|
r34087 | book1 1:a3b65065808c | ||
* book2 1:a3b65065808c | ||||
|
r18198 | $ hg revert -Caq | ||
$ rm editor.sh | ||||
|
r16458 | $ echo '[defaults]' >> $HGRCPATH | ||
$ echo "commit=-d '0 0'" >> $HGRCPATH | ||||
Moving branches: | ||||
$ hg branch foo | ||||
marked working directory as branch foo | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ echo a >> a | ||||
$ hg ci -m 'branch foo' | ||||
$ hg branch default -f | ||||
marked working directory as branch default | ||||
$ hg ci --amend -m 'back to default' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg | ||
|
r16458 | $ hg branches | ||
|
r34087 | default 2:9c07515f2650 | ||
|
r16458 | |||
Close branch: | ||||
$ hg up -q 0 | ||||
$ echo b >> b | ||||
$ hg branch foo | ||||
marked working directory as branch foo | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg ci -Am 'fork' | ||||
adding b | ||||
$ echo b >> b | ||||
$ hg ci -mb | ||||
$ hg ci --amend --close-branch -m 'closing branch foo' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg | ||
|
r16458 | |||
Same thing, different code path: | ||||
$ echo b >> b | ||||
$ hg ci -m 'reopen branch' | ||||
reopening closed branch head 4 | ||||
$ echo b >> b | ||||
$ hg ci --amend --close-branch | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg | ||
|
r16458 | $ hg branches | ||
|
r34087 | default 2:9c07515f2650 | ||
|
r16458 | |||
|
r18909 | Refuse to amend during a merge: | ||
|
r16458 | |||
$ hg up -q default | ||||
$ hg merge foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci --amend | ||||
|
r47783 | abort: cannot amend changesets while merging | ||
|
r46457 | [20] | ||
|
r16458 | $ hg ci -m 'merge' | ||
|
r36927 | Refuse to amend if there is a merge conflict (issue5805): | ||
$ hg up -q foo | ||||
$ echo c > a | ||||
$ hg up default -t :fail | ||||
0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
use 'hg resolve' to retry unresolved file merges | ||||
[1] | ||||
$ hg resolve -l | ||||
U a | ||||
$ hg ci --amend | ||||
abort: unresolved merge conflicts (see 'hg help resolve') | ||||
|
r46528 | [20] | ||
|
r36927 | |||
$ hg up -qC . | ||||
|
r16458 | Follow copies/renames: | ||
$ hg mv b c | ||||
$ hg ci -m 'b -> c' | ||||
$ hg mv c d | ||||
$ hg ci --amend -m 'b -> d' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg | ||
|
r16483 | $ hg st --rev '.^' --copies d | ||
|
r16458 | A d | ||
b | ||||
$ hg cp d e | ||||
$ hg ci -m 'e = d' | ||||
$ hg cp e f | ||||
$ hg ci --amend -m 'f = d' | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg | ||
|
r16483 | $ hg st --rev '.^' --copies f | ||
|
r16458 | A f | ||
d | ||||
|
r16552 | $ mv f f.orig | ||
$ hg rm -A f | ||||
$ hg ci -m removef | ||||
$ hg cp a f | ||||
$ mv f.orig f | ||||
$ hg ci --amend -m replacef | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg | ||
|
r16552 | $ hg st --change . --copies | ||
$ hg log -r . --template "{file_copies}\n" | ||||
|
r16553 | |||
Move added file (issue3410): | ||||
$ echo g >> g | ||||
$ hg ci -Am g | ||||
adding g | ||||
$ hg mv g h | ||||
$ hg ci --amend | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg | ||
|
r16553 | $ hg st --change . --copies h | ||
A h | ||||
$ hg log -r . --template "{file_copies}\n" | ||||
|
r16552 | |||
|
r16458 | Can't rollback an amend: | ||
$ hg rollback | ||||
no rollback information available | ||||
[1] | ||||
|
r16630 | |||
Preserve extra dict (issue3430): | ||||
$ hg branch a | ||||
marked working directory as branch a | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ echo a >> a | ||||
$ hg ci -ma | ||||
$ hg ci --amend -m "a'" | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg | ||
|
r16630 | $ hg log -r . --template "{branch}\n" | ||
a | ||||
$ hg ci --amend -m "a''" | ||||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg | ||
|
r16630 | $ hg log -r . --template "{branch}\n" | ||
a | ||||
Also preserve other entries in the dict that are in the old commit, | ||||
first graft something so there's an additional entry: | ||||
$ hg up 0 -q | ||||
$ echo z > z | ||||
$ hg ci -Am 'fork' | ||||
adding z | ||||
created new head | ||||
$ hg up 11 | ||||
5 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg graft 12 | ||||
|
r23505 | grafting 12:2647734878ef "fork" (tip) | ||
|
r16630 | $ hg ci --amend -m 'graft amend' | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg | ||
|
r16630 | $ hg log -r . --debug | grep extra | ||
|
r34087 | extra: amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60 | ||
|
r16630 | extra: branch=a | ||
extra: source=2647734878ef0236dda712fae9c1651cf694ea8a | ||||
|
r17461 | |||
Preserve phase | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: draft | ||||
$ hg phase --secret --force . | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: secret | ||||
$ hg commit --amend -m 'amend for phase' -q | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: secret | ||||
|
r17475 | Test amend with obsolete | ||
--------------------------- | ||||
Enable obsolete | ||||
|
r22956 | $ cat >> $HGRCPATH << EOF | ||
> [experimental] | ||||
|
r34867 | > evolution.createmarkers=True | ||
|
r34868 | > evolution.allowunstable=True | ||
|
r17475 | > EOF | ||
Amend with no files changes | ||||
$ hg id -n | ||||
13 | ||||
$ hg ci --amend -m 'babar' | ||||
$ hg id -n | ||||
14 | ||||
$ hg log -Gl 3 --style=compact | ||||
|
r34087 | @ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
|
r28627 | | ~ | ||
|
r34087 | o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test | ||
|
r28627 | | a'' | ||
~ | ||||
|
r17475 | $ hg log -Gl 4 --hidden --style=compact | ||
|
r34087 | @ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
|
r34087 | | x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ amend for phase | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
|
r28627 | | ~ | ||
|
r34087 | o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test | ||
|
r28627 | | a'' | ||
~ | ||||
|
r17475 | |||
Amend with files changes | ||||
(note: the extra commit over 15 is a temporary junk I would be happy to get | ||||
ride of) | ||||
$ echo 'babar' >> a | ||||
$ hg commit --amend | ||||
$ hg log -Gl 6 --hidden --style=compact | ||||
|
r34087 | @ 15[tip]:11 a5b42b49b0d5 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
|
r34087 | | x 14:11 682950e85999 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ babar | ||
| | ||||
|
r34087 | | x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ amend for phase | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
|
r28627 | | ~ | ||
|
r34087 | o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test | ||
|
r28627 | | a'' | ||
|
r34087 | | | ||
o 10 5fa75032e226 1970-01-01 00:00 +0000 test | ||||
| g | ||||
|
r28627 | ~ | ||
|
r17475 | |||
|
r18399 | Test that amend does not make it easy to create obsolescence cycle | ||
|
r17811 | --------------------------------------------------------------------- | ||
|
r18267 | $ hg id -r 14 --hidden | ||
|
r34087 | 682950e85999 (a) | ||
|
r18267 | $ hg revert -ar 14 --hidden | ||
|
r17811 | reverting a | ||
$ hg commit --amend | ||||
$ hg id | ||||
|
r34087 | 37973c7e0b61 (a) tip | ||
|
r18163 | |||
|
r18398 | Test that rewriting leaving instability behind is allowed | ||
|
r18163 | --------------------------------------------------------------------- | ||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'b' >> a | ||||
$ hg log --style compact -r 'children(.)' | ||||
|
r34087 | 16[tip]:11 37973c7e0b61 1970-01-01 00:00 +0000 test | ||
|
r18163 | babar | ||
$ hg commit --amend | ||||
|
r35727 | 1 new orphan changesets | ||
|
r33769 | $ hg log -r 'orphan()' | ||
|
r34087 | changeset: 16:37973c7e0b61 | ||
|
r18163 | branch: a | ||
|
r34087 | parent: 11:0ddb275cfad1 | ||
|
r18163 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r33632 | instability: orphan | ||
|
r18163 | summary: babar | ||
|
r18909 | |||
Amend a merge changeset (with renames and conflicts from the second parent): | ||||
$ hg up -q default | ||||
$ hg branch -q bar | ||||
$ hg cp a aa | ||||
$ hg mv z zz | ||||
$ echo cc > cc | ||||
$ hg add cc | ||||
$ hg ci -m aazzcc | ||||
$ hg up -q default | ||||
$ echo a >> a | ||||
$ echo dd > cc | ||||
$ hg add cc | ||||
$ hg ci -m aa | ||||
$ hg merge -q bar | ||||
|
r26614 | warning: conflicts while merging cc! (edit, then use 'hg resolve --mark') | ||
|
r18909 | [1] | ||
$ hg resolve -m cc | ||||
|
r21947 | (no more unresolved files) | ||
|
r18909 | $ hg ci -m 'merge bar' | ||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 20:5aba7f3726e6 | ||
|
r18909 | tag: tip | ||
|
r34087 | parent: 19:30d96aeaf27b | ||
parent: 18:1aa437659d19 | ||||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r30062 | +<<<<<<< working copy: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r30460 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | diff --git a/z b/zz | ||
rename from z | ||||
rename to zz | ||||
$ hg debugrename aa | ||||
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||||
$ hg debugrename zz | ||||
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a | ||||
$ hg debugrename cc | ||||
cc not renamed | ||||
|
r22249 | $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit | ||
HGEDITFORM=commit.amend.merge | ||||
|
r18909 | $ hg log --config diff.git=1 -pr . | ||
|
r42840 | changeset: 21:4b0631ef043e | ||
|
r18909 | tag: tip | ||
|
r34087 | parent: 19:30d96aeaf27b | ||
parent: 18:1aa437659d19 | ||||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (amend message) | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r30062 | +<<<<<<< working copy: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r30460 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | diff --git a/z b/zz | ||
rename from z | ||||
rename to zz | ||||
$ hg debugrename aa | ||||
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||||
$ hg debugrename zz | ||||
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a | ||||
$ hg debugrename cc | ||||
cc not renamed | ||||
$ hg mv zz z | ||||
$ hg ci --amend -m 'merge bar (undo rename)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 22:06423be42d60 | ||
|
r18909 | tag: tip | ||
|
r34087 | parent: 19:30d96aeaf27b | ||
parent: 18:1aa437659d19 | ||||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (undo rename) | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r30062 | +<<<<<<< working copy: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r30460 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | |||
$ hg debugrename z | ||||
z not renamed | ||||
Amend a merge changeset (with renames during the merge): | ||||
$ hg up -q bar | ||||
$ echo x > x | ||||
$ hg add x | ||||
$ hg ci -m x | ||||
$ hg up -q default | ||||
$ hg merge -q bar | ||||
$ hg mv aa aaa | ||||
$ echo aa >> aaa | ||||
$ hg ci -m 'merge bar again' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 24:a89974a20457 | ||
|
r18909 | tag: tip | ||
|
r42840 | parent: 22:06423be42d60 | ||
|
r34087 | parent: 23:4c94d5bc65f5 | ||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar again | ||||
diff --git a/aa b/aa | ||||
deleted file mode 100644 | ||||
--- a/aa | ||||
+++ /dev/null | ||||
@@ -1,2 +0,0 @@ | ||||
-a | ||||
-a | ||||
diff --git a/aaa b/aaa | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/aaa | ||||
@@ -0,0 +1,3 @@ | ||||
+a | ||||
+a | ||||
+aa | ||||
diff --git a/x b/x | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/x | ||||
@@ -0,0 +1,1 @@ | ||||
+x | ||||
$ hg debugrename aaa | ||||
aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980 | ||||
|
r42399 | |||
Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists | ||||
in p1 too, but it was recorded as copied from p2. | ||||
$ echo modified >> aaa | ||||
$ hg co -m '.^' -t :merge3 | ||||
|
r42408 | file 'aaa' was deleted in other [destination] but was modified in local [working copy]. | ||
|
r42765 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | ||
What do you want to do? u | ||||
|
r42408 | 1 files updated, 0 files merged, 1 files removed, 1 files unresolved | ||
|
r42399 | use 'hg resolve' to retry unresolved file merges | ||
[1] | ||||
$ hg co -C tip | ||||
2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r18909 | $ hg mv aaa aa | ||
$ hg ci --amend -m 'merge bar again (undo rename)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 25:282080768800 | ||
|
r18909 | tag: tip | ||
|
r42840 | parent: 22:06423be42d60 | ||
|
r34087 | parent: 23:4c94d5bc65f5 | ||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar again (undo rename) | ||||
diff --git a/aa b/aa | ||||
--- a/aa | ||||
+++ b/aa | ||||
@@ -1,2 +1,3 @@ | ||||
a | ||||
a | ||||
+aa | ||||
diff --git a/x b/x | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/x | ||||
@@ -0,0 +1,1 @@ | ||||
+x | ||||
$ hg debugrename aa | ||||
aa not renamed | ||||
|
r18912 | $ hg debugrename -r '.^' aa | ||
|
r18909 | aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||
Amend a merge changeset (with manifest-level conflicts): | ||||
$ hg up -q bar | ||||
$ hg rm aa | ||||
$ hg ci -m 'rm aa' | ||||
$ hg up -q default | ||||
$ echo aa >> aa | ||||
$ hg ci -m aa | ||||
|
r27597 | $ hg merge -q bar --config ui.interactive=True << EOF | ||
> c | ||||
> EOF | ||||
|
r39321 | file 'aa' was deleted in other [merge rev] but was modified in local [working copy]. | ||
|
r42765 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | ||
What do you want to do? c | ||||
|
r18909 | $ hg ci -m 'merge bar (with conflicts)' | ||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 28:ed15db12298d | ||
|
r18909 | tag: tip | ||
|
r42840 | parent: 27:eb5adec0b43b | ||
|
r34087 | parent: 26:67db8847a540 | ||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (with conflicts) | ||||
$ hg rm aa | ||||
$ hg ci --amend -m 'merge bar (with conflicts, amended)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r42840 | changeset: 29:0eeafd043f63 | ||
|
r18909 | tag: tip | ||
|
r42840 | parent: 27:eb5adec0b43b | ||
|
r34087 | parent: 26:67db8847a540 | ||
|
r18909 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (with conflicts, amended) | ||||
diff --git a/aa b/aa | ||||
deleted file mode 100644 | ||||
--- a/aa | ||||
+++ /dev/null | ||||
@@ -1,4 +0,0 @@ | ||||
-a | ||||
-a | ||||
-aa | ||||
-aa | ||||
|
r19305 | Issue 3445: amending with --close-branch a commit that created a new head should fail | ||
This shouldn't be possible: | ||||
$ hg up -q default | ||||
$ hg branch closewithamend | ||||
marked working directory as branch closewithamend | ||||
|
r23588 | $ echo foo > foo | ||
|
r22956 | $ hg add foo | ||
|
r19980 | $ hg ci -m.. | ||
|
r19305 | $ hg ci --amend --close-branch -m 'closing' | ||
abort: can only close branch heads | ||||
|
r46431 | [10] | ||
|
r19305 | |||
This silliness fails: | ||||
$ hg branch silliness | ||||
marked working directory as branch silliness | ||||
$ echo b >> b | ||||
$ hg ci --close-branch -m'open and close' | ||||
|
r42694 | abort: branch "silliness" has no heads to close | ||
|
r46431 | [10] | ||
|
r20700 | |||
Test that amend with --secret creates new secret changeset forcibly | ||||
--------------------------------------------------------------------- | ||||
$ hg phase '.^::.' | ||||
|
r34087 | 29: draft | ||
30: draft | ||||
|
r20700 | $ hg commit --amend --secret -m 'amend as secret' -q | ||
$ hg phase '.^::.' | ||||
|
r34087 | 29: draft | ||
31: secret | ||||
|
r21036 | |||
Test that amend with --edit invokes editor forcibly | ||||
--------------------------------------------------- | ||||
$ hg parents --template "{desc}\n" | ||||
amend as secret | ||||
$ HGEDITOR=cat hg commit --amend -m "editor should be suppressed" | ||||
$ hg parents --template "{desc}\n" | ||||
editor should be suppressed | ||||
|
r23587 | $ hg status --rev '.^1::.' | ||
A foo | ||||
|
r21036 | $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit | ||
editor should be invoked | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'silliness' | ||||
|
r23587 | HG: added foo | ||
|
r21036 | $ hg parents --template "{desc}\n" | ||
editor should be invoked | ||||
|
r23071 | |||
|
r42590 | Test that amend with --no-edit avoids the editor | ||
------------------------------------------------ | ||||
$ hg commit --amend -m "before anything happens" | ||||
$ hg parents --template "{desc}\n" | ||||
before anything happens | ||||
$ HGEDITOR=cat hg commit --amend --no-edit -m "editor should be suppressed" | ||||
$ hg parents --template "{desc}\n" | ||||
editor should be suppressed | ||||
(We need a file change here since we won't have a message change) | ||||
$ cp foo foo.orig | ||||
$ echo hi >> foo | ||||
$ HGEDITOR=cat hg commit --amend --no-edit | ||||
$ hg parents --template "{desc}\n" | ||||
editor should be suppressed | ||||
$ hg status -mar | ||||
(Let's undo adding that "hi" so later tests don't need to be adjusted) | ||||
$ mv foo.orig foo | ||||
$ hg commit --amend --no-edit | ||||
|
r23588 | Test that "diff()" in committemplate works correctly for amending | ||
----------------------------------------------------------------- | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [committemplate] | ||||
> changeset.commit.amend = {desc}\n | ||||
> HG: M: {file_mods} | ||||
> HG: A: {file_adds} | ||||
> HG: R: {file_dels} | ||||
> {splitlines(diff()) % 'HG: {line}\n'} | ||||
> EOF | ||||
$ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n" | ||||
M: | ||||
A: foo | ||||
R: | ||||
$ hg status -amr | ||||
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo" | ||||
expecting diff of foo | ||||
HG: M: | ||||
HG: A: foo | ||||
HG: R: | ||||
|
r42840 | HG: diff -r 0eeafd043f63 foo | ||
|
r23588 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +foo | ||||
$ echo y > y | ||||
$ hg add y | ||||
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y" | ||||
expecting diff of foo and y | ||||
HG: M: | ||||
HG: A: foo y | ||||
HG: R: | ||||
|
r42840 | HG: diff -r 0eeafd043f63 foo | ||
|
r23588 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +foo | ||||
|
r42840 | HG: diff -r 0eeafd043f63 y | ||
|
r23588 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +y | ||||
|
r23589 | $ hg rm a | ||
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y" | ||||
expecting diff of a, foo and y | ||||
HG: M: | ||||
HG: A: foo y | ||||
HG: R: a | ||||
|
r42840 | HG: diff -r 0eeafd043f63 a | ||
|
r23589 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -1,2 +0,0 @@ | ||||
HG: -a | ||||
HG: -a | ||||
|
r42840 | HG: diff -r 0eeafd043f63 foo | ||
|
r23589 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +foo | ||||
|
r42840 | HG: diff -r 0eeafd043f63 y | ||
|
r23589 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +y | ||||
$ hg rm x | ||||
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y" | ||||
expecting diff of a, foo, x and y | ||||
HG: M: | ||||
HG: A: foo y | ||||
HG: R: a x | ||||
|
r42840 | HG: diff -r 0eeafd043f63 a | ||
|
r23589 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -1,2 +0,0 @@ | ||||
HG: -a | ||||
HG: -a | ||||
|
r42840 | HG: diff -r 0eeafd043f63 foo | ||
|
r23589 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +foo | ||||
|
r42840 | HG: diff -r 0eeafd043f63 x | ||
|
r23589 | HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -1,1 +0,0 @@ | ||||
HG: -x | ||||
|
r42840 | HG: diff -r 0eeafd043f63 y | ||
|
r23589 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +y | ||||
|
r23588 | |||
|
r25392 | $ echo cccc >> cc | ||
$ hg status -amr | ||||
M cc | ||||
$ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc | ||||
cc should be excluded | ||||
HG: M: | ||||
HG: A: foo y | ||||
HG: R: a x | ||||
|
r42840 | HG: diff -r 0eeafd043f63 a | ||
|
r25392 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -1,2 +0,0 @@ | ||||
HG: -a | ||||
HG: -a | ||||
|
r42840 | HG: diff -r 0eeafd043f63 foo | ||
|
r25392 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +foo | ||||
|
r42840 | HG: diff -r 0eeafd043f63 x | ||
|
r25392 | HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -1,1 +0,0 @@ | ||||
HG: -x | ||||
|
r42840 | HG: diff -r 0eeafd043f63 y | ||
|
r25392 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | ||||
HG: @@ -0,0 +1,1 @@ | ||||
HG: +y | ||||
|
r23071 | Check for issue4405 | ||
------------------- | ||||
Setup the repo with a file that gets moved in a second commit. | ||||
$ hg init repo | ||||
$ cd repo | ||||
$ touch a0 | ||||
$ hg add a0 | ||||
$ hg commit -m a0 | ||||
$ hg mv a0 a1 | ||||
$ hg commit -m a1 | ||||
$ hg up -q 0 | ||||
$ hg log -G --template '{rev} {desc}' | ||||
o 1 a1 | ||||
| | ||||
@ 0 a0 | ||||
Now we branch the repro, but re-use the file contents, so we have a divergence | ||||
in the file revlog topology and the changelog topology. | ||||
$ hg revert --rev 1 --all | ||||
removing a0 | ||||
adding a1 | ||||
$ hg ci -qm 'a1-amend' | ||||
$ hg log -G --template '{rev} {desc}' | ||||
@ 2 a1-amend | ||||
| | ||||
| o 1 a1 | ||||
|/ | ||||
o 0 a0 | ||||
|
r34087 | The way mercurial does amends is by folding the working copy and old commit | ||
together into another commit (rev 3). During this process, _findlimit is called | ||||
to check how far back to look for the transitive closure of file copy | ||||
information, but due to the divergence of the filelog and changelog graph | ||||
topologies, before _findlimit was fixed, it returned a rev which was not far | ||||
enough back in this case. | ||||
|
r23071 | $ hg mv a1 a2 | ||
$ hg status --copies --rev 0 | ||||
A a2 | ||||
a0 | ||||
R a0 | ||||
$ hg ci --amend -q | ||||
$ hg log -G --template '{rev} {desc}' | ||||
|
r34087 | @ 3 a1-amend | ||
|
r23071 | | | ||
| o 1 a1 | ||||
|/ | ||||
o 0 a0 | ||||
Before the fix, the copy information was lost. | ||||
$ hg status --copies --rev 0 | ||||
A a2 | ||||
a0 | ||||
R a0 | ||||
|
r24169 | $ cd .. | ||
Check that amend properly preserve rename from directory rename (issue-4516) | ||||
If a parent of the merge renames a full directory, any files added to the old | ||||
directory in the other parent will be renamed to the new directory. For some | ||||
reason, the rename metadata was when amending such merge. This test ensure we | ||||
do not regress. We have a dedicated repo because it needs a setup with renamed | ||||
directory) | ||||
$ hg init issue4516 | ||||
$ cd issue4516 | ||||
$ mkdir olddirname | ||||
$ echo line1 > olddirname/commonfile.py | ||||
$ hg add olddirname/commonfile.py | ||||
$ hg ci -m first | ||||
$ hg branch newdirname | ||||
marked working directory as branch newdirname | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg mv olddirname newdirname | ||||
|
r35394 | moving olddirname/commonfile.py to newdirname/commonfile.py | ||
|
r24169 | $ hg ci -m rename | ||
$ hg update default | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo line1 > olddirname/newfile.py | ||||
$ hg add olddirname/newfile.py | ||||
$ hg ci -m log | ||||
$ hg up newdirname | ||||
1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ # create newdirname/newfile.py | ||||
$ hg merge default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -m add | ||||
$ | ||||
$ hg debugrename newdirname/newfile.py | ||||
|
r35394 | newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def | ||
|
r24169 | $ hg status -C --change . | ||
A newdirname/newfile.py | ||||
$ hg status -C --rev 1 | ||||
A newdirname/newfile.py | ||||
$ hg status -C --rev 2 | ||||
A newdirname/commonfile.py | ||||
olddirname/commonfile.py | ||||
A newdirname/newfile.py | ||||
olddirname/newfile.py | ||||
R olddirname/commonfile.py | ||||
R olddirname/newfile.py | ||||
$ hg debugindex newdirname/newfile.py | ||||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 3 34a4d536c0c0 000000000000 000000000000 | ||||
|
r24169 | |||
$ echo a >> newdirname/commonfile.py | ||||
$ hg ci --amend -m bug | ||||
$ hg debugrename newdirname/newfile.py | ||||
|
r35394 | newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def | ||
|
r24169 | $ hg debugindex newdirname/newfile.py | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 3 34a4d536c0c0 000000000000 000000000000 | ||||
|
r24169 | |||
|
r30240 | #if execbit | ||
|
r29181 | Test if amend preserves executable bit changes | ||
$ chmod +x newdirname/commonfile.py | ||||
$ hg ci -m chmod | ||||
$ hg ci --amend -m "chmod amended" | ||||
$ hg ci --amend -m "chmod amended second time" | ||||
$ hg log -p --git -r . | ||||
|
r34087 | changeset: 7:b1326f52dddf | ||
|
r29181 | branch: newdirname | ||
tag: tip | ||||
|
r34087 | parent: 4:7fd235f7cb2f | ||
|
r29181 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: chmod amended second time | ||||
diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py | ||||
old mode 100644 | ||||
new mode 100755 | ||||
|
r30240 | #endif | ||
|
r34061 | |||
Test amend with file inclusion options | ||||
-------------------------------------- | ||||
These tests ensure that we are always amending some files that were part of the | ||||
pre-amend commit. We want to test that the remaining files in the pre-amend | ||||
commit were not changed in the amended commit. We do so by performing a diff of | ||||
the amended commit against its parent commit. | ||||
$ cd .. | ||||
$ hg init testfileinclusions | ||||
$ cd testfileinclusions | ||||
$ echo a > a | ||||
$ echo b > b | ||||
$ hg commit -Aqm "Adding a and b" | ||||
Only add changes to a particular file | ||||
$ echo a >> a | ||||
$ echo b >> b | ||||
$ hg commit --amend -I a | ||||
$ hg diff --git -r null -r . | ||||
diff --git a/a b/a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/a | ||||
@@ -0,0 +1,2 @@ | ||||
+a | ||||
+a | ||||
diff --git a/b b/b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,1 @@ | ||||
+b | ||||
$ echo a >> a | ||||
$ hg commit --amend b | ||||
$ hg diff --git -r null -r . | ||||
diff --git a/a b/a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/a | ||||
@@ -0,0 +1,2 @@ | ||||
+a | ||||
+a | ||||
diff --git a/b b/b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,2 @@ | ||||
+b | ||||
+b | ||||
Exclude changes to a particular file | ||||
$ echo b >> b | ||||
$ hg commit --amend -X a | ||||
$ hg diff --git -r null -r . | ||||
diff --git a/a b/a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/a | ||||
@@ -0,0 +1,2 @@ | ||||
+a | ||||
+a | ||||
diff --git a/b b/b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,3 @@ | ||||
+b | ||||
+b | ||||
+b | ||||
Check the addremove flag | ||||
$ echo c > c | ||||
$ rm a | ||||
$ hg commit --amend -A | ||||
removing a | ||||
adding c | ||||
$ hg diff --git -r null -r . | ||||
diff --git a/b b/b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,3 @@ | ||||
+b | ||||
+b | ||||
+b | ||||
diff --git a/c b/c | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/c | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||