Mercurial > hg
annotate tests/test-log.t @ 24013:942a5a34b2d0 stable
log: fix json-formatted output when file copies are listed (issue4523)
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 02 Feb 2015 14:26:47 -0500 |
parents | 344939126579 |
children | c260887cdbcd e810c7da1cae |
rev | line source |
---|---|
18991
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
1 Log on empty repository: checking consistency |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
2 |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
3 $ hg init empty |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
4 $ cd empty |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
5 $ hg log |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
6 $ hg log -r 1 |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
7 abort: unknown revision '1'! |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
8 [255] |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
9 $ hg log -r -1:0 |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
10 abort: unknown revision '-1'! |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
11 [255] |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
12 $ hg log -r 'branch(name)' |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
13 abort: unknown revision 'name'! |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
14 [255] |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
15 $ hg log -r null -q |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
16 -1:000000000000 |
c1af1fb314bc
log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents:
18495
diff
changeset
|
17 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
18 The g is crafted to have 2 filelog topological heads in a linear |
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
19 changeset graph |
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
20 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
21 $ hg init a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
22 $ cd a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
23 $ echo a > a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
24 $ echo f > f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
25 $ hg ci -Ama -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
26 adding a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
27 adding f |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
29 $ hg cp a b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
30 $ hg cp f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
31 $ hg ci -mb -d '2 0' |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
32 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
33 $ mkdir dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
34 $ hg mv b dir |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
35 $ echo g >> g |
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
36 $ echo f >> f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
37 $ hg ci -mc -d '3 0' |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
39 $ hg mv a b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
40 $ hg cp -f f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
41 $ echo a > d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
42 $ hg add d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
43 $ hg ci -md -d '4 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
44 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
45 $ hg mv dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
46 $ hg ci -me -d '5 0' |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
47 |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
48 Make sure largefiles doesn't interfere with logging a regular file |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
49 $ hg log a --config extensions.largefiles= |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
50 changeset: 0:9161b9aeaf16 |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
51 user: test |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
52 date: Thu Jan 01 00:00:01 1970 +0000 |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
53 summary: a |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
54 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
55 $ hg log a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
56 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
57 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
58 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
59 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
60 |
18340
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
61 log on directory |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
62 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
63 $ hg log dir |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
64 changeset: 4:7e4639b4691b |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
65 tag: tip |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
66 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
67 date: Thu Jan 01 00:00:05 1970 +0000 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
68 summary: e |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
69 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
70 changeset: 2:f8954cd4dc1f |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
71 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
72 date: Thu Jan 01 00:00:03 1970 +0000 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
73 summary: c |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
74 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
75 $ hg log somethingthatdoesntexist dir |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
76 changeset: 4:7e4639b4691b |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
77 tag: tip |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
78 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
79 date: Thu Jan 01 00:00:05 1970 +0000 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
80 summary: e |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
81 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
82 changeset: 2:f8954cd4dc1f |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
83 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
84 date: Thu Jan 01 00:00:03 1970 +0000 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
85 summary: c |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
86 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
87 |
21998 | 88 -f, non-existent directory |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
89 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
90 $ hg log -f dir |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
91 abort: cannot follow file not in parent revision: "dir" |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
92 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
93 |
21998 | 94 -f, directory |
95 | |
96 $ hg up -q 3 | |
97 $ hg log -f dir | |
98 changeset: 2:f8954cd4dc1f | |
99 user: test | |
100 date: Thu Jan 01 00:00:03 1970 +0000 | |
101 summary: c | |
102 | |
103 -f, directory with --patch | |
104 | |
105 $ hg log -f dir -p | |
106 changeset: 2:f8954cd4dc1f | |
107 user: test | |
108 date: Thu Jan 01 00:00:03 1970 +0000 | |
109 summary: c | |
110 | |
111 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
112 --- /dev/null* (glob) | |
113 +++ b/dir/b* (glob) | |
114 @@ -0,0 +1,1 @@ | |
115 +a | |
116 | |
117 | |
118 -f, pattern | |
119 | |
120 $ hg log -f -I 'dir**' -p | |
121 changeset: 2:f8954cd4dc1f | |
122 user: test | |
123 date: Thu Jan 01 00:00:03 1970 +0000 | |
124 summary: c | |
125 | |
126 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
127 --- /dev/null* (glob) | |
128 +++ b/dir/b* (glob) | |
129 @@ -0,0 +1,1 @@ | |
130 +a | |
131 | |
132 $ hg up -q 4 | |
133 | |
19125
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
134 -f, a wrong style |
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
135 |
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
136 $ hg log -f -l1 --style something |
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
137 abort: style 'something' not found |
19127
d982edcfe7f0
templater: fix output instability from gsoc patches
Augie Fackler <raf@durin42.com>
parents:
19126
diff
changeset
|
138 (available styles: bisect, changelog, compact, default, phases, xml) |
19125
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
139 [255] |
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
140 |
19126
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
141 -f, phases style |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
142 |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
143 |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
144 $ hg log -f -l1 --style phases |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
145 changeset: 4:7e4639b4691b |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
146 tag: tip |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
147 phase: draft |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
148 user: test |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
149 date: Thu Jan 01 00:00:05 1970 +0000 |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
150 summary: e |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
151 |
19125
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
152 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
153 -f, but no args |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
154 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
155 $ hg log -f |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
156 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
157 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
158 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
159 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
160 summary: e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
161 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
162 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
163 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
164 date: Thu Jan 01 00:00:04 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
165 summary: d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
166 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
167 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
168 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
169 date: Thu Jan 01 00:00:03 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
170 summary: c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
171 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
172 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
173 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
174 date: Thu Jan 01 00:00:02 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
175 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
176 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
177 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
178 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
179 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
180 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
181 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
182 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
183 one rename |
11562
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
184 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
185 $ hg up -q 2 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
186 $ hg log -vf a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
187 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
188 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
189 date: Thu Jan 01 00:00:01 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
190 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
191 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
192 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
193 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
194 |
3197 | 195 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
196 many renames |
10776
08870cf7d388
Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents:
10061
diff
changeset
|
197 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
198 $ hg up -q tip |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
199 $ hg log -vf e |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
200 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
201 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
202 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
203 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
204 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
205 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
206 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
207 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
208 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
209 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
210 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
211 date: Thu Jan 01 00:00:03 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
212 files: b dir/b f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
213 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
214 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
215 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
216 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
217 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
218 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
219 date: Thu Jan 01 00:00:02 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
220 files: b g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
221 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
222 b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
223 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
224 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
225 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
226 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
227 date: Thu Jan 01 00:00:01 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
228 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
229 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
230 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
231 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
232 |
5811
180a3eee4b75
Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4510
diff
changeset
|
233 |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
234 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
235 log -pf dir/b |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
236 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
237 $ hg up -q 3 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
238 $ hg log -pf dir/b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
239 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
240 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
241 date: Thu Jan 01 00:00:03 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
242 summary: c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
243 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
244 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
245 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
246 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
247 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
248 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
249 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
250 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
251 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
252 date: Thu Jan 01 00:00:02 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
253 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
254 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
255 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
256 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
257 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
258 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
259 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
260 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
261 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
262 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
263 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
264 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
265 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
266 diff -r 000000000000 -r 9161b9aeaf16 a |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
267 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
268 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
269 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
270 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
271 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
272 |
21876
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
273 log -pf b inside dir |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
274 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
275 $ hg --cwd=dir log -pf b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
276 changeset: 2:f8954cd4dc1f |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
277 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
278 date: Thu Jan 01 00:00:03 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
279 summary: c |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
280 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
281 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
282 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
283 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
284 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
285 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
286 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
287 changeset: 1:d89b0a12d229 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
288 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
289 date: Thu Jan 01 00:00:02 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
290 summary: b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
291 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
292 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
293 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
294 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
295 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
296 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
297 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
298 changeset: 0:9161b9aeaf16 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
299 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
300 date: Thu Jan 01 00:00:01 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
301 summary: a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
302 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
303 diff -r 000000000000 -r 9161b9aeaf16 a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
304 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
305 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
306 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
307 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
308 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
309 |
21966
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
310 log -pf, but no args |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
311 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
312 $ hg log -pf |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
313 changeset: 3:2ca5ba701980 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
314 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
315 date: Thu Jan 01 00:00:04 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
316 summary: d |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
317 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
318 diff -r f8954cd4dc1f -r 2ca5ba701980 a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
319 --- a/a Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
320 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
321 @@ -1,1 +0,0 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
322 -a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
323 diff -r f8954cd4dc1f -r 2ca5ba701980 b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
324 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
325 +++ b/b Thu Jan 01 00:00:04 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
326 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
327 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
328 diff -r f8954cd4dc1f -r 2ca5ba701980 d |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
329 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
330 +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
331 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
332 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
333 diff -r f8954cd4dc1f -r 2ca5ba701980 g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
334 --- a/g Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
335 +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
336 @@ -1,2 +1,2 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
337 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
338 -g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
339 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
340 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
341 changeset: 2:f8954cd4dc1f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
342 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
343 date: Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
344 summary: c |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
345 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
346 diff -r d89b0a12d229 -r f8954cd4dc1f b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
347 --- a/b Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
348 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
349 @@ -1,1 +0,0 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
350 -a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
351 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
352 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
353 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
354 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
355 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
356 diff -r d89b0a12d229 -r f8954cd4dc1f f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
357 --- a/f Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
358 +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
359 @@ -1,1 +1,2 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
360 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
361 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
362 diff -r d89b0a12d229 -r f8954cd4dc1f g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
363 --- a/g Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
364 +++ b/g Thu Jan 01 00:00:03 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
365 @@ -1,1 +1,2 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
366 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
367 +g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
368 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
369 changeset: 1:d89b0a12d229 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
370 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
371 date: Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
372 summary: b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
373 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
374 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
375 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
376 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
377 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
378 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
379 diff -r 9161b9aeaf16 -r d89b0a12d229 g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
380 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
381 +++ b/g Thu Jan 01 00:00:02 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
382 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
383 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
384 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
385 changeset: 0:9161b9aeaf16 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
386 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
387 date: Thu Jan 01 00:00:01 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
388 summary: a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
389 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
390 diff -r 000000000000 -r 9161b9aeaf16 a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
391 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
392 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
393 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
394 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
395 diff -r 000000000000 -r 9161b9aeaf16 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
396 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
397 +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
398 @@ -0,0 +1,1 @@ |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
399 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
400 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
401 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
402 log -vf dir/b |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
403 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
404 $ hg log -vf dir/b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
405 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
406 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
407 date: Thu Jan 01 00:00:03 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
408 files: b dir/b f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
409 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
410 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
411 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
412 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
413 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
414 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
415 date: Thu Jan 01 00:00:02 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
416 files: b g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
417 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
418 b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
419 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
420 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
421 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
422 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
423 date: Thu Jan 01 00:00:01 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
424 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
425 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
426 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
427 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
428 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
429 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
430 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
431 -f and multiple filelog heads |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
432 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
433 $ hg up -q 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
434 $ hg log -f g --template '{rev}\n' |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
435 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
436 1 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
437 0 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
438 $ hg up -q tip |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
439 $ hg log -f g --template '{rev}\n' |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
440 3 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
441 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
442 0 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
443 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
444 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
445 log copies with --copies |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
446 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
447 $ hg log -vC --template '{rev} {file_copies}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
448 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
449 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
450 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
451 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
452 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
453 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
454 log copies switch without --copies, with old filecopy template |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
455 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
456 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
457 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
458 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
459 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
460 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
461 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
462 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
463 log copies switch with --copies |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
464 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
465 $ hg log -vC --template '{rev} {file_copies_switch}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
466 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
467 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
468 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
469 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
470 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
471 |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
472 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
473 log copies with hardcoded style and with --style=default |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
474 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
475 $ hg log -vC -r4 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
476 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
477 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
478 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
479 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
480 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
481 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
482 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
483 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
484 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
485 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
486 $ hg log -vC -r4 --style=default |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
487 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
488 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
489 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
490 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
491 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
492 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
493 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
494 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
495 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
496 |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
497 $ hg log -vC -r4 -Tjson |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
498 [ |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
499 { |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
500 "rev": 4, |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
501 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
502 "branch": "default", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
503 "phase": "draft", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
504 "user": "test", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
505 "date": [5, 0], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
506 "desc": "e", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
507 "bookmarks": [], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
508 "tags": ["tip"], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
509 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
510 "files": ["dir/b", "e"], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
511 "copies": {"e": "dir/b"} |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
512 } |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
513 ] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
514 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
515 log copies, non-linear manifest |
7762
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7062
diff
changeset
|
516 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
517 $ hg up -C 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
518 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
519 $ hg mv dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
520 $ echo foo > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
521 $ hg ci -Ame2 -d '6 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
522 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
523 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
524 $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
525 5 e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
526 |
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
527 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
528 log copies, execute bit set |
9373
b34184c046ac
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8020
diff
changeset
|
529 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
530 #if execbit |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
531 $ chmod +x e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
532 $ hg ci -me3 -d '7 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
533 $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
534 6 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
535 #endif |
9421
c8e4dc218aaf
log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents:
9373
diff
changeset
|
536 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
537 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
538 log -p d |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
539 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
540 $ hg log -pv d |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
541 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
542 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
543 date: Thu Jan 01 00:00:04 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
544 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
545 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
546 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
547 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
548 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
549 diff -r f8954cd4dc1f -r 2ca5ba701980 d |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
550 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
551 +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
552 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
553 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
554 |
11061
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
555 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
556 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
557 log --removed file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
558 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
559 $ hg log --removed -v a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
560 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
561 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
562 date: Thu Jan 01 00:00:04 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
563 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
564 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
565 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
566 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
567 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
568 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
569 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
570 date: Thu Jan 01 00:00:01 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
571 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
572 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
573 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
574 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
575 |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
576 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
577 log --removed revrange file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
578 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
579 $ hg log --removed -v -r0:2 a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
580 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
581 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
582 date: Thu Jan 01 00:00:01 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
583 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
584 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
585 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
586 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
587 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
588 $ cd .. |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
589 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
590 log --follow tests |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
591 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
592 $ hg init follow |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
593 $ cd follow |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
594 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
595 $ echo base > base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
596 $ hg ci -Ambase -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
597 adding base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
598 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
599 $ echo r1 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
600 $ hg ci -Amr1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
601 $ echo r2 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
602 $ hg ci -Amr2 -d '1 0' |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
603 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
604 $ hg up -C 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
605 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
606 $ echo b1 > b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
607 $ hg ci -Amb1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
608 adding b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
609 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
610 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
611 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
612 log -f |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
613 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
614 $ hg log -f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
615 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
616 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
617 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
618 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
619 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
620 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
621 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
622 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
623 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
624 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
625 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
626 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
627 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
628 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
629 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
630 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
631 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
632 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
633 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
634 log -f -r 1:tip |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
635 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
636 $ hg up -C 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
637 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
638 $ echo b2 > b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
639 $ hg ci -Amb2 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
640 adding b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
641 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
642 $ hg log -f -r 1:tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
643 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
644 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
645 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
646 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
647 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
648 changeset: 2:60c670bf5b30 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
649 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
650 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
651 summary: r2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
652 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
653 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
654 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
655 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
656 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
657 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
658 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
659 |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
660 |
23956
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
661 log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
662 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
663 $ hg log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
664 changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
665 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
666 date: Thu Jan 01 00:00:00 1970 +0000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
667 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
668 $ hg log -f -r null -G |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
669 o changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
670 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
671 date: Thu Jan 01 00:00:00 1970 +0000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
672 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
673 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
674 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
675 log -r . with two parents |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
676 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
677 $ hg up -C 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
678 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
679 $ hg merge tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
680 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
681 (branch merge, don't forget to commit) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
682 $ hg log -r . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
683 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
684 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
685 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
686 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
687 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
688 |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
689 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
690 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
691 log -r . with one parent |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
692 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
693 $ hg ci -mm12 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
694 $ hg log -r . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
695 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
696 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
697 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
698 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
699 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
700 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
701 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
702 |
11508
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11141
diff
changeset
|
703 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
704 $ echo postm >> b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
705 $ hg ci -Amb1.1 -d'1 0' |
11509
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
706 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
707 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
708 log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
709 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
710 $ hg log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
711 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
712 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
713 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
714 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
715 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
716 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
717 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
718 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
719 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
720 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
721 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
722 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
723 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
724 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
725 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
726 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
727 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
728 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
729 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
730 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
731 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
732 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
733 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
734 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
735 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
736 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
737 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
738 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
739 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
740 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
741 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
742 log -P 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
743 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
744 $ hg log -P 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
745 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
746 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
747 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
748 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
749 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
750 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
751 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
752 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
753 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
754 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
755 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
756 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
757 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
758 changeset: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
759 parent: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
760 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
761 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
762 summary: b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
763 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
764 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
765 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
766 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
767 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
768 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
769 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
770 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
771 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
772 log -r tip -p --git |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
773 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
774 $ hg log -r tip -p --git |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
775 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
776 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
777 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
778 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
779 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
780 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
781 diff --git a/b1 b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
782 --- a/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
783 +++ b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
784 @@ -1,1 +1,2 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
785 b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
786 +postm |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
787 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
788 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
789 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
790 log -r "" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
791 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
792 $ hg log -r '' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
793 hg: parse error: empty query |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
794 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
795 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
796 log -r <some unknown node id> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
797 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
798 $ hg log -r 1000000000000000000000000000000000000000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
799 abort: unknown revision '1000000000000000000000000000000000000000'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
800 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
801 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
802 log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
803 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
804 $ hg log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
805 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
806 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
807 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
808 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
809 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
810 log -p -l2 --color=always |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
811 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
812 $ hg --config extensions.color= --config color.mode=ansi \ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
813 > log -p -l2 --color=always |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
814 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
815 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
816 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
817 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
818 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
819 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
820 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
821 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
822 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
823 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
824 b1 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
825 \x1b[0;32m+postm\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
826 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
827 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
828 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
829 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
830 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
831 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
832 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
833 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
834 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
835 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
836 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
837 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
838 \x1b[0;32m+b2\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
839 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
840 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
841 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
842 log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
843 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
844 $ hg log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
845 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
846 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
847 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
848 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
849 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
850 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
851 b1 | 1 + |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
852 1 files changed, 1 insertions(+), 0 deletions(-) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
853 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
854 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
855 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
856 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
857 |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
858 User |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
859 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
860 $ hg init usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
861 $ cd usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
862 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
863 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
864 $ hg ci -A -m "a" -u "User One <user1@example.org>" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
865 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
866 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
867 $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
868 adding b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
869 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
870 $ hg log -u "User One <user1@example.org>" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
871 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
872 user: User One <user1@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
873 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
874 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
875 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
876 $ hg log -u "user1" -u "user2" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
877 changeset: 1:e834b5e69c0e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
878 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
879 user: User Two <user2@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
880 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
881 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
882 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
883 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
884 user: User One <user1@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
885 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
886 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
887 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
888 $ hg log -u "user3" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
889 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
890 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
891 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
892 $ hg init branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
893 $ cd branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
894 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
895 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
896 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
897 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
898 $ hg branch test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
899 marked working directory as branch test |
15615 | 900 (branches are permanent and global, did you want a bookmark?) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
901 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
902 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
903 adding b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
904 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
905 $ hg up default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
906 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
907 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
908 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
909 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
910 $ hg up test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
911 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
912 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
913 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
914 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
915 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
916 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
917 log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
918 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
919 $ hg log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
920 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
921 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
922 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
923 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
924 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
925 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
926 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
927 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
928 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
929 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
930 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
931 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
932 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
933 log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
934 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
935 $ hg log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
936 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
937 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
938 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
939 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
940 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
941 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
942 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
943 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
944 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
945 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
946 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
947 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
948 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
949 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
950 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
951 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
952 log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
953 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
954 $ hg log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
955 abort: unknown revision 'dummy'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
956 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
957 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
958 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
959 log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
960 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
961 $ hg log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
962 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
963 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
964 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
965 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
966 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
967 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
968 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
969 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
970 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
971 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
972 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
973 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
974 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
975 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
976 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
977 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
978 log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
979 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
980 $ hg log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
981 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
982 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
983 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
984 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
985 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
986 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
987 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
988 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
989 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
990 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
991 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
992 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
993 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
994 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
995 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
996 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
997 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
998 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
999 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1001 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1002 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1003 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1004 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1005 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1006 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1007 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1008 log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1009 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1010 $ hg log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1011 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1012 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1013 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1014 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1015 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1016 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1017 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1018 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1019 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1020 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1021 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1022 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1023 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1024 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1025 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1026 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1027 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1028 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1029 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1030 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1031 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1032 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1033 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1034 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1035 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1036 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1037 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1038 log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1039 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1040 $ hg log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1041 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1042 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1043 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1044 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1045 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1046 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1047 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1048 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1049 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1050 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1051 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1052 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1053 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1054 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1055 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1056 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1057 log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1058 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1059 $ hg log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1060 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1061 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1062 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1063 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1064 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1065 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1066 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1067 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1068 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1069 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1070 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1071 #if gettext |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1072 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1073 Test that all log names are translated (e.g. branches, bookmarks, tags): |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1074 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1075 $ hg bookmark babar -r tip |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1076 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1077 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1078 \xc3\x84nderung: 3:f5d8de11c2e2 (esc) |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1079 Zweig: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1080 Lesezeichen: babar |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1081 Marke: tip |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1082 Vorg\xc3\xa4nger: 1:d32277701ccb (esc) |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1083 Nutzer: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1084 Datum: Thu Jan 01 00:00:00 1970 +0000 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1085 Zusammenfassung: commit on test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1086 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1087 $ hg bookmark -d babar |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1088 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1089 #endif |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1090 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1091 log -p --cwd dir (in subdir) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1092 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1093 $ mkdir dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1094 $ hg log -p --cwd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1095 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1096 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1097 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1098 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1099 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1100 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1101 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1102 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1103 diff -r d32277701ccb -r f5d8de11c2e2 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1104 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1105 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1106 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1107 +c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1108 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1109 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1110 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1111 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1112 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1113 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1114 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1115 diff -r 24427303d56f -r c3a4f03cc9a7 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1116 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1117 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1118 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1119 +c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1120 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1121 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1122 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1123 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1124 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1125 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1126 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1127 diff -r 24427303d56f -r d32277701ccb b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1128 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1129 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1130 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1131 +b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1132 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1133 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1134 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1135 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1136 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1137 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1138 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1139 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1140 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1141 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1142 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1143 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1144 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1145 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1146 log -p -R repo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1147 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1148 $ cd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1149 $ hg log -p -R .. ../a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1150 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1151 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1152 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1153 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1154 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1155 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1156 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1157 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1158 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1159 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1160 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1161 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1162 $ cd ../.. |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1163 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1164 $ hg init follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1165 $ cd follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1166 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1167 # Build the following history: |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1168 # tip - o - x - o - x - x |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1169 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1170 # o - o - o - x |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1171 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1172 # o |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1173 # |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1174 # Where "o" is a revision containing "foo" and |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1175 # "x" is a revision without "foo" |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1176 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1177 $ touch init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1178 $ hg ci -A -m "init, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1179 adding init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1180 $ echo 'foo' > init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1181 $ hg ci -m "change, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1182 $ echo 'foo' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1183 $ hg ci -A -m "add unrelated old foo" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1184 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1185 $ hg rm foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1186 $ hg ci -m "delete foo, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1187 $ echo 'related' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1188 $ hg ci -A -m "add foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1189 adding foo |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1190 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1191 $ hg up 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1192 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1193 $ touch branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1194 $ hg ci -A -m "first branch, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1195 adding branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1196 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1197 $ touch foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1198 $ hg ci -A -m "create foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1199 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1200 $ echo 'change' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1201 $ hg ci -m "change foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1202 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1203 $ hg up 6 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1205 $ echo 'change foo in branch' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1206 $ hg ci -m "change foo in branch, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1207 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1208 $ hg merge 7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1209 merging foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1210 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15442
diff
changeset
|
1211 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1212 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
11900
diff
changeset
|
1213 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1214 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1215 $ echo 'merge 1' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1216 $ hg resolve -m foo |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21877
diff
changeset
|
1217 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1218 $ hg ci -m "First merge, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1219 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1220 $ hg merge 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1221 merging foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1222 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15442
diff
changeset
|
1223 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1224 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
11900
diff
changeset
|
1225 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1226 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1227 $ echo 'merge 2' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1228 $ hg resolve -m foo |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21877
diff
changeset
|
1229 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1230 $ hg ci -m "Last merge, related" |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1231 |
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
16923
diff
changeset
|
1232 $ hg log --graph |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1233 @ changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1234 |\ tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1235 | | parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1236 | | parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1237 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1238 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1239 | | summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1240 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1241 | o changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1242 | |\ parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1243 | | | parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1244 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1245 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1246 | | | summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1247 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1248 | | o changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1249 | | | parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1250 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1251 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1252 | | | summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1253 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1254 | o | changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1255 | |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1256 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1257 | | summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1258 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1259 | o changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1260 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1261 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1262 | | summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1263 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1264 | o changeset: 5:73db34516eb9 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1265 | | parent: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1266 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1267 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1268 | | summary: first branch, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1269 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1270 o | changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1271 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1272 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1273 | | summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1274 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1275 o | changeset: 3:dd78ae4afb56 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1276 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1277 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1278 | | summary: delete foo, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1279 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1280 o | changeset: 2:c4c64aedf0f7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1281 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1282 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1283 | | summary: add unrelated old foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1284 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1285 o | changeset: 1:e5faa7440653 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1286 |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1287 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1288 | summary: change, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1289 | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1290 o changeset: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1291 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1292 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1293 summary: init, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1294 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1295 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1296 $ hg --traceback log -f foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1297 changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1298 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1299 parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1300 parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1301 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1302 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1303 summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1304 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1305 changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1306 parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1307 parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1308 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1309 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1310 summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1311 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1312 changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1313 parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1314 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1315 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1316 summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1317 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1318 changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1319 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1320 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1321 summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1322 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1323 changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1324 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1325 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1326 summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1327 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1328 changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1329 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1330 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1331 summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1332 |
12383 | 1333 |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1334 Also check when maxrev < lastrevfilelog |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1335 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1336 $ hg --traceback log -f -r4 foo |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1337 changeset: 4:88176d361b69 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1338 user: test |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1339 date: Thu Jan 01 00:00:00 1970 +0000 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1340 summary: add foo, related |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1341 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1342 $ cd .. |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1343 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12383
diff
changeset
|
1344 Issue2383: hg log showing _less_ differences than hg diff |
12383 | 1345 |
1346 $ hg init issue2383 | |
1347 $ cd issue2383 | |
1348 | |
1349 Create a test repo: | |
1350 | |
1351 $ echo a > a | |
1352 $ hg ci -Am0 | |
1353 adding a | |
1354 $ echo b > b | |
1355 $ hg ci -Am1 | |
1356 adding b | |
1357 $ hg co 0 | |
1358 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1359 $ echo b > a | |
1360 $ hg ci -m2 | |
1361 created new head | |
1362 | |
1363 Merge: | |
1364 | |
1365 $ hg merge | |
1366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1367 (branch merge, don't forget to commit) | |
1368 | |
1369 Make sure there's a file listed in the merge to trigger the bug: | |
1370 | |
1371 $ echo c > a | |
1372 $ hg ci -m3 | |
1373 | |
1374 Two files shown here in diff: | |
1375 | |
1376 $ hg diff --rev 2:3 | |
1377 diff -r b09be438c43a -r 8e07aafe1edc a | |
1378 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1379 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1380 @@ -1,1 +1,1 @@ | |
1381 -b | |
1382 +c | |
1383 diff -r b09be438c43a -r 8e07aafe1edc b | |
1384 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1385 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1386 @@ -0,0 +1,1 @@ | |
1387 +b | |
1388 | |
1389 Diff here should be the same: | |
1390 | |
1391 $ hg log -vpr 3 | |
1392 changeset: 3:8e07aafe1edc | |
1393 tag: tip | |
1394 parent: 2:b09be438c43a | |
1395 parent: 1:925d80f479bb | |
1396 user: test | |
1397 date: Thu Jan 01 00:00:00 1970 +0000 | |
1398 files: a | |
1399 description: | |
1400 3 | |
1401 | |
1402 | |
1403 diff -r b09be438c43a -r 8e07aafe1edc a | |
1404 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1405 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1406 @@ -1,1 +1,1 @@ | |
1407 -b | |
1408 +c | |
1409 diff -r b09be438c43a -r 8e07aafe1edc b | |
1410 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1411 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1412 @@ -0,0 +1,1 @@ | |
1413 +b | |
1414 | |
1415 $ cd .. | |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1416 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1417 'hg log -r rev fn' when last(filelog(fn)) != rev |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1418 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1419 $ hg init simplelog |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1420 $ cd simplelog |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1421 $ echo f > a |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1422 $ hg ci -Am'a' -d '0 0' |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1423 adding a |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1424 $ echo f >> a |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1425 $ hg ci -Am'a bis' -d '1 0' |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1426 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1427 $ hg log -r0 a |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1428 changeset: 0:9f758d63dcde |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1429 user: test |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1430 date: Thu Jan 01 00:00:00 1970 +0000 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1431 summary: a |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1432 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1433 enable obsolete to test hidden feature |
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1434 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1435 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1436 > [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1437 > evolution=createmarkers |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1438 > EOF |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1439 |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1440 $ hg log --template='{rev}:{node}\n' |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1441 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1442 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1443 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1444 $ hg up null -q |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1445 $ hg log --template='{rev}:{node}\n' |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1446 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1447 $ hg log --template='{rev}:{node}\n' --hidden |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1448 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1449 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1450 $ hg log -r a |
23046
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
1451 abort: hidden revision 'a'! |
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
1452 (use --hidden to access hidden revisions) |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1453 [255] |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1454 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1455 test that parent prevent a changeset to be hidden |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1456 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18250
diff
changeset
|
1457 $ hg up 1 -q --hidden |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1458 $ hg log --template='{rev}:{node}\n' |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1459 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1460 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1461 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1462 test that second parent prevent a changeset to be hidden too |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1463 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1464 $ hg debugsetparents 0 1 # nothing suitable to merge here |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1465 $ hg log --template='{rev}:{node}\n' |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1466 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1467 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1468 $ hg debugsetparents 1 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1469 $ hg up -q null |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1470 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1471 bookmarks prevent a changeset being hidden |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1472 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1473 $ hg bookmark --hidden -r 1 X |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1474 $ hg log --template '{rev}:{node}\n' |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1475 1:a765632148dc55d38c35c4f247c618701886cb2f |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1476 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1477 $ hg bookmark -d X |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1478 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1479 divergent bookmarks are not hidden |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1480 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1481 $ hg bookmark --hidden -r 1 X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1482 $ hg log --template '{rev}:{node}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1483 1:a765632148dc55d38c35c4f247c618701886cb2f |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1484 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1485 |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1486 clear extensions configuration |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1487 $ echo '[extensions]' >> $HGRCPATH |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1488 $ echo "obs=!" >> $HGRCPATH |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1489 $ cd .. |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1490 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1491 test -u/-k for problematic encoding |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1492 # unicode: cp932: |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1493 # u30A2 0x83 0x41(= 'A') |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1494 # u30C2 0x83 0x61(= 'a') |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1495 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1496 $ hg init problematicencoding |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1497 $ cd problematicencoding |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1498 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1499 $ python > setup.sh <<EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1500 > print u''' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1501 > echo a > text |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1502 > hg add text |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1503 > hg --encoding utf-8 commit -u '\u30A2' -m none |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1504 > echo b > text |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1505 > hg --encoding utf-8 commit -u '\u30C2' -m none |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1506 > echo c > text |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1507 > hg --encoding utf-8 commit -u none -m '\u30A2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1508 > echo d > text |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1509 > hg --encoding utf-8 commit -u none -m '\u30C2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1510 > '''.encode('utf-8') |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1511 > EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1512 $ sh < setup.sh |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1513 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1514 test in problematic encoding |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1515 $ python > test.sh <<EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1516 > print u''' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1517 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1518 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1519 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1520 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1521 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1522 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1523 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1524 > '''.encode('cp932') |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1525 > EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1526 $ sh < test.sh |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1527 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1528 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1529 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1530 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1531 2 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1532 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1533 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1534 3 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1535 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1536 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1537 $ cd .. |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1538 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1539 test hg log on non-existent files and on directories |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1540 $ hg init issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1541 $ cd issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1542 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1543 $ echo 1 > d1/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1544 $ echo 1 > D2/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1545 $ echo 1 > D3.i/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1546 $ echo 1 > d4.hg/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1547 $ echo 1 > d5.d/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1548 $ echo 1 > .d6/f1 |
17781
8ce535745500
test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b
Adrian Buehlmann <adrian@cadifra.com>
parents:
17746
diff
changeset
|
1549 $ hg -q add . |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1550 $ hg commit -m "a bunch of weird directories" |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1551 $ hg log -l1 d1/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1552 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1553 $ hg log -l1 f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1554 $ hg log -l1 . | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1555 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1556 $ hg log -l1 ./ | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1557 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1558 $ hg log -l1 d1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1559 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1560 $ hg log -l1 D2 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1561 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1562 $ hg log -l1 D2/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1563 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1564 $ hg log -l1 D3.i | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1565 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1566 $ hg log -l1 D3.i/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1567 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1568 $ hg log -l1 d4.hg | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1569 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1570 $ hg log -l1 d4.hg/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1571 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1572 $ hg log -l1 d5.d | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1573 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1574 $ hg log -l1 d5.d/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1575 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1576 $ hg log -l1 .d6 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1577 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1578 $ hg log -l1 .d6/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1579 changeset: 0:65624cd9070a |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1580 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1581 issue3772: hg log -r :null showing revision 0 as well |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1582 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1583 $ hg log -r :null |
20699
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1584 changeset: 0:65624cd9070a |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1585 tag: tip |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1586 user: test |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1587 date: Thu Jan 01 00:00:00 1970 +0000 |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1588 summary: a bunch of weird directories |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1589 |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1590 changeset: -1:000000000000 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1591 user: |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1592 date: Thu Jan 01 00:00:00 1970 +0000 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1593 |
18468
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1594 $ hg log -r null:null |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1595 changeset: -1:000000000000 |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1596 user: |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1597 date: Thu Jan 01 00:00:00 1970 +0000 |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1598 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1599 Check that adding an arbitrary name shows up in log automatically |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1600 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1601 $ cat > ../names.py <<EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1602 > """A small extension to test adding arbitrary names to a repo""" |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1603 > from mercurial.namespaces import namespace |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1604 > |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1605 > def reposetup(ui, repo): |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1606 > foo = {'foo': repo[0].node()} |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
1607 > names = lambda r: foo.keys() |
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
1608 > namemap = lambda r, name: foo.get(name) |
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
1609 > nodemap = lambda r, node: [name for name, n in foo.iteritems() |
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
1610 > if n == node] |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1611 > ns = namespace("bars", templatename="bar", logname="barlog", |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1612 > colorname="barcolor", listnames=names, namemap=namemap, |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1613 > nodemap=nodemap) |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
1614 > |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1615 > repo.names.addnamespace(ns) |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1616 > EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1617 |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1618 $ hg --config extensions.names=../names.py log -r 0 |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1619 changeset: 0:65624cd9070a |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1620 tag: tip |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1621 barlog: foo |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1622 user: test |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1623 date: Thu Jan 01 00:00:00 1970 +0000 |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1624 summary: a bunch of weird directories |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
1625 |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1626 $ hg --config extensions.names=../names.py \ |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1627 > --config extensions.color= --config color.log.barcolor=red \ |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1628 > --color=always log -r 0 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1629 \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1630 tag: tip |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1631 \x1b[0;31mbarlog: foo\x1b[0m (esc) |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1632 user: test |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1633 date: Thu Jan 01 00:00:00 1970 +0000 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1634 summary: a bunch of weird directories |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1635 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1636 $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1637 foo |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
1638 |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1639 $ cd .. |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1640 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1641 hg log -f dir across branches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1642 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1643 $ hg init acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1644 $ cd acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1645 $ mkdir d |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1646 $ echo a > d/a && hg ci -Aqm a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1647 $ echo b > d/a && hg ci -Aqm b |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1648 $ hg up -q 0 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1649 $ echo b > d/a && hg ci -Aqm c |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1650 $ hg log -f d -T '{desc}' -G |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1651 @ c |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1652 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1653 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1654 |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1655 Ensure that largefiles doesn't intefere with following a normal file |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1656 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1657 @ c |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1658 | |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1659 o a |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
1660 |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1661 $ hg log -f d/a -T '{desc}' -G |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1662 @ c |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1663 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1664 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1665 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
1666 $ cd .. |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1667 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1668 hg log -f with linkrev pointing to another branch |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1669 ------------------------------------------------- |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1670 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1671 create history with a filerev whose linkrev points to another branch |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1672 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1673 $ hg init branchedlinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1674 $ cd branchedlinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1675 $ echo 1 > a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1676 $ hg commit -Am 'content1' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1677 adding a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1678 $ echo 2 > a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1679 $ hg commit -m 'content2' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1680 $ hg up --rev 'desc(content1)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1681 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1682 $ echo unrelated > unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1683 $ hg commit -Am 'unrelated' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1684 adding unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1685 created new head |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1686 $ hg graft -r 'desc(content2)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1687 grafting 1:2294ae80ad84 "content2" |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1688 $ echo 3 > a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1689 $ hg commit -m 'content3' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1690 $ hg log -G |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1691 @ changeset: 4:50b9b36e9c5d |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1692 | tag: tip |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1693 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1694 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1695 | summary: content3 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1696 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1697 o changeset: 3:15b2327059e5 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1698 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1699 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1700 | summary: content2 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1701 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1702 o changeset: 2:2029acd1168c |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1703 | parent: 0:ae0a3c9f9e95 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1704 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1705 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1706 | summary: unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1707 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1708 | o changeset: 1:2294ae80ad84 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1709 |/ user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1710 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1711 | summary: content2 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1712 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1713 o changeset: 0:ae0a3c9f9e95 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1714 user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1715 date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1716 summary: content1 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1717 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1718 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1719 log -f on the file should list the graft result. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1720 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1721 $ hg log -Gf a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1722 @ changeset: 4:50b9b36e9c5d |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1723 | tag: tip |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1724 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1725 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1726 | summary: content3 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1727 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1728 o changeset: 3:15b2327059e5 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1729 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1730 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1731 | summary: content2 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1732 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1733 o changeset: 0:ae0a3c9f9e95 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1734 user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1735 date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1736 summary: content1 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1737 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1738 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1739 plain log lists the original version |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1740 (XXX we should probably list both) |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1741 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1742 $ hg log -G a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1743 @ changeset: 4:50b9b36e9c5d |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1744 | tag: tip |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1745 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1746 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1747 | summary: content3 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1748 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1749 | o changeset: 1:2294ae80ad84 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1750 |/ user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1751 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1752 | summary: content2 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1753 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1754 o changeset: 0:ae0a3c9f9e95 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1755 user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1756 date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1757 summary: content1 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1758 |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1759 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1760 hg log -f from the grafted changeset |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1761 (The bootstrap should properly take the topology in account) |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1762 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1763 $ hg up 'desc(content3)^' |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1764 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1765 $ hg log -Gf a |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1766 @ changeset: 3:15b2327059e5 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1767 | user: test |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1768 | date: Thu Jan 01 00:00:00 1970 +0000 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1769 | summary: content2 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1770 | |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1771 o changeset: 0:ae0a3c9f9e95 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1772 user: test |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1773 date: Thu Jan 01 00:00:00 1970 +0000 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1774 summary: content1 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1775 |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1776 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1777 Test that we use the first non-hidden changeset in that case. |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1778 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1779 (hide the changeset) |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1780 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1781 $ hg log -T '{node}\n' -r 1 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1782 2294ae80ad8447bc78383182eeac50cb049df623 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1783 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1784 $ hg log -G |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1785 o changeset: 4:50b9b36e9c5d |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1786 | tag: tip |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1787 | user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1788 | date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1789 | summary: content3 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1790 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1791 @ changeset: 3:15b2327059e5 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1792 | user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1793 | date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1794 | summary: content2 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1795 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1796 o changeset: 2:2029acd1168c |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1797 | parent: 0:ae0a3c9f9e95 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1798 | user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1799 | date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1800 | summary: unrelated |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1801 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1802 o changeset: 0:ae0a3c9f9e95 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1803 user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1804 date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1805 summary: content1 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1806 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1807 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1808 Check that log on the file does not drop the file revision. |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1809 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1810 $ hg log -G a |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1811 o changeset: 4:50b9b36e9c5d |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1812 | tag: tip |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1813 | user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1814 | date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1815 | summary: content3 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1816 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1817 @ changeset: 3:15b2327059e5 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1818 | user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1819 | date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1820 | summary: content2 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1821 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1822 o changeset: 0:ae0a3c9f9e95 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1823 user: test |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1824 date: Thu Jan 01 00:00:00 1970 +0000 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1825 summary: content1 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1826 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
1827 |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1828 Even when a head revision is linkrev-shadowed. |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1829 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1830 $ hg log -T '{node}\n' -r 4 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1831 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1832 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1833 $ hg log -G a |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1834 @ changeset: 3:15b2327059e5 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1835 | tag: tip |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1836 | user: test |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1837 | date: Thu Jan 01 00:00:00 1970 +0000 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1838 | summary: content2 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1839 | |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1840 o changeset: 0:ae0a3c9f9e95 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1841 user: test |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1842 date: Thu Jan 01 00:00:00 1970 +0000 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1843 summary: content1 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1844 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
1845 |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23500
diff
changeset
|
1846 $ cd .. |
23729
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1847 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1848 Even when the file revision is missing from some head: |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1849 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1850 $ hg init issue4490 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1851 $ cd issue4490 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1852 $ echo '[experimental]' >> .hg/hgrc |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1853 $ echo 'evolution=createmarkers' >> .hg/hgrc |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1854 $ echo a > a |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1855 $ hg ci -Am0 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1856 adding a |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1857 $ echo b > b |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1858 $ hg ci -Am1 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1859 adding b |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1860 $ echo B > b |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1861 $ hg ci --amend -m 1 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1862 $ hg up 0 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1863 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1864 $ echo c > c |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1865 $ hg ci -Am2 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1866 adding c |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1867 created new head |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1868 $ hg up 'head() and not .' |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1869 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1870 $ hg log -G |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1871 o changeset: 4:db815d6d32e6 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1872 | tag: tip |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1873 | parent: 0:f7b1eb17ad24 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1874 | user: test |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1875 | date: Thu Jan 01 00:00:00 1970 +0000 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1876 | summary: 2 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1877 | |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1878 | @ changeset: 3:9bc8ce7f9356 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1879 |/ parent: 0:f7b1eb17ad24 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1880 | user: test |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1881 | date: Thu Jan 01 00:00:00 1970 +0000 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1882 | summary: 1 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1883 | |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1884 o changeset: 0:f7b1eb17ad24 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1885 user: test |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1886 date: Thu Jan 01 00:00:00 1970 +0000 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1887 summary: 0 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1888 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1889 $ hg log -f -G b |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1890 @ changeset: 3:9bc8ce7f9356 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1891 | parent: 0:f7b1eb17ad24 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1892 | user: test |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1893 | date: Thu Jan 01 00:00:00 1970 +0000 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1894 | summary: 1 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1895 | |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1896 $ hg log -G b |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1897 @ changeset: 3:9bc8ce7f9356 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1898 | parent: 0:f7b1eb17ad24 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1899 | user: test |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1900 | date: Thu Jan 01 00:00:00 1970 +0000 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1901 | summary: 1 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
1902 | |
23865
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1903 $ cd .. |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1904 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1905 Check proper report when the manifest changes but not the file issue4499 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1906 ------------------------------------------------------------------------ |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1907 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1908 $ hg init issue4499 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1909 $ cd issue4499 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1910 $ for f in A B C D F E G H I J K L M N O P Q R S T U; do |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1911 > echo 1 > $f; |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1912 > hg add $f; |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1913 > done |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1914 $ hg commit -m 'A1B1C1' |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1915 $ echo 2 > A |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1916 $ echo 2 > B |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1917 $ echo 2 > C |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1918 $ hg commit -m 'A2B2C2' |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1919 $ hg up 0 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1920 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1921 $ echo 3 > A |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1922 $ echo 2 > B |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1923 $ echo 2 > C |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1924 $ hg commit -m 'A3B2C2' |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1925 created new head |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1926 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1927 $ hg log -G |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1928 @ changeset: 2:fe5fc3d0eb17 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1929 | tag: tip |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1930 | parent: 0:abf4f0e38563 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1931 | user: test |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1932 | date: Thu Jan 01 00:00:00 1970 +0000 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1933 | summary: A3B2C2 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1934 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1935 | o changeset: 1:07dcc6b312c0 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1936 |/ user: test |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1937 | date: Thu Jan 01 00:00:00 1970 +0000 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1938 | summary: A2B2C2 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1939 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1940 o changeset: 0:abf4f0e38563 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1941 user: test |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1942 date: Thu Jan 01 00:00:00 1970 +0000 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1943 summary: A1B1C1 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1944 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1945 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1946 Log -f on B should reports current changesets |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1947 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1948 $ hg log -fG B |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1949 @ changeset: 2:fe5fc3d0eb17 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1950 | tag: tip |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1951 | parent: 0:abf4f0e38563 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1952 | user: test |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1953 | date: Thu Jan 01 00:00:00 1970 +0000 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1954 | summary: A3B2C2 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1955 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1956 o changeset: 0:abf4f0e38563 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1957 user: test |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1958 date: Thu Jan 01 00:00:00 1970 +0000 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1959 summary: A1B1C1 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1960 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
1961 $ cd .. |