Show More
| @@ -1,828 +1,831 b'' | |||||
| 1 | commit date test |
|
1 | commit date test | |
| 2 |
|
2 | |||
| 3 | $ hg init test |
|
3 | $ hg init test | |
| 4 | $ cd test |
|
4 | $ cd test | |
| 5 | $ echo foo > foo |
|
5 | $ echo foo > foo | |
| 6 | $ hg add foo |
|
6 | $ hg add foo | |
| 7 | $ cat > $TESTTMP/checkeditform.sh <<EOF |
|
7 | $ cat > $TESTTMP/checkeditform.sh <<EOF | |
| 8 | > env | grep HGEDITFORM |
|
8 | > env | grep HGEDITFORM | |
| 9 | > true |
|
9 | > true | |
| 10 | > EOF |
|
10 | > EOF | |
| 11 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" |
|
11 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" | |
| 12 | HGEDITFORM=commit.normal.normal |
|
12 | HGEDITFORM=commit.normal.normal | |
| 13 | abort: empty commit message |
|
13 | abort: empty commit message | |
| 14 | [255] |
|
14 | [255] | |
| 15 | $ hg commit -d '0 0' -m commit-1 |
|
15 | $ hg commit -d '0 0' -m commit-1 | |
| 16 | $ echo foo >> foo |
|
16 | $ echo foo >> foo | |
| 17 | $ hg commit -d '1 4444444' -m commit-3 |
|
17 | $ hg commit -d '1 4444444' -m commit-3 | |
| 18 | hg: parse error: impossible time zone offset: 4444444 |
|
18 | hg: parse error: impossible time zone offset: 4444444 | |
| 19 | [255] |
|
19 | [255] | |
| 20 | $ hg commit -d '1 15.1' -m commit-4 |
|
20 | $ hg commit -d '1 15.1' -m commit-4 | |
| 21 | hg: parse error: invalid date: '1\t15.1' |
|
21 | hg: parse error: invalid date: '1\t15.1' | |
| 22 | [255] |
|
22 | [255] | |
| 23 | $ hg commit -d 'foo bar' -m commit-5 |
|
23 | $ hg commit -d 'foo bar' -m commit-5 | |
| 24 | hg: parse error: invalid date: 'foo bar' |
|
24 | hg: parse error: invalid date: 'foo bar' | |
| 25 | [255] |
|
25 | [255] | |
| 26 | $ hg commit -d ' 1 4444' -m commit-6 |
|
26 | $ hg commit -d ' 1 4444' -m commit-6 | |
| 27 | $ hg commit -d '111111111111 0' -m commit-7 |
|
27 | $ hg commit -d '111111111111 0' -m commit-7 | |
| 28 | hg: parse error: date exceeds 32 bits: 111111111111 |
|
28 | hg: parse error: date exceeds 32 bits: 111111111111 | |
| 29 | [255] |
|
29 | [255] | |
| 30 | $ hg commit -d '-111111111111 0' -m commit-7 |
|
30 | $ hg commit -d '-111111111111 0' -m commit-7 | |
| 31 | hg: parse error: date exceeds 32 bits: -111111111111 |
|
31 | hg: parse error: date exceeds 32 bits: -111111111111 | |
| 32 | [255] |
|
32 | [255] | |
| 33 | $ echo foo >> foo |
|
33 | $ echo foo >> foo | |
| 34 | $ hg commit -d '1901-12-13 20:45:52 +0000' -m commit-7-2 |
|
34 | $ hg commit -d '1901-12-13 20:45:52 +0000' -m commit-7-2 | |
| 35 | $ echo foo >> foo |
|
35 | $ echo foo >> foo | |
| 36 | $ hg commit -d '-2147483648 0' -m commit-7-3 |
|
36 | $ hg commit -d '-2147483648 0' -m commit-7-3 | |
| 37 | $ hg log -T '{rev} {date|isodatesec}\n' -l2 |
|
37 | $ hg log -T '{rev} {date|isodatesec}\n' -l2 | |
| 38 | 3 1901-12-13 20:45:52 +0000 |
|
38 | 3 1901-12-13 20:45:52 +0000 | |
| 39 | 2 1901-12-13 20:45:52 +0000 |
|
39 | 2 1901-12-13 20:45:52 +0000 | |
| 40 | $ hg commit -d '1901-12-13 20:45:51 +0000' -m commit-7 |
|
40 | $ hg commit -d '1901-12-13 20:45:51 +0000' -m commit-7 | |
| 41 | hg: parse error: date exceeds 32 bits: -2147483649 |
|
41 | hg: parse error: date exceeds 32 bits: -2147483649 | |
| 42 | [255] |
|
42 | [255] | |
| 43 | $ hg commit -d '-2147483649 0' -m commit-7 |
|
43 | $ hg commit -d '-2147483649 0' -m commit-7 | |
| 44 | hg: parse error: date exceeds 32 bits: -2147483649 |
|
44 | hg: parse error: date exceeds 32 bits: -2147483649 | |
| 45 | [255] |
|
45 | [255] | |
| 46 |
|
46 | |||
| 47 | commit added file that has been deleted |
|
47 | commit added file that has been deleted | |
| 48 |
|
48 | |||
| 49 | $ echo bar > bar |
|
49 | $ echo bar > bar | |
| 50 | $ hg add bar |
|
50 | $ hg add bar | |
| 51 | $ rm bar |
|
51 | $ rm bar | |
| 52 | $ hg commit -m commit-8 |
|
52 | $ hg commit -m commit-8 | |
| 53 | nothing changed (1 missing files, see 'hg status') |
|
53 | nothing changed (1 missing files, see 'hg status') | |
| 54 | [1] |
|
54 | [1] | |
| 55 | $ hg commit -m commit-8-2 bar |
|
55 | $ hg commit -m commit-8-2 bar | |
| 56 | abort: bar: file not found! |
|
56 | abort: bar: file not found! | |
| 57 | [255] |
|
57 | [255] | |
| 58 |
|
58 | |||
| 59 | $ hg -q revert -a --no-backup |
|
59 | $ hg -q revert -a --no-backup | |
| 60 |
|
60 | |||
| 61 | $ mkdir dir |
|
61 | $ mkdir dir | |
| 62 | $ echo boo > dir/file |
|
62 | $ echo boo > dir/file | |
| 63 | $ hg add |
|
63 | $ hg add | |
| 64 | adding dir/file (glob) |
|
64 | adding dir/file (glob) | |
| 65 | $ hg -v commit -m commit-9 dir |
|
65 | $ hg -v commit -m commit-9 dir | |
| 66 | committing files: |
|
66 | committing files: | |
| 67 | dir/file |
|
67 | dir/file | |
| 68 | committing manifest |
|
68 | committing manifest | |
| 69 | committing changelog |
|
69 | committing changelog | |
| 70 | committed changeset 4:1957363f1ced |
|
70 | committed changeset 4:1957363f1ced | |
| 71 |
|
71 | |||
| 72 | $ echo > dir.file |
|
72 | $ echo > dir.file | |
| 73 | $ hg add |
|
73 | $ hg add | |
| 74 | adding dir.file |
|
74 | adding dir.file | |
| 75 | $ hg commit -m commit-10 dir dir.file |
|
75 | $ hg commit -m commit-10 dir dir.file | |
| 76 | abort: dir: no match under directory! |
|
76 | abort: dir: no match under directory! | |
| 77 | [255] |
|
77 | [255] | |
| 78 |
|
78 | |||
| 79 | $ echo >> dir/file |
|
79 | $ echo >> dir/file | |
| 80 | $ mkdir bleh |
|
80 | $ mkdir bleh | |
| 81 | $ mkdir dir2 |
|
81 | $ mkdir dir2 | |
| 82 | $ cd bleh |
|
82 | $ cd bleh | |
| 83 | $ hg commit -m commit-11 . |
|
83 | $ hg commit -m commit-11 . | |
| 84 | abort: bleh: no match under directory! |
|
84 | abort: bleh: no match under directory! | |
| 85 | [255] |
|
85 | [255] | |
| 86 | $ hg commit -m commit-12 ../dir ../dir2 |
|
86 | $ hg commit -m commit-12 ../dir ../dir2 | |
| 87 | abort: dir2: no match under directory! |
|
87 | abort: dir2: no match under directory! | |
| 88 | [255] |
|
88 | [255] | |
| 89 | $ hg -v commit -m commit-13 ../dir |
|
89 | $ hg -v commit -m commit-13 ../dir | |
| 90 | committing files: |
|
90 | committing files: | |
| 91 | dir/file |
|
91 | dir/file | |
| 92 | committing manifest |
|
92 | committing manifest | |
| 93 | committing changelog |
|
93 | committing changelog | |
| 94 | committed changeset 5:a31d8f87544a |
|
94 | committed changeset 5:a31d8f87544a | |
| 95 | $ cd .. |
|
95 | $ cd .. | |
| 96 |
|
96 | |||
| 97 | $ hg commit -m commit-14 does-not-exist |
|
97 | $ hg commit -m commit-14 does-not-exist | |
| 98 | abort: does-not-exist: * (glob) |
|
98 | abort: does-not-exist: * (glob) | |
| 99 | [255] |
|
99 | [255] | |
| 100 |
|
100 | |||
| 101 | #if symlink |
|
101 | #if symlink | |
| 102 | $ ln -s foo baz |
|
102 | $ ln -s foo baz | |
| 103 | $ hg commit -m commit-15 baz |
|
103 | $ hg commit -m commit-15 baz | |
| 104 | abort: baz: file not tracked! |
|
104 | abort: baz: file not tracked! | |
| 105 | [255] |
|
105 | [255] | |
| 106 | $ rm baz |
|
106 | $ rm baz | |
| 107 | #endif |
|
107 | #endif | |
| 108 |
|
108 | |||
| 109 | $ touch quux |
|
109 | $ touch quux | |
| 110 | $ hg commit -m commit-16 quux |
|
110 | $ hg commit -m commit-16 quux | |
| 111 | abort: quux: file not tracked! |
|
111 | abort: quux: file not tracked! | |
| 112 | [255] |
|
112 | [255] | |
| 113 | $ echo >> dir/file |
|
113 | $ echo >> dir/file | |
| 114 | $ hg -v commit -m commit-17 dir/file |
|
114 | $ hg -v commit -m commit-17 dir/file | |
| 115 | committing files: |
|
115 | committing files: | |
| 116 | dir/file |
|
116 | dir/file | |
| 117 | committing manifest |
|
117 | committing manifest | |
| 118 | committing changelog |
|
118 | committing changelog | |
| 119 | committed changeset 6:32d054c9d085 |
|
119 | committed changeset 6:32d054c9d085 | |
| 120 |
|
120 | |||
| 121 | An empty date was interpreted as epoch origin |
|
121 | An empty date was interpreted as epoch origin | |
| 122 |
|
122 | |||
| 123 | $ echo foo >> foo |
|
123 | $ echo foo >> foo | |
| 124 | $ hg commit -d '' -m commit-no-date --config devel.default-date= |
|
124 | $ hg commit -d '' -m commit-no-date --config devel.default-date= | |
| 125 | $ hg tip --template '{date|isodate}\n' | grep '1970' |
|
125 | $ hg tip --template '{date|isodate}\n' | grep '1970' | |
| 126 | [1] |
|
126 | [1] | |
| 127 |
|
127 | |||
| 128 | Using the advanced --extra flag |
|
128 | Using the advanced --extra flag | |
| 129 |
|
129 | |||
| 130 | $ echo "[extensions]" >> $HGRCPATH |
|
130 | $ echo "[extensions]" >> $HGRCPATH | |
| 131 | $ echo "commitextras=" >> $HGRCPATH |
|
131 | $ echo "commitextras=" >> $HGRCPATH | |
| 132 | $ hg status |
|
132 | $ hg status | |
| 133 | ? quux |
|
133 | ? quux | |
| 134 | $ hg add quux |
|
134 | $ hg add quux | |
| 135 | $ hg commit -m "adding internal used extras" --extra amend_source=hash |
|
135 | $ hg commit -m "adding internal used extras" --extra amend_source=hash | |
| 136 | abort: key 'amend_source' is used internally, can't be set manually |
|
136 | abort: key 'amend_source' is used internally, can't be set manually | |
| 137 | [255] |
|
137 | [255] | |
| 138 | $ hg commit -m "special chars in extra" --extra id@phab=214 |
|
138 | $ hg commit -m "special chars in extra" --extra id@phab=214 | |
| 139 | abort: keys can only contain ascii letters, digits, '_' and '-' |
|
139 | abort: keys can only contain ascii letters, digits, '_' and '-' | |
| 140 | [255] |
|
140 | [255] | |
| 141 | $ hg commit -m "empty key" --extra =value |
|
141 | $ hg commit -m "empty key" --extra =value | |
| 142 | abort: unable to parse '=value', keys can't be empty |
|
142 | abort: unable to parse '=value', keys can't be empty | |
| 143 | [255] |
|
143 | [255] | |
| 144 | $ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar |
|
144 | $ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar | |
| 145 | $ hg log -r . -T '{extras % "{extra}\n"}' |
|
145 | $ hg log -r . -T '{extras % "{extra}\n"}' | |
| 146 | branch=default |
|
146 | branch=default | |
| 147 | oldhash=bar |
|
147 | oldhash=bar | |
| 148 | sourcehash=foo |
|
148 | sourcehash=foo | |
| 149 |
|
149 | |||
| 150 | Failed commit with --addremove should not update dirstate |
|
150 | Failed commit with --addremove should not update dirstate | |
| 151 |
|
151 | |||
| 152 | $ echo foo > newfile |
|
152 | $ echo foo > newfile | |
| 153 | $ hg status |
|
153 | $ hg status | |
| 154 | ? newfile |
|
154 | ? newfile | |
| 155 | $ HGEDITOR=false hg ci --addremove |
|
155 | $ HGEDITOR=false hg ci --addremove | |
| 156 | adding newfile |
|
156 | adding newfile | |
| 157 | abort: edit failed: false exited with status 1 |
|
157 | abort: edit failed: false exited with status 1 | |
| 158 | [255] |
|
158 | [255] | |
| 159 | $ hg status |
|
159 | $ hg status | |
| 160 | ? newfile |
|
160 | ? newfile | |
| 161 |
|
161 | |||
| 162 | Make sure we do not obscure unknown requires file entries (issue2649) |
|
162 | Make sure we do not obscure unknown requires file entries (issue2649) | |
| 163 |
|
163 | |||
| 164 | $ echo foo >> foo |
|
164 | $ echo foo >> foo | |
| 165 | $ echo fake >> .hg/requires |
|
165 | $ echo fake >> .hg/requires | |
| 166 | $ hg commit -m bla |
|
166 | $ hg commit -m bla | |
| 167 | abort: repository requires features unknown to this Mercurial: fake! |
|
167 | abort: repository requires features unknown to this Mercurial: fake! | |
| 168 | (see https://mercurial-scm.org/wiki/MissingRequirement for more information) |
|
168 | (see https://mercurial-scm.org/wiki/MissingRequirement for more information) | |
| 169 | [255] |
|
169 | [255] | |
| 170 |
|
170 | |||
| 171 | $ cd .. |
|
171 | $ cd .. | |
| 172 |
|
172 | |||
| 173 |
|
173 | |||
| 174 | partial subdir commit test |
|
174 | partial subdir commit test | |
| 175 |
|
175 | |||
| 176 | $ hg init test2 |
|
176 | $ hg init test2 | |
| 177 | $ cd test2 |
|
177 | $ cd test2 | |
| 178 | $ mkdir foo |
|
178 | $ mkdir foo | |
| 179 | $ echo foo > foo/foo |
|
179 | $ echo foo > foo/foo | |
| 180 | $ mkdir bar |
|
180 | $ mkdir bar | |
| 181 | $ echo bar > bar/bar |
|
181 | $ echo bar > bar/bar | |
| 182 | $ hg add |
|
182 | $ hg add | |
| 183 | adding bar/bar (glob) |
|
183 | adding bar/bar (glob) | |
| 184 | adding foo/foo (glob) |
|
184 | adding foo/foo (glob) | |
| 185 | $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo |
|
185 | $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo | |
| 186 | commit-subdir-1 |
|
186 | commit-subdir-1 | |
| 187 |
|
187 | |||
| 188 |
|
188 | |||
| 189 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
189 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
| 190 | HG: Leave message empty to abort commit. |
|
190 | HG: Leave message empty to abort commit. | |
| 191 | HG: -- |
|
191 | HG: -- | |
| 192 | HG: user: test |
|
192 | HG: user: test | |
| 193 | HG: branch 'default' |
|
193 | HG: branch 'default' | |
| 194 | HG: added foo/foo |
|
194 | HG: added foo/foo | |
| 195 |
|
195 | |||
| 196 |
|
196 | |||
| 197 | $ hg ci -m commit-subdir-2 bar |
|
197 | $ hg ci -m commit-subdir-2 bar | |
| 198 |
|
198 | |||
| 199 | subdir log 1 |
|
199 | subdir log 1 | |
| 200 |
|
200 | |||
| 201 | $ hg log -v foo |
|
201 | $ hg log -v foo | |
| 202 | changeset: 0:f97e73a25882 |
|
202 | changeset: 0:f97e73a25882 | |
| 203 | user: test |
|
203 | user: test | |
| 204 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
204 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 205 | files: foo/foo |
|
205 | files: foo/foo | |
| 206 | description: |
|
206 | description: | |
| 207 | commit-subdir-1 |
|
207 | commit-subdir-1 | |
| 208 |
|
208 | |||
| 209 |
|
209 | |||
| 210 |
|
210 | |||
| 211 | subdir log 2 |
|
211 | subdir log 2 | |
| 212 |
|
212 | |||
| 213 | $ hg log -v bar |
|
213 | $ hg log -v bar | |
| 214 | changeset: 1:aa809156d50d |
|
214 | changeset: 1:aa809156d50d | |
| 215 | tag: tip |
|
215 | tag: tip | |
| 216 | user: test |
|
216 | user: test | |
| 217 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
217 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 218 | files: bar/bar |
|
218 | files: bar/bar | |
| 219 | description: |
|
219 | description: | |
| 220 | commit-subdir-2 |
|
220 | commit-subdir-2 | |
| 221 |
|
221 | |||
| 222 |
|
222 | |||
| 223 |
|
223 | |||
| 224 | full log |
|
224 | full log | |
| 225 |
|
225 | |||
| 226 | $ hg log -v |
|
226 | $ hg log -v | |
| 227 | changeset: 1:aa809156d50d |
|
227 | changeset: 1:aa809156d50d | |
| 228 | tag: tip |
|
228 | tag: tip | |
| 229 | user: test |
|
229 | user: test | |
| 230 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
230 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 231 | files: bar/bar |
|
231 | files: bar/bar | |
| 232 | description: |
|
232 | description: | |
| 233 | commit-subdir-2 |
|
233 | commit-subdir-2 | |
| 234 |
|
234 | |||
| 235 |
|
235 | |||
| 236 | changeset: 0:f97e73a25882 |
|
236 | changeset: 0:f97e73a25882 | |
| 237 | user: test |
|
237 | user: test | |
| 238 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
238 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 239 | files: foo/foo |
|
239 | files: foo/foo | |
| 240 | description: |
|
240 | description: | |
| 241 | commit-subdir-1 |
|
241 | commit-subdir-1 | |
| 242 |
|
242 | |||
| 243 |
|
243 | |||
| 244 | $ cd .. |
|
244 | $ cd .. | |
| 245 |
|
245 | |||
| 246 |
|
246 | |||
| 247 | dot and subdir commit test |
|
247 | dot and subdir commit test | |
| 248 |
|
248 | |||
| 249 | $ hg init test3 |
|
249 | $ hg init test3 | |
| 250 | $ echo commit-foo-subdir > commit-log-test |
|
250 | $ echo commit-foo-subdir > commit-log-test | |
| 251 | $ cd test3 |
|
251 | $ cd test3 | |
| 252 | $ mkdir foo |
|
252 | $ mkdir foo | |
| 253 | $ echo foo content > foo/plain-file |
|
253 | $ echo foo content > foo/plain-file | |
| 254 | $ hg add foo/plain-file |
|
254 | $ hg add foo/plain-file | |
| 255 | $ HGEDITOR=cat hg ci --edit -l ../commit-log-test foo |
|
255 | $ HGEDITOR=cat hg ci --edit -l ../commit-log-test foo | |
| 256 | commit-foo-subdir |
|
256 | commit-foo-subdir | |
| 257 |
|
257 | |||
| 258 |
|
258 | |||
| 259 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
259 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
| 260 | HG: Leave message empty to abort commit. |
|
260 | HG: Leave message empty to abort commit. | |
| 261 | HG: -- |
|
261 | HG: -- | |
| 262 | HG: user: test |
|
262 | HG: user: test | |
| 263 | HG: branch 'default' |
|
263 | HG: branch 'default' | |
| 264 | HG: added foo/plain-file |
|
264 | HG: added foo/plain-file | |
| 265 |
|
265 | |||
| 266 |
|
266 | |||
| 267 | $ echo modified foo content > foo/plain-file |
|
267 | $ echo modified foo content > foo/plain-file | |
| 268 | $ hg ci -m commit-foo-dot . |
|
268 | $ hg ci -m commit-foo-dot . | |
| 269 |
|
269 | |||
| 270 | full log |
|
270 | full log | |
| 271 |
|
271 | |||
| 272 | $ hg log -v |
|
272 | $ hg log -v | |
| 273 | changeset: 1:95b38e3a5b2e |
|
273 | changeset: 1:95b38e3a5b2e | |
| 274 | tag: tip |
|
274 | tag: tip | |
| 275 | user: test |
|
275 | user: test | |
| 276 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 277 | files: foo/plain-file |
|
277 | files: foo/plain-file | |
| 278 | description: |
|
278 | description: | |
| 279 | commit-foo-dot |
|
279 | commit-foo-dot | |
| 280 |
|
280 | |||
| 281 |
|
281 | |||
| 282 | changeset: 0:65d4e9386227 |
|
282 | changeset: 0:65d4e9386227 | |
| 283 | user: test |
|
283 | user: test | |
| 284 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
284 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 285 | files: foo/plain-file |
|
285 | files: foo/plain-file | |
| 286 | description: |
|
286 | description: | |
| 287 | commit-foo-subdir |
|
287 | commit-foo-subdir | |
| 288 |
|
288 | |||
| 289 |
|
289 | |||
| 290 |
|
290 | |||
| 291 | subdir log |
|
291 | subdir log | |
| 292 |
|
292 | |||
| 293 | $ cd foo |
|
293 | $ cd foo | |
| 294 | $ hg log . |
|
294 | $ hg log . | |
| 295 | changeset: 1:95b38e3a5b2e |
|
295 | changeset: 1:95b38e3a5b2e | |
| 296 | tag: tip |
|
296 | tag: tip | |
| 297 | user: test |
|
297 | user: test | |
| 298 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
298 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 299 | summary: commit-foo-dot |
|
299 | summary: commit-foo-dot | |
| 300 |
|
300 | |||
| 301 | changeset: 0:65d4e9386227 |
|
301 | changeset: 0:65d4e9386227 | |
| 302 | user: test |
|
302 | user: test | |
| 303 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
303 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 304 | summary: commit-foo-subdir |
|
304 | summary: commit-foo-subdir | |
| 305 |
|
305 | |||
| 306 | $ cd .. |
|
306 | $ cd .. | |
| 307 | $ cd .. |
|
307 | $ cd .. | |
| 308 |
|
308 | |||
| 309 | Issue1049: Hg permits partial commit of merge without warning |
|
309 | Issue1049: Hg permits partial commit of merge without warning | |
| 310 |
|
310 | |||
| 311 | $ hg init issue1049 |
|
311 | $ hg init issue1049 | |
| 312 | $ cd issue1049 |
|
312 | $ cd issue1049 | |
| 313 | $ echo a > a |
|
313 | $ echo a > a | |
| 314 | $ hg ci -Ama |
|
314 | $ hg ci -Ama | |
| 315 | adding a |
|
315 | adding a | |
| 316 | $ echo a >> a |
|
316 | $ echo a >> a | |
| 317 | $ hg ci -mb |
|
317 | $ hg ci -mb | |
| 318 | $ hg up 0 |
|
318 | $ hg up 0 | |
| 319 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
319 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 320 | $ echo b >> a |
|
320 | $ echo b >> a | |
| 321 | $ hg ci -mc |
|
321 | $ hg ci -mc | |
| 322 | created new head |
|
322 | created new head | |
| 323 | $ HGMERGE=true hg merge |
|
323 | $ HGMERGE=true hg merge | |
| 324 | merging a |
|
324 | merging a | |
| 325 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
325 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 326 | (branch merge, don't forget to commit) |
|
326 | (branch merge, don't forget to commit) | |
| 327 |
|
327 | |||
| 328 | should fail because we are specifying a file name |
|
328 | should fail because we are specifying a file name | |
| 329 |
|
329 | |||
| 330 | $ hg ci -mmerge a |
|
330 | $ hg ci -mmerge a | |
| 331 | abort: cannot partially commit a merge (do not specify files or patterns) |
|
331 | abort: cannot partially commit a merge (do not specify files or patterns) | |
| 332 | [255] |
|
332 | [255] | |
| 333 |
|
333 | |||
| 334 | should fail because we are specifying a pattern |
|
334 | should fail because we are specifying a pattern | |
| 335 |
|
335 | |||
| 336 | $ hg ci -mmerge -I a |
|
336 | $ hg ci -mmerge -I a | |
| 337 | abort: cannot partially commit a merge (do not specify files or patterns) |
|
337 | abort: cannot partially commit a merge (do not specify files or patterns) | |
| 338 | [255] |
|
338 | [255] | |
| 339 |
|
339 | |||
| 340 | should succeed |
|
340 | should succeed | |
| 341 |
|
341 | |||
| 342 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit |
|
342 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit | |
| 343 | HGEDITFORM=commit.normal.merge |
|
343 | HGEDITFORM=commit.normal.merge | |
| 344 | $ cd .. |
|
344 | $ cd .. | |
| 345 |
|
345 | |||
| 346 |
|
346 | |||
| 347 | test commit message content |
|
347 | test commit message content | |
| 348 |
|
348 | |||
| 349 | $ hg init commitmsg |
|
349 | $ hg init commitmsg | |
| 350 | $ cd commitmsg |
|
350 | $ cd commitmsg | |
| 351 | $ echo changed > changed |
|
351 | $ echo changed > changed | |
| 352 | $ echo removed > removed |
|
352 | $ echo removed > removed | |
| 353 | $ hg book activebookmark |
|
353 | $ hg book activebookmark | |
| 354 | $ hg ci -qAm init |
|
354 | $ hg ci -qAm init | |
| 355 |
|
355 | |||
| 356 | $ hg rm removed |
|
356 | $ hg rm removed | |
| 357 | $ echo changed >> changed |
|
357 | $ echo changed >> changed | |
| 358 | $ echo added > added |
|
358 | $ echo added > added | |
| 359 | $ hg add added |
|
359 | $ hg add added | |
| 360 | $ HGEDITOR=cat hg ci -A |
|
360 | $ HGEDITOR=cat hg ci -A | |
| 361 |
|
361 | |||
| 362 |
|
362 | |||
| 363 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
363 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
| 364 | HG: Leave message empty to abort commit. |
|
364 | HG: Leave message empty to abort commit. | |
| 365 | HG: -- |
|
365 | HG: -- | |
| 366 | HG: user: test |
|
366 | HG: user: test | |
| 367 | HG: branch 'default' |
|
367 | HG: branch 'default' | |
| 368 | HG: bookmark 'activebookmark' |
|
368 | HG: bookmark 'activebookmark' | |
| 369 | HG: added added |
|
369 | HG: added added | |
| 370 | HG: changed changed |
|
370 | HG: changed changed | |
| 371 | HG: removed removed |
|
371 | HG: removed removed | |
| 372 | abort: empty commit message |
|
372 | abort: empty commit message | |
| 373 | [255] |
|
373 | [255] | |
| 374 |
|
374 | |||
| 375 | test saving last-message.txt |
|
375 | test saving last-message.txt | |
| 376 |
|
376 | |||
| 377 | $ hg init sub |
|
377 | $ hg init sub | |
| 378 | $ echo a > sub/a |
|
378 | $ echo a > sub/a | |
| 379 | $ hg -R sub add sub/a |
|
379 | $ hg -R sub add sub/a | |
| 380 | $ cat > sub/.hg/hgrc <<EOF |
|
380 | $ cat > sub/.hg/hgrc <<EOF | |
| 381 | > [hooks] |
|
381 | > [hooks] | |
| 382 | > precommit.test-saving-last-message = false |
|
382 | > precommit.test-saving-last-message = false | |
| 383 | > EOF |
|
383 | > EOF | |
| 384 |
|
384 | |||
| 385 | $ echo 'sub = sub' > .hgsub |
|
385 | $ echo 'sub = sub' > .hgsub | |
| 386 | $ hg add .hgsub |
|
386 | $ hg add .hgsub | |
| 387 |
|
387 | |||
| 388 | $ cat > $TESTTMP/editor.sh <<EOF |
|
388 | $ cat > $TESTTMP/editor.sh <<EOF | |
| 389 | > echo "==== before editing:" |
|
389 | > echo "==== before editing:" | |
| 390 | > cat \$1 |
|
390 | > cat \$1 | |
| 391 | > echo "====" |
|
391 | > echo "====" | |
| 392 | > echo "test saving last-message.txt" >> \$1 |
|
392 | > echo "test saving last-message.txt" >> \$1 | |
| 393 | > EOF |
|
393 | > EOF | |
| 394 |
|
394 | |||
| 395 | $ rm -f .hg/last-message.txt |
|
395 | $ rm -f .hg/last-message.txt | |
| 396 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg commit -S -q |
|
396 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg commit -S -q | |
| 397 | ==== before editing: |
|
397 | ==== before editing: | |
| 398 |
|
398 | |||
| 399 |
|
399 | |||
| 400 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
400 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
| 401 | HG: Leave message empty to abort commit. |
|
401 | HG: Leave message empty to abort commit. | |
| 402 | HG: -- |
|
402 | HG: -- | |
| 403 | HG: user: test |
|
403 | HG: user: test | |
| 404 | HG: branch 'default' |
|
404 | HG: branch 'default' | |
| 405 | HG: bookmark 'activebookmark' |
|
405 | HG: bookmark 'activebookmark' | |
| 406 | HG: subrepo sub |
|
406 | HG: subrepo sub | |
| 407 | HG: added .hgsub |
|
407 | HG: added .hgsub | |
| 408 | HG: added added |
|
408 | HG: added added | |
| 409 | HG: changed .hgsubstate |
|
409 | HG: changed .hgsubstate | |
| 410 | HG: changed changed |
|
410 | HG: changed changed | |
| 411 | HG: removed removed |
|
411 | HG: removed removed | |
| 412 | ==== |
|
412 | ==== | |
| 413 | abort: precommit.test-saving-last-message hook exited with status 1 (in subrepository "sub") |
|
413 | abort: precommit.test-saving-last-message hook exited with status 1 (in subrepository "sub") | |
| 414 | [255] |
|
414 | [255] | |
| 415 | $ cat .hg/last-message.txt |
|
415 | $ cat .hg/last-message.txt | |
| 416 |
|
416 | |||
| 417 |
|
417 | |||
| 418 | test saving last-message.txt |
|
418 | test saving last-message.txt | |
| 419 |
|
419 | |||
| 420 | test that '[committemplate] changeset' definition and commit log |
|
420 | test that '[committemplate] changeset' definition and commit log | |
| 421 | specific template keywords work well |
|
421 | specific template keywords work well | |
| 422 |
|
422 | |||
| 423 | $ cat >> .hg/hgrc <<EOF |
|
423 | $ cat >> .hg/hgrc <<EOF | |
| 424 | > [committemplate] |
|
424 | > [committemplate] | |
| 425 | > changeset.commit.normal = 'HG: this is "commit.normal" template |
|
425 | > changeset.commit.normal = 'HG: this is "commit.normal" template | |
| 426 | > HG: {extramsg} |
|
426 | > HG: {extramsg} | |
| 427 | > {if(activebookmark, |
|
427 | > {if(activebookmark, | |
| 428 | > "HG: bookmark '{activebookmark}' is activated\n", |
|
428 | > "HG: bookmark '{activebookmark}' is activated\n", | |
| 429 | > "HG: no bookmark is activated\n")}{subrepos % |
|
429 | > "HG: no bookmark is activated\n")}{subrepos % | |
| 430 | > "HG: subrepo '{subrepo}' is changed\n"}' |
|
430 | > "HG: subrepo '{subrepo}' is changed\n"}' | |
| 431 | > |
|
431 | > | |
| 432 | > changeset.commit = HG: this is "commit" template |
|
432 | > changeset.commit = HG: this is "commit" template | |
| 433 | > HG: {extramsg} |
|
433 | > HG: {extramsg} | |
| 434 | > {if(activebookmark, |
|
434 | > {if(activebookmark, | |
| 435 | > "HG: bookmark '{activebookmark}' is activated\n", |
|
435 | > "HG: bookmark '{activebookmark}' is activated\n", | |
| 436 | > "HG: no bookmark is activated\n")}{subrepos % |
|
436 | > "HG: no bookmark is activated\n")}{subrepos % | |
| 437 | > "HG: subrepo '{subrepo}' is changed\n"} |
|
437 | > "HG: subrepo '{subrepo}' is changed\n"} | |
| 438 | > |
|
438 | > | |
| 439 | > changeset = HG: this is customized commit template |
|
439 | > changeset = HG: this is customized commit template | |
| 440 | > HG: {extramsg} |
|
440 | > HG: {extramsg} | |
| 441 | > {if(activebookmark, |
|
441 | > {if(activebookmark, | |
| 442 | > "HG: bookmark '{activebookmark}' is activated\n", |
|
442 | > "HG: bookmark '{activebookmark}' is activated\n", | |
| 443 | > "HG: no bookmark is activated\n")}{subrepos % |
|
443 | > "HG: no bookmark is activated\n")}{subrepos % | |
| 444 | > "HG: subrepo '{subrepo}' is changed\n"} |
|
444 | > "HG: subrepo '{subrepo}' is changed\n"} | |
| 445 | > EOF |
|
445 | > EOF | |
| 446 |
|
446 | |||
| 447 | $ hg init sub2 |
|
447 | $ hg init sub2 | |
| 448 | $ echo a > sub2/a |
|
448 | $ echo a > sub2/a | |
| 449 | $ hg -R sub2 add sub2/a |
|
449 | $ hg -R sub2 add sub2/a | |
| 450 | $ echo 'sub2 = sub2' >> .hgsub |
|
450 | $ echo 'sub2 = sub2' >> .hgsub | |
| 451 |
|
451 | |||
| 452 | $ HGEDITOR=cat hg commit -S -q |
|
452 | $ HGEDITOR=cat hg commit -S -q | |
| 453 | HG: this is "commit.normal" template |
|
453 | HG: this is "commit.normal" template | |
| 454 | HG: Leave message empty to abort commit. |
|
454 | HG: Leave message empty to abort commit. | |
| 455 | HG: bookmark 'activebookmark' is activated |
|
455 | HG: bookmark 'activebookmark' is activated | |
| 456 | HG: subrepo 'sub' is changed |
|
456 | HG: subrepo 'sub' is changed | |
| 457 | HG: subrepo 'sub2' is changed |
|
457 | HG: subrepo 'sub2' is changed | |
| 458 | abort: empty commit message |
|
458 | abort: empty commit message | |
| 459 | [255] |
|
459 | [255] | |
| 460 |
|
460 | |||
| 461 | $ cat >> .hg/hgrc <<EOF |
|
461 | $ cat >> .hg/hgrc <<EOF | |
| 462 | > [committemplate] |
|
462 | > [committemplate] | |
| 463 | > changeset.commit.normal = |
|
463 | > changeset.commit.normal = | |
| 464 | > # now, "changeset.commit" should be chosen for "hg commit" |
|
464 | > # now, "changeset.commit" should be chosen for "hg commit" | |
| 465 | > EOF |
|
465 | > EOF | |
| 466 |
|
466 | |||
| 467 | $ hg bookmark --inactive activebookmark |
|
467 | $ hg bookmark --inactive activebookmark | |
| 468 | $ hg forget .hgsub |
|
468 | $ hg forget .hgsub | |
| 469 | $ HGEDITOR=cat hg commit -q |
|
469 | $ HGEDITOR=cat hg commit -q | |
| 470 | HG: this is "commit" template |
|
470 | HG: this is "commit" template | |
| 471 | HG: Leave message empty to abort commit. |
|
471 | HG: Leave message empty to abort commit. | |
| 472 | HG: no bookmark is activated |
|
472 | HG: no bookmark is activated | |
| 473 | abort: empty commit message |
|
473 | abort: empty commit message | |
| 474 | [255] |
|
474 | [255] | |
| 475 |
|
475 | |||
| 476 | $ cat >> .hg/hgrc <<EOF |
|
476 | $ cat >> .hg/hgrc <<EOF | |
| 477 | > [committemplate] |
|
477 | > [committemplate] | |
| 478 | > changeset.commit = |
|
478 | > changeset.commit = | |
| 479 | > # now, "changeset" should be chosen for "hg commit" |
|
479 | > # now, "changeset" should be chosen for "hg commit" | |
| 480 | > EOF |
|
480 | > EOF | |
| 481 |
|
481 | |||
| 482 | $ HGEDITOR=cat hg commit -q |
|
482 | $ HGEDITOR=cat hg commit -q | |
| 483 | HG: this is customized commit template |
|
483 | HG: this is customized commit template | |
| 484 | HG: Leave message empty to abort commit. |
|
484 | HG: Leave message empty to abort commit. | |
| 485 | HG: no bookmark is activated |
|
485 | HG: no bookmark is activated | |
| 486 | abort: empty commit message |
|
486 | abort: empty commit message | |
| 487 | [255] |
|
487 | [255] | |
| 488 |
|
488 | |||
| 489 | $ cat >> .hg/hgrc <<EOF |
|
489 | $ cat >> .hg/hgrc <<EOF | |
| 490 | > [committemplate] |
|
490 | > [committemplate] | |
| 491 | > changeset = {desc} |
|
491 | > changeset = {desc} | |
| 492 | > HG: mods={file_mods} |
|
492 | > HG: mods={file_mods} | |
| 493 | > HG: adds={file_adds} |
|
493 | > HG: adds={file_adds} | |
| 494 | > HG: dels={file_dels} |
|
494 | > HG: dels={file_dels} | |
| 495 | > HG: files={files} |
|
495 | > HG: files={files} | |
| 496 | > HG: |
|
496 | > HG: | |
| 497 | > {splitlines(diff()) % 'HG: {line}\n' |
|
497 | > {splitlines(diff()) % 'HG: {line}\n' | |
| 498 | > }HG: |
|
498 | > }HG: | |
| 499 | > HG: mods={file_mods} |
|
499 | > HG: mods={file_mods} | |
| 500 | > HG: adds={file_adds} |
|
500 | > HG: adds={file_adds} | |
| 501 | > HG: dels={file_dels} |
|
501 | > HG: dels={file_dels} | |
| 502 | > HG: files={files}\n |
|
502 | > HG: files={files}\n | |
| 503 | > EOF |
|
503 | > EOF | |
| 504 | $ hg status -amr |
|
504 | $ hg status -amr | |
| 505 | M changed |
|
505 | M changed | |
| 506 | A added |
|
506 | A added | |
| 507 | R removed |
|
507 | R removed | |
| 508 | $ HGEDITOR=cat hg commit -q -e -m "foo bar" changed |
|
508 | $ HGEDITOR=cat hg commit -q -e -m "foo bar" changed | |
| 509 | foo bar |
|
509 | foo bar | |
| 510 | HG: mods=changed |
|
510 | HG: mods=changed | |
| 511 | HG: adds= |
|
511 | HG: adds= | |
| 512 | HG: dels= |
|
512 | HG: dels= | |
| 513 | HG: files=changed |
|
513 | HG: files=changed | |
| 514 | HG: |
|
514 | HG: | |
| 515 | HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000 |
|
515 | HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000 | |
| 516 | HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000 |
|
516 | HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000 | |
| 517 | HG: @@ -1,1 +1,2 @@ |
|
517 | HG: @@ -1,1 +1,2 @@ | |
| 518 | HG: changed |
|
518 | HG: changed | |
| 519 | HG: +changed |
|
519 | HG: +changed | |
| 520 | HG: |
|
520 | HG: | |
| 521 | HG: mods=changed |
|
521 | HG: mods=changed | |
| 522 | HG: adds= |
|
522 | HG: adds= | |
| 523 | HG: dels= |
|
523 | HG: dels= | |
| 524 | HG: files=changed |
|
524 | HG: files=changed | |
| 525 | $ hg status -amr |
|
525 | $ hg status -amr | |
| 526 | A added |
|
526 | A added | |
| 527 | R removed |
|
527 | R removed | |
| 528 | $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" |
|
528 | $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" | |
| 529 | M changed |
|
529 | M changed | |
| 530 | A |
|
530 | A | |
| 531 | R |
|
531 | R | |
| 532 | $ hg rollback -q |
|
532 | $ hg rollback -q | |
| 533 |
|
533 | |||
| 534 | $ cat >> .hg/hgrc <<EOF |
|
534 | $ cat >> .hg/hgrc <<EOF | |
| 535 | > [committemplate] |
|
535 | > [committemplate] | |
| 536 | > changeset = {desc} |
|
536 | > changeset = {desc} | |
| 537 | > HG: mods={file_mods} |
|
537 | > HG: mods={file_mods} | |
| 538 | > HG: adds={file_adds} |
|
538 | > HG: adds={file_adds} | |
| 539 | > HG: dels={file_dels} |
|
539 | > HG: dels={file_dels} | |
| 540 | > HG: files={files} |
|
540 | > HG: files={files} | |
| 541 | > HG: |
|
541 | > HG: | |
| 542 | > {splitlines(diff("changed")) % 'HG: {line}\n' |
|
542 | > {splitlines(diff("changed")) % 'HG: {line}\n' | |
| 543 | > }HG: |
|
543 | > }HG: | |
| 544 | > HG: mods={file_mods} |
|
544 | > HG: mods={file_mods} | |
| 545 | > HG: adds={file_adds} |
|
545 | > HG: adds={file_adds} | |
| 546 | > HG: dels={file_dels} |
|
546 | > HG: dels={file_dels} | |
| 547 | > HG: files={files} |
|
547 | > HG: files={files} | |
| 548 | > HG: |
|
548 | > HG: | |
| 549 | > {splitlines(diff("added")) % 'HG: {line}\n' |
|
549 | > {splitlines(diff("added")) % 'HG: {line}\n' | |
| 550 | > }HG: |
|
550 | > }HG: | |
| 551 | > HG: mods={file_mods} |
|
551 | > HG: mods={file_mods} | |
| 552 | > HG: adds={file_adds} |
|
552 | > HG: adds={file_adds} | |
| 553 | > HG: dels={file_dels} |
|
553 | > HG: dels={file_dels} | |
| 554 | > HG: files={files} |
|
554 | > HG: files={files} | |
| 555 | > HG: |
|
555 | > HG: | |
| 556 | > {splitlines(diff("removed")) % 'HG: {line}\n' |
|
556 | > {splitlines(diff("removed")) % 'HG: {line}\n' | |
| 557 | > }HG: |
|
557 | > }HG: | |
| 558 | > HG: mods={file_mods} |
|
558 | > HG: mods={file_mods} | |
| 559 | > HG: adds={file_adds} |
|
559 | > HG: adds={file_adds} | |
| 560 | > HG: dels={file_dels} |
|
560 | > HG: dels={file_dels} | |
| 561 | > HG: files={files}\n |
|
561 | > HG: files={files}\n | |
| 562 | > EOF |
|
562 | > EOF | |
| 563 | $ HGEDITOR=cat hg commit -q -e -m "foo bar" added removed |
|
563 | $ HGEDITOR=cat hg commit -q -e -m "foo bar" added removed | |
| 564 | foo bar |
|
564 | foo bar | |
| 565 | HG: mods= |
|
565 | HG: mods= | |
| 566 | HG: adds=added |
|
566 | HG: adds=added | |
| 567 | HG: dels=removed |
|
567 | HG: dels=removed | |
| 568 | HG: files=added removed |
|
568 | HG: files=added removed | |
| 569 | HG: |
|
569 | HG: | |
| 570 | HG: |
|
570 | HG: | |
| 571 | HG: mods= |
|
571 | HG: mods= | |
| 572 | HG: adds=added |
|
572 | HG: adds=added | |
| 573 | HG: dels=removed |
|
573 | HG: dels=removed | |
| 574 | HG: files=added removed |
|
574 | HG: files=added removed | |
| 575 | HG: |
|
575 | HG: | |
| 576 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
576 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 577 | HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000 |
|
577 | HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000 | |
| 578 | HG: @@ -0,0 +1,1 @@ |
|
578 | HG: @@ -0,0 +1,1 @@ | |
| 579 | HG: +added |
|
579 | HG: +added | |
| 580 | HG: |
|
580 | HG: | |
| 581 | HG: mods= |
|
581 | HG: mods= | |
| 582 | HG: adds=added |
|
582 | HG: adds=added | |
| 583 | HG: dels=removed |
|
583 | HG: dels=removed | |
| 584 | HG: files=added removed |
|
584 | HG: files=added removed | |
| 585 | HG: |
|
585 | HG: | |
| 586 | HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000 |
|
586 | HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000 | |
| 587 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
587 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 588 | HG: @@ -1,1 +0,0 @@ |
|
588 | HG: @@ -1,1 +0,0 @@ | |
| 589 | HG: -removed |
|
589 | HG: -removed | |
| 590 | HG: |
|
590 | HG: | |
| 591 | HG: mods= |
|
591 | HG: mods= | |
| 592 | HG: adds=added |
|
592 | HG: adds=added | |
| 593 | HG: dels=removed |
|
593 | HG: dels=removed | |
| 594 | HG: files=added removed |
|
594 | HG: files=added removed | |
| 595 | $ hg status -amr |
|
595 | $ hg status -amr | |
| 596 | M changed |
|
596 | M changed | |
| 597 | $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" |
|
597 | $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n" | |
| 598 | M |
|
598 | M | |
| 599 | A added |
|
599 | A added | |
| 600 | R removed |
|
600 | R removed | |
| 601 | $ hg rollback -q |
|
601 | $ hg rollback -q | |
| 602 |
|
602 | |||
| 603 | $ cat >> .hg/hgrc <<EOF |
|
603 | $ cat >> .hg/hgrc <<EOF | |
| 604 | > # disable customizing for subsequent tests |
|
604 | > # disable customizing for subsequent tests | |
| 605 | > [committemplate] |
|
605 | > [committemplate] | |
| 606 | > changeset = |
|
606 | > changeset = | |
| 607 | > EOF |
|
607 | > EOF | |
| 608 |
|
608 | |||
| 609 | $ cd .. |
|
609 | $ cd .. | |
| 610 |
|
610 | |||
| 611 |
|
611 | |||
| 612 | commit copy |
|
612 | commit copy | |
| 613 |
|
613 | |||
| 614 | $ hg init dir2 |
|
614 | $ hg init dir2 | |
| 615 | $ cd dir2 |
|
615 | $ cd dir2 | |
| 616 | $ echo bleh > bar |
|
616 | $ echo bleh > bar | |
| 617 | $ hg add bar |
|
617 | $ hg add bar | |
| 618 | $ hg ci -m 'add bar' |
|
618 | $ hg ci -m 'add bar' | |
| 619 |
|
619 | |||
| 620 | $ hg cp bar foo |
|
620 | $ hg cp bar foo | |
| 621 | $ echo >> bar |
|
621 | $ echo >> bar | |
| 622 | $ hg ci -m 'cp bar foo; change bar' |
|
622 | $ hg ci -m 'cp bar foo; change bar' | |
| 623 |
|
623 | |||
| 624 | $ hg debugrename foo |
|
624 | $ hg debugrename foo | |
| 625 | foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 |
|
625 | foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 | |
| 626 | $ hg debugindex bar |
|
626 | $ hg debugindex bar | |
| 627 | rev offset length ..... linkrev nodeid p1 p2 (re) |
|
627 | rev offset length ..... linkrev nodeid p1 p2 (re) | |
| 628 | 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) |
|
628 | 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) | |
| 629 | 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) |
|
629 | 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) | |
| 630 |
|
630 | |||
| 631 | Test making empty commits |
|
631 | Test making empty commits | |
| 632 | $ hg commit --config ui.allowemptycommit=True -m "empty commit" |
|
632 | $ hg commit --config ui.allowemptycommit=True -m "empty commit" | |
| 633 | $ hg log -r . -v --stat |
|
633 | $ hg log -r . -v --stat | |
| 634 | changeset: 2:d809f3644287 |
|
634 | changeset: 2:d809f3644287 | |
| 635 | tag: tip |
|
635 | tag: tip | |
| 636 | user: test |
|
636 | user: test | |
| 637 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
637 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 638 | description: |
|
638 | description: | |
| 639 | empty commit |
|
639 | empty commit | |
| 640 |
|
640 | |||
| 641 |
|
641 | |||
| 642 |
|
642 | |||
| 643 | verify pathauditor blocks evil filepaths |
|
643 | verify pathauditor blocks evil filepaths | |
| 644 | $ cat > evil-commit.py <<EOF |
|
644 | $ cat > evil-commit.py <<EOF | |
| 645 | > from mercurial import ui, hg, context, node |
|
645 | > from __future__ import absolute_import | |
|
|
646 | > from mercurial import context, hg, node, ui as uimod | |||
| 646 | > notrc = u".h\u200cg".encode('utf-8') + '/hgrc' |
|
647 | > notrc = u".h\u200cg".encode('utf-8') + '/hgrc' | |
| 647 | > u = ui.ui.load() |
|
648 | > u = uimod.ui.load() | |
| 648 | > r = hg.repository(u, '.') |
|
649 | > r = hg.repository(u, '.') | |
| 649 | > def filectxfn(repo, memctx, path): |
|
650 | > def filectxfn(repo, memctx, path): | |
| 650 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
|
651 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') | |
| 651 | > c = context.memctx(r, [r['tip'].node(), node.nullid], |
|
652 | > c = context.memctx(r, [r['tip'].node(), node.nullid], | |
| 652 | > 'evil', [notrc], filectxfn, 0) |
|
653 | > 'evil', [notrc], filectxfn, 0) | |
| 653 | > r.commitctx(c) |
|
654 | > r.commitctx(c) | |
| 654 | > EOF |
|
655 | > EOF | |
| 655 | $ $PYTHON evil-commit.py |
|
656 | $ $PYTHON evil-commit.py | |
| 656 | #if windows |
|
657 | #if windows | |
| 657 | $ hg co --clean tip |
|
658 | $ hg co --clean tip | |
| 658 | abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc) |
|
659 | abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc) | |
| 659 | [255] |
|
660 | [255] | |
| 660 | #else |
|
661 | #else | |
| 661 | $ hg co --clean tip |
|
662 | $ hg co --clean tip | |
| 662 | abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc) |
|
663 | abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc) | |
| 663 | [255] |
|
664 | [255] | |
| 664 | #endif |
|
665 | #endif | |
| 665 |
|
666 | |||
| 666 | $ hg rollback -f |
|
667 | $ hg rollback -f | |
| 667 | repository tip rolled back to revision 2 (undo commit) |
|
668 | repository tip rolled back to revision 2 (undo commit) | |
| 668 | $ cat > evil-commit.py <<EOF |
|
669 | $ cat > evil-commit.py <<EOF | |
| 669 | > from mercurial import ui, hg, context, node |
|
670 | > from __future__ import absolute_import | |
|
|
671 | > from mercurial import context, hg, node, ui as uimod | |||
| 670 | > notrc = "HG~1/hgrc" |
|
672 | > notrc = "HG~1/hgrc" | |
| 671 | > u = ui.ui.load() |
|
673 | > u = uimod.ui.load() | |
| 672 | > r = hg.repository(u, '.') |
|
674 | > r = hg.repository(u, '.') | |
| 673 | > def filectxfn(repo, memctx, path): |
|
675 | > def filectxfn(repo, memctx, path): | |
| 674 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
|
676 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') | |
| 675 | > c = context.memctx(r, [r['tip'].node(), node.nullid], |
|
677 | > c = context.memctx(r, [r['tip'].node(), node.nullid], | |
| 676 | > 'evil', [notrc], filectxfn, 0) |
|
678 | > 'evil', [notrc], filectxfn, 0) | |
| 677 | > r.commitctx(c) |
|
679 | > r.commitctx(c) | |
| 678 | > EOF |
|
680 | > EOF | |
| 679 | $ $PYTHON evil-commit.py |
|
681 | $ $PYTHON evil-commit.py | |
| 680 | $ hg co --clean tip |
|
682 | $ hg co --clean tip | |
| 681 | abort: path contains illegal component: HG~1/hgrc (glob) |
|
683 | abort: path contains illegal component: HG~1/hgrc (glob) | |
| 682 | [255] |
|
684 | [255] | |
| 683 |
|
685 | |||
| 684 | $ hg rollback -f |
|
686 | $ hg rollback -f | |
| 685 | repository tip rolled back to revision 2 (undo commit) |
|
687 | repository tip rolled back to revision 2 (undo commit) | |
| 686 | $ cat > evil-commit.py <<EOF |
|
688 | $ cat > evil-commit.py <<EOF | |
| 687 | > from mercurial import ui, hg, context, node |
|
689 | > from __future__ import absolute_import | |
|
|
690 | > from mercurial import context, hg, node, ui as uimod | |||
| 688 | > notrc = "HG8B6C~2/hgrc" |
|
691 | > notrc = "HG8B6C~2/hgrc" | |
| 689 | > u = ui.ui.load() |
|
692 | > u = uimod.ui.load() | |
| 690 | > r = hg.repository(u, '.') |
|
693 | > r = hg.repository(u, '.') | |
| 691 | > def filectxfn(repo, memctx, path): |
|
694 | > def filectxfn(repo, memctx, path): | |
| 692 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') |
|
695 | > return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned') | |
| 693 | > c = context.memctx(r, [r['tip'].node(), node.nullid], |
|
696 | > c = context.memctx(r, [r['tip'].node(), node.nullid], | |
| 694 | > 'evil', [notrc], filectxfn, 0) |
|
697 | > 'evil', [notrc], filectxfn, 0) | |
| 695 | > r.commitctx(c) |
|
698 | > r.commitctx(c) | |
| 696 | > EOF |
|
699 | > EOF | |
| 697 | $ $PYTHON evil-commit.py |
|
700 | $ $PYTHON evil-commit.py | |
| 698 | $ hg co --clean tip |
|
701 | $ hg co --clean tip | |
| 699 | abort: path contains illegal component: HG8B6C~2/hgrc (glob) |
|
702 | abort: path contains illegal component: HG8B6C~2/hgrc (glob) | |
| 700 | [255] |
|
703 | [255] | |
| 701 |
|
704 | |||
| 702 | # test that an unmodified commit template message aborts |
|
705 | # test that an unmodified commit template message aborts | |
| 703 |
|
706 | |||
| 704 | $ hg init unmodified_commit_template |
|
707 | $ hg init unmodified_commit_template | |
| 705 | $ cd unmodified_commit_template |
|
708 | $ cd unmodified_commit_template | |
| 706 | $ echo foo > foo |
|
709 | $ echo foo > foo | |
| 707 | $ hg add foo |
|
710 | $ hg add foo | |
| 708 | $ hg commit -m "foo" |
|
711 | $ hg commit -m "foo" | |
| 709 | $ cat >> .hg/hgrc <<EOF |
|
712 | $ cat >> .hg/hgrc <<EOF | |
| 710 | > [committemplate] |
|
713 | > [committemplate] | |
| 711 | > changeset.commit = HI THIS IS NOT STRIPPED |
|
714 | > changeset.commit = HI THIS IS NOT STRIPPED | |
| 712 | > HG: this is customized commit template |
|
715 | > HG: this is customized commit template | |
| 713 | > HG: {extramsg} |
|
716 | > HG: {extramsg} | |
| 714 | > {if(activebookmark, |
|
717 | > {if(activebookmark, | |
| 715 | > "HG: bookmark '{activebookmark}' is activated\n", |
|
718 | > "HG: bookmark '{activebookmark}' is activated\n", | |
| 716 | > "HG: no bookmark is activated\n")}{subrepos % |
|
719 | > "HG: no bookmark is activated\n")}{subrepos % | |
| 717 | > "HG: subrepo '{subrepo}' is changed\n"} |
|
720 | > "HG: subrepo '{subrepo}' is changed\n"} | |
| 718 | > EOF |
|
721 | > EOF | |
| 719 | $ cat > $TESTTMP/notouching.sh <<EOF |
|
722 | $ cat > $TESTTMP/notouching.sh <<EOF | |
| 720 | > true |
|
723 | > true | |
| 721 | > EOF |
|
724 | > EOF | |
| 722 | $ echo foo2 > foo2 |
|
725 | $ echo foo2 > foo2 | |
| 723 | $ hg add foo2 |
|
726 | $ hg add foo2 | |
| 724 | $ HGEDITOR="sh $TESTTMP/notouching.sh" hg commit |
|
727 | $ HGEDITOR="sh $TESTTMP/notouching.sh" hg commit | |
| 725 | abort: commit message unchanged |
|
728 | abort: commit message unchanged | |
| 726 | [255] |
|
729 | [255] | |
| 727 |
|
730 | |||
| 728 | test that text below the --- >8 --- special string is ignored |
|
731 | test that text below the --- >8 --- special string is ignored | |
| 729 |
|
732 | |||
| 730 | $ cat <<'EOF' > $TESTTMP/lowercaseline.sh |
|
733 | $ cat <<'EOF' > $TESTTMP/lowercaseline.sh | |
| 731 | > cat $1 | sed s/LINE/line/ | tee $1.new |
|
734 | > cat $1 | sed s/LINE/line/ | tee $1.new | |
| 732 | > mv $1.new $1 |
|
735 | > mv $1.new $1 | |
| 733 | > EOF |
|
736 | > EOF | |
| 734 |
|
737 | |||
| 735 | $ hg init ignore_below_special_string |
|
738 | $ hg init ignore_below_special_string | |
| 736 | $ cd ignore_below_special_string |
|
739 | $ cd ignore_below_special_string | |
| 737 | $ echo foo > foo |
|
740 | $ echo foo > foo | |
| 738 | $ hg add foo |
|
741 | $ hg add foo | |
| 739 | $ hg commit -m "foo" |
|
742 | $ hg commit -m "foo" | |
| 740 | $ cat >> .hg/hgrc <<EOF |
|
743 | $ cat >> .hg/hgrc <<EOF | |
| 741 | > [committemplate] |
|
744 | > [committemplate] | |
| 742 | > changeset.commit = first LINE |
|
745 | > changeset.commit = first LINE | |
| 743 | > HG: this is customized commit template |
|
746 | > HG: this is customized commit template | |
| 744 | > HG: {extramsg} |
|
747 | > HG: {extramsg} | |
| 745 | > HG: ------------------------ >8 ------------------------ |
|
748 | > HG: ------------------------ >8 ------------------------ | |
| 746 | > {diff()} |
|
749 | > {diff()} | |
| 747 | > EOF |
|
750 | > EOF | |
| 748 | $ echo foo2 > foo2 |
|
751 | $ echo foo2 > foo2 | |
| 749 | $ hg add foo2 |
|
752 | $ hg add foo2 | |
| 750 | $ HGEDITOR="sh $TESTTMP/notouching.sh" hg ci |
|
753 | $ HGEDITOR="sh $TESTTMP/notouching.sh" hg ci | |
| 751 | abort: commit message unchanged |
|
754 | abort: commit message unchanged | |
| 752 | [255] |
|
755 | [255] | |
| 753 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
|
756 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci | |
| 754 | first line |
|
757 | first line | |
| 755 | HG: this is customized commit template |
|
758 | HG: this is customized commit template | |
| 756 | HG: Leave message empty to abort commit. |
|
759 | HG: Leave message empty to abort commit. | |
| 757 | HG: ------------------------ >8 ------------------------ |
|
760 | HG: ------------------------ >8 ------------------------ | |
| 758 | diff -r e63c23eaa88a foo2 |
|
761 | diff -r e63c23eaa88a foo2 | |
| 759 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
762 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 760 | +++ b/foo2 Thu Jan 01 00:00:00 1970 +0000 |
|
763 | +++ b/foo2 Thu Jan 01 00:00:00 1970 +0000 | |
| 761 | @@ -0,0 +1,1 @@ |
|
764 | @@ -0,0 +1,1 @@ | |
| 762 | +foo2 |
|
765 | +foo2 | |
| 763 | $ hg log -T '{desc}\n' -r . |
|
766 | $ hg log -T '{desc}\n' -r . | |
| 764 | first line |
|
767 | first line | |
| 765 |
|
768 | |||
| 766 | test that the special string --- >8 --- isn't used when not at the beginning of |
|
769 | test that the special string --- >8 --- isn't used when not at the beginning of | |
| 767 | a line |
|
770 | a line | |
| 768 |
|
771 | |||
| 769 | $ cat >> .hg/hgrc <<EOF |
|
772 | $ cat >> .hg/hgrc <<EOF | |
| 770 | > [committemplate] |
|
773 | > [committemplate] | |
| 771 | > changeset.commit = first LINE2 |
|
774 | > changeset.commit = first LINE2 | |
| 772 | > another line HG: ------------------------ >8 ------------------------ |
|
775 | > another line HG: ------------------------ >8 ------------------------ | |
| 773 | > HG: this is customized commit template |
|
776 | > HG: this is customized commit template | |
| 774 | > HG: {extramsg} |
|
777 | > HG: {extramsg} | |
| 775 | > HG: ------------------------ >8 ------------------------ |
|
778 | > HG: ------------------------ >8 ------------------------ | |
| 776 | > {diff()} |
|
779 | > {diff()} | |
| 777 | > EOF |
|
780 | > EOF | |
| 778 | $ echo foo >> foo |
|
781 | $ echo foo >> foo | |
| 779 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
|
782 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci | |
| 780 | first line2 |
|
783 | first line2 | |
| 781 | another line HG: ------------------------ >8 ------------------------ |
|
784 | another line HG: ------------------------ >8 ------------------------ | |
| 782 | HG: this is customized commit template |
|
785 | HG: this is customized commit template | |
| 783 | HG: Leave message empty to abort commit. |
|
786 | HG: Leave message empty to abort commit. | |
| 784 | HG: ------------------------ >8 ------------------------ |
|
787 | HG: ------------------------ >8 ------------------------ | |
| 785 | diff -r 3661b22b0702 foo |
|
788 | diff -r 3661b22b0702 foo | |
| 786 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
|
789 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
| 787 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
790 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
| 788 | @@ -1,1 +1,2 @@ |
|
791 | @@ -1,1 +1,2 @@ | |
| 789 | foo |
|
792 | foo | |
| 790 | +foo |
|
793 | +foo | |
| 791 | $ hg log -T '{desc}\n' -r . |
|
794 | $ hg log -T '{desc}\n' -r . | |
| 792 | first line2 |
|
795 | first line2 | |
| 793 | another line HG: ------------------------ >8 ------------------------ |
|
796 | another line HG: ------------------------ >8 ------------------------ | |
| 794 |
|
797 | |||
| 795 | also test that this special string isn't accepted when there is some extra text |
|
798 | also test that this special string isn't accepted when there is some extra text | |
| 796 | at the end |
|
799 | at the end | |
| 797 |
|
800 | |||
| 798 | $ cat >> .hg/hgrc <<EOF |
|
801 | $ cat >> .hg/hgrc <<EOF | |
| 799 | > [committemplate] |
|
802 | > [committemplate] | |
| 800 | > changeset.commit = first LINE3 |
|
803 | > changeset.commit = first LINE3 | |
| 801 | > HG: ------------------------ >8 ------------------------foobar |
|
804 | > HG: ------------------------ >8 ------------------------foobar | |
| 802 | > second line |
|
805 | > second line | |
| 803 | > HG: this is customized commit template |
|
806 | > HG: this is customized commit template | |
| 804 | > HG: {extramsg} |
|
807 | > HG: {extramsg} | |
| 805 | > HG: ------------------------ >8 ------------------------ |
|
808 | > HG: ------------------------ >8 ------------------------ | |
| 806 | > {diff()} |
|
809 | > {diff()} | |
| 807 | > EOF |
|
810 | > EOF | |
| 808 | $ echo foo >> foo |
|
811 | $ echo foo >> foo | |
| 809 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci |
|
812 | $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci | |
| 810 | first line3 |
|
813 | first line3 | |
| 811 | HG: ------------------------ >8 ------------------------foobar |
|
814 | HG: ------------------------ >8 ------------------------foobar | |
| 812 | second line |
|
815 | second line | |
| 813 | HG: this is customized commit template |
|
816 | HG: this is customized commit template | |
| 814 | HG: Leave message empty to abort commit. |
|
817 | HG: Leave message empty to abort commit. | |
| 815 | HG: ------------------------ >8 ------------------------ |
|
818 | HG: ------------------------ >8 ------------------------ | |
| 816 | diff -r ce648f5f066f foo |
|
819 | diff -r ce648f5f066f foo | |
| 817 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
|
820 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
| 818 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
821 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
| 819 | @@ -1,2 +1,3 @@ |
|
822 | @@ -1,2 +1,3 @@ | |
| 820 | foo |
|
823 | foo | |
| 821 | foo |
|
824 | foo | |
| 822 | +foo |
|
825 | +foo | |
| 823 | $ hg log -T '{desc}\n' -r . |
|
826 | $ hg log -T '{desc}\n' -r . | |
| 824 | first line3 |
|
827 | first line3 | |
| 825 | second line |
|
828 | second line | |
| 826 |
|
829 | |||
| 827 | $ cd .. |
|
830 | $ cd .. | |
| 828 |
|
831 | |||
General Comments 0
You need to be logged in to leave comments.
Login now