test-commit.t
283 lines
| 5.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-commit.t
Mads Kiilerich
|
r15441 | $ "$TESTDIR/hghave" symlink || exit 80 | ||
Nicolas Dumazet
|
r11802 | commit date test | ||
$ hg init test | ||||
$ cd test | ||||
$ echo foo > foo | ||||
$ hg add foo | ||||
$ HGEDITOR=true hg commit -m "" | ||||
abort: empty commit message | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
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 | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ hg commit -d '1 15.1' -m commit-4 | ||
Nicolas Dumazet
|
r12105 | abort: invalid date: '1\t15.1' | ||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ hg commit -d 'foo bar' -m commit-5 | ||
Nicolas Dumazet
|
r12105 | abort: invalid date: 'foo bar' | ||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ hg commit -d ' 1 4444' -m commit-6 | ||
$ hg commit -d '111111111111 0' -m commit-7 | ||||
abort: date exceeds 32 bits: 111111111111 | ||||
Matt Mackall
|
r12316 | [255] | ||
Adrian Buehlmann
|
r13062 | $ hg commit -d '-7654321 3600' -m commit-7 | ||
abort: negative date value: -7654321 | ||||
[255] | ||||
Nicolas Dumazet
|
r11802 | |||
commit added file that has been deleted | ||||
$ echo bar > bar | ||||
$ hg add bar | ||||
$ rm bar | ||||
Martin Geisler
|
r12156 | $ hg commit -m commit-8 | ||
Martin Geisler
|
r13899 | nothing changed (1 missing files, see 'hg status') | ||
Matt Mackall
|
r12316 | [1] | ||
Martin Geisler
|
r12156 | $ hg commit -m commit-8-2 bar | ||
Nicolas Dumazet
|
r11802 | abort: bar: file not found! | ||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | |||
$ hg -q revert -a --no-backup | ||||
$ mkdir dir | ||||
$ echo boo > dir/file | ||||
$ hg add | ||||
Mads Kiilerich
|
r15447 | adding dir/file (glob) | ||
Nicolas Dumazet
|
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! | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | |||
$ echo >> dir/file | ||||
$ mkdir bleh | ||||
$ mkdir dir2 | ||||
$ cd bleh | ||||
$ hg commit -m commit-11 . | ||||
abort: bleh: no match under directory! | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ hg commit -m commit-12 ../dir ../dir2 | ||
abort: dir2: no match under directory! | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ hg -v commit -m commit-13 ../dir | ||
dir/file | ||||
committed changeset 3:1cd62a2d8db5 | ||||
$ cd .. | ||||
$ hg commit -m commit-14 does-not-exist | ||||
Mads Kiilerich
|
r15521 | abort: does-not-exist: * (glob) | ||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ ln -s foo baz | ||
$ hg commit -m commit-15 baz | ||||
abort: baz: file not tracked! | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | $ touch quux | ||
$ hg commit -m commit-16 quux | ||||
abort: quux: file not tracked! | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
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' | ||||
Matt Mackall
|
r12316 | [1] | ||
Adrian Buehlmann
|
r13447 | |||
Make sure we do not obscure unknown requires file entries (issue2649) | ||||
$ echo foo >> foo | ||||
$ echo fake >> .hg/requires | ||||
$ hg commit -m bla | ||||
Pierre-Yves David
|
r14746 | abort: unknown repository format: requires features 'fake' (upgrade Mercurial)! | ||
Adrian Buehlmann
|
r13447 | [255] | ||
Nicolas Dumazet
|
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 | ||||
Mads Kiilerich
|
r15447 | adding bar/bar (glob) | ||
adding foo/foo (glob) | ||||
Martin Geisler
|
r12156 | $ hg ci -m commit-subdir-1 foo | ||
$ hg ci -m commit-subdir-2 bar | ||||
Nicolas Dumazet
|
r11802 | |||
subdir log 1 | ||||
$ hg log -v foo | ||||
Martin Geisler
|
r12156 | changeset: 0:f97e73a25882 | ||
Nicolas Dumazet
|
r11802 | user: test | ||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: foo/foo | ||
description: | ||||
commit-subdir-1 | ||||
subdir log 2 | ||||
$ hg log -v bar | ||||
Martin Geisler
|
r12156 | changeset: 1:aa809156d50d | ||
Nicolas Dumazet
|
r11802 | tag: tip | ||
user: test | ||||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: bar/bar | ||
description: | ||||
commit-subdir-2 | ||||
full log | ||||
$ hg log -v | ||||
Martin Geisler
|
r12156 | changeset: 1:aa809156d50d | ||
Nicolas Dumazet
|
r11802 | tag: tip | ||
user: test | ||||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: bar/bar | ||
description: | ||||
commit-subdir-2 | ||||
Martin Geisler
|
r12156 | changeset: 0:f97e73a25882 | ||
Nicolas Dumazet
|
r11802 | user: test | ||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: foo/foo | ||
description: | ||||
commit-subdir-1 | ||||
$ cd .. | ||||
dot and subdir commit test | ||||
$ hg init test3 | ||||
$ cd test3 | ||||
$ mkdir foo | ||||
$ echo foo content > foo/plain-file | ||||
$ hg add foo/plain-file | ||||
Martin Geisler
|
r12156 | $ hg ci -m commit-foo-subdir foo | ||
Nicolas Dumazet
|
r11802 | $ echo modified foo content > foo/plain-file | ||
Martin Geisler
|
r12156 | $ hg ci -m commit-foo-dot . | ||
Nicolas Dumazet
|
r11802 | |||
full log | ||||
$ hg log -v | ||||
Martin Geisler
|
r12156 | changeset: 1:95b38e3a5b2e | ||
Nicolas Dumazet
|
r11802 | tag: tip | ||
user: test | ||||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: foo/plain-file | ||
description: | ||||
commit-foo-dot | ||||
Martin Geisler
|
r12156 | changeset: 0:65d4e9386227 | ||
Nicolas Dumazet
|
r11802 | user: test | ||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | files: foo/plain-file | ||
description: | ||||
commit-foo-subdir | ||||
subdir log | ||||
$ cd foo | ||||
$ hg log . | ||||
Martin Geisler
|
r12156 | changeset: 1:95b38e3a5b2e | ||
Nicolas Dumazet
|
r11802 | tag: tip | ||
user: test | ||||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | summary: commit-foo-dot | ||
Martin Geisler
|
r12156 | changeset: 0:65d4e9386227 | ||
Nicolas Dumazet
|
r11802 | user: test | ||
Martin Geisler
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
Nicolas Dumazet
|
r11802 | summary: commit-foo-subdir | ||
$ cd .. | ||||
$ cd .. | ||||
Martin Geisler
|
r12399 | Issue1049: Hg permits partial commit of merge without warning | ||
Nicolas Dumazet
|
r11802 | $ cd .. | ||
$ 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) | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
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) | ||||
Matt Mackall
|
r12316 | [255] | ||
Nicolas Dumazet
|
r11802 | |||
should succeed | ||||
$ hg ci -mmerge | ||||
$ cd .. | ||||
test commit message content | ||||
$ hg init commitmsg | ||||
$ cd commitmsg | ||||
$ echo changed > changed | ||||
$ echo removed > removed | ||||
$ 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' | ||||
HG: added added | ||||
HG: changed changed | ||||
HG: removed removed | ||||
abort: empty commit message | ||||
Matt Mackall
|
r12316 | [255] | ||