test-commit.t
477 lines
| 10.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-commit.t
|
r11802 | commit date test | ||
$ hg init test | ||||
$ cd test | ||||
$ echo foo > foo | ||||
$ hg add foo | ||||
|
r22205 | $ cat > $TESTTMP/checkeditform.sh <<EOF | ||
> env | grep HGEDITFORM | ||||
> true | ||||
> EOF | ||||
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" | ||||
|
r22248 | HGEDITFORM=commit.normal.normal | ||
|
r11802 | abort: empty commit message | ||
|
r12316 | [255] | ||
|
r11802 | $ hg commit -d '0 0' -m commit-1 | ||
$ echo foo >> foo | ||||
$ hg commit -d '1 4444444' -m commit-3 | ||||
abort: impossible time zone offset: 4444444 | ||||
|
r12316 | [255] | ||
|
r11802 | $ hg commit -d '1 15.1' -m commit-4 | ||
|
r12105 | abort: invalid date: '1\t15.1' | ||
|
r12316 | [255] | ||
|
r11802 | $ hg commit -d 'foo bar' -m commit-5 | ||
|
r12105 | abort: invalid date: 'foo bar' | ||
|
r12316 | [255] | ||
|
r11802 | $ hg commit -d ' 1 4444' -m commit-6 | ||
$ hg commit -d '111111111111 0' -m commit-7 | ||||
abort: date exceeds 32 bits: 111111111111 | ||||
|
r12316 | [255] | ||
|
r13062 | $ hg commit -d '-7654321 3600' -m commit-7 | ||
abort: negative date value: -7654321 | ||||
[255] | ||||
|
r11802 | |||
commit added file that has been deleted | ||||
$ echo bar > bar | ||||
$ hg add bar | ||||
$ rm bar | ||||
|
r12156 | $ hg commit -m commit-8 | ||
|
r13899 | nothing changed (1 missing files, see 'hg status') | ||
|
r12316 | [1] | ||
|
r12156 | $ hg commit -m commit-8-2 bar | ||
|
r11802 | abort: bar: file not found! | ||
|
r12316 | [255] | ||
|
r11802 | |||
$ hg -q revert -a --no-backup | ||||
$ mkdir dir | ||||
$ echo boo > dir/file | ||||
$ hg add | ||||
|
r15447 | adding dir/file (glob) | ||
|
r11802 | $ hg -v commit -m commit-9 dir | ||
dir/file | ||||
committed changeset 2:d2a76177cb42 | ||||
$ echo > dir.file | ||||
$ hg add | ||||
adding dir.file | ||||
$ hg commit -m commit-10 dir dir.file | ||||
abort: dir: no match under directory! | ||||
|
r12316 | [255] | ||
|
r11802 | |||
$ echo >> dir/file | ||||
$ mkdir bleh | ||||
$ mkdir dir2 | ||||
$ cd bleh | ||||
$ hg commit -m commit-11 . | ||||
abort: bleh: no match under directory! | ||||
|
r12316 | [255] | ||
|
r11802 | $ hg commit -m commit-12 ../dir ../dir2 | ||
abort: dir2: no match under directory! | ||||
|
r12316 | [255] | ||
|
r11802 | $ hg -v commit -m commit-13 ../dir | ||
dir/file | ||||
committed changeset 3:1cd62a2d8db5 | ||||
$ cd .. | ||||
$ hg commit -m commit-14 does-not-exist | ||||
|
r15521 | abort: does-not-exist: * (glob) | ||
|
r12316 | [255] | ||
|
r16842 | |||
#if symlink | ||||
|
r11802 | $ ln -s foo baz | ||
$ hg commit -m commit-15 baz | ||||
abort: baz: file not tracked! | ||||
|
r12316 | [255] | ||
|
r16842 | #endif | ||
|
r11802 | $ touch quux | ||
$ hg commit -m commit-16 quux | ||||
abort: quux: file not tracked! | ||||
|
r12316 | [255] | ||
|
r11802 | $ echo >> dir/file | ||
$ hg -v commit -m commit-17 dir/file | ||||
dir/file | ||||
committed changeset 4:49176991390e | ||||
An empty date was interpreted as epoch origin | ||||
$ echo foo >> foo | ||||
$ hg commit -d '' -m commit-no-date | ||||
$ hg tip --template '{date|isodate}\n' | grep '1970' | ||||
|
r12316 | [1] | ||
|
r13447 | |||
Make sure we do not obscure unknown requires file entries (issue2649) | ||||
$ echo foo >> foo | ||||
$ echo fake >> .hg/requires | ||||
$ hg commit -m bla | ||||
|
r20820 | abort: repository requires features unknown to this Mercurial: fake! | ||
(see http://mercurial.selenic.com/wiki/MissingRequirement for more information) | ||||
|
r13447 | [255] | ||
|
r11802 | $ cd .. | ||
partial subdir commit test | ||||
$ hg init test2 | ||||
$ cd test2 | ||||
$ mkdir foo | ||||
$ echo foo > foo/foo | ||||
$ mkdir bar | ||||
$ echo bar > bar/bar | ||||
$ hg add | ||||
|
r15447 | adding bar/bar (glob) | ||
adding foo/foo (glob) | ||||
|
r21021 | $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo | ||
commit-subdir-1 | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'default' | ||||
HG: added foo/foo | ||||
|
r12156 | $ hg ci -m commit-subdir-2 bar | ||
|
r11802 | |||
subdir log 1 | ||||
$ hg log -v foo | ||||
|
r12156 | changeset: 0:f97e73a25882 | ||
|
r11802 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: foo/foo | ||
description: | ||||
commit-subdir-1 | ||||
subdir log 2 | ||||
$ hg log -v bar | ||||
|
r12156 | changeset: 1:aa809156d50d | ||
|
r11802 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: bar/bar | ||
description: | ||||
commit-subdir-2 | ||||
full log | ||||
$ hg log -v | ||||
|
r12156 | changeset: 1:aa809156d50d | ||
|
r11802 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: bar/bar | ||
description: | ||||
commit-subdir-2 | ||||
|
r12156 | changeset: 0:f97e73a25882 | ||
|
r11802 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: foo/foo | ||
description: | ||||
commit-subdir-1 | ||||
$ cd .. | ||||
dot and subdir commit test | ||||
$ hg init test3 | ||||
|
r21021 | $ echo commit-foo-subdir > commit-log-test | ||
|
r11802 | $ cd test3 | ||
$ mkdir foo | ||||
$ echo foo content > foo/plain-file | ||||
$ hg add foo/plain-file | ||||
|
r21021 | $ HGEDITOR=cat hg ci --edit -l ../commit-log-test foo | ||
commit-foo-subdir | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'default' | ||||
HG: added foo/plain-file | ||||
|
r11802 | $ echo modified foo content > foo/plain-file | ||
|
r12156 | $ hg ci -m commit-foo-dot . | ||
|
r11802 | |||
full log | ||||
$ hg log -v | ||||
|
r12156 | changeset: 1:95b38e3a5b2e | ||
|
r11802 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: foo/plain-file | ||
description: | ||||
commit-foo-dot | ||||
|
r12156 | changeset: 0:65d4e9386227 | ||
|
r11802 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | files: foo/plain-file | ||
description: | ||||
commit-foo-subdir | ||||
subdir log | ||||
$ cd foo | ||||
$ hg log . | ||||
|
r12156 | changeset: 1:95b38e3a5b2e | ||
|
r11802 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | summary: commit-foo-dot | ||
|
r12156 | changeset: 0:65d4e9386227 | ||
|
r11802 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11802 | summary: commit-foo-subdir | ||
$ cd .. | ||||
$ cd .. | ||||
|
r12399 | Issue1049: Hg permits partial commit of merge without warning | ||
|
r11802 | $ hg init issue1049 | ||
$ cd issue1049 | ||||
$ echo a > a | ||||
$ hg ci -Ama | ||||
adding a | ||||
$ echo a >> a | ||||
$ hg ci -mb | ||||
$ hg up 0 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo b >> a | ||||
$ hg ci -mc | ||||
created new head | ||||
$ HGMERGE=true hg merge | ||||
merging a | ||||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
should fail because we are specifying a file name | ||||
$ hg ci -mmerge a | ||||
abort: cannot partially commit a merge (do not specify files or patterns) | ||||
|
r12316 | [255] | ||
|
r11802 | |||
should fail because we are specifying a pattern | ||||
$ hg ci -mmerge -I a | ||||
abort: cannot partially commit a merge (do not specify files or patterns) | ||||
|
r12316 | [255] | ||
|
r11802 | |||
should succeed | ||||
|
r22248 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit | ||
HGEDITFORM=commit.normal.merge | ||||
|
r11802 | $ cd .. | ||
test commit message content | ||||
$ hg init commitmsg | ||||
$ cd commitmsg | ||||
$ echo changed > changed | ||||
$ echo removed > removed | ||||
|
r18538 | $ hg book currentbookmark | ||
|
r11802 | $ hg ci -qAm init | ||
$ hg rm removed | ||||
$ echo changed >> changed | ||||
$ echo added > added | ||||
$ hg add added | ||||
$ HGEDITOR=cat hg ci -A | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'default' | ||||
|
r18538 | HG: bookmark 'currentbookmark' | ||
|
r11802 | HG: added added | ||
HG: changed changed | ||||
HG: removed removed | ||||
abort: empty commit message | ||||
|
r12316 | [255] | ||
|
r20765 | |||
test saving last-message.txt | ||||
$ hg init sub | ||||
$ echo a > sub/a | ||||
$ hg -R sub add sub/a | ||||
$ cat > sub/.hg/hgrc <<EOF | ||||
> [hooks] | ||||
> precommit.test-saving-last-message = false | ||||
> EOF | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ hg add .hgsub | ||||
|
r20859 | $ cat > $TESTTMP/editor.sh <<EOF | ||
|
r20765 | > echo "==== before editing:" | ||
> cat \$1 | ||||
> echo "====" | ||||
> echo "test saving last-message.txt" >> \$1 | ||||
> EOF | ||||
$ rm -f .hg/last-message.txt | ||||
|
r20859 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg commit -S -q | ||
|
r20765 | ==== before editing: | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'default' | ||||
HG: bookmark 'currentbookmark' | ||||
HG: subrepo sub | ||||
HG: added .hgsub | ||||
HG: added added | ||||
HG: changed .hgsubstate | ||||
HG: changed changed | ||||
HG: removed removed | ||||
==== | ||||
abort: precommit.test-saving-last-message hook exited with status 1 (in subrepo sub) | ||||
[255] | ||||
$ cat .hg/last-message.txt | ||||
test saving last-message.txt | ||||
|
r21924 | test that '[committemplate] changeset' definition and commit log | ||
specific template keywords work well | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [committemplate] | ||||
|
r22012 | > changeset.commit.normal = HG: this is "commit.normal" template | ||
> HG: {extramsg} | ||||
> {if(currentbookmark, | ||||
> "HG: bookmark '{currentbookmark}' is activated\n", | ||||
> "HG: no bookmark is activated\n")}{subrepos % | ||||
> "HG: subrepo '{subrepo}' is changed\n"} | ||||
> | ||||
> changeset.commit = HG: this is "commit" template | ||||
> HG: {extramsg} | ||||
> {if(currentbookmark, | ||||
> "HG: bookmark '{currentbookmark}' is activated\n", | ||||
> "HG: no bookmark is activated\n")}{subrepos % | ||||
> "HG: subrepo '{subrepo}' is changed\n"} | ||||
> | ||||
|
r21924 | > changeset = HG: this is customized commit template | ||
> HG: {extramsg} | ||||
> {if(currentbookmark, | ||||
> "HG: bookmark '{currentbookmark}' is activated\n", | ||||
> "HG: no bookmark is activated\n")}{subrepos % | ||||
> "HG: subrepo '{subrepo}' is changed\n"} | ||||
> EOF | ||||
$ hg init sub2 | ||||
$ echo a > sub2/a | ||||
$ hg -R sub2 add sub2/a | ||||
$ echo 'sub2 = sub2' >> .hgsub | ||||
$ HGEDITOR=cat hg commit -S -q | ||||
|
r22012 | HG: this is "commit.normal" template | ||
|
r21924 | HG: Leave message empty to abort commit. | ||
HG: bookmark 'currentbookmark' is activated | ||||
HG: subrepo 'sub' is changed | ||||
HG: subrepo 'sub2' is changed | ||||
abort: empty commit message | ||||
[255] | ||||
|
r22012 | $ cat >> .hg/hgrc <<EOF | ||
> [committemplate] | ||||
> changeset.commit.normal = | ||||
> # now, "changeset.commit" should be chosen for "hg commit" | ||||
> EOF | ||||
|
r21924 | $ hg bookmark --inactive currentbookmark | ||
$ hg forget .hgsub | ||||
$ HGEDITOR=cat hg commit -q | ||||
|
r22012 | HG: this is "commit" template | ||
HG: Leave message empty to abort commit. | ||||
HG: no bookmark is activated | ||||
abort: empty commit message | ||||
[255] | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [committemplate] | ||||
> changeset.commit = | ||||
> # now, "changeset" should be chosen for "hg commit" | ||||
> EOF | ||||
$ HGEDITOR=cat hg commit -q | ||||
|
r21924 | HG: this is customized commit template | ||
HG: Leave message empty to abort commit. | ||||
HG: no bookmark is activated | ||||
abort: empty commit message | ||||
[255] | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> # disable customizing for subsequent tests | ||||
> [committemplate] | ||||
> changeset = | ||||
> EOF | ||||
|
r16849 | $ cd .. | ||
commit copy | ||||
$ hg init dir2 | ||||
$ cd dir2 | ||||
$ echo bleh > bar | ||||
$ hg add bar | ||||
$ hg ci -m 'add bar' | ||||
$ hg cp bar foo | ||||
$ echo >> bar | ||||
$ hg ci -m 'cp bar foo; change bar' | ||||
$ hg debugrename foo | ||||
foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 | ||||
$ hg debugindex bar | ||||
|
r17132 | rev offset length ..... linkrev nodeid p1 p2 (re) | ||
0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) | ||||
1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) | ||||
|
r16913 | |||
|
r23598 | verify pathauditor blocks evil filepaths | ||
$ cat > evil-commit.py <<EOF | ||||
> from mercurial import ui, hg, context, node | ||||
> notrc = u".h\u200cg".encode('utf-8') + '/hgrc' | ||||
> u = ui.ui() | ||||
> r = hg.repository(u, '.') | ||||
> def filectxfn(repo, memctx, path): | ||||
> return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') | ||||
> c = context.memctx(r, [r['tip'].node(), node.nullid], | ||||
> 'evil', [notrc], filectxfn, 0) | ||||
> r.commitctx(c) | ||||
> EOF | ||||
$ $PYTHON evil-commit.py | ||||
$ hg co --clean tip | ||||
abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc) | ||||
[255] | ||||
|
r16913 | $ cd .. | ||