1 adding a |
|
2 changeset: 0:8580ff50825a |
|
3 user: test |
|
4 date: Thu Jan 01 00:00:01 1970 +0000 |
|
5 summary: a |
|
6 |
|
7 % -f, directory |
|
8 abort: cannot follow nonexistent file: "dir" |
|
9 % -f, but no args |
|
10 changeset: 4:66c1345dc4f9 |
|
11 tag: tip |
|
12 user: test |
|
13 date: Thu Jan 01 00:00:05 1970 +0000 |
|
14 summary: e |
|
15 |
|
16 changeset: 3:7c6c671bb7cc |
|
17 user: test |
|
18 date: Thu Jan 01 00:00:04 1970 +0000 |
|
19 summary: d |
|
20 |
|
21 changeset: 2:41dd4284081e |
|
22 user: test |
|
23 date: Thu Jan 01 00:00:03 1970 +0000 |
|
24 summary: c |
|
25 |
|
26 changeset: 1:784de7cef101 |
|
27 user: test |
|
28 date: Thu Jan 01 00:00:02 1970 +0000 |
|
29 summary: b |
|
30 |
|
31 changeset: 0:8580ff50825a |
|
32 user: test |
|
33 date: Thu Jan 01 00:00:01 1970 +0000 |
|
34 summary: a |
|
35 |
|
36 % one rename |
|
37 changeset: 0:8580ff50825a |
|
38 user: test |
|
39 date: Thu Jan 01 00:00:01 1970 +0000 |
|
40 files: a |
|
41 description: |
|
42 a |
|
43 |
|
44 |
|
45 % many renames |
|
46 changeset: 4:66c1345dc4f9 |
|
47 tag: tip |
|
48 user: test |
|
49 date: Thu Jan 01 00:00:05 1970 +0000 |
|
50 files: dir/b e |
|
51 description: |
|
52 e |
|
53 |
|
54 |
|
55 changeset: 2:41dd4284081e |
|
56 user: test |
|
57 date: Thu Jan 01 00:00:03 1970 +0000 |
|
58 files: b dir/b |
|
59 description: |
|
60 c |
|
61 |
|
62 |
|
63 changeset: 1:784de7cef101 |
|
64 user: test |
|
65 date: Thu Jan 01 00:00:02 1970 +0000 |
|
66 files: b |
|
67 description: |
|
68 b |
|
69 |
|
70 |
|
71 changeset: 0:8580ff50825a |
|
72 user: test |
|
73 date: Thu Jan 01 00:00:01 1970 +0000 |
|
74 files: a |
|
75 description: |
|
76 a |
|
77 |
|
78 |
|
79 % log -pf dir/b |
|
80 changeset: 2:41dd4284081e |
|
81 user: test |
|
82 date: Thu Jan 01 00:00:03 1970 +0000 |
|
83 summary: c |
|
84 |
|
85 diff -r 784de7cef101 -r 41dd4284081e dir/b |
|
86 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
87 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
88 @@ -0,0 +1,1 @@ |
|
89 +a |
|
90 |
|
91 changeset: 1:784de7cef101 |
|
92 user: test |
|
93 date: Thu Jan 01 00:00:02 1970 +0000 |
|
94 summary: b |
|
95 |
|
96 diff -r 8580ff50825a -r 784de7cef101 b |
|
97 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
98 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
99 @@ -0,0 +1,1 @@ |
|
100 +a |
|
101 |
|
102 changeset: 0:8580ff50825a |
|
103 user: test |
|
104 date: Thu Jan 01 00:00:01 1970 +0000 |
|
105 summary: a |
|
106 |
|
107 diff -r 000000000000 -r 8580ff50825a a |
|
108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
109 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
110 @@ -0,0 +1,1 @@ |
|
111 +a |
|
112 |
|
113 % log -vf dir/b |
|
114 changeset: 2:41dd4284081e |
|
115 user: test |
|
116 date: Thu Jan 01 00:00:03 1970 +0000 |
|
117 files: b dir/b |
|
118 description: |
|
119 c |
|
120 |
|
121 |
|
122 changeset: 1:784de7cef101 |
|
123 user: test |
|
124 date: Thu Jan 01 00:00:02 1970 +0000 |
|
125 files: b |
|
126 description: |
|
127 b |
|
128 |
|
129 |
|
130 changeset: 0:8580ff50825a |
|
131 user: test |
|
132 date: Thu Jan 01 00:00:01 1970 +0000 |
|
133 files: a |
|
134 description: |
|
135 a |
|
136 |
|
137 |
|
138 % log copies with --copies |
|
139 4 e (dir/b) |
|
140 3 b (a) |
|
141 2 dir/b (b) |
|
142 1 b (a) |
|
143 0 |
|
144 % log copies switch without --copies, with old filecopy template |
|
145 4 |
|
146 3 |
|
147 2 |
|
148 1 |
|
149 0 |
|
150 % log copies switch with --copies |
|
151 4 e (dir/b) |
|
152 3 b (a) |
|
153 2 dir/b (b) |
|
154 1 b (a) |
|
155 0 |
|
156 % log copies with hardcoded style and with --style=default |
|
157 changeset: 4:66c1345dc4f9 |
|
158 tag: tip |
|
159 user: test |
|
160 date: Thu Jan 01 00:00:05 1970 +0000 |
|
161 files: dir/b e |
|
162 copies: e (dir/b) |
|
163 description: |
|
164 e |
|
165 |
|
166 |
|
167 changeset: 4:66c1345dc4f9 |
|
168 tag: tip |
|
169 user: test |
|
170 date: Thu Jan 01 00:00:05 1970 +0000 |
|
171 files: dir/b e |
|
172 copies: e (dir/b) |
|
173 description: |
|
174 e |
|
175 |
|
176 |
|
177 % log copies, non-linear manifest |
|
178 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
179 adding foo |
|
180 created new head |
|
181 5 e (dir/b) |
|
182 % log copies, execute bit set |
|
183 6 |
|
184 % log -p d |
|
185 changeset: 3:7c6c671bb7cc |
|
186 user: test |
|
187 date: Thu Jan 01 00:00:04 1970 +0000 |
|
188 files: a b d |
|
189 description: |
|
190 d |
|
191 |
|
192 |
|
193 diff -r 41dd4284081e -r 7c6c671bb7cc d |
|
194 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
195 +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
196 @@ -0,0 +1,1 @@ |
|
197 +a |
|
198 |
|
199 adding base |
|
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
201 adding b1 |
|
202 created new head |
|
203 % log -f |
|
204 changeset: 3:e62f78d544b4 |
|
205 tag: tip |
|
206 parent: 1:3d5bf5654eda |
|
207 user: test |
|
208 date: Thu Jan 01 00:00:01 1970 +0000 |
|
209 summary: b1 |
|
210 |
|
211 changeset: 1:3d5bf5654eda |
|
212 user: test |
|
213 date: Thu Jan 01 00:00:01 1970 +0000 |
|
214 summary: r1 |
|
215 |
|
216 changeset: 0:67e992f2c4f3 |
|
217 user: test |
|
218 date: Thu Jan 01 00:00:01 1970 +0000 |
|
219 summary: base |
|
220 |
|
221 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
222 adding b2 |
|
223 created new head |
|
224 % log -f -r 1:tip |
|
225 changeset: 1:3d5bf5654eda |
|
226 user: test |
|
227 date: Thu Jan 01 00:00:01 1970 +0000 |
|
228 summary: r1 |
|
229 |
|
230 changeset: 2:60c670bf5b30 |
|
231 user: test |
|
232 date: Thu Jan 01 00:00:01 1970 +0000 |
|
233 summary: r2 |
|
234 |
|
235 changeset: 3:e62f78d544b4 |
|
236 parent: 1:3d5bf5654eda |
|
237 user: test |
|
238 date: Thu Jan 01 00:00:01 1970 +0000 |
|
239 summary: b1 |
|
240 |
|
241 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
243 (branch merge, don't forget to commit) |
|
244 % log -r . with two parents |
|
245 changeset: 3:e62f78d544b4 |
|
246 parent: 1:3d5bf5654eda |
|
247 user: test |
|
248 date: Thu Jan 01 00:00:01 1970 +0000 |
|
249 summary: b1 |
|
250 |
|
251 % log -r . with one parent |
|
252 changeset: 5:302e9dd6890d |
|
253 tag: tip |
|
254 parent: 3:e62f78d544b4 |
|
255 parent: 4:ddb82e70d1a1 |
|
256 user: test |
|
257 date: Thu Jan 01 00:00:01 1970 +0000 |
|
258 summary: m12 |
|
259 |
|
260 % log --follow-first |
|
261 changeset: 6:2404bbcab562 |
|
262 tag: tip |
|
263 user: test |
|
264 date: Thu Jan 01 00:00:01 1970 +0000 |
|
265 summary: b1.1 |
|
266 |
|
267 changeset: 5:302e9dd6890d |
|
268 parent: 3:e62f78d544b4 |
|
269 parent: 4:ddb82e70d1a1 |
|
270 user: test |
|
271 date: Thu Jan 01 00:00:01 1970 +0000 |
|
272 summary: m12 |
|
273 |
|
274 changeset: 3:e62f78d544b4 |
|
275 parent: 1:3d5bf5654eda |
|
276 user: test |
|
277 date: Thu Jan 01 00:00:01 1970 +0000 |
|
278 summary: b1 |
|
279 |
|
280 changeset: 1:3d5bf5654eda |
|
281 user: test |
|
282 date: Thu Jan 01 00:00:01 1970 +0000 |
|
283 summary: r1 |
|
284 |
|
285 changeset: 0:67e992f2c4f3 |
|
286 user: test |
|
287 date: Thu Jan 01 00:00:01 1970 +0000 |
|
288 summary: base |
|
289 |
|
290 % log -P 2 |
|
291 changeset: 6:2404bbcab562 |
|
292 tag: tip |
|
293 user: test |
|
294 date: Thu Jan 01 00:00:01 1970 +0000 |
|
295 summary: b1.1 |
|
296 |
|
297 changeset: 5:302e9dd6890d |
|
298 parent: 3:e62f78d544b4 |
|
299 parent: 4:ddb82e70d1a1 |
|
300 user: test |
|
301 date: Thu Jan 01 00:00:01 1970 +0000 |
|
302 summary: m12 |
|
303 |
|
304 changeset: 4:ddb82e70d1a1 |
|
305 parent: 0:67e992f2c4f3 |
|
306 user: test |
|
307 date: Thu Jan 01 00:00:01 1970 +0000 |
|
308 summary: b2 |
|
309 |
|
310 changeset: 3:e62f78d544b4 |
|
311 parent: 1:3d5bf5654eda |
|
312 user: test |
|
313 date: Thu Jan 01 00:00:01 1970 +0000 |
|
314 summary: b1 |
|
315 |
|
316 % log -r tip -p --git |
|
317 changeset: 6:2404bbcab562 |
|
318 tag: tip |
|
319 user: test |
|
320 date: Thu Jan 01 00:00:01 1970 +0000 |
|
321 summary: b1.1 |
|
322 |
|
323 diff --git a/b1 b/b1 |
|
324 --- a/b1 |
|
325 +++ b/b1 |
|
326 @@ -1,1 +1,2 @@ |
|
327 b1 |
|
328 +postm |
|
329 |
|
330 % log -r "" |
|
331 hg: parse error: empty query |
|
332 % log -r <some unknown node id> |
|
333 abort: unknown revision '1000000000000000000000000000000000000000'! |
|
334 % log -k r1 |
|
335 changeset: 1:3d5bf5654eda |
|
336 user: test |
|
337 date: Thu Jan 01 00:00:01 1970 +0000 |
|
338 summary: r1 |
|
339 |
|
340 % log -d -1 |
|
341 % log -p -l2 --color=always |
|
342 [0;33mchangeset: 6:2404bbcab562[0m |
|
343 tag: tip |
|
344 user: test |
|
345 date: Thu Jan 01 00:00:01 1970 +0000 |
|
346 summary: b1.1 |
|
347 |
|
348 [0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1[0m |
|
349 [0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000[0m |
|
350 [0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000[0m |
|
351 [0;35m@@ -1,1 +1,2 @@[0m |
|
352 b1 |
|
353 [0;32m+postm[0m |
|
354 |
|
355 [0;33mchangeset: 5:302e9dd6890d[0m |
|
356 parent: 3:e62f78d544b4 |
|
357 parent: 4:ddb82e70d1a1 |
|
358 user: test |
|
359 date: Thu Jan 01 00:00:01 1970 +0000 |
|
360 summary: m12 |
|
361 |
|
362 [0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2[0m |
|
363 [0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000[0m |
|
364 [0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000[0m |
|
365 [0;35m@@ -0,0 +1,1 @@[0m |
|
366 [0;32m+b2[0m |
|
367 |
|
368 % log -r tip --stat |
|
369 changeset: 6:2404bbcab562 |
|
370 tag: tip |
|
371 user: test |
|
372 date: Thu Jan 01 00:00:01 1970 +0000 |
|
373 summary: b1.1 |
|
374 |
|
375 b1 | 1 + |
|
376 1 files changed, 1 insertions(+), 0 deletions(-) |
|
377 |
|
378 adding a |
|
379 adding b |
|
380 changeset: 0:29a4c94f1924 |
|
381 user: User One <user1@example.org> |
|
382 date: Thu Jan 01 00:00:00 1970 +0000 |
|
383 summary: a |
|
384 |
|
385 changeset: 1:e834b5e69c0e |
|
386 tag: tip |
|
387 user: User Two <user2@example.org> |
|
388 date: Thu Jan 01 00:00:00 1970 +0000 |
|
389 summary: b |
|
390 |
|
391 changeset: 0:29a4c94f1924 |
|
392 user: User One <user1@example.org> |
|
393 date: Thu Jan 01 00:00:00 1970 +0000 |
|
394 summary: a |
|
395 |
|
396 adding a |
|
397 marked working directory as branch test |
|
398 adding b |
|
399 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
400 adding c |
|
401 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
402 adding c |
|
403 % log -b default |
|
404 changeset: 2:c3a4f03cc9a7 |
|
405 parent: 0:24427303d56f |
|
406 user: test |
|
407 date: Thu Jan 01 00:00:00 1970 +0000 |
|
408 summary: commit on default |
|
409 |
|
410 changeset: 0:24427303d56f |
|
411 user: test |
|
412 date: Thu Jan 01 00:00:00 1970 +0000 |
|
413 summary: commit on default |
|
414 |
|
415 % log -b test |
|
416 changeset: 3:f5d8de11c2e2 |
|
417 branch: test |
|
418 tag: tip |
|
419 parent: 1:d32277701ccb |
|
420 user: test |
|
421 date: Thu Jan 01 00:00:00 1970 +0000 |
|
422 summary: commit on test |
|
423 |
|
424 changeset: 1:d32277701ccb |
|
425 branch: test |
|
426 user: test |
|
427 date: Thu Jan 01 00:00:00 1970 +0000 |
|
428 summary: commit on test |
|
429 |
|
430 % log -b dummy |
|
431 abort: unknown revision 'dummy'! |
|
432 % log -b . |
|
433 changeset: 3:f5d8de11c2e2 |
|
434 branch: test |
|
435 tag: tip |
|
436 parent: 1:d32277701ccb |
|
437 user: test |
|
438 date: Thu Jan 01 00:00:00 1970 +0000 |
|
439 summary: commit on test |
|
440 |
|
441 changeset: 1:d32277701ccb |
|
442 branch: test |
|
443 user: test |
|
444 date: Thu Jan 01 00:00:00 1970 +0000 |
|
445 summary: commit on test |
|
446 |
|
447 % log -b default -b test |
|
448 changeset: 3:f5d8de11c2e2 |
|
449 branch: test |
|
450 tag: tip |
|
451 parent: 1:d32277701ccb |
|
452 user: test |
|
453 date: Thu Jan 01 00:00:00 1970 +0000 |
|
454 summary: commit on test |
|
455 |
|
456 changeset: 2:c3a4f03cc9a7 |
|
457 parent: 0:24427303d56f |
|
458 user: test |
|
459 date: Thu Jan 01 00:00:00 1970 +0000 |
|
460 summary: commit on default |
|
461 |
|
462 changeset: 1:d32277701ccb |
|
463 branch: test |
|
464 user: test |
|
465 date: Thu Jan 01 00:00:00 1970 +0000 |
|
466 summary: commit on test |
|
467 |
|
468 changeset: 0:24427303d56f |
|
469 user: test |
|
470 date: Thu Jan 01 00:00:00 1970 +0000 |
|
471 summary: commit on default |
|
472 |
|
473 % log -b default -b . |
|
474 changeset: 3:f5d8de11c2e2 |
|
475 branch: test |
|
476 tag: tip |
|
477 parent: 1:d32277701ccb |
|
478 user: test |
|
479 date: Thu Jan 01 00:00:00 1970 +0000 |
|
480 summary: commit on test |
|
481 |
|
482 changeset: 2:c3a4f03cc9a7 |
|
483 parent: 0:24427303d56f |
|
484 user: test |
|
485 date: Thu Jan 01 00:00:00 1970 +0000 |
|
486 summary: commit on default |
|
487 |
|
488 changeset: 1:d32277701ccb |
|
489 branch: test |
|
490 user: test |
|
491 date: Thu Jan 01 00:00:00 1970 +0000 |
|
492 summary: commit on test |
|
493 |
|
494 changeset: 0:24427303d56f |
|
495 user: test |
|
496 date: Thu Jan 01 00:00:00 1970 +0000 |
|
497 summary: commit on default |
|
498 |
|
499 % log -b . -b test |
|
500 changeset: 3:f5d8de11c2e2 |
|
501 branch: test |
|
502 tag: tip |
|
503 parent: 1:d32277701ccb |
|
504 user: test |
|
505 date: Thu Jan 01 00:00:00 1970 +0000 |
|
506 summary: commit on test |
|
507 |
|
508 changeset: 1:d32277701ccb |
|
509 branch: test |
|
510 user: test |
|
511 date: Thu Jan 01 00:00:00 1970 +0000 |
|
512 summary: commit on test |
|
513 |
|
514 % log -b 2 |
|
515 changeset: 2:c3a4f03cc9a7 |
|
516 parent: 0:24427303d56f |
|
517 user: test |
|
518 date: Thu Jan 01 00:00:00 1970 +0000 |
|
519 summary: commit on default |
|
520 |
|
521 changeset: 0:24427303d56f |
|
522 user: test |
|
523 date: Thu Jan 01 00:00:00 1970 +0000 |
|
524 summary: commit on default |
|
525 |
|
526 % log -p --cwd dir (in subdir) |
|
527 changeset: 3:f5d8de11c2e2 |
|
528 branch: test |
|
529 tag: tip |
|
530 parent: 1:d32277701ccb |
|
531 user: test |
|
532 date: Thu Jan 01 00:00:00 1970 +0000 |
|
533 summary: commit on test |
|
534 |
|
535 diff -r d32277701ccb -r f5d8de11c2e2 c |
|
536 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
537 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
538 @@ -0,0 +1,1 @@ |
|
539 +c |
|
540 |
|
541 changeset: 2:c3a4f03cc9a7 |
|
542 parent: 0:24427303d56f |
|
543 user: test |
|
544 date: Thu Jan 01 00:00:00 1970 +0000 |
|
545 summary: commit on default |
|
546 |
|
547 diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
548 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
549 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
550 @@ -0,0 +1,1 @@ |
|
551 +c |
|
552 |
|
553 changeset: 1:d32277701ccb |
|
554 branch: test |
|
555 user: test |
|
556 date: Thu Jan 01 00:00:00 1970 +0000 |
|
557 summary: commit on test |
|
558 |
|
559 diff -r 24427303d56f -r d32277701ccb b |
|
560 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
561 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
562 @@ -0,0 +1,1 @@ |
|
563 +b |
|
564 |
|
565 changeset: 0:24427303d56f |
|
566 user: test |
|
567 date: Thu Jan 01 00:00:00 1970 +0000 |
|
568 summary: commit on default |
|
569 |
|
570 diff -r 000000000000 -r 24427303d56f a |
|
571 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
572 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
573 @@ -0,0 +1,1 @@ |
|
574 +a |
|
575 |
|
576 % log -p -R repo |
|
577 changeset: 0:24427303d56f |
|
578 user: test |
|
579 date: Thu Jan 01 00:00:00 1970 +0000 |
|
580 summary: commit on default |
|
581 |
|
582 diff -r 000000000000 -r 24427303d56f a |
|
583 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
584 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
585 @@ -0,0 +1,1 @@ |
|
586 +a |
|
587 |
|
588 % issue2383 |
|
589 adding a |
|
590 adding b |
|
591 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
592 created new head |
|
593 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
594 (branch merge, don't forget to commit) |
|
595 |
|
596 % diff |
|
597 diff -r b09be438c43a -r 8e07aafe1edc a |
|
598 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
599 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
600 @@ -1,1 +1,1 @@ |
|
601 -b |
|
602 +c |
|
603 diff -r b09be438c43a -r 8e07aafe1edc b |
|
604 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
605 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
606 @@ -0,0 +1,1 @@ |
|
607 +b |
|
608 |
|
609 % log |
|
610 changeset: 3:8e07aafe1edc |
|
611 tag: tip |
|
612 parent: 2:b09be438c43a |
|
613 parent: 1:925d80f479bb |
|
614 user: test |
|
615 date: Thu Jan 01 00:00:00 1970 +0000 |
|
616 files: a |
|
617 description: |
|
618 3 |
|
619 |
|
620 |
|
621 diff -r b09be438c43a -r 8e07aafe1edc a |
|
622 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
623 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
624 @@ -1,1 +1,1 @@ |
|
625 -b |
|
626 +c |
|
627 diff -r b09be438c43a -r 8e07aafe1edc b |
|
628 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
629 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
630 @@ -0,0 +1,1 @@ |
|
631 +b |
|
632 |
|