Mercurial > hg
annotate tests/test-log.out @ 12382:28ddf67198b2 stable
log: include unmodified-in-merge files in log diff/stat (issue2383)
f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.
This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 23 Sep 2010 01:23:16 +0200 |
parents | efbc09fdefd8 |
children |
rev | line source |
---|---|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 adding a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 changeset: 0:8580ff50825a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 date: Thu Jan 01 00:00:01 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 summary: a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 % -f, directory |
7404
07cb58b8c843
Improved error message for log --follow
Brendan Cully <brendan@kublai.com>
parents:
7062
diff
changeset
|
8 abort: cannot follow nonexistent file: "dir" |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 % -f, but no args |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
10 changeset: 4:66c1345dc4f9 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 tag: tip |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 date: Thu Jan 01 00:00:05 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 summary: e |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
16 changeset: 3:7c6c671bb7cc |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 date: Thu Jan 01 00:00:04 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 summary: d |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
21 changeset: 2:41dd4284081e |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 date: Thu Jan 01 00:00:03 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 summary: c |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
26 changeset: 1:784de7cef101 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 date: Thu Jan 01 00:00:02 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 summary: b |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
31 changeset: 0:8580ff50825a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
32 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 date: Thu Jan 01 00:00:01 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 summary: a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
36 % one rename |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
37 changeset: 0:8580ff50825a |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 date: Thu Jan 01 00:00:01 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
40 files: a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 description: |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
42 a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
43 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
44 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 % many renames |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
46 changeset: 4:66c1345dc4f9 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
47 tag: tip |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
48 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
49 date: Thu Jan 01 00:00:05 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
50 files: dir/b e |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
51 description: |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
52 e |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
53 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
54 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
55 changeset: 2:41dd4284081e |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
56 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
57 date: Thu Jan 01 00:00:03 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
58 files: b dir/b |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
59 description: |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
60 c |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
61 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
62 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
63 changeset: 1:784de7cef101 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
64 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
65 date: Thu Jan 01 00:00:02 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
66 files: b |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
67 description: |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
68 b |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
69 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
70 |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
71 changeset: 0:8580ff50825a |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
72 user: test |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
73 date: Thu Jan 01 00:00:01 1970 +0000 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
74 files: a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
75 description: |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
76 a |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
77 |
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
78 |
11562
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
79 % log -pf dir/b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
80 changeset: 2:41dd4284081e |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
81 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
82 date: Thu Jan 01 00:00:03 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
83 summary: c |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
84 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
85 diff -r 784de7cef101 -r 41dd4284081e dir/b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
86 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
87 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
88 @@ -0,0 +1,1 @@ |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
89 +a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
90 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
91 changeset: 1:784de7cef101 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
92 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
93 date: Thu Jan 01 00:00:02 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
94 summary: b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
95 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
96 diff -r 8580ff50825a -r 784de7cef101 b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
97 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
98 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
99 @@ -0,0 +1,1 @@ |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
100 +a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
101 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
102 changeset: 0:8580ff50825a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
103 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
104 date: Thu Jan 01 00:00:01 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
105 summary: a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
106 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
107 diff -r 000000000000 -r 8580ff50825a a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
109 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
110 @@ -0,0 +1,1 @@ |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
111 +a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
112 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
113 % log -vf dir/b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
114 changeset: 2:41dd4284081e |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
115 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
116 date: Thu Jan 01 00:00:03 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
117 files: b dir/b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
118 description: |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
119 c |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
120 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
121 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
122 changeset: 1:784de7cef101 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
123 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
124 date: Thu Jan 01 00:00:02 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
125 files: b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
126 description: |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
127 b |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
128 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
129 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
130 changeset: 0:8580ff50825a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
131 user: test |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
132 date: Thu Jan 01 00:00:01 1970 +0000 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
133 files: a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
134 description: |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
135 a |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
136 |
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
137 |
10060
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
138 % log copies with --copies |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
139 4 e (dir/b) |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
140 3 b (a) |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
141 2 dir/b (b) |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
142 1 b (a) |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
143 0 |
10061
9e2ab10728a2
Make {file_copies} usable as a --template key
Patrick Mezard <pmezard@gmail.com>
parents:
10060
diff
changeset
|
144 % log copies switch without --copies, with old filecopy template |
10060
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
145 4 |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
146 3 |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
147 2 |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
148 1 |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
149 0 |
f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents:
9421
diff
changeset
|
150 % log copies switch with --copies |
3197 | 151 4 e (dir/b) |
152 3 b (a) | |
153 2 dir/b (b) | |
154 1 b (a) | |
155 0 | |
10776
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
156 % log copies with hardcoded style and with --style=default |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
157 changeset: 4:66c1345dc4f9 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
158 tag: tip |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
159 user: test |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
160 date: Thu Jan 01 00:00:05 1970 +0000 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
161 files: dir/b e |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
162 copies: e (dir/b) |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
163 description: |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
164 e |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
165 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
166 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
167 changeset: 4:66c1345dc4f9 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
168 tag: tip |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
169 user: test |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
170 date: Thu Jan 01 00:00:05 1970 +0000 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
171 files: dir/b e |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
172 copies: e (dir/b) |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
173 description: |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
174 e |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
175 |
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10490
diff
changeset
|
176 |
3383
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
177 % log copies, non-linear manifest |
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
178 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
179 adding foo |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6228
diff
changeset
|
180 created new head |
3383
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
181 5 e (dir/b) |
5811
180a3eee4b75
Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4510
diff
changeset
|
182 % log copies, execute bit set |
180a3eee4b75
Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4510
diff
changeset
|
183 6 |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
184 % log -p d |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
185 changeset: 3:7c6c671bb7cc |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
186 user: test |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
187 date: Thu Jan 01 00:00:04 1970 +0000 |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
188 files: a b d |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
189 description: |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
190 d |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
191 |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
192 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10061
diff
changeset
|
193 diff -r 41dd4284081e -r 7c6c671bb7cc d |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
194 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
195 +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
196 @@ -0,0 +1,1 @@ |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
197 +a |
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
198 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
199 adding base |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
201 adding b1 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6228
diff
changeset
|
202 created new head |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
203 % log -f |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
204 changeset: 3:e62f78d544b4 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
205 tag: tip |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
206 parent: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
207 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
208 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
209 summary: b1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
210 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
211 changeset: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
212 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
213 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
214 summary: r1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
215 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
216 changeset: 0:67e992f2c4f3 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
217 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
218 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
219 summary: base |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
220 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
221 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
222 adding b2 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6228
diff
changeset
|
223 created new head |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
224 % log -f -r 1:tip |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
225 changeset: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
226 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
227 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
228 summary: r1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
229 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
230 changeset: 2:60c670bf5b30 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
231 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
232 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
233 summary: r2 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
234 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
235 changeset: 3:e62f78d544b4 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
236 parent: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
237 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
238 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
239 summary: b1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
240 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
241 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
243 (branch merge, don't forget to commit) |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
244 % log -r . with two parents |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
245 changeset: 3:e62f78d544b4 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
246 parent: 1:3d5bf5654eda |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
247 user: test |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
248 date: Thu Jan 01 00:00:01 1970 +0000 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
249 summary: b1 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
250 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
251 % log -r . with one parent |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
252 changeset: 5:302e9dd6890d |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
253 tag: tip |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
254 parent: 3:e62f78d544b4 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
255 parent: 4:ddb82e70d1a1 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
256 user: test |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
257 date: Thu Jan 01 00:00:01 1970 +0000 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
258 summary: m12 |
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
259 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
260 % log --follow-first |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
261 changeset: 6:2404bbcab562 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
262 tag: tip |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
263 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
264 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
265 summary: b1.1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
266 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
267 changeset: 5:302e9dd6890d |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
268 parent: 3:e62f78d544b4 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
269 parent: 4:ddb82e70d1a1 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
270 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
271 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
272 summary: m12 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
273 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
274 changeset: 3:e62f78d544b4 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
275 parent: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
276 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
277 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
278 summary: b1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
279 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
280 changeset: 1:3d5bf5654eda |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
281 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
282 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
283 summary: r1 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
284 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
285 changeset: 0:67e992f2c4f3 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
286 user: test |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
287 date: Thu Jan 01 00:00:01 1970 +0000 |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
288 summary: base |
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
289 |
2901 | 290 % log -P 2 |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
291 changeset: 6:2404bbcab562 |
2901 | 292 tag: tip |
293 user: test | |
294 date: Thu Jan 01 00:00:01 1970 +0000 | |
295 summary: b1.1 | |
296 | |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
297 changeset: 5:302e9dd6890d |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
298 parent: 3:e62f78d544b4 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
299 parent: 4:ddb82e70d1a1 |
2901 | 300 user: test |
301 date: Thu Jan 01 00:00:01 1970 +0000 | |
302 summary: m12 | |
303 | |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
304 changeset: 4:ddb82e70d1a1 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
305 parent: 0:67e992f2c4f3 |
2901 | 306 user: test |
307 date: Thu Jan 01 00:00:01 1970 +0000 | |
308 summary: b2 | |
309 | |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
310 changeset: 3:e62f78d544b4 |
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
311 parent: 1:3d5bf5654eda |
2901 | 312 user: test |
313 date: Thu Jan 01 00:00:01 1970 +0000 | |
314 summary: b1 | |
315 | |
7762
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
316 % log -r tip -p --git |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
317 changeset: 6:2404bbcab562 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
318 tag: tip |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
319 user: test |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
320 date: Thu Jan 01 00:00:01 1970 +0000 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
321 summary: b1.1 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
322 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
323 diff --git a/b1 b/b1 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
324 --- a/b1 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
325 +++ b/b1 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
326 @@ -1,1 +1,2 @@ |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
327 b1 |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
328 +postm |
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7404
diff
changeset
|
329 |
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
330 % log -r "" |
11405
bf5d88c466e0
revrange: attempt to parse old-style queries as a first pass
Matt Mackall <mpm@selenic.com>
parents:
11173
diff
changeset
|
331 hg: parse error: empty query |
7062
efc579fdaf69
provide nicer feedback when an unknown node id is passed to a command
Sune Foldager <cryo@cyanite.org>
parents:
6736
diff
changeset
|
332 % log -r <some unknown node id> |
efc579fdaf69
provide nicer feedback when an unknown node id is passed to a command
Sune Foldager <cryo@cyanite.org>
parents:
6736
diff
changeset
|
333 abort: unknown revision '1000000000000000000000000000000000000000'! |
9373
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
334 % log -k r1 |
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
335 changeset: 1:3d5bf5654eda |
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
336 user: test |
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
337 date: Thu Jan 01 00:00:01 1970 +0000 |
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
338 summary: r1 |
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
339 |
9421
c8e4dc218aaf
log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents:
9373
diff
changeset
|
340 % log -d -1 |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
341 % log -p -l2 --color=always |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
342 [0;33mchangeset: 6:2404bbcab562[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
343 tag: tip |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
344 user: test |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
345 date: Thu Jan 01 00:00:01 1970 +0000 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
346 summary: b1.1 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
347 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
348 [0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
349 [0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
350 [0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
351 [0;35m@@ -1,1 +1,2 @@[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
352 b1 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
353 [0;32m+postm[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
354 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
355 [0;33mchangeset: 5:302e9dd6890d[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
356 parent: 3:e62f78d544b4 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
357 parent: 4:ddb82e70d1a1 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
358 user: test |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
359 date: Thu Jan 01 00:00:01 1970 +0000 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
360 summary: m12 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
361 |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
362 [0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
363 [0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
364 [0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
365 [0;35m@@ -0,0 +1,1 @@[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
366 [0;32m+b2[0m |
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
367 |
11061
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
368 % log -r tip --stat |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
369 changeset: 6:2404bbcab562 |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
370 tag: tip |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
371 user: test |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
372 date: Thu Jan 01 00:00:01 1970 +0000 |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
373 summary: b1.1 |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
374 |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
375 b1 | 1 + |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
376 1 files changed, 1 insertions(+), 0 deletions(-) |
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
377 |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
378 adding a |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
379 adding b |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
380 changeset: 0:29a4c94f1924 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
381 user: User One <user1@example.org> |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
382 date: Thu Jan 01 00:00:00 1970 +0000 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
383 summary: a |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
384 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
385 changeset: 1:e834b5e69c0e |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
386 tag: tip |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
387 user: User Two <user2@example.org> |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
388 date: Thu Jan 01 00:00:00 1970 +0000 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
389 summary: b |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
390 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
391 changeset: 0:29a4c94f1924 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
392 user: User One <user1@example.org> |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
393 date: Thu Jan 01 00:00:00 1970 +0000 |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
394 summary: a |
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
395 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
396 adding a |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
397 marked working directory as branch test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
398 adding b |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
399 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
400 adding c |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
401 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
402 adding c |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
403 % log -b default |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
404 changeset: 2:c3a4f03cc9a7 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
405 parent: 0:24427303d56f |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
406 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
407 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
408 summary: commit on default |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
409 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
410 changeset: 0:24427303d56f |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
411 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
412 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
413 summary: commit on default |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
414 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
415 % log -b test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
416 changeset: 3:f5d8de11c2e2 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
417 branch: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
418 tag: tip |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
419 parent: 1:d32277701ccb |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
420 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
421 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
422 summary: commit on test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
423 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
424 changeset: 1:d32277701ccb |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
425 branch: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
426 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
427 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
428 summary: commit on test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
429 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
430 % log -b dummy |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
431 abort: unknown revision 'dummy'! |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
432 % log -b . |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
433 changeset: 3:f5d8de11c2e2 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
434 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
435 tag: tip |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
436 parent: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
437 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
438 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
439 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
440 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
441 changeset: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
442 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
443 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
444 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
445 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
446 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
447 % log -b default -b test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
448 changeset: 3:f5d8de11c2e2 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
449 branch: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
450 tag: tip |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
451 parent: 1:d32277701ccb |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
452 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
453 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
454 summary: commit on test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
455 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
456 changeset: 2:c3a4f03cc9a7 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
457 parent: 0:24427303d56f |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
458 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
459 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
460 summary: commit on default |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
461 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
462 changeset: 1:d32277701ccb |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
463 branch: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
464 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
465 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
466 summary: commit on test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
467 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
468 changeset: 0:24427303d56f |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
469 user: test |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
470 date: Thu Jan 01 00:00:00 1970 +0000 |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
471 summary: commit on default |
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
472 |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
473 % log -b default -b . |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
474 changeset: 3:f5d8de11c2e2 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
475 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
476 tag: tip |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
477 parent: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
478 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
479 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
480 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
481 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
482 changeset: 2:c3a4f03cc9a7 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
483 parent: 0:24427303d56f |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
484 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
485 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
486 summary: commit on default |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
487 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
488 changeset: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
489 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
490 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
491 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
492 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
493 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
494 changeset: 0:24427303d56f |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
495 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
496 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
497 summary: commit on default |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
498 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
499 % log -b . -b test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
500 changeset: 3:f5d8de11c2e2 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
501 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
502 tag: tip |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
503 parent: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
504 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
505 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
506 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
507 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
508 changeset: 1:d32277701ccb |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
509 branch: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
510 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
511 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
512 summary: commit on test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
513 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
514 % log -b 2 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
515 changeset: 2:c3a4f03cc9a7 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
516 parent: 0:24427303d56f |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
517 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
518 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
519 summary: commit on default |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
520 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
521 changeset: 0:24427303d56f |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
522 user: test |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
523 date: Thu Jan 01 00:00:00 1970 +0000 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
524 summary: commit on default |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
525 |
11508
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
526 % log -p --cwd dir (in subdir) |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
527 changeset: 3:f5d8de11c2e2 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
528 branch: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
529 tag: tip |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
530 parent: 1:d32277701ccb |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
531 user: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
532 date: Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
533 summary: commit on test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
534 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
535 diff -r d32277701ccb -r f5d8de11c2e2 c |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
536 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
537 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
538 @@ -0,0 +1,1 @@ |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
539 +c |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
540 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
541 changeset: 2:c3a4f03cc9a7 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
542 parent: 0:24427303d56f |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
543 user: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
544 date: Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
545 summary: commit on default |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
546 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
547 diff -r 24427303d56f -r c3a4f03cc9a7 c |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
548 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
549 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
550 @@ -0,0 +1,1 @@ |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
551 +c |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
552 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
553 changeset: 1:d32277701ccb |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
554 branch: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
555 user: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
556 date: Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
557 summary: commit on test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
558 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
559 diff -r 24427303d56f -r d32277701ccb b |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
560 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
561 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
562 @@ -0,0 +1,1 @@ |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
563 +b |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
564 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
565 changeset: 0:24427303d56f |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
566 user: test |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
567 date: Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
568 summary: commit on default |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
569 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
570 diff -r 000000000000 -r 24427303d56f a |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
571 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
572 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
573 @@ -0,0 +1,1 @@ |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
574 +a |
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11405
diff
changeset
|
575 |
11509
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
576 % log -p -R repo |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
577 changeset: 0:24427303d56f |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
578 user: test |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
579 date: Thu Jan 01 00:00:00 1970 +0000 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
580 summary: commit on default |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
581 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
582 diff -r 000000000000 -r 24427303d56f a |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
583 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
584 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
585 @@ -0,0 +1,1 @@ |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
586 +a |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
587 |
12382
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
588 % issue2383 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
589 adding a |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
590 adding b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
591 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
592 created new head |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
593 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
594 (branch merge, don't forget to commit) |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
595 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
596 % diff |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
597 diff -r b09be438c43a -r 8e07aafe1edc a |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
598 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
599 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
600 @@ -1,1 +1,1 @@ |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
601 -b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
602 +c |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
603 diff -r b09be438c43a -r 8e07aafe1edc b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
604 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
605 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
606 @@ -0,0 +1,1 @@ |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
607 +b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
608 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
609 % log |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
610 changeset: 3:8e07aafe1edc |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
611 tag: tip |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
612 parent: 2:b09be438c43a |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
613 parent: 1:925d80f479bb |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
614 user: test |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
615 date: Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
616 files: a |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
617 description: |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
618 3 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
619 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
620 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
621 diff -r b09be438c43a -r 8e07aafe1edc a |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
622 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
623 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
624 @@ -1,1 +1,1 @@ |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
625 -b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
626 +c |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
627 diff -r b09be438c43a -r 8e07aafe1edc b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
628 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
629 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
630 @@ -0,0 +1,1 @@ |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
631 +b |
28ddf67198b2
log: include unmodified-in-merge files in log diff/stat (issue2383)
Mads Kiilerich <mads@kiilerich.com>
parents:
11562
diff
changeset
|
632 |