Mercurial > hg
annotate tests/test-log.t @ 35659:821d8a5ab4ff
match: do not weirdly include explicit files excluded by -X option
Actually, this was the original behavior. Before a83a7d27911e, "log" and
"files" showed nothing if "FILE -X FILE" was specified, whereas "debugwalk"
got confused by an explicit FILE pattern. Under the hood, "log" and "files"
use m() and ctx.matches(m) respectively, and "debugwalk" uses ctx.walk(m).
I suspect dirstate.walk() goes wrong in _walkexplicit(), which seems to
blindly trust m.files().
I reckon the original "log"/"files" behavior is correct, and drop the hack
from the differencematcher.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Tue, 16 Jan 2018 22:14:33 +0900 |
parents | 7336ac5e786e |
children | 1c929b4942a3 |
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 |
34455
5c122b410706
tests: change to parent directory before all "hg init" in test-log.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34085
diff
changeset
|
18 $ cd .. |
5c122b410706
tests: change to parent directory before all "hg init" in test-log.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34085
diff
changeset
|
19 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
20 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
|
21 changeset graph |
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
22 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
23 $ hg init a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
24 $ cd a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
25 $ echo a > a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
26 $ echo f > f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
27 $ hg ci -Ama -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
28 adding a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
29 adding f |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
31 $ hg cp a b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
32 $ hg cp f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
33 $ 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
|
34 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
35 $ mkdir dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
36 $ hg mv b dir |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
37 $ echo g >> g |
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
38 $ echo f >> f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
39 $ 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
|
40 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
41 $ hg mv a b |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
42 $ hg cp -f f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
43 $ echo a > d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
44 $ hg add d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
45 $ hg ci -md -d '4 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
46 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
47 $ hg mv dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
48 $ 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
|
49 |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
50 Make sure largefiles doesn't interfere with logging a regular file |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
51 $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= |
33212
fe0667cc521e
tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32308
diff
changeset
|
52 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
32308
e8569cc131d1
py3: explicitly convert a list to bytes to pass in ui.debug
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31765
diff
changeset
|
53 updated patterns: .hglf/a, a |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
54 0: a |
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 |
24206
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
61 $ hg log glob:a* |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
62 changeset: 3:2ca5ba701980 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
63 user: test |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
64 date: Thu Jan 01 00:00:04 1970 +0000 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
65 summary: d |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
66 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
67 changeset: 0:9161b9aeaf16 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
68 user: test |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
69 date: Thu Jan 01 00:00:01 1970 +0000 |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
70 summary: a |
13c1e66f9653
largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents:
24189
diff
changeset
|
71 |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
72 $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= |
33212
fe0667cc521e
tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32308
diff
changeset
|
73 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
32308
e8569cc131d1
py3: explicitly convert a list to bytes to pass in ui.debug
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31765
diff
changeset
|
74 updated patterns: glob:.hglf/a*, glob:a* |
24207
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
75 3: d |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
76 0: a |
d90e3faf96a9
largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents:
24206
diff
changeset
|
77 |
18340
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
78 log on directory |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
79 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
80 $ hg log dir |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
81 changeset: 4:7e4639b4691b |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
82 tag: tip |
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:05 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: e |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
86 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
87 changeset: 2:f8954cd4dc1f |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
88 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
89 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
|
90 summary: c |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
91 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
92 $ 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
|
93 changeset: 4:7e4639b4691b |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
94 tag: tip |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
95 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
96 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
|
97 summary: e |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
98 |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
99 changeset: 2:f8954cd4dc1f |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
100 user: test |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
101 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
|
102 summary: c |
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
103 |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
104 |
35659
821d8a5ab4ff
match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents:
35611
diff
changeset
|
105 -X, with explicit path |
821d8a5ab4ff
match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents:
35611
diff
changeset
|
106 |
821d8a5ab4ff
match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents:
35611
diff
changeset
|
107 $ hg log a -X a |
821d8a5ab4ff
match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents:
35611
diff
changeset
|
108 |
21998 | 109 -f, non-existent directory |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
110 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
111 $ hg log -f dir |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
112 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
|
113 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
114 |
21998 | 115 -f, directory |
116 | |
117 $ hg up -q 3 | |
118 $ hg log -f dir | |
119 changeset: 2:f8954cd4dc1f | |
120 user: test | |
121 date: Thu Jan 01 00:00:03 1970 +0000 | |
122 summary: c | |
123 | |
124 -f, directory with --patch | |
125 | |
126 $ hg log -f dir -p | |
127 changeset: 2:f8954cd4dc1f | |
128 user: test | |
129 date: Thu Jan 01 00:00:03 1970 +0000 | |
130 summary: c | |
131 | |
132 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
133 --- /dev/null* (glob) | |
134 +++ b/dir/b* (glob) | |
135 @@ -0,0 +1,1 @@ | |
136 +a | |
137 | |
138 | |
139 -f, pattern | |
140 | |
141 $ hg log -f -I 'dir**' -p | |
142 changeset: 2:f8954cd4dc1f | |
143 user: test | |
144 date: Thu Jan 01 00:00:03 1970 +0000 | |
145 summary: c | |
146 | |
147 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
148 --- /dev/null* (glob) | |
149 +++ b/dir/b* (glob) | |
150 @@ -0,0 +1,1 @@ | |
151 +a | |
152 | |
153 $ hg up -q 4 | |
154 | |
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
|
155 -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
|
156 |
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
157 $ 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
|
158 abort: style 'something' not found |
31765
264baeef3588
show: new extension for displaying various repository data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30044
diff
changeset
|
159 (available styles: bisect, changelog, compact, default, phases, show, status, 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
|
160 [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
|
161 |
19126
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
162 -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
|
163 |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
164 |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
165 $ 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
|
166 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
|
167 tag: tip |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
168 phase: draft |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
169 user: test |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
170 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
|
171 summary: e |
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
172 |
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
|
173 |
24493
e810c7da1cae
templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
174 $ hg log -f -l1 --style phases -q |
e810c7da1cae
templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
175 4:7e4639b4691b |
e810c7da1cae
templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
176 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
177 -f, but no args |
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
178 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
179 $ hg log -f |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
180 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
181 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
182 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
183 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
184 summary: e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
185 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
186 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
187 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
188 date: Thu Jan 01 00:00:04 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
189 summary: d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
190 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
191 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
192 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
193 date: Thu Jan 01 00:00:03 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
194 summary: c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
195 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
196 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
197 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
198 date: Thu Jan 01 00:00:02 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
199 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
200 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
201 changeset: 0:9161b9aeaf16 |
11900
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:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
204 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
205 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
206 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
207 one rename |
11562
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
208 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
209 $ hg up -q 2 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
210 $ hg log -vf a |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
211 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
212 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
213 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
|
214 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
215 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
216 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
217 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
218 |
3197 | 219 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
220 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
|
221 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
222 $ hg up -q tip |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
223 $ hg log -vf e |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
224 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
225 tag: tip |
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:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
228 files: dir/b e |
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 e |
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 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
233 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
234 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
235 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
|
236 files: b dir/b f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
237 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
238 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
239 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
240 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
241 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
242 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
243 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
|
244 files: b g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
245 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
246 b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
247 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
248 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
249 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
250 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
251 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
|
252 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
253 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
254 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
255 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
256 |
5811
180a3eee4b75
Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4510
diff
changeset
|
257 |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
258 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
259 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
|
260 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
261 $ hg up -q 3 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
262 $ 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
|
263 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
264 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
265 date: Thu Jan 01 00:00:03 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
266 summary: c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
267 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
268 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
269 --- /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
|
270 +++ 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
|
271 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
272 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
273 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
274 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
275 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
276 date: Thu Jan 01 00:00:02 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
277 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
278 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
279 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
280 --- /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
|
281 +++ 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
|
282 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
283 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
284 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
285 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
286 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
287 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
288 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
289 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
290 diff -r 000000000000 -r 9161b9aeaf16 a |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
291 --- /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
|
292 +++ 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
|
293 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
294 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
295 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
296 |
21876
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
297 log -pf b inside dir |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
298 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
299 $ hg --cwd=dir log -pf b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
300 changeset: 2:f8954cd4dc1f |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
301 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
302 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
|
303 summary: c |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
304 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
305 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
|
306 --- /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
|
307 +++ 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
|
308 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
309 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
310 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
311 changeset: 1:d89b0a12d229 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
312 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
313 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
|
314 summary: b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
315 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
316 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
317 --- /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
|
318 +++ 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
|
319 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
320 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
321 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
322 changeset: 0:9161b9aeaf16 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
323 user: test |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
324 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
|
325 summary: a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
326 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
327 diff -r 000000000000 -r 9161b9aeaf16 a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
328 --- /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
|
329 +++ 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
|
330 @@ -0,0 +1,1 @@ |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
331 +a |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
332 |
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
333 |
21966
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
334 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
|
335 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
336 $ 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
|
337 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
|
338 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
339 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
|
340 summary: d |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
341 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
342 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
|
343 --- 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
|
344 +++ /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
|
345 @@ -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
|
346 -a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
347 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
|
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 +++ 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
|
350 @@ -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
|
351 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
352 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
|
353 --- /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
|
354 +++ 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
|
355 @@ -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
|
356 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
357 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
|
358 --- 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
|
359 +++ 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
|
360 @@ -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
|
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 -g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
363 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
364 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
365 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
|
366 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
367 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
|
368 summary: c |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
369 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
370 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
|
371 --- 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
|
372 +++ /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
|
373 @@ -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
|
374 -a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
375 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
|
376 --- /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
|
377 +++ 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
|
378 @@ -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
|
379 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
380 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
|
381 --- 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
|
382 +++ 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
|
383 @@ -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
|
384 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
385 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
386 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
|
387 --- 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
|
388 +++ 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
|
389 @@ -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
|
390 f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
391 +g |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
392 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
393 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
|
394 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
395 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
|
396 summary: b |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
397 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
398 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
|
399 --- /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
|
400 +++ 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
|
401 @@ -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
|
402 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
403 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
|
404 --- /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
|
405 +++ 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
|
406 @@ -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
|
407 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
408 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
409 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
|
410 user: test |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
411 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
|
412 summary: a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
413 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
414 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
|
415 --- /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
|
416 +++ 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
|
417 @@ -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
|
418 +a |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
419 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
|
420 --- /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
|
421 +++ 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
|
422 @@ -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
|
423 +f |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
424 |
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
425 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
426 log -vf dir/b |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
427 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
428 $ 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
|
429 changeset: 2:f8954cd4dc1f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
430 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
431 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
|
432 files: b dir/b f g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
433 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
434 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
435 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
436 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
437 changeset: 1:d89b0a12d229 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
438 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
439 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
|
440 files: b g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
441 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
442 b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
443 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
444 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
445 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
446 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
447 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
|
448 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
449 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
450 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
451 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
452 |
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 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
455 -f and multiple filelog heads |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
456 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
457 $ hg up -q 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
458 $ hg log -f g --template '{rev}\n' |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
459 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
460 1 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
461 0 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
462 $ hg up -q tip |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
463 $ hg log -f g --template '{rev}\n' |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
464 3 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
465 2 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
466 0 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
467 |
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
468 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
469 log copies with --copies |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
470 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
471 $ hg log -vC --template '{rev} {file_copies}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
472 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
473 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
474 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
475 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
476 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
477 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
478 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
|
479 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
480 $ 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
|
481 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
482 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
483 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
484 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
485 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
486 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
487 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
|
488 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
489 $ hg log -vC --template '{rev} {file_copies_switch}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
490 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
491 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
492 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
493 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
494 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
495 |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
496 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
497 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
|
498 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
499 $ hg log -vC -r4 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
500 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
501 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
502 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
503 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
504 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
505 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
506 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
507 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
508 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
509 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
510 $ 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
|
511 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
512 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
513 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
514 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
515 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
516 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
517 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
518 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
519 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
520 |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
521 $ 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
|
522 [ |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
523 { |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
524 "rev": 4, |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
525 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
526 "branch": "default", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
527 "phase": "draft", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
528 "user": "test", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
529 "date": [5, 0], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
530 "desc": "e", |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
531 "bookmarks": [], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
532 "tags": ["tip"], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
533 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
534 "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
|
535 "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
|
536 } |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
537 ] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
538 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
539 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
|
540 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
541 $ hg up -C 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
542 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
|
543 $ hg mv dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
544 $ echo foo > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
545 $ hg ci -Ame2 -d '6 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
546 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
547 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
548 $ 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
|
549 5 e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
550 |
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
551 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
552 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
|
553 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
554 #if execbit |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
555 $ chmod +x e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
556 $ hg ci -me3 -d '7 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
557 $ 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
|
558 6 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
559 #endif |
9421
c8e4dc218aaf
log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents:
9373
diff
changeset
|
560 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
561 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
562 log -p d |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
563 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
564 $ hg log -pv d |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
565 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
566 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
567 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
|
568 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
569 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
570 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
571 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
572 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
573 diff -r f8954cd4dc1f -r 2ca5ba701980 d |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
574 --- /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
|
575 +++ 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
|
576 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
577 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
578 |
11061
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
579 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
580 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
581 log --removed file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
582 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
583 $ 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
|
584 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
585 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
586 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
|
587 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
588 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
589 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
590 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
591 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
592 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
593 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
594 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
|
595 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
596 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
597 a |
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 |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
600 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
601 log --removed revrange file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
602 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
603 $ 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
|
604 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
605 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
606 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
|
607 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
608 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
609 a |
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 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
612 $ cd .. |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
613 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
614 log --follow tests |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
615 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
616 $ 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
|
617 $ cd follow |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
618 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
619 $ echo base > base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
620 $ hg ci -Ambase -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
621 adding base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
622 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
623 $ echo r1 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
624 $ hg ci -Amr1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
625 $ echo r2 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
626 $ 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
|
627 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
628 $ hg up -C 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
629 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
|
630 $ echo b1 > b1 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
631 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
632 log -r "follow('set:clean()')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
633 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
634 $ hg log -r "follow('set:clean()')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
635 changeset: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
636 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
637 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
638 summary: base |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
639 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
640 changeset: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
641 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
642 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
643 summary: r1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
644 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
645 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
646 $ hg ci -Amb1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
647 adding b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
648 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
649 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
650 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
651 log -f |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
652 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
653 $ hg log -f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
654 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
655 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
656 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
657 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
658 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
659 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
660 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
661 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
662 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
663 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
664 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
665 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
666 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
667 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
668 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
669 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
670 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
671 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
672 log -r follow('glob:b*') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
673 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
674 $ hg log -r "follow('glob:b*')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
675 changeset: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
676 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
677 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
678 summary: base |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
679 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
680 changeset: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
681 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
682 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
683 summary: r1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
684 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
685 changeset: 3:e62f78d544b4 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
686 tag: tip |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
687 parent: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
688 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
689 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
690 summary: b1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
691 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
692 log -f -r '1 + 4' |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
693 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
694 $ hg up -C 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
695 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
|
696 $ echo b2 > b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
697 $ hg ci -Amb2 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
698 adding b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
699 created new head |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
700 $ hg log -f -r '1 + 4' |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
701 changeset: 4:ddb82e70d1a1 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
702 tag: tip |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
703 parent: 0:67e992f2c4f3 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
704 user: test |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
705 date: Thu Jan 01 00:00:01 1970 +0000 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
706 summary: b2 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
707 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
708 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
709 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
710 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
711 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
712 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
713 changeset: 0:67e992f2c4f3 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
714 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
715 date: Thu Jan 01 00:00:01 1970 +0000 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
716 summary: base |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
717 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
718 log -r "follow('set:grep(b2)')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
719 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
720 $ hg log -r "follow('set:grep(b2)')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
721 changeset: 4:ddb82e70d1a1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
722 tag: tip |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
723 parent: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
724 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
725 date: Thu Jan 01 00:00:01 1970 +0000 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
726 summary: b2 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
727 |
29814
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
728 log -r "follow('set:grep(b2)', 4)" |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
729 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
730 $ hg up -qC 0 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
731 $ hg log -r "follow('set:grep(b2)', 4)" |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
732 changeset: 4:ddb82e70d1a1 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
733 tag: tip |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
734 parent: 0:67e992f2c4f3 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
735 user: test |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
736 date: Thu Jan 01 00:00:01 1970 +0000 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
737 summary: b2 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
738 |
35298
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
739 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
740 follow files starting from multiple revisions: |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
741 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
742 $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)" |
35298
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
743 3: b1 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
744 4: b2 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
745 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
746 follow files starting from empty revision: |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
747 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
748 $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)" |
35298
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
749 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
750 follow starting from revisions: |
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
751 |
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
752 $ hg log -Gq -r "follow(startrev=2+4)" |
35300
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
753 o 4:ddb82e70d1a1 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
754 | |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
755 | o 2:60c670bf5b30 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
756 | | |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
757 | o 1:3d5bf5654eda |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
758 |/ |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
759 @ 0:67e992f2c4f3 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
760 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
761 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
762 follow the current revision: |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
763 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
764 $ hg log -Gq -r "follow()" |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
765 @ 0:67e992f2c4f3 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
766 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
767 |
29814
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
768 $ hg up -qC 4 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
769 |
23956
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
770 log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
771 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
772 $ hg log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
773 changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
774 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
775 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
|
776 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
777 $ 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
|
778 o changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
779 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
780 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
|
781 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
782 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
783 |
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
784 log -f with null parent |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
785 |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
786 $ hg up -C null |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
787 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
788 $ hg log -f |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
789 |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
790 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
791 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
|
792 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
793 $ hg up -C 3 |
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
794 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
795 $ hg merge tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
796 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
|
797 (branch merge, don't forget to commit) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
798 $ hg log -r . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
799 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
800 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
801 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
802 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
803 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
804 |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
805 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
806 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
807 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
|
808 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
809 $ hg ci -mm12 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
810 $ hg log -r . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
811 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
812 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
813 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
814 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
815 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
816 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
817 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
818 |
11508
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11141
diff
changeset
|
819 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
820 $ echo postm >> b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
821 $ 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
|
822 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
823 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
824 log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
825 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
826 $ hg log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
827 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
828 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
829 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
830 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
831 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
832 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
833 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
834 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
835 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
836 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
837 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
838 summary: m12 |
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 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
841 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
842 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
843 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
844 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
845 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
846 changeset: 1:3d5bf5654eda |
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: r1 |
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 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
852 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
853 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
854 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
856 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
857 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
858 log -P 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
859 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
860 $ hg log -P 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
861 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
862 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
863 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
864 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
865 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
866 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
867 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
868 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
869 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
870 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
871 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
872 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
873 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
874 changeset: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
875 parent: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
876 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
877 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
878 summary: b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
879 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
880 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
881 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
882 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
883 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
884 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
885 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
886 |
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 log -r tip -p --git |
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 $ hg log -r tip -p --git |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
891 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
892 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
893 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
894 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
895 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
896 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
897 diff --git a/b1 b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
898 --- a/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
899 +++ b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
900 @@ -1,1 +1,2 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
901 b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
902 +postm |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
903 |
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 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
906 log -r "" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
907 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
908 $ hg log -r '' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
909 hg: parse error: empty query |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
910 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
911 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
912 log -r <some unknown node id> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
913 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
914 $ hg log -r 1000000000000000000000000000000000000000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
915 abort: unknown revision '1000000000000000000000000000000000000000'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
916 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
917 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
918 log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
919 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
920 $ hg log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
921 changeset: 1:3d5bf5654eda |
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:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
924 summary: r1 |
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 log -p -l2 --color=always |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
927 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
928 $ hg --config extensions.color= --config color.mode=ansi \ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
929 > 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
|
930 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
931 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
932 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
933 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
934 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
935 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
936 \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
|
937 \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
|
938 \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
|
939 \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
|
940 b1 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
941 \x1b[0;32m+postm\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
942 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
943 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
944 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
945 parent: 4:ddb82e70d1a1 |
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:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
948 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
949 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
950 \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
|
951 \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
|
952 \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
|
953 \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
|
954 \x1b[0;32m+b2\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
955 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
956 |
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 log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
959 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
960 $ hg log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
961 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
962 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
963 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
964 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
965 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
966 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
967 b1 | 1 + |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
968 1 files changed, 1 insertions(+), 0 deletions(-) |
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 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
971 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
972 |
30016
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
973 log --follow --patch FILE in repository where linkrev isn't trustworthy |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
974 (issue5376) |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
975 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
976 $ hg init follow-dup |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
977 $ cd follow-dup |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
978 $ cat <<EOF >> .hg/hgrc |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
979 > [ui] |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
980 > logtemplate = '=== {rev}: {desc}\n' |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
981 > [diff] |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
982 > nodates = True |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
983 > EOF |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
984 $ echo 0 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
985 $ hg ci -qAm 'a0' |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
986 $ echo 1 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
987 $ hg ci -m 'a1' |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
988 $ hg up -q 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
989 $ echo 1 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
990 $ touch b |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
991 $ hg ci -qAm 'a1 with b' |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
992 $ echo 3 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
993 $ hg ci -m 'a3' |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
994 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
995 fctx.rev() == 2, but fctx.linkrev() == 1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
996 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
997 $ hg log -pf a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
998 === 3: a3 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
999 diff -r 4ea02ba94d66 -r e7a6331a34f0 a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1000 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1001 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1002 @@ -1,2 +1,3 @@ |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1003 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1004 1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1005 +3 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1006 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1007 === 2: a1 with b |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1008 diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1009 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1010 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1011 @@ -1,1 +1,2 @@ |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1012 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1013 +1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1014 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1015 === 0: a0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1016 diff -r 000000000000 -r 49b5e81287e2 a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1017 --- /dev/null |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1018 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1019 @@ -0,0 +1,1 @@ |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1020 +0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1021 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1022 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1023 fctx.introrev() == 2, but fctx.linkrev() == 1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1024 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1025 $ hg up -q 2 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1026 $ hg log -pf a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1027 === 2: a1 with b |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1028 diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1029 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1030 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1031 @@ -1,1 +1,2 @@ |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1032 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1033 +1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1034 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1035 === 0: a0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1036 diff -r 000000000000 -r 49b5e81287e2 a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1037 --- /dev/null |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1038 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1039 @@ -0,0 +1,1 @@ |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1040 +0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1041 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1042 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1043 $ cd .. |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1044 |
35269
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1045 Multiple copy sources of a file: |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1046 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1047 $ hg init follow-multi |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1048 $ cd follow-multi |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1049 $ echo 0 >> a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1050 $ hg ci -qAm 'a' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1051 $ hg cp a b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1052 $ hg ci -m 'a->b' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1053 $ echo 2 >> a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1054 $ hg ci -m 'a' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1055 $ echo 3 >> b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1056 $ hg ci -m 'b' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1057 $ echo 4 >> a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1058 $ echo 4 >> b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1059 $ hg ci -m 'a,b' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1060 $ echo 5 >> a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1061 $ hg ci -m 'a0' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1062 $ echo 6 >> b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1063 $ hg ci -m 'b0' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1064 $ hg up -q 4 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1065 $ echo 7 >> b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1066 $ hg ci -m 'b1' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1067 created new head |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1068 $ echo 8 >> a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1069 $ hg ci -m 'a1' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1070 $ hg rm a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1071 $ hg mv b a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1072 $ hg ci -m 'b1->a1' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1073 $ hg merge -qt :local |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1074 $ hg ci -m '(a0,b1->a1)->a' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1075 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1076 $ hg log -GT '{rev}: {desc}\n' |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1077 @ 10: (a0,b1->a1)->a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1078 |\ |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1079 | o 9: b1->a1 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1080 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1081 | o 8: a1 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1082 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1083 | o 7: b1 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1084 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1085 o | 6: b0 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1086 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1087 o | 5: a0 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1088 |/ |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1089 o 4: a,b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1090 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1091 o 3: b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1092 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1093 o 2: a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1094 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1095 o 1: a->b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1096 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1097 o 0: a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1098 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1099 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1100 since file 'a' has multiple copy sources at the revision 4, ancestors can't |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1101 be indexed solely by fctx.linkrev(). |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1102 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1103 $ hg log -T '{rev}: {desc}\n' -f a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1104 10: (a0,b1->a1)->a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1105 9: b1->a1 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1106 7: b1 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1107 5: a0 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1108 4: a,b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1109 3: b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1110 2: a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1111 1: a->b |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1112 0: a |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1113 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1114 $ cd .. |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1115 |
28253
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1116 Test that log should respect the order of -rREV even if multiple OR conditions |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1117 are specified (issue5100): |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1118 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1119 $ hg init revorder |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1120 $ cd revorder |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1121 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1122 $ hg branch -q b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1123 $ echo 0 >> f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1124 $ hg ci -qAm k0 -u u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1125 $ hg branch -q b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1126 $ echo 1 >> f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1127 $ hg ci -qAm k1 -u u1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1128 $ hg branch -q b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1129 $ echo 2 >> f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1130 $ hg ci -qAm k2 -u u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1131 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1132 $ hg update -q b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1133 $ echo 3 >> f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1134 $ hg ci -qAm k2 -u u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1135 $ hg update -q b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1136 $ echo 4 >> f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1137 $ hg ci -qAm k1 -u u1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1138 $ hg update -q b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1139 $ echo 5 >> f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1140 $ hg ci -qAm k0 -u u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1141 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1142 summary of revisions: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1143 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1144 $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1145 @ 5 b0 u0 k0 f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1146 | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1147 | o 4 b1 u1 k1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1148 | | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1149 | | o 3 b2 u2 k2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1150 | | | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1151 | | o 2 b2 u2 k2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1152 | |/ |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1153 | o 1 b1 u1 k1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1154 |/ |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1155 o 0 b0 u0 k0 f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1156 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1157 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1158 log -b BRANCH in ascending order: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1159 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1160 $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1161 0 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1162 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1163 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1164 5 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1165 $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1166 0 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1167 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1168 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1169 5 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1170 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1171 log --only-branch BRANCH in descending order: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1172 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1173 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1174 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1175 3 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1176 2 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1177 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1178 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1179 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1180 3 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1181 2 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1182 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1183 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1184 log -u USER in ascending order, against compound set: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1185 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1186 $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1187 0 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1188 2 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1189 3 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1190 5 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1191 $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1192 0 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1193 2 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1194 3 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1195 5 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1196 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1197 log -k TEXT in descending order, against compound set: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1198 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1199 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1200 5 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1201 3 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1202 2 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1203 1 k1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1204 0 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1205 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1206 5 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1207 3 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1208 2 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1209 1 k1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1210 0 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1211 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1212 log FILE in ascending order, against dagrange: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1213 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1214 $ hg log -r1:: -T '{rev} {files}\n' f1 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1215 1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1216 2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1217 3 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1218 4 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1219 $ hg log -r1:: -T '{rev} {files}\n' f2 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1220 1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1221 2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1222 3 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1223 4 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1224 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1225 $ cd .. |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1226 |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1227 User |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1228 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1229 $ hg init usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1230 $ cd usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1231 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1232 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1233 $ 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
|
1234 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1235 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1236 $ 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
|
1237 adding b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1238 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1239 $ hg log -u "User One <user1@example.org>" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1240 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1241 user: User One <user1@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1242 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1243 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1244 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1245 $ hg log -u "user1" -u "user2" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1246 changeset: 1:e834b5e69c0e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1247 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1248 user: User Two <user2@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1249 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1250 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1251 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1252 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1253 user: User One <user1@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1254 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1255 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1256 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1257 $ hg log -u "user3" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1258 |
35547
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1259 "-u USER" shouldn't be overridden by "user(USER)" alias |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1260 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1261 $ hg log --config 'revsetalias.user(x)=branch(x)' -u default |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1262 $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1263 changeset: 0:29a4c94f1924 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1264 user: User One <user1@example.org> |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1265 date: Thu Jan 01 00:00:00 1970 +0000 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1266 summary: a |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1267 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1268 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1269 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1270 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1271 $ hg init branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1272 $ cd branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1273 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1274 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1275 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1276 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1277 $ hg branch test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1278 marked working directory as branch test |
15615 | 1279 (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
|
1280 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1281 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1282 adding b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1283 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1284 $ hg up default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1285 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
|
1286 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1287 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1288 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1289 $ hg up test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1290 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
|
1291 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1292 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1293 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1294 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1295 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1296 log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1297 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1298 $ hg log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1299 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1300 parent: 0:24427303d56f |
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: commit on default |
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: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1306 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1307 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1308 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1309 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1310 |
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 log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1313 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1314 $ hg log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1315 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1316 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1317 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1318 parent: 1:d32277701ccb |
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: commit on test |
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: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1324 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1325 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1326 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1327 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1328 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1329 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1330 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1331 log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1332 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1333 $ hg log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1334 abort: unknown revision 'dummy'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1335 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1336 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1337 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1338 log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1339 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1340 $ hg log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1341 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1342 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1343 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1344 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1345 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1346 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1347 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1348 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1349 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1350 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1351 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1352 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1353 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1354 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1355 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1356 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1357 log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1358 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1359 $ hg log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1360 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1361 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1362 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1363 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1364 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1365 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1366 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1367 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1368 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1369 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1370 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1371 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1372 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1373 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1374 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1375 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1376 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1377 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1378 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1379 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1380 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1381 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1382 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1383 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1384 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1385 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1386 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1387 log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1388 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1389 $ hg log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1390 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1391 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1392 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1393 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1394 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1395 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1396 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1397 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1398 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1399 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1400 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1401 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1402 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1403 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1404 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1405 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1406 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1407 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1408 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1409 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1410 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1411 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1412 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1413 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1414 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1415 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1416 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1417 log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1418 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1419 $ hg log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1420 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1421 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1422 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1423 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1424 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1425 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1426 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1427 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1428 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1429 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1430 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1431 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1432 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1433 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1434 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1435 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1436 log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1437 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1438 $ hg log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1439 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1440 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1441 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1442 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1443 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1444 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1445 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1446 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1447 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1448 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1449 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1450 #if gettext |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1451 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1452 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
|
1453 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1454 $ 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
|
1455 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1456 $ 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
|
1457 \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
|
1458 Zweig: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1459 Lesezeichen: babar |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1460 Marke: tip |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1461 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
|
1462 Nutzer: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1463 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
|
1464 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
|
1465 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1466 $ 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
|
1467 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1468 #endif |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1469 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1470 log -p --cwd dir (in subdir) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1471 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1472 $ mkdir dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1473 $ hg log -p --cwd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1474 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1475 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1476 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1477 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1478 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1479 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1480 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1481 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1482 diff -r d32277701ccb -r f5d8de11c2e2 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1483 --- /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
|
1484 +++ 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
|
1485 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1486 +c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1487 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1488 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1489 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1490 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1491 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1492 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1493 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1494 diff -r 24427303d56f -r c3a4f03cc9a7 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1495 --- /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
|
1496 +++ 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
|
1497 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1498 +c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1499 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1500 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1501 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1502 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1503 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1504 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1505 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1506 diff -r 24427303d56f -r d32277701ccb b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1507 --- /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
|
1508 +++ 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
|
1509 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1510 +b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1511 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1512 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1513 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1514 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1515 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1516 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1517 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1518 --- /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
|
1519 +++ 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
|
1520 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1521 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1522 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1523 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1524 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1525 log -p -R repo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1526 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1527 $ cd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1528 $ hg log -p -R .. ../a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1529 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1530 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1531 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1532 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1533 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1534 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1535 --- /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
|
1536 +++ 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
|
1537 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1538 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1539 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1540 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1541 $ cd ../.. |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1542 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1543 $ hg init follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1544 $ cd follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1545 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1546 # 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
|
1547 # 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
|
1548 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1549 # 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
|
1550 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1551 # o |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1552 # |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1553 # 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
|
1554 # "x" is a revision without "foo" |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1555 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1556 $ touch init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1557 $ hg ci -A -m "init, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1558 adding init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1559 $ echo 'foo' > init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1560 $ hg ci -m "change, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1561 $ echo 'foo' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1562 $ hg ci -A -m "add unrelated old foo" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1563 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1564 $ hg rm foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1565 $ hg ci -m "delete foo, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1566 $ echo 'related' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1567 $ hg ci -A -m "add foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1568 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
|
1569 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1570 $ hg up 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1571 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
|
1572 $ touch branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1573 $ hg ci -A -m "first branch, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1574 adding branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1575 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1576 $ touch foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1577 $ hg ci -A -m "create foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1578 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1579 $ echo 'change' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1580 $ hg ci -m "change foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1581 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1582 $ hg up 6 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1583 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
|
1584 $ echo 'change foo in branch' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1585 $ hg ci -m "change foo in branch, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1586 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1587 $ hg merge 7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1588 merging foo |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26102
diff
changeset
|
1589 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1590 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
|
1591 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
|
1592 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1593 $ echo 'merge 1' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1594 $ 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
|
1595 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1596 $ hg ci -m "First merge, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1597 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1598 $ hg merge 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1599 merging foo |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26102
diff
changeset
|
1600 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1601 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
|
1602 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
|
1603 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1604 $ echo 'merge 2' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1605 $ 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
|
1606 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1607 $ 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
|
1608 |
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
16923
diff
changeset
|
1609 $ hg log --graph |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1610 @ changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1611 |\ tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1612 | | parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1613 | | parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1614 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1615 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1616 | | summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1617 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1618 | o changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1619 | |\ parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1620 | | | parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1621 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1622 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1623 | | | summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1624 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1625 | | o changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1626 | | | parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1627 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1628 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1629 | | | summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1630 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1631 | o | changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1632 | |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1633 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1634 | | summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1635 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1636 | o changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1637 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1638 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1639 | | summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1640 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1641 | o changeset: 5:73db34516eb9 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1642 | | parent: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1643 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1644 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1645 | | summary: first branch, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1646 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1647 o | changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1648 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1649 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1650 | | summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1651 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1652 o | changeset: 3:dd78ae4afb56 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1653 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1654 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1655 | | summary: delete foo, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1656 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1657 o | changeset: 2:c4c64aedf0f7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1658 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1659 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1660 | | summary: add unrelated old foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1661 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1662 o | changeset: 1:e5faa7440653 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1663 |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1664 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1665 | summary: change, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1666 | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1667 o changeset: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1668 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1669 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1670 summary: init, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1671 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1672 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1673 $ hg --traceback log -f foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1674 changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1675 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1676 parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1677 parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1678 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1679 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1680 summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1681 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1682 changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1683 parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1684 parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1685 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1686 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1687 summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1688 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1689 changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1690 parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1691 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1692 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1693 summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1694 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1695 changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1696 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1697 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1698 summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1699 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1700 changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1701 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1702 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1703 summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1704 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1705 changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1706 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1707 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1708 summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1709 |
12383 | 1710 |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1711 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
|
1712 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1713 $ 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
|
1714 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
|
1715 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
|
1716 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
|
1717 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
|
1718 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
1719 changeset: 2:c4c64aedf0f7 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
1720 user: test |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
1721 date: Thu Jan 01 00:00:00 1970 +0000 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
1722 summary: add unrelated old foo |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
1723 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1724 $ 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
|
1725 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12383
diff
changeset
|
1726 Issue2383: hg log showing _less_ differences than hg diff |
12383 | 1727 |
1728 $ hg init issue2383 | |
1729 $ cd issue2383 | |
1730 | |
1731 Create a test repo: | |
1732 | |
1733 $ echo a > a | |
1734 $ hg ci -Am0 | |
1735 adding a | |
1736 $ echo b > b | |
1737 $ hg ci -Am1 | |
1738 adding b | |
1739 $ hg co 0 | |
1740 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1741 $ echo b > a | |
1742 $ hg ci -m2 | |
1743 created new head | |
1744 | |
1745 Merge: | |
1746 | |
1747 $ hg merge | |
1748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1749 (branch merge, don't forget to commit) | |
1750 | |
1751 Make sure there's a file listed in the merge to trigger the bug: | |
1752 | |
1753 $ echo c > a | |
1754 $ hg ci -m3 | |
1755 | |
1756 Two files shown here in diff: | |
1757 | |
1758 $ hg diff --rev 2:3 | |
1759 diff -r b09be438c43a -r 8e07aafe1edc a | |
1760 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1761 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1762 @@ -1,1 +1,1 @@ | |
1763 -b | |
1764 +c | |
1765 diff -r b09be438c43a -r 8e07aafe1edc b | |
1766 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1767 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1768 @@ -0,0 +1,1 @@ | |
1769 +b | |
1770 | |
1771 Diff here should be the same: | |
1772 | |
1773 $ hg log -vpr 3 | |
1774 changeset: 3:8e07aafe1edc | |
1775 tag: tip | |
1776 parent: 2:b09be438c43a | |
1777 parent: 1:925d80f479bb | |
1778 user: test | |
1779 date: Thu Jan 01 00:00:00 1970 +0000 | |
1780 files: a | |
1781 description: | |
1782 3 | |
1783 | |
1784 | |
1785 diff -r b09be438c43a -r 8e07aafe1edc a | |
1786 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1787 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1788 @@ -1,1 +1,1 @@ | |
1789 -b | |
1790 +c | |
1791 diff -r b09be438c43a -r 8e07aafe1edc b | |
1792 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1793 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1794 @@ -0,0 +1,1 @@ | |
1795 +b | |
1796 | |
1797 $ 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
|
1798 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1799 '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
|
1800 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1801 $ 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
|
1802 $ 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
|
1803 $ 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
|
1804 $ 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
|
1805 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
|
1806 $ 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
|
1807 $ 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
|
1808 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1809 $ 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
|
1810 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
|
1811 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
|
1812 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
|
1813 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
|
1814 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1815 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
|
1816 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1817 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1818 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34455
diff
changeset
|
1819 > evolution.createmarkers=True |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1820 > EOF |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1821 |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1822 $ 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
|
1823 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1824 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1825 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
1826 obsoleted 1 changesets |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1827 $ 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
|
1828 $ 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
|
1829 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1830 $ 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
|
1831 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1832 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1833 $ hg log -r a |
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
35547
diff
changeset
|
1834 abort: hidden revision 'a' is pruned! |
23046
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
1835 (use --hidden to access hidden revisions) |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1836 [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
|
1837 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1838 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
|
1839 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18250
diff
changeset
|
1840 $ hg up 1 -q --hidden |
35518
02fdb8c018aa
update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35301
diff
changeset
|
1841 updating to a hidden changeset a765632148dc |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1842 $ 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
|
1843 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1844 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1845 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1846 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
|
1847 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1848 $ 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
|
1849 $ 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
|
1850 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1851 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1852 $ hg debugsetparents 1 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1853 $ hg up -q null |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1854 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1855 bookmarks prevent a changeset being hidden |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1856 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1857 $ hg bookmark --hidden -r 1 X |
35611
7336ac5e786e
bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35571
diff
changeset
|
1858 bookmarking hidden changeset a765632148dc |
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1859 $ hg log --template '{rev}:{node}\n' |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1860 1:a765632148dc55d38c35c4f247c618701886cb2f |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1861 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1862 $ hg bookmark -d X |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1863 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1864 divergent bookmarks are not hidden |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1865 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1866 $ hg bookmark --hidden -r 1 X@foo |
35611
7336ac5e786e
bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35571
diff
changeset
|
1867 bookmarking hidden changeset a765632148dc |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1868 $ 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
|
1869 1:a765632148dc55d38c35c4f247c618701886cb2f |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1870 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1871 |
30044
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1872 test hidden revision 0 (issue5385) |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1873 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1874 $ hg bookmark -d X@foo |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1875 $ hg up null -q |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1876 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
1877 obsoleted 1 changesets |
30044
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1878 $ echo f > b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1879 $ hg ci -Am'b' -d '2 0' |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1880 adding b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1881 $ echo f >> b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1882 $ hg ci -m'b bis' -d '3 0' |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1883 $ hg log -T'{rev}:{node}\n' |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1884 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1885 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1886 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1887 $ hg log -T'{rev}:{node}\n' -r: |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1888 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1889 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1890 $ hg log -T'{rev}:{node}\n' -r:tip |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1891 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1892 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1893 $ hg log -T'{rev}:{node}\n' -r:0 |
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
35547
diff
changeset
|
1894 abort: hidden revision '0' is pruned! |
30044
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1895 (use --hidden to access hidden revisions) |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1896 [255] |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1897 $ hg log -T'{rev}:{node}\n' -f |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1898 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1899 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1900 |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1901 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
|
1902 $ echo '[extensions]' >> $HGRCPATH |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1903 $ 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
|
1904 $ cd .. |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1905 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1906 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
|
1907 # 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
|
1908 # 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
|
1909 # 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
|
1910 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1911 $ 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
|
1912 $ 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
|
1913 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
33212
diff
changeset
|
1914 $ $PYTHON > setup.sh <<EOF |
33721
24849d53697d
tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents:
33542
diff
changeset
|
1915 > print(u''' |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1916 > 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
|
1917 > 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
|
1918 > 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
|
1919 > 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
|
1920 > 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
|
1921 > 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
|
1922 > 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
|
1923 > 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
|
1924 > hg --encoding utf-8 commit -u none -m '\u30C2' |
33721
24849d53697d
tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents:
33542
diff
changeset
|
1925 > '''.encode('utf-8')) |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1926 > EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1927 $ 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
|
1928 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1929 test in problematic encoding |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
33212
diff
changeset
|
1930 $ $PYTHON > test.sh <<EOF |
33721
24849d53697d
tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents:
33542
diff
changeset
|
1931 > print(u''' |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1932 > 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
|
1933 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1934 > 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
|
1935 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1936 > 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
|
1937 > echo ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1938 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
33721
24849d53697d
tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents:
33542
diff
changeset
|
1939 > '''.encode('cp932')) |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1940 > EOF |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1941 $ 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
|
1942 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1943 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1944 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1945 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1946 2 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1947 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1948 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1949 3 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1950 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1951 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1952 $ cd .. |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1953 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1954 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
|
1955 $ hg init issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1956 $ cd issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1957 $ 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
|
1958 $ echo 1 > d1/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1959 $ echo 1 > D2/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1960 $ echo 1 > D3.i/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1961 $ echo 1 > d4.hg/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1962 $ echo 1 > d5.d/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1963 $ 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
|
1964 $ hg -q add . |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1965 $ hg commit -m "a bunch of weird directories" |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1966 $ hg log -l1 d1/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1967 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1968 $ hg log -l1 f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1969 $ hg log -l1 . | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1970 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1971 $ hg log -l1 ./ | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1972 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1973 $ hg log -l1 d1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1974 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1975 $ hg log -l1 D2 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1976 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1977 $ hg log -l1 D2/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1978 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1979 $ hg log -l1 D3.i | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1980 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1981 $ hg log -l1 D3.i/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1982 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1983 $ hg log -l1 d4.hg | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1984 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1985 $ hg log -l1 d4.hg/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1986 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1987 $ hg log -l1 d5.d | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1988 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1989 $ hg log -l1 d5.d/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1990 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1991 $ hg log -l1 .d6 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1992 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1993 $ hg log -l1 .d6/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1994 changeset: 0:65624cd9070a |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1995 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1996 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
|
1997 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1998 $ 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
|
1999 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
|
2000 tag: tip |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
2001 user: test |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
2002 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
|
2003 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
|
2004 |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2005 changeset: -1:000000000000 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2006 user: |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2007 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
|
2008 |
18468
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2009 $ hg log -r null:null |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2010 changeset: -1:000000000000 |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2011 user: |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2012 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
|
2013 |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2014 working-directory revision requires special treatment |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2015 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2016 clean: |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2017 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2018 $ hg log -r 'wdir()' --debug |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2019 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2020 phase: draft |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2021 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2022 parent: -1:0000000000000000000000000000000000000000 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2023 user: test |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2024 date: [A-Za-z0-9:+ ]+ (re) |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2025 extra: branch=default |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2026 |
28566
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2027 $ hg log -r 'wdir()' -p --stat |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2028 changeset: 2147483647:ffffffffffff |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2029 parent: 0:65624cd9070a |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2030 user: test |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2031 date: [A-Za-z0-9:+ ]+ (re) |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2032 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2033 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2034 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2035 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2036 dirty: |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2037 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2038 $ echo 2 >> d1/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2039 $ echo 2 > d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2040 $ hg add d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2041 $ hg remove .d6/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2042 $ hg status |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2043 M d1/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2044 A d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2045 R .d6/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2046 |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2047 $ hg log -r 'wdir()' |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2048 changeset: 2147483647:ffffffffffff |
25739
3dabc9b7494a
changeset_printer: use node.wdirrev to calculate meaningful parentrevs
Yuya Nishihara <yuya@tcha.org>
parents:
25688
diff
changeset
|
2049 parent: 0:65624cd9070a |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2050 user: test |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2051 date: [A-Za-z0-9:+ ]+ (re) |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2052 |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2053 $ hg log -r 'wdir()' -q |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2054 2147483647:ffffffffffff |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2055 |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2056 $ hg log -r 'wdir()' --debug |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2057 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2058 phase: draft |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2059 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2060 parent: -1:0000000000000000000000000000000000000000 |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2061 user: test |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2062 date: [A-Za-z0-9:+ ]+ (re) |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2063 files: d1/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2064 files+: d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2065 files-: .d6/f1 |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2066 extra: branch=default |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2067 |
28566
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2068 $ hg log -r 'wdir()' -p --stat --git |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2069 changeset: 2147483647:ffffffffffff |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2070 parent: 0:65624cd9070a |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2071 user: test |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2072 date: [A-Za-z0-9:+ ]+ (re) |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2073 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2074 .d6/f1 | 1 - |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2075 d1/f1 | 1 + |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2076 d1/f2 | 1 + |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2077 3 files changed, 2 insertions(+), 1 deletions(-) |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2078 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2079 diff --git a/.d6/f1 b/.d6/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2080 deleted file mode 100644 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2081 --- a/.d6/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2082 +++ /dev/null |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2083 @@ -1,1 +0,0 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2084 -1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2085 diff --git a/d1/f1 b/d1/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2086 --- a/d1/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2087 +++ b/d1/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2088 @@ -1,1 +1,2 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2089 1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2090 +2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2091 diff --git a/d1/f2 b/d1/f2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2092 new file mode 100644 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2093 --- /dev/null |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2094 +++ b/d1/f2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2095 @@ -0,0 +1,1 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2096 +2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2097 |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2098 $ hg log -r 'wdir()' -Tjson |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2099 [ |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2100 { |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2101 "rev": null, |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2102 "node": null, |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2103 "branch": "default", |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2104 "phase": "draft", |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2105 "user": "test", |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2106 "date": [*, 0], (glob) |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2107 "desc": "", |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2108 "bookmarks": [], |
25688
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
25006
diff
changeset
|
2109 "tags": [], |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2110 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2111 } |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2112 ] |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2113 |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2114 $ hg log -r 'wdir()' -Tjson -q |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2115 [ |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2116 { |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2117 "rev": null, |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2118 "node": null |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2119 } |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2120 ] |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2121 |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2122 $ hg log -r 'wdir()' -Tjson --debug |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2123 [ |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2124 { |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2125 "rev": null, |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2126 "node": null, |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2127 "branch": "default", |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2128 "phase": "draft", |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2129 "user": "test", |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2130 "date": [*, 0], (glob) |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2131 "desc": "", |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2132 "bookmarks": [], |
25688
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
25006
diff
changeset
|
2133 "tags": [], |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2134 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2135 "manifest": null, |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2136 "extra": {"branch": "default"}, |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2137 "modified": ["d1/f1"], |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2138 "added": ["d1/f2"], |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2139 "removed": [".d6/f1"] |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2140 } |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2141 ] |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2142 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2143 $ hg revert -aqC |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2144 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2145 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
|
2146 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2147 $ cat > ../names.py <<EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2148 > """A small extension to test adding arbitrary names to a repo""" |
33965
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2149 > from __future__ import absolute_import |
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2150 > from mercurial import namespaces |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2151 > |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2152 > def reposetup(ui, repo): |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2153 > 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
|
2154 > names = lambda r: foo.keys() |
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2155 > 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
|
2156 > 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
|
2157 > if n == node] |
33965
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2158 > ns = namespaces.namespace( |
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2159 > "bars", templatename="bar", logname="barlog", |
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2160 > colorname="barcolor", listnames=names, namemap=namemap, |
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2161 > nodemap=nodemap) |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2162 > |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2163 > repo.names.addnamespace(ns) |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2164 > EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2165 |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2166 $ 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
|
2167 changeset: 0:65624cd9070a |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2168 tag: tip |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2169 barlog: foo |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2170 user: test |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2171 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
|
2172 summary: a bunch of weird directories |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2173 |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2174 $ hg --config extensions.names=../names.py \ |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2175 > --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
|
2176 > --color=always log -r 0 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2177 \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
|
2178 tag: tip |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2179 \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
|
2180 user: test |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2181 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
|
2182 summary: a bunch of weird directories |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2183 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2184 $ 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
|
2185 foo |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2186 |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2187 $ cd .. |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2188 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2189 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
|
2190 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2191 $ hg init acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2192 $ cd acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2193 $ mkdir d |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2194 $ 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
|
2195 $ 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
|
2196 $ hg up -q 0 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2197 $ 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
|
2198 $ 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
|
2199 @ c |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2200 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2201 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2202 |
24180
d8e0c591781c
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
24064
diff
changeset
|
2203 Ensure that largefiles doesn't interfere with following a normal file |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2204 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G |
33212
fe0667cc521e
tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32308
diff
changeset
|
2205 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
23976
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2206 @ c |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2207 | |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2208 o a |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2209 |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2210 $ 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
|
2211 @ c |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2212 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2213 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2214 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2215 $ 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
|
2216 |
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
|
2217 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
|
2218 ------------------------------------------------- |
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
|
2219 |
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
|
2220 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
|
2221 |
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
|
2222 $ 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
|
2223 $ 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
|
2224 $ 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
|
2225 $ 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
|
2226 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
|
2227 $ 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
|
2228 $ 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
|
2229 $ 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
|
2230 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
|
2231 $ 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
|
2232 $ 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
|
2233 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
|
2234 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
|
2235 $ 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
|
2236 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
|
2237 $ 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
|
2238 $ 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
|
2239 $ 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
|
2240 @ 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
|
2241 | 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
|
2242 | 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
|
2243 | 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
|
2244 | 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
|
2245 | |
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
|
2246 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
|
2247 | 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
|
2248 | 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
|
2249 | 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
|
2250 | |
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
|
2251 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
|
2252 | 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
|
2253 | 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
|
2254 | 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
|
2255 | 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
|
2256 | |
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
|
2257 | 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
|
2258 |/ 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
|
2259 | 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
|
2260 | 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
|
2261 | |
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
|
2262 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
|
2263 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
|
2264 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
|
2265 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
|
2266 |
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
|
2267 |
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
|
2268 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
|
2269 |
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
|
2270 $ 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
|
2271 @ 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
|
2272 | 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
|
2273 | 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
|
2274 | 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
|
2275 | 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
|
2276 | |
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
|
2277 o changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2278 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2279 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2280 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2281 : |
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
|
2282 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
|
2283 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
|
2284 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
|
2285 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
|
2286 |
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
|
2287 |
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
|
2288 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
|
2289 (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
|
2290 |
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
|
2291 $ 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
|
2292 @ changeset: 4:50b9b36e9c5d |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2293 : tag: tip |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2294 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2295 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2296 : summary: content3 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2297 : |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2298 : o changeset: 1:2294ae80ad84 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2299 :/ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2300 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2301 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2302 : |
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
|
2303 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
|
2304 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
|
2305 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
|
2306 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
|
2307 |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2308 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2309 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
|
2310 (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
|
2311 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2312 $ 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
|
2313 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
|
2314 $ 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
|
2315 @ changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2316 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2317 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2318 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2319 : |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2320 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
|
2321 user: test |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2322 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
|
2323 summary: content1 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2324 |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2325 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2326 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
|
2327 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2328 (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
|
2329 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2330 $ 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
|
2331 2294ae80ad8447bc78383182eeac50cb049df623 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2332 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
2333 obsoleted 1 changesets |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2334 $ 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
|
2335 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
|
2336 | 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
|
2337 | 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
|
2338 | 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
|
2339 | 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
|
2340 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2341 @ 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
|
2342 | 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
|
2343 | 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
|
2344 | 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
|
2345 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2346 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
|
2347 | 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
|
2348 | 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
|
2349 | 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
|
2350 | 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
|
2351 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2352 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
|
2353 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
|
2354 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
|
2355 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
|
2356 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2357 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2358 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
|
2359 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2360 $ 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
|
2361 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
|
2362 | 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
|
2363 | 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
|
2364 | 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
|
2365 | 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
|
2366 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2367 @ changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2368 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2369 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2370 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2371 : |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2372 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
|
2373 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
|
2374 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
|
2375 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
|
2376 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2377 |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2378 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
|
2379 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2380 $ 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
|
2381 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2382 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
2383 obsoleted 1 changesets |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2384 $ 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
|
2385 @ changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2386 : tag: tip |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2387 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2388 : date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2389 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2390 : |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2391 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
|
2392 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
|
2393 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
|
2394 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
|
2395 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2396 |
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
|
2397 $ 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
|
2398 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2399 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
|
2400 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2401 $ 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
|
2402 $ 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
|
2403 $ echo '[experimental]' >> .hg/hgrc |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34455
diff
changeset
|
2404 $ echo 'evolution.createmarkers=True' >> .hg/hgrc |
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
|
2405 $ 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
|
2406 $ 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
|
2407 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
|
2408 $ 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
|
2409 $ 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
|
2410 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
|
2411 $ 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
|
2412 $ 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
|
2413 $ 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
|
2414 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
|
2415 $ 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
|
2416 $ 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
|
2417 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
|
2418 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
|
2419 $ 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
|
2420 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
|
2421 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2422 o changeset: 3:db815d6d32e6 |
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
|
2423 | 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
|
2424 | 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
|
2425 | 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
|
2426 | 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
|
2427 | 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
|
2428 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2429 | @ changeset: 2:9bc8ce7f9356 |
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
|
2430 |/ 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
|
2431 | 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
|
2432 | 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
|
2433 | 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
|
2434 | |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2435 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
|
2436 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
|
2437 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
|
2438 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
|
2439 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2440 $ hg log -f -G b |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2441 @ changeset: 2:9bc8ce7f9356 |
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
|
2442 | parent: 0:f7b1eb17ad24 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2443 ~ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2444 date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2445 summary: 1 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2446 |
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
|
2447 $ hg log -G b |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2448 @ changeset: 2:9bc8ce7f9356 |
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
|
2449 | parent: 0:f7b1eb17ad24 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2450 ~ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2451 date: Thu Jan 01 00:00:00 1970 +0000 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2452 summary: 1 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2453 |
23865
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2454 $ cd .. |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2455 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2456 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
|
2457 ------------------------------------------------------------------------ |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2458 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2459 $ 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
|
2460 $ 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
|
2461 $ 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
|
2462 > 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
|
2463 > 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
|
2464 > done |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2465 $ 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
|
2466 $ 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
|
2467 $ 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
|
2468 $ 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
|
2469 $ 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
|
2470 $ 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
|
2471 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
|
2472 $ 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
|
2473 $ 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
|
2474 $ 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
|
2475 $ 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
|
2476 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
|
2477 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2478 $ 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
|
2479 @ 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
|
2480 | 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
|
2481 | 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
|
2482 | 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
|
2483 | 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
|
2484 | 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
|
2485 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2486 | 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
|
2487 |/ 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
|
2488 | 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
|
2489 | 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
|
2490 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2491 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
|
2492 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
|
2493 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
|
2494 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
|
2495 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2496 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2497 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
|
2498 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2499 $ 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
|
2500 @ 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
|
2501 | 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
|
2502 | 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
|
2503 | 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
|
2504 | 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
|
2505 | 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
|
2506 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2507 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
|
2508 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
|
2509 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
|
2510 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
|
2511 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2512 $ cd .. |