Mercurial > hg
annotate tests/test-commit.t @ 31736:dd2079fae003
largefiles: add copytostore() fstandin argument to replace readstandin() (API)
copyalltostore(), only one caller of copytostore(), already knows
standin file name of the target largefile. Therefore, passing it to
copytostore() is more efficient than calculating it in copytostore()
or readstandin().
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 01 Apr 2017 02:32:48 +0900 |
parents | ee47e951c6f9 |
children | 5b630f2ccb4e |
rev | line source |
---|---|
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
1 commit date test |
1488
08c7851969cc
only files in normal state should be marked as deleted
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1203
diff
changeset
|
2 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
3 $ hg init test |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
4 $ cd test |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
5 $ echo foo > foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
6 $ hg add foo |
22205
9fa429723f26
ui: invoke editor for committing with HGEDITFORM environment variable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22012
diff
changeset
|
7 $ cat > $TESTTMP/checkeditform.sh <<EOF |
9fa429723f26
ui: invoke editor for committing with HGEDITFORM environment variable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22012
diff
changeset
|
8 > env | grep HGEDITFORM |
9fa429723f26
ui: invoke editor for committing with HGEDITFORM environment variable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22012
diff
changeset
|
9 > true |
9fa429723f26
ui: invoke editor for committing with HGEDITFORM environment variable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22012
diff
changeset
|
10 > EOF |
9fa429723f26
ui: invoke editor for committing with HGEDITFORM environment variable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22012
diff
changeset
|
11 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" |
22248
75618a223e18
commit: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22205
diff
changeset
|
12 HGEDITFORM=commit.normal.normal |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
13 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
14 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
15 $ hg commit -d '0 0' -m commit-1 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
16 $ echo foo >> foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
17 $ hg commit -d '1 4444444' -m commit-3 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
18 abort: impossible time zone offset: 4444444 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
19 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
20 $ hg commit -d '1 15.1' -m commit-4 |
12105
6f58430dfdd0
util: get rid of extra trailing whitespace in parsedate abort message
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11802
diff
changeset
|
21 abort: invalid date: '1\t15.1' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
22 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
23 $ hg commit -d 'foo bar' -m commit-5 |
12105
6f58430dfdd0
util: get rid of extra trailing whitespace in parsedate abort message
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11802
diff
changeset
|
24 abort: invalid date: 'foo bar' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
25 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
26 $ hg commit -d ' 1 4444' -m commit-6 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
27 $ hg commit -d '111111111111 0' -m commit-7 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
28 abort: date exceeds 32 bits: 111111111111 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
29 [255] |
28825
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
30 $ hg commit -d '-111111111111 0' -m commit-7 |
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
31 abort: date exceeds 32 bits: -111111111111 |
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
32 [255] |
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
33 $ echo foo >> foo |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
34 $ hg commit -d '1901-12-13 20:45:52 +0000' -m commit-7-2 |
28825
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
35 $ echo foo >> foo |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
36 $ hg commit -d '-2147483648 0' -m commit-7-3 |
28825
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
37 $ hg log -T '{rev} {date|isodatesec}\n' -l2 |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
38 3 1901-12-13 20:45:52 +0000 |
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
39 2 1901-12-13 20:45:52 +0000 |
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
40 $ hg commit -d '1901-12-13 20:45:51 +0000' -m commit-7 |
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
41 abort: date exceeds 32 bits: -2147483649 |
28825
87c6ad2251d8
date: reallow negative timestamp, fix for Windows buggy gmtime() (issue2513)
Florent Gallaire <fgallaire@gmail.com>
parents:
26742
diff
changeset
|
42 [255] |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
43 $ hg commit -d '-2147483649 0' -m commit-7 |
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
44 abort: date exceeds 32 bits: -2147483649 |
13062
e1002cf9fe54
parsedate: abort on negative dates (issue2513)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12399
diff
changeset
|
45 [255] |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
46 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
47 commit added file that has been deleted |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
48 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
49 $ echo bar > bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
50 $ hg add bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
51 $ rm bar |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
52 $ hg commit -m commit-8 |
13899
a7cd0eee396b
commit: note when files are missing
Martin Geisler <mg@aragost.com>
parents:
13447
diff
changeset
|
53 nothing changed (1 missing files, see 'hg status') |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
54 [1] |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
55 $ hg commit -m commit-8-2 bar |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
56 abort: bar: file not found! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
58 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
59 $ hg -q revert -a --no-backup |
3786
8d603f8567ae
make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3709
diff
changeset
|
60 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
61 $ mkdir dir |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
62 $ echo boo > dir/file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
63 $ hg add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15441
diff
changeset
|
64 adding dir/file (glob) |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
65 $ hg -v commit -m commit-9 dir |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
66 committing files: |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
67 dir/file |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
68 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
69 committing changelog |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
70 committed changeset 4:1957363f1ced |
3709
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
1933
diff
changeset
|
71 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
72 $ echo > dir.file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
73 $ hg add |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
74 adding dir.file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
75 $ hg commit -m commit-10 dir dir.file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
76 abort: dir: no match under directory! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
77 [255] |
3709
38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
1933
diff
changeset
|
78 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
79 $ echo >> dir/file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
80 $ mkdir bleh |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
81 $ mkdir dir2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
82 $ cd bleh |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
83 $ hg commit -m commit-11 . |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
84 abort: bleh: no match under directory! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
85 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
86 $ hg commit -m commit-12 ../dir ../dir2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
87 abort: dir2: no match under directory! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
88 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
89 $ hg -v commit -m commit-13 ../dir |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
90 committing files: |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
91 dir/file |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
92 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
93 committing changelog |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
94 committed changeset 5:a31d8f87544a |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
95 $ cd .. |
4253
9e3e975258a9
tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3786
diff
changeset
|
96 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
97 $ hg commit -m commit-14 does-not-exist |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
98 abort: does-not-exist: * (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
99 [255] |
16842
a3ea092203a5
tests: introduce c-style conditional sections in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
15521
diff
changeset
|
100 |
a3ea092203a5
tests: introduce c-style conditional sections in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
15521
diff
changeset
|
101 #if symlink |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
102 $ ln -s foo baz |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
103 $ hg commit -m commit-15 baz |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
104 abort: baz: file not tracked! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
105 [255] |
16842
a3ea092203a5
tests: introduce c-style conditional sections in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
15521
diff
changeset
|
106 #endif |
a3ea092203a5
tests: introduce c-style conditional sections in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
15521
diff
changeset
|
107 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
108 $ touch quux |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
109 $ hg commit -m commit-16 quux |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
110 abort: quux: file not tracked! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
111 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
112 $ echo >> dir/file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
113 $ hg -v commit -m commit-17 dir/file |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
114 committing files: |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
115 dir/file |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
116 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23712
diff
changeset
|
117 committing changelog |
28864
b0811a9fe67c
date: fix boundary check of negative integer
Florent Gallaire <fgallaire@gmail.com>
parents:
28825
diff
changeset
|
118 committed changeset 6:32d054c9d085 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
119 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
120 An empty date was interpreted as epoch origin |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
121 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
122 $ echo foo >> foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
123 $ hg commit -d '' -m commit-no-date |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
124 $ hg tip --template '{date|isodate}\n' | grep '1970' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
125 [1] |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
126 |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
127 Make sure we do not obscure unknown requires file entries (issue2649) |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
128 |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
129 $ echo foo >> foo |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
130 $ echo fake >> .hg/requires |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
131 $ hg commit -m bla |
20820
f8e531a3a77c
repo: rephrase the "missing requirement" error message
Mads Kiilerich <madski@unity3d.com>
parents:
20773
diff
changeset
|
132 abort: repository requires features unknown to this Mercurial: fake! |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
25393
diff
changeset
|
133 (see https://mercurial-scm.org/wiki/MissingRequirement for more information) |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
134 [255] |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13062
diff
changeset
|
135 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
136 $ cd .. |
7072
4e0d54fbd34f
Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents:
6935
diff
changeset
|
137 |
4e0d54fbd34f
Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents:
6935
diff
changeset
|
138 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
139 partial subdir commit test |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
140 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
141 $ hg init test2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
142 $ cd test2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
143 $ mkdir foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
144 $ echo foo > foo/foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
145 $ mkdir bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
146 $ echo bar > bar/bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
147 $ hg add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15441
diff
changeset
|
148 adding bar/bar (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15441
diff
changeset
|
149 adding foo/foo (glob) |
21021
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
150 $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
151 commit-subdir-1 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
152 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
153 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
154 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
155 HG: Leave message empty to abort commit. |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
156 HG: -- |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
157 HG: user: test |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
158 HG: branch 'default' |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
159 HG: added foo/foo |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
160 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
161 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
162 $ hg ci -m commit-subdir-2 bar |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
163 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
164 subdir log 1 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
165 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
166 $ hg log -v foo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
167 changeset: 0:f97e73a25882 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
168 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
169 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
170 files: foo/foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
171 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
172 commit-subdir-1 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
173 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
174 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
175 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
176 subdir log 2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
177 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
178 $ hg log -v bar |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
179 changeset: 1:aa809156d50d |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
180 tag: tip |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
181 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
182 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
183 files: bar/bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
184 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
185 commit-subdir-2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
186 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
187 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
188 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
189 full log |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
190 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
191 $ hg log -v |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
192 changeset: 1:aa809156d50d |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
193 tag: tip |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
194 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
195 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
196 files: bar/bar |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
197 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
198 commit-subdir-2 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
199 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
200 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
201 changeset: 0:f97e73a25882 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
202 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
203 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
204 files: foo/foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
205 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
206 commit-subdir-1 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
207 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
208 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
209 $ cd .. |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
210 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
211 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
212 dot and subdir commit test |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
213 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
214 $ hg init test3 |
21021
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
215 $ echo commit-foo-subdir > commit-log-test |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
216 $ cd test3 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
217 $ mkdir foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
218 $ echo foo content > foo/plain-file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
219 $ hg add foo/plain-file |
21021
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
220 $ HGEDITOR=cat hg ci --edit -l ../commit-log-test foo |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
221 commit-foo-subdir |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
222 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
223 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
224 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
225 HG: Leave message empty to abort commit. |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
226 HG: -- |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
227 HG: user: test |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
228 HG: branch 'default' |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
229 HG: added foo/plain-file |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
230 |
422981492ace
commit: --edit/-e to force edit of otherwise-supplied commit message
"Bradley M. Kuhn" <bkuhn@ebb.org>
parents:
20860
diff
changeset
|
231 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
232 $ echo modified foo content > foo/plain-file |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
233 $ hg ci -m commit-foo-dot . |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
234 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
235 full log |
7072
4e0d54fbd34f
Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents:
6935
diff
changeset
|
236 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
237 $ hg log -v |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
238 changeset: 1:95b38e3a5b2e |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
239 tag: tip |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
240 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
241 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
242 files: foo/plain-file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
243 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
244 commit-foo-dot |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
245 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
246 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
247 changeset: 0:65d4e9386227 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
248 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
249 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
250 files: foo/plain-file |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
251 description: |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
252 commit-foo-subdir |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
253 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
254 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
255 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
256 subdir log |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
257 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
258 $ cd foo |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
259 $ hg log . |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
260 changeset: 1:95b38e3a5b2e |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
261 tag: tip |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
262 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
263 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
264 summary: commit-foo-dot |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
265 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
266 changeset: 0:65d4e9386227 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
267 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12105
diff
changeset
|
268 date: Thu Jan 01 00:00:00 1970 +0000 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
269 summary: commit-foo-subdir |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
270 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
271 $ cd .. |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
272 $ cd .. |
6386
bae2e9c838e9
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents:
6112
diff
changeset
|
273 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12327
diff
changeset
|
274 Issue1049: Hg permits partial commit of merge without warning |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12327
diff
changeset
|
275 |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
276 $ hg init issue1049 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
277 $ cd issue1049 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
278 $ echo a > a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
279 $ hg ci -Ama |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
280 adding a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
281 $ echo a >> a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
282 $ hg ci -mb |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
283 $ hg up 0 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
285 $ echo b >> a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
286 $ hg ci -mc |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
287 created new head |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
288 $ HGMERGE=true hg merge |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
289 merging a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
290 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
291 (branch merge, don't forget to commit) |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
292 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
293 should fail because we are specifying a file name |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
294 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
295 $ hg ci -mmerge a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
296 abort: cannot partially commit a merge (do not specify files or patterns) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
297 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
298 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
299 should fail because we are specifying a pattern |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
300 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
301 $ hg ci -mmerge -I a |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
302 abort: cannot partially commit a merge (do not specify files or patterns) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
303 [255] |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
304 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
305 should succeed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
306 |
22248
75618a223e18
commit: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22205
diff
changeset
|
307 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit |
75618a223e18
commit: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22205
diff
changeset
|
308 HGEDITFORM=commit.normal.merge |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
309 $ cd .. |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
310 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
311 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
312 test commit message content |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
313 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
314 $ hg init commitmsg |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
315 $ cd commitmsg |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
316 $ echo changed > changed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
317 $ echo removed > removed |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
318 $ hg book activebookmark |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
319 $ hg ci -qAm init |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
320 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
321 $ hg rm removed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
322 $ echo changed >> changed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
323 $ echo added > added |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
324 $ hg add added |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
325 $ HGEDITOR=cat hg ci -A |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
326 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
327 |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
328 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
329 HG: Leave message empty to abort commit. |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
330 HG: -- |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
331 HG: user: test |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
332 HG: branch 'default' |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
333 HG: bookmark 'activebookmark' |
11802
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
334 HG: added added |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
335 HG: changed changed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
336 HG: removed removed |
d26b7cc96bc4
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
337 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
338 [255] |
20765
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
339 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
340 test saving last-message.txt |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
341 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
342 $ hg init sub |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
343 $ echo a > sub/a |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
344 $ hg -R sub add sub/a |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
345 $ cat > sub/.hg/hgrc <<EOF |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
346 > [hooks] |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
347 > precommit.test-saving-last-message = false |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
348 > EOF |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
349 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
350 $ echo 'sub = sub' > .hgsub |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
351 $ hg add .hgsub |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
352 |
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20765
diff
changeset
|
353 $ cat > $TESTTMP/editor.sh <<EOF |
20765
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
354 > echo "==== before editing:" |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
355 > cat \$1 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
356 > echo "====" |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
357 > echo "test saving last-message.txt" >> \$1 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
358 > EOF |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
359 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
360 $ rm -f .hg/last-message.txt |
20859
e259d4c462b5
tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents:
20765
diff
changeset
|
361 $ HGEDITOR="sh $TESTTMP/editor.sh" hg commit -S -q |
20765
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
362 ==== before editing: |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
363 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
364 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
365 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
366 HG: Leave message empty to abort commit. |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
367 HG: -- |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
368 HG: user: test |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
369 HG: branch 'default' |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
370 HG: bookmark 'activebookmark' |
20765
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
371 HG: subrepo sub |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
372 HG: added .hgsub |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
373 HG: added added |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
374 HG: changed .hgsubstate |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
375 HG: changed changed |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
376 HG: removed removed |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
377 ==== |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
378 abort: precommit.test-saving-last-message hook exited with status 1 (in subrepo sub) |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
379 [255] |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
380 $ cat .hg/last-message.txt |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
381 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
382 |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
383 test saving last-message.txt |
f042d4b263f4
localrepo: save manually edited commit message as soon as possible
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18538
diff
changeset
|
384 |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
385 test that '[committemplate] changeset' definition and commit log |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
386 specific template keywords work well |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
387 |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
388 $ cat >> .hg/hgrc <<EOF |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
389 > [committemplate] |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
390 > changeset.commit.normal = HG: this is "commit.normal" template |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
391 > HG: {extramsg} |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
392 > {if(activebookmark, |
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
393 > "HG: bookmark '{activebookmark}' is activated\n", |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
394 > "HG: no bookmark is activated\n")}{subrepos % |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
395 > "HG: subrepo '{subrepo}' is changed\n"} |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
396 > |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
397 > changeset.commit = HG: this is "commit" template |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
398 > HG: {extramsg} |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
399 > {if(activebookmark, |
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
400 > "HG: bookmark '{activebookmark}' is activated\n", |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
401 > "HG: no bookmark is activated\n")}{subrepos % |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
402 > "HG: subrepo '{subrepo}' is changed\n"} |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
403 > |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
404 > changeset = HG: this is customized commit template |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
405 > HG: {extramsg} |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
406 > {if(activebookmark, |
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
407 > "HG: bookmark '{activebookmark}' is activated\n", |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
408 > "HG: no bookmark is activated\n")}{subrepos % |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
409 > "HG: subrepo '{subrepo}' is changed\n"} |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
410 > EOF |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
411 |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
412 $ hg init sub2 |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
413 $ echo a > sub2/a |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
414 $ hg -R sub2 add sub2/a |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
415 $ echo 'sub2 = sub2' >> .hgsub |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
416 |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
417 $ HGEDITOR=cat hg commit -S -q |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
418 HG: this is "commit.normal" template |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
419 HG: Leave message empty to abort commit. |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
420 HG: bookmark 'activebookmark' is activated |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
421 HG: subrepo 'sub' is changed |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
422 HG: subrepo 'sub2' is changed |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
423 abort: empty commit message |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
424 [255] |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
425 |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
426 $ cat >> .hg/hgrc <<EOF |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
427 > [committemplate] |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
428 > changeset.commit.normal = |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
429 > # now, "changeset.commit" should be chosen for "hg commit" |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
430 > EOF |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
431 |
25014
7e5d5160073b
templatekw: replace currentbookmark with activebookmark keyword
Ryan McElroy <rmcelroy@fb.com>
parents:
23749
diff
changeset
|
432 $ hg bookmark --inactive activebookmark |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
433 $ hg forget .hgsub |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
434 $ HGEDITOR=cat hg commit -q |
22012
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
435 HG: this is "commit" template |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
436 HG: Leave message empty to abort commit. |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
437 HG: no bookmark is activated |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
438 abort: empty commit message |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
439 [255] |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
440 |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
441 $ cat >> .hg/hgrc <<EOF |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
442 > [committemplate] |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
443 > changeset.commit = |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
444 > # now, "changeset" should be chosen for "hg commit" |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
445 > EOF |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
446 |
9d92b9d1e282
cmdutil: look commit template definition up by specified 'editform'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21924
diff
changeset
|
447 $ HGEDITOR=cat hg commit -q |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
448 HG: this is customized commit template |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
449 HG: Leave message empty to abort commit. |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
450 HG: no bookmark is activated |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
451 abort: empty commit message |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
452 [255] |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
453 |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
454 $ cat >> .hg/hgrc <<EOF |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
455 > [committemplate] |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
456 > changeset = {desc} |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
457 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
458 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
459 > HG: dels={file_dels} |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
460 > HG: files={files} |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
461 > HG: |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
462 > {splitlines(diff()) % 'HG: {line}\n' |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
463 > }HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
464 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
465 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
466 > HG: dels={file_dels} |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
467 > HG: files={files}\n |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
468 > EOF |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
469 $ hg status -amr |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
470 M changed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
471 A added |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
472 R removed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
473 $ HGEDITOR=cat hg commit -q -e -m "foo bar" changed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
474 foo bar |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
475 HG: mods=changed |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
476 HG: adds= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
477 HG: dels= |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
478 HG: files=changed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
479 HG: |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
480 HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
481 HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
482 HG: @@ -1,1 +1,2 @@ |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
483 HG: changed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
484 HG: +changed |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
485 HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
486 HG: mods=changed |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
487 HG: adds= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
488 HG: dels= |
23711
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
489 HG: files=changed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
490 $ hg status -amr |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
491 A added |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
492 R removed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
493 $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
494 M changed |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
495 A |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
496 R |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
497 $ hg rollback -q |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
498 |
1e6fb8db666e
context: avoid breaking already fixed self._status at ctx.status()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23627
diff
changeset
|
499 $ cat >> .hg/hgrc <<EOF |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
500 > [committemplate] |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
501 > changeset = {desc} |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
502 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
503 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
504 > HG: dels={file_dels} |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
505 > HG: files={files} |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
506 > HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
507 > {splitlines(diff("changed")) % 'HG: {line}\n' |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
508 > }HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
509 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
510 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
511 > HG: dels={file_dels} |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
512 > HG: files={files} |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
513 > HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
514 > {splitlines(diff("added")) % 'HG: {line}\n' |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
515 > }HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
516 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
517 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
518 > HG: dels={file_dels} |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
519 > HG: files={files} |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
520 > HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
521 > {splitlines(diff("removed")) % 'HG: {line}\n' |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
522 > }HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
523 > HG: mods={file_mods} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
524 > HG: adds={file_adds} |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
525 > HG: dels={file_dels} |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
526 > HG: files={files}\n |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
527 > EOF |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
528 $ HGEDITOR=cat hg commit -q -e -m "foo bar" added removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
529 foo bar |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
530 HG: mods= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
531 HG: adds=added |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
532 HG: dels=removed |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
533 HG: files=added removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
534 HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
535 HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
536 HG: mods= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
537 HG: adds=added |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
538 HG: dels=removed |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
539 HG: files=added removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
540 HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
541 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
542 HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
543 HG: @@ -0,0 +1,1 @@ |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
544 HG: +added |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
545 HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
546 HG: mods= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
547 HG: adds=added |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
548 HG: dels=removed |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
549 HG: files=added removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
550 HG: |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
551 HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
552 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
553 HG: @@ -1,1 +0,0 @@ |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
554 HG: -removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
555 HG: |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
556 HG: mods= |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
557 HG: adds=added |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23749
diff
changeset
|
558 HG: dels=removed |
23712
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
559 HG: files=added removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
560 $ hg status -amr |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
561 M changed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
562 $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
563 M |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
564 A added |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
565 R removed |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
566 $ hg rollback -q |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
567 |
bfce25d25c96
context: override _dirstatestatus in workingcommitctx for correct matching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23711
diff
changeset
|
568 $ cat >> .hg/hgrc <<EOF |
21924
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
569 > # disable customizing for subsequent tests |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
570 > [committemplate] |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
571 > changeset = |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
572 > EOF |
5375ba75df40
cmdutil: make commit message shown in text editor customizable by template
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
573 |
16849
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
574 $ cd .. |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
575 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
576 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
577 commit copy |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
578 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
579 $ hg init dir2 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
580 $ cd dir2 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
581 $ echo bleh > bar |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
582 $ hg add bar |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
583 $ hg ci -m 'add bar' |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
584 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
585 $ hg cp bar foo |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
586 $ echo >> bar |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
587 $ hg ci -m 'cp bar foo; change bar' |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
588 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
589 $ hg debugrename foo |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
590 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 |
928ee57e3aae
tests: roll test-commit-copy.t into test-commit.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
16842
diff
changeset
|
591 $ hg debugindex bar |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16958
diff
changeset
|
592 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16958
diff
changeset
|
593 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16958
diff
changeset
|
594 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16896
diff
changeset
|
595 |
25018
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
596 Test making empty commits |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
597 $ hg commit --config ui.allowemptycommit=True -m "empty commit" |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
598 $ hg log -r . -v --stat |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
599 changeset: 2:d809f3644287 |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
600 tag: tip |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
601 user: test |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
602 date: Thu Jan 01 00:00:00 1970 +0000 |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
603 description: |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
604 empty commit |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
605 |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
606 |
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
607 |
23598
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
608 verify pathauditor blocks evil filepaths |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
609 $ cat > evil-commit.py <<EOF |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
610 > from mercurial import ui, hg, context, node |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
611 > notrc = u".h\u200cg".encode('utf-8') + '/hgrc' |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28864
diff
changeset
|
612 > u = ui.ui.load() |
23598
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
613 > r = hg.repository(u, '.') |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
614 > def filectxfn(repo, memctx, path): |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
615 > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
616 > c = context.memctx(r, [r['tip'].node(), node.nullid], |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
617 > 'evil', [notrc], filectxfn, 0) |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
618 > r.commitctx(c) |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
619 > EOF |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
620 $ $PYTHON evil-commit.py |
23627
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
621 #if windows |
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
622 $ hg co --clean tip |
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
623 abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc) |
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
624 [255] |
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
625 #else |
23598
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
626 $ hg co --clean tip |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
627 abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc) |
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
628 [255] |
23627
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
629 #endif |
23598
c02a05cc6f5e
pathauditor: check for codepoints ignored on OS X
Augie Fackler <raf@durin42.com>
parents:
22248
diff
changeset
|
630 |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
631 $ hg rollback -f |
25018
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
632 repository tip rolled back to revision 2 (undo commit) |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
633 $ cat > evil-commit.py <<EOF |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
634 > from mercurial import ui, hg, context, node |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
635 > notrc = "HG~1/hgrc" |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28864
diff
changeset
|
636 > u = ui.ui.load() |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
637 > r = hg.repository(u, '.') |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
638 > def filectxfn(repo, memctx, path): |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
639 > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
640 > c = context.memctx(r, [r['tip'].node(), node.nullid], |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
641 > 'evil', [notrc], filectxfn, 0) |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
642 > r.commitctx(c) |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
643 > EOF |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
644 $ $PYTHON evil-commit.py |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
645 $ hg co --clean tip |
23627
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
646 abort: path contains illegal component: HG~1/hgrc (glob) |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
647 [255] |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
648 |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
649 $ hg rollback -f |
25018
93e015a3d1ea
commit: add ui.allowemptycommit config option
Durham Goode <durham@fb.com>
parents:
25014
diff
changeset
|
650 repository tip rolled back to revision 2 (undo commit) |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
651 $ cat > evil-commit.py <<EOF |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
652 > from mercurial import ui, hg, context, node |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
653 > notrc = "HG8B6C~2/hgrc" |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28864
diff
changeset
|
654 > u = ui.ui.load() |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
655 > r = hg.repository(u, '.') |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
656 > def filectxfn(repo, memctx, path): |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
657 > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
658 > c = context.memctx(r, [r['tip'].node(), node.nullid], |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
659 > 'evil', [notrc], filectxfn, 0) |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
660 > r.commitctx(c) |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
661 > EOF |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
662 $ $PYTHON evil-commit.py |
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
663 $ hg co --clean tip |
23627
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23604
diff
changeset
|
664 abort: path contains illegal component: HG8B6C~2/hgrc (glob) |
23599
6dad422ecc5a
pathauditor: check for Windows shortname aliases
Matt Mackall <mpm@selenic.com>
parents:
23598
diff
changeset
|
665 [255] |
26742
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
666 |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
667 # test that an unmodified commit template message aborts |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
668 |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
669 $ hg init unmodified_commit_template |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
670 $ cd unmodified_commit_template |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
671 $ echo foo > foo |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
672 $ hg add foo |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
673 $ hg commit -m "foo" |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
674 $ cat >> .hg/hgrc <<EOF |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
675 > [committemplate] |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
676 > changeset.commit = HI THIS IS NOT STRIPPED |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
677 > HG: this is customized commit template |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
678 > HG: {extramsg} |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
679 > {if(activebookmark, |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
680 > "HG: bookmark '{activebookmark}' is activated\n", |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
681 > "HG: no bookmark is activated\n")}{subrepos % |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
682 > "HG: subrepo '{subrepo}' is changed\n"} |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
683 > EOF |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
684 $ cat > $TESTTMP/notouching.sh <<EOF |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
685 > true |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
686 > EOF |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
687 $ echo foo2 > foo2 |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
688 $ hg add foo2 |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
689 $ HGEDITOR="sh $TESTTMP/notouching.sh" hg commit |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
690 abort: commit message unchanged |
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
691 [255] |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
692 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
693 test that text below the --- >8 --- special string is ignored |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
694 |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
695 $ cat <<'EOF' > $TESTTMP/lowercaseline.sh |
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
696 > cat $1 | sed s/LINE/line/ | tee $1.new |
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
697 > mv $1.new $1 |
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
698 > EOF |
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
699 |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
700 $ hg init ignore_below_special_string |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
701 $ cd ignore_below_special_string |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
702 $ echo foo > foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
703 $ hg add foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
704 $ hg commit -m "foo" |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
705 $ cat >> .hg/hgrc <<EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
706 > [committemplate] |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
707 > changeset.commit = first LINE |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
708 > HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
709 > HG: {extramsg} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
710 > HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
711 > {diff()} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
712 > EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
713 $ echo foo2 > foo2 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
714 $ hg add foo2 |
30724
ee47e951c6f9
commit: fix unmodified message detection for the "--- >8 ----" magic
Yuya Nishihara <yuya@tcha.org>
parents:
30723
diff
changeset
|
715 $ HGEDITOR="sh $TESTTMP/notouching.sh" hg ci |
ee47e951c6f9
commit: fix unmodified message detection for the "--- >8 ----" magic
Yuya Nishihara <yuya@tcha.org>
parents:
30723
diff
changeset
|
716 abort: commit message unchanged |
ee47e951c6f9
commit: fix unmodified message detection for the "--- >8 ----" magic
Yuya Nishihara <yuya@tcha.org>
parents:
30723
diff
changeset
|
717 [255] |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
718 $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
719 first line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
720 HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
721 HG: Leave message empty to abort commit. |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
722 HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
723 diff -r e63c23eaa88a foo2 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
724 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
725 +++ b/foo2 Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
726 @@ -0,0 +1,1 @@ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
727 +foo2 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
728 $ hg log -T '{desc}\n' -r . |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
729 first line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
730 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
731 test that the special string --- >8 --- isn't used when not at the beginning of |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
732 a line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
733 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
734 $ cat >> .hg/hgrc <<EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
735 > [committemplate] |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
736 > changeset.commit = first LINE2 |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
737 > another line HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
738 > HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
739 > HG: {extramsg} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
740 > HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
741 > {diff()} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
742 > EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
743 $ echo foo >> foo |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
744 $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
745 first line2 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
746 another line HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
747 HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
748 HG: Leave message empty to abort commit. |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
749 HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
750 diff -r 3661b22b0702 foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
751 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
752 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
753 @@ -1,1 +1,2 @@ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
754 foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
755 +foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
756 $ hg log -T '{desc}\n' -r . |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
757 first line2 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
758 another line HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
759 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
760 also test that this special string isn't accepted when there is some extra text |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
761 at the end |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
762 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
763 $ cat >> .hg/hgrc <<EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
764 > [committemplate] |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
765 > changeset.commit = first LINE3 |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
766 > HG: ------------------------ >8 ------------------------foobar |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
767 > second line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
768 > HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
769 > HG: {extramsg} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
770 > HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
771 > {diff()} |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
772 > EOF |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
773 $ echo foo >> foo |
30723
6ef9f32d76c6
commit: update test to actually modify template text
Yuya Nishihara <yuya@tcha.org>
parents:
30703
diff
changeset
|
774 $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
775 first line3 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
776 HG: ------------------------ >8 ------------------------foobar |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
777 second line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
778 HG: this is customized commit template |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
779 HG: Leave message empty to abort commit. |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
780 HG: ------------------------ >8 ------------------------ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
781 diff -r ce648f5f066f foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
782 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
783 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
784 @@ -1,2 +1,3 @@ |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
785 foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
786 foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
787 +foo |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
788 $ hg log -T '{desc}\n' -r . |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
789 first line3 |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
790 second line |
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
791 |
26742
bec1a579ebc4
commit: abort when a committemplate is not changed
Tony Tung <tonytung@fb.com>
parents:
26421
diff
changeset
|
792 $ cd .. |
30703
5c85c93cdd61
cmdutil: add special string that ignores rest of text
Sean Farley <sean@farley.io>
parents:
30559
diff
changeset
|
793 |