Mercurial > hg
annotate tests/test-log.t @ 41710:4028897dfa05
url: always use str for proxy configuration
Previously, proxies didn't work on Python 3 for various reasons.
First, the keys to the "proxies" dict are fed into a
`setattr(self, "%s_open", ...)` call and passing bytestrings
results in setting an oddly named attribute due to the b''
in %s formatting. This resulted in "http_open" and "https_open"
not being properly overridden and proxies not being used.
Second, the standard library was expecting proxy URLs to be
str. And various operations (including our custom code in
url.py) would fail to account for the str/bytes mismatch.
This commit normalizes everything to str and adjusts our
proxy code in url.py to account for the presence of str
on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D5952
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 15 Feb 2019 13:16:07 -0800 |
parents | 6a63ba61e71f |
children | c96507f6875c |
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 |
35687
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
468 follow files from the specified revisions (issue4959) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
469 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
470 $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n' |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
471 @ 4 dir/b e, dir/b->e |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
472 | |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
473 o 3 a b d g, a->b f->g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
474 | |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
475 o 2 b dir/b f g, b->dir/b |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
476 | |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
477 o 1 b g, a->b f->g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
478 | |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
479 o 0 a f, |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
480 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
481 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
482 $ hg log -T '{rev}\n' -fr 4 e |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
483 4 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
484 2 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
485 1 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
486 0 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
487 $ hg log -T '{rev}\n' -fr 2 g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
488 2 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
489 1 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
490 0 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
491 $ hg log -T '{rev}\n' -fr '2+3' g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
492 3 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
493 2 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
494 1 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
495 0 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
496 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
497 follow files from the specified revisions with glob patterns (issue5053) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
498 (BROKEN: should follow copies from e@4) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
499 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
500 $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]' |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
501 4 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
502 2 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
503 1 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
504 0 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
505 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
506 follow files from the specified revisions with missing patterns |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
507 (BROKEN: should follow copies from e@4) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
508 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
509 $ hg log -T '{rev}\n' -fr4 e x |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
510 4 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
511 2 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
512 1 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
513 0 (false !) |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
514 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
515 follow files from the specified revisions across copies with -p/--patch |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
516 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
517 $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
518 == rev: 4, dir/b->e == |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
519 diff -r 2ca5ba701980 -r 7e4639b4691b e |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
520 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
521 +++ b/e Thu Jan 01 00:00:05 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
522 @@ -0,0 +1,1 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
523 +a |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
524 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
525 == rev: 3, a->b f->g == |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
526 diff -r f8954cd4dc1f -r 2ca5ba701980 g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
527 --- a/g Thu Jan 01 00:00:03 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
528 +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
529 @@ -1,2 +1,2 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
530 f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
531 -g |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
532 +f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
533 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
534 == rev: 2, b->dir/b == |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
535 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
536 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
537 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
538 @@ -0,0 +1,1 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
539 +a |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
540 diff -r d89b0a12d229 -r f8954cd4dc1f f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
541 --- a/f Thu Jan 01 00:00:02 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
542 +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
543 @@ -1,1 +1,2 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
544 f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
545 +f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
546 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
547 == rev: 1, a->b f->g == |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
548 diff -r 9161b9aeaf16 -r d89b0a12d229 b |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
549 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
550 +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
551 @@ -0,0 +1,1 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
552 +a |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
553 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
554 == rev: 0, == |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
555 diff -r 000000000000 -r 9161b9aeaf16 a |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
556 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
557 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
558 @@ -0,0 +1,1 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
559 +a |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
560 diff -r 000000000000 -r 9161b9aeaf16 f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
561 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
562 +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
563 @@ -0,0 +1,1 @@ |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
564 +f |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
565 |
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
566 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
567 log copies with --copies |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
568 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
569 $ hg log -vC --template '{rev} {file_copies}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
570 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
571 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
572 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
573 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
574 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
575 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
576 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
|
577 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
578 $ 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
|
579 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
580 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
581 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
582 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
583 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
584 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
585 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
|
586 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
587 $ hg log -vC --template '{rev} {file_copies_switch}\n' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
588 4 e (dir/b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
589 3 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
590 2 dir/b (b) |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
591 1 b (a)g (f) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
592 0 |
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
593 |
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
594 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
595 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
|
596 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
597 $ hg log -vC -r4 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
598 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
599 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
600 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
601 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
602 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
603 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
604 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
605 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
606 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
607 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
608 $ 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
|
609 changeset: 4:7e4639b4691b |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
610 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
611 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
612 date: Thu Jan 01 00:00:05 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
613 files: dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
614 copies: e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
615 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
616 e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
617 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
618 |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
619 $ 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
|
620 [ |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
621 { |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
622 "bookmarks": [], |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
623 "branch": "default", |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
624 "copies": {"e": "dir/b"}, |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
625 "date": [5, 0], |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
626 "desc": "e", |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
627 "files": ["dir/b", "e"], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
628 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
629 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
630 "phase": "draft", |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
631 "rev": 4, |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
632 "tags": ["tip"], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
633 "user": "test" |
24013
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
634 } |
942a5a34b2d0
log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents:
23976
diff
changeset
|
635 ] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
636 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
637 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
|
638 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
639 $ hg up -C 3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
640 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
|
641 $ hg mv dir/b e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
642 $ echo foo > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
643 $ hg ci -Ame2 -d '6 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
644 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
645 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
646 $ 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
|
647 5 e (dir/b) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
648 |
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
649 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
650 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
|
651 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
652 #if execbit |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
653 $ chmod +x e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
654 $ hg ci -me3 -d '7 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
655 $ 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
|
656 6 |
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
657 #endif |
9421
c8e4dc218aaf
log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents:
9373
diff
changeset
|
658 |
37776
141017c7f7a9
log: fix crash on empty revision with --copies switch
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
659 log copies, empty set |
141017c7f7a9
log: fix crash on empty revision with --copies switch
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
660 |
141017c7f7a9
log: fix crash on empty revision with --copies switch
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
661 $ hg log --copies -r '0 and not 0' |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
662 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
663 log -p d |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
664 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
665 $ hg log -pv d |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
666 changeset: 3:2ca5ba701980 |
11900
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:04 1970 +0000 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
669 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
670 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
671 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
672 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
673 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
674 diff -r f8954cd4dc1f -r 2ca5ba701980 d |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
675 --- /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
|
676 +++ 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
|
677 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
678 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
679 |
11061
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
680 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
681 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
682 log --removed file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
683 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
684 $ 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
|
685 changeset: 3:2ca5ba701980 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
686 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
687 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
|
688 files: a b d g |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
689 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
690 d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
691 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
692 |
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
693 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
694 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
695 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
|
696 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
697 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
698 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
699 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
700 |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
701 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
702 log --removed revrange file |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
703 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
704 $ 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
|
705 changeset: 0:9161b9aeaf16 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
706 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
707 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
|
708 files: a f |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
709 description: |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
710 a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
711 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
712 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
713 $ cd .. |
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
714 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
715 log --follow tests |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
716 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
717 $ 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
|
718 $ cd follow |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
719 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
720 $ echo base > base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
721 $ hg ci -Ambase -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
722 adding base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
723 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
724 $ echo r1 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
725 $ hg ci -Amr1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
726 $ echo r2 >> base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
727 $ 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
|
728 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
729 $ hg up -C 1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
730 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
|
731 $ echo b1 > b1 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
732 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
733 log -r "follow('set:clean()')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
734 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
735 $ hg log -r "follow('set:clean()')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
736 changeset: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
737 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
738 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
|
739 summary: base |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
740 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
741 changeset: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
742 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
743 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
|
744 summary: r1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
745 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
746 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
747 $ hg ci -Amb1 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
748 adding b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
749 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
750 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
751 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
752 log -f |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
753 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
754 $ hg log -f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
755 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
756 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
757 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
758 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
759 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
760 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
761 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
762 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
763 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
764 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
765 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
766 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
767 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
768 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
769 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
770 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
771 |
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
772 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
773 log -r follow('glob:b*') |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
774 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
775 $ hg log -r "follow('glob:b*')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
776 changeset: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
777 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
778 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
|
779 summary: base |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
780 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
781 changeset: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
782 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
783 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
|
784 summary: r1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
785 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
786 changeset: 3:e62f78d544b4 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
787 tag: tip |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
788 parent: 1:3d5bf5654eda |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
789 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
790 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
|
791 summary: b1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
792 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
793 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
|
794 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
795 $ hg up -C 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
796 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
|
797 $ echo b2 > b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
798 $ hg ci -Amb2 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
799 adding b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
800 created new head |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
801 $ 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
|
802 changeset: 4:ddb82e70d1a1 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
803 tag: tip |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
804 parent: 0:67e992f2c4f3 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
805 user: test |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
806 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
|
807 summary: b2 |
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
808 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
809 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
810 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
811 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
812 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
813 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
814 changeset: 0:67e992f2c4f3 |
11900
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 |
24189
8b4b9ee6001a
log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents:
24180
diff
changeset
|
817 summary: base |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
818 |
35684
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
819 |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
820 log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
821 effect |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
822 |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
823 $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
824 4:ddb82e70d1a1 |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
825 1:3d5bf5654eda |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
826 0:67e992f2c4f3 |
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35659
diff
changeset
|
827 |
26102
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
828 log -r "follow('set:grep(b2)')" |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
829 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
830 $ 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
|
831 changeset: 4:ddb82e70d1a1 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
832 tag: tip |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
833 parent: 0:67e992f2c4f3 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
834 user: test |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
835 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
|
836 summary: b2 |
5618858dce26
revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
25762
diff
changeset
|
837 |
29814
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
838 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
|
839 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
840 $ hg up -qC 0 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
841 $ 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
|
842 changeset: 4:ddb82e70d1a1 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
843 tag: tip |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
844 parent: 0:67e992f2c4f3 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
845 user: test |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
846 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
|
847 summary: b2 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
848 |
35298
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
849 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
850 follow files starting from multiple revisions: |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
851 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
852 $ 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
|
853 3: b1 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
854 4: b2 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
855 |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
856 follow files starting from empty revision: |
921680c3e2ea
revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents:
35269
diff
changeset
|
857 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
858 $ 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
|
859 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
860 follow starting from revisions: |
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
861 |
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
862 $ 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
|
863 o 4:ddb82e70d1a1 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
864 | |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
865 | o 2:60c670bf5b30 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
866 | | |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
867 | o 1:3d5bf5654eda |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
868 |/ |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
869 @ 0:67e992f2c4f3 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
870 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
871 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
872 follow the current revision: |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
873 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
874 $ hg log -Gq -r "follow()" |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
875 @ 0:67e992f2c4f3 |
d36eda8896cc
revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents:
35299
diff
changeset
|
876 |
35299
89b5c2ae1980
revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents:
35298
diff
changeset
|
877 |
29814
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
878 $ hg up -qC 4 |
cbf9984a7957
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
28627
diff
changeset
|
879 |
23956
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
880 log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
881 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
882 $ hg log -f -r null |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
883 changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
884 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
885 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
|
886 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
887 $ 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
|
888 o changeset: -1:000000000000 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
889 user: |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
890 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
|
891 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
892 |
b1e026c25552
revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents:
23876
diff
changeset
|
893 |
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
894 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
|
895 |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
896 $ hg up -C null |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
897 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
|
898 $ hg log -f |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
899 |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24013
diff
changeset
|
900 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
901 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
|
902 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
903 $ 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
|
904 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
|
905 $ hg merge tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
906 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
|
907 (branch merge, don't forget to commit) |
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 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
910 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
911 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
912 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
913 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
914 |
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
915 |
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
916 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
917 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
|
918 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
919 $ hg ci -mm12 -d '1 0' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
920 $ hg log -r . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
921 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
922 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
923 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
924 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
925 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
926 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
927 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
928 |
11508
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11141
diff
changeset
|
929 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
930 $ echo postm >> b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
931 $ 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
|
932 |
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
933 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
934 log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
935 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
936 $ hg log --follow-first |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
937 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
938 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
939 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
940 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
941 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
942 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
943 changeset: 5:302e9dd6890d |
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 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
950 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
951 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
952 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
953 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
954 summary: b1 |
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 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
957 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
958 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
959 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
960 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
961 changeset: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
962 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
963 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
964 summary: base |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
965 |
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 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
968 log -P 2 |
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 $ hg log -P 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
971 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
972 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
973 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
974 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
975 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
976 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
977 changeset: 5:302e9dd6890d |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
978 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
979 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
980 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
981 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
982 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
983 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
984 changeset: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
985 parent: 0:67e992f2c4f3 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
986 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
987 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
988 summary: b2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
989 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
990 changeset: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
991 parent: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
992 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
993 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
994 summary: b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
995 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
996 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
997 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
998 log -r tip -p --git |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
999 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1000 $ hg log -r tip -p --git |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1001 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1002 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1003 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1004 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1005 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1006 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1007 diff --git a/b1 b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1008 --- a/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1009 +++ b/b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1010 @@ -1,1 +1,2 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1011 b1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1012 +postm |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1013 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1014 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1015 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1016 log -r "" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1017 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1018 $ hg log -r '' |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1019 hg: parse error: empty query |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1020 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1021 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1022 log -r <some unknown node id> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1023 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1024 $ hg log -r 1000000000000000000000000000000000000000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1025 abort: unknown revision '1000000000000000000000000000000000000000'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1026 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1027 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1028 log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1029 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1030 $ hg log -k r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1031 changeset: 1:3d5bf5654eda |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1032 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1033 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1034 summary: r1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1035 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1036 log -p -l2 --color=always |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1037 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1038 $ hg --config extensions.color= --config color.mode=ansi \ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1039 > 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
|
1040 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1041 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1042 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1043 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1044 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1045 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
1046 \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
|
1047 \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
|
1048 \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
|
1049 \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
|
1050 b1 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
1051 \x1b[0;32m+postm\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1052 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
1053 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1054 parent: 3:e62f78d544b4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1055 parent: 4:ddb82e70d1a1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1056 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1057 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1058 summary: m12 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1059 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
1060 \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
|
1061 \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
|
1062 \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
|
1063 \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
|
1064 \x1b[0;32m+b2\x1b[0m (esc) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1065 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1066 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1067 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1068 log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1069 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1070 $ hg log -r tip --stat |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1071 changeset: 6:2404bbcab562 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1072 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1073 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1074 date: Thu Jan 01 00:00:01 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1075 summary: b1.1 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1076 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1077 b1 | 1 + |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1078 1 files changed, 1 insertions(+), 0 deletions(-) |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1079 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1080 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1081 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1082 |
30016
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1083 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
|
1084 (issue5376) |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1085 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1086 $ 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
|
1087 $ cd follow-dup |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1088 $ 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
|
1089 > [ui] |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1090 > 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
|
1091 > [diff] |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1092 > nodates = True |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1093 > EOF |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1094 $ echo 0 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1095 $ 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
|
1096 $ echo 1 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1097 $ 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
|
1098 $ 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
|
1099 $ echo 1 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1100 $ touch b |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1101 $ 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
|
1102 $ echo 3 >> a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1103 $ 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
|
1104 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1105 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
|
1106 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1107 $ 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
|
1108 === 3: a3 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1109 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
|
1110 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1111 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1112 @@ -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
|
1113 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1114 1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1115 +3 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1116 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1117 === 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
|
1118 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
|
1119 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1120 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1121 @@ -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
|
1122 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1123 +1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1124 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1125 === 0: a0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1126 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
|
1127 --- /dev/null |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1128 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1129 @@ -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
|
1130 +0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1131 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1132 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1133 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
|
1134 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1135 $ 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
|
1136 $ 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
|
1137 === 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
|
1138 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
|
1139 --- a/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1140 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1141 @@ -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
|
1142 0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1143 +1 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1144 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1145 === 0: a0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1146 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
|
1147 --- /dev/null |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1148 +++ b/a |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1149 @@ -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
|
1150 +0 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1151 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1152 |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1153 $ cd .. |
2963fba2d18a
log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents:
29814
diff
changeset
|
1154 |
35269
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1155 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
|
1156 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1157 $ 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
|
1158 $ 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
|
1159 $ 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
|
1160 $ 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
|
1161 $ 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
|
1162 $ 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
|
1163 $ 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
|
1164 $ 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
|
1165 $ 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
|
1166 $ 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
|
1167 $ 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
|
1168 $ 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
|
1169 $ 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
|
1170 $ 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
|
1171 $ 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
|
1172 $ 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
|
1173 $ 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
|
1174 $ 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
|
1175 $ 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
|
1176 $ 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
|
1177 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
|
1178 $ 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
|
1179 $ 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
|
1180 $ 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
|
1181 $ 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
|
1182 $ 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
|
1183 $ 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
|
1184 $ 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
|
1185 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1186 $ 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
|
1187 @ 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
|
1188 |\ |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1189 | 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
|
1190 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1191 | 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
|
1192 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1193 | 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
|
1194 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1195 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
|
1196 | | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1197 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
|
1198 |/ |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1199 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
|
1200 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1201 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
|
1202 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1203 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
|
1204 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1205 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
|
1206 | |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1207 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
|
1208 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1209 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1210 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
|
1211 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
|
1212 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1213 $ 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
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 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
|
1219 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
|
1220 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
|
1221 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
|
1222 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
|
1223 |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1224 $ cd .. |
2af38229f147
test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
1225 |
28253
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1226 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
|
1227 are specified (issue5100): |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1228 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1229 $ hg init revorder |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1230 $ cd revorder |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1231 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1232 $ 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
|
1233 $ echo 0 >> f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1234 $ 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
|
1235 $ 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
|
1236 $ echo 1 >> f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1237 $ 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
|
1238 $ 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
|
1239 $ echo 2 >> f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1240 $ 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
|
1241 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1242 $ 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
|
1243 $ echo 3 >> f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1244 $ 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
|
1245 $ 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
|
1246 $ echo 4 >> f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1247 $ 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
|
1248 $ 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
|
1249 $ echo 5 >> f0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1250 $ 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
|
1251 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1252 summary of revisions: |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1253 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1254 $ 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
|
1255 @ 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
|
1256 | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1257 | 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
|
1258 | | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1259 | | 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
|
1260 | | | |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1261 | | 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
|
1262 | |/ |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1263 | 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
|
1264 |/ |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1265 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
|
1266 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1267 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1268 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
|
1269 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1270 $ 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
|
1271 0 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1272 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1273 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1274 5 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1275 $ 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
|
1276 0 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1277 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1278 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1279 5 b0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1280 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1281 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
|
1282 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1283 $ 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
|
1284 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1285 3 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1286 2 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1287 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1288 $ 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
|
1289 4 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1290 3 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1291 2 b2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1292 1 b1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1293 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1294 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
|
1295 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1296 $ 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
|
1297 0 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1298 2 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1299 3 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1300 5 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1301 $ 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
|
1302 0 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1303 2 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1304 3 u2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1305 5 u0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1306 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1307 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
|
1308 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1309 $ 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
|
1310 5 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1311 3 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1312 2 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1313 1 k1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1314 0 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1315 $ 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
|
1316 5 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1317 3 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1318 2 k2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1319 1 k1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1320 0 k0 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1321 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1322 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
|
1323 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1324 $ 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
|
1325 1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1326 2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1327 3 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1328 4 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1329 $ 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
|
1330 1 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1331 2 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1332 3 f2 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1333 4 f1 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1334 |
c407583cf5f6
log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents:
26614
diff
changeset
|
1335 $ cd .. |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1336 |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1337 User |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1338 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1339 $ hg init usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1340 $ cd usertest |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1341 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1342 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1343 $ 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
|
1344 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1345 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1346 $ 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
|
1347 adding b |
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 $ hg log -u "User One <user1@example.org>" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1350 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1351 user: User One <user1@example.org> |
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: a |
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 $ hg log -u "user1" -u "user2" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1356 changeset: 1:e834b5e69c0e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1357 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1358 user: User Two <user2@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1359 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1360 summary: b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1361 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1362 changeset: 0:29a4c94f1924 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1363 user: User One <user1@example.org> |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1364 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1365 summary: a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1366 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1367 $ hg log -u "user3" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1368 |
35547
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1369 "-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
|
1370 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1371 $ 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
|
1372 $ 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
|
1373 changeset: 0:29a4c94f1924 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1374 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
|
1375 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
|
1376 summary: a |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1377 |
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35518
diff
changeset
|
1378 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1379 $ cd .. |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1380 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1381 $ hg init branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1382 $ cd branches |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1383 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1384 $ echo a > a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1385 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1386 adding a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1387 $ hg branch test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1388 marked working directory as branch test |
15615 | 1389 (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
|
1390 $ echo b > b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1391 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1392 adding b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1393 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1394 $ hg up default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1395 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
|
1396 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1397 $ hg ci -A -m "commit on default" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1398 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1399 $ hg up test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1400 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
|
1401 $ echo c > c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1402 $ hg ci -A -m "commit on test" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1403 adding c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1404 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1405 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1406 log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1407 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1408 $ hg log -b default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1409 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1410 parent: 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 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1416 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1417 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1418 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1419 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1420 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1421 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1422 log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1423 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1424 $ hg log -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1425 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1426 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1427 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1428 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1429 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1430 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1431 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1432 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1433 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1434 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1435 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1436 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1437 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1438 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1439 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1440 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1441 log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1442 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1443 $ hg log -b dummy |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1444 abort: unknown revision 'dummy'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1445 [255] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1446 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1447 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1448 log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1449 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1450 $ hg log -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1451 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1452 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1453 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1454 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1455 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1456 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1457 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1458 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1459 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1460 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1461 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1462 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1463 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1464 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1465 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1466 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1467 log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1468 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1469 $ hg log -b default -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1470 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1471 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1472 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1473 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1474 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1475 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1476 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1477 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1478 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1479 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1480 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1481 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1482 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1483 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1484 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1485 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1486 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1487 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1488 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1489 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1490 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1491 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1492 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1493 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1494 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1495 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1496 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1497 log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1498 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1499 $ hg log -b default -b . |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1500 changeset: 3:f5d8de11c2e2 |
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 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1503 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1504 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1505 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1506 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1507 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1508 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1509 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1510 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1511 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1512 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1513 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1514 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1515 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1516 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1517 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1518 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1519 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1520 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1521 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1522 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1523 summary: commit on default |
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 |
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 log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1528 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1529 $ hg log -b . -b test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1530 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1531 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1532 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1533 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1534 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1535 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1536 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1537 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1538 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1539 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1540 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1541 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1542 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1543 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1544 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1545 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1546 log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1547 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1548 $ hg log -b 2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1549 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1550 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1551 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1552 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1553 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1554 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1555 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1556 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1557 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1558 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1559 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1560 #if gettext |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1561 |
23771
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1562 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
|
1563 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1564 $ 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
|
1565 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1566 $ 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
|
1567 \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
|
1568 Zweig: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1569 Lesezeichen: babar |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1570 Marke: tip |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1571 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
|
1572 Nutzer: test |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1573 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
|
1574 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
|
1575 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1576 $ 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
|
1577 |
9f81f9e5b47a
tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents:
23729
diff
changeset
|
1578 #endif |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1579 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1580 log -p --cwd dir (in subdir) |
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 $ mkdir dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1583 $ hg log -p --cwd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1584 changeset: 3:f5d8de11c2e2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1585 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1586 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1587 parent: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1588 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1589 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1590 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1591 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1592 diff -r d32277701ccb -r f5d8de11c2e2 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1593 --- /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
|
1594 +++ 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
|
1595 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1596 +c |
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 changeset: 2:c3a4f03cc9a7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1599 parent: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1600 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1601 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1602 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1603 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1604 diff -r 24427303d56f -r c3a4f03cc9a7 c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1605 --- /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
|
1606 +++ 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
|
1607 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1608 +c |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1609 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1610 changeset: 1:d32277701ccb |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1611 branch: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1612 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1613 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1614 summary: commit on test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1615 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1616 diff -r 24427303d56f -r d32277701ccb b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1617 --- /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
|
1618 +++ 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
|
1619 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1620 +b |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1621 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1622 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1623 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1624 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1625 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1626 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1627 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1628 --- /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
|
1629 +++ 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
|
1630 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1631 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1632 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1633 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1634 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1635 log -p -R repo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1636 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1637 $ cd dir |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1638 $ hg log -p -R .. ../a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1639 changeset: 0:24427303d56f |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1640 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1641 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1642 summary: commit on default |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1643 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1644 diff -r 000000000000 -r 24427303d56f a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1645 --- /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
|
1646 +++ 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
|
1647 @@ -0,0 +1,1 @@ |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1648 +a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1649 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1650 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1651 $ cd ../.. |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1652 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1653 $ hg init follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1654 $ cd follow2 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1655 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1656 # 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
|
1657 # 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
|
1658 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1659 # 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
|
1660 # \ / |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1661 # o |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1662 # |
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1663 # 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
|
1664 # "x" is a revision without "foo" |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1665 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1666 $ touch init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1667 $ hg ci -A -m "init, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1668 adding init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1669 $ echo 'foo' > init |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1670 $ hg ci -m "change, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1671 $ echo 'foo' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1672 $ hg ci -A -m "add unrelated old foo" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1673 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1674 $ hg rm foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1675 $ hg ci -m "delete foo, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1676 $ echo 'related' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1677 $ hg ci -A -m "add foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1678 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
|
1679 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1680 $ hg up 0 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1681 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
|
1682 $ touch branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1683 $ hg ci -A -m "first branch, unrelated" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1684 adding branch |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1685 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1686 $ touch foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1687 $ hg ci -A -m "create foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1688 adding foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1689 $ echo 'change' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1690 $ hg ci -m "change foo, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1691 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1692 $ hg up 6 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1693 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
|
1694 $ echo 'change foo in branch' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1695 $ hg ci -m "change foo in branch, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1696 created new head |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1697 $ hg merge 7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1698 merging foo |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26102
diff
changeset
|
1699 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
|
1700 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35687
diff
changeset
|
1701 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1702 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1703 $ echo 'merge 1' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1704 $ 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
|
1705 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1706 $ hg ci -m "First merge, related" |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1707 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1708 $ hg merge 4 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1709 merging foo |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26102
diff
changeset
|
1710 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
|
1711 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35687
diff
changeset
|
1712 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1713 [1] |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1714 $ echo 'merge 2' > foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1715 $ 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
|
1716 (no more unresolved files) |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1717 $ 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
|
1718 |
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
16923
diff
changeset
|
1719 $ hg log --graph |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1720 @ changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1721 |\ tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1722 | | parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1723 | | parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1724 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1725 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1726 | | summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1727 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1728 | o changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1729 | |\ parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1730 | | | parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1731 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1732 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1733 | | | summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1734 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1735 | | o changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1736 | | | parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1737 | | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1738 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1739 | | | summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1740 | | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1741 | o | changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1742 | |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1743 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1744 | | summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1745 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1746 | o changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1747 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1748 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1749 | | summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1750 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1751 | o changeset: 5:73db34516eb9 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1752 | | parent: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1753 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1754 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1755 | | summary: first branch, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1756 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1757 o | changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1758 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1759 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1760 | | summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1761 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1762 o | changeset: 3:dd78ae4afb56 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1763 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1764 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1765 | | summary: delete foo, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1766 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1767 o | changeset: 2:c4c64aedf0f7 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1768 | | user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1769 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1770 | | summary: add unrelated old foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1771 | | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1772 o | changeset: 1:e5faa7440653 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1773 |/ user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1774 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1775 | summary: change, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1776 | |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1777 o changeset: 0:e87515fd044a |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1778 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1779 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1780 summary: init, unrelated |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1781 |
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1782 |
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1783 $ hg --traceback log -f foo |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1784 changeset: 10:4dae8563d2c5 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1785 tag: tip |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1786 parent: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1787 parent: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1788 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1789 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1790 summary: Last merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1791 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1792 changeset: 9:7b35701b003e |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1793 parent: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1794 parent: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1795 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1796 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1797 summary: First merge, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1798 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1799 changeset: 8:e5416ad8a855 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1800 parent: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1801 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1802 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1803 summary: change foo in branch, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1804 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1805 changeset: 7:87fe3144dcfa |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1806 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1807 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1808 summary: change foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1809 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1810 changeset: 6:dc6c325fe5ee |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1811 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1812 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1813 summary: create foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1814 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1815 changeset: 4:88176d361b69 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1816 user: test |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1817 date: Thu Jan 01 00:00:00 1970 +0000 |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1818 summary: add foo, related |
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1819 |
12383 | 1820 |
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1821 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
|
1822 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1823 $ 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
|
1824 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
|
1825 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
|
1826 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
|
1827 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
|
1828 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1829 $ 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
|
1830 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12383
diff
changeset
|
1831 Issue2383: hg log showing _less_ differences than hg diff |
12383 | 1832 |
1833 $ hg init issue2383 | |
1834 $ cd issue2383 | |
1835 | |
1836 Create a test repo: | |
1837 | |
1838 $ echo a > a | |
1839 $ hg ci -Am0 | |
1840 adding a | |
1841 $ echo b > b | |
1842 $ hg ci -Am1 | |
1843 adding b | |
1844 $ hg co 0 | |
1845 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1846 $ echo b > a | |
1847 $ hg ci -m2 | |
1848 created new head | |
1849 | |
1850 Merge: | |
1851 | |
1852 $ hg merge | |
1853 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1854 (branch merge, don't forget to commit) | |
1855 | |
1856 Make sure there's a file listed in the merge to trigger the bug: | |
1857 | |
1858 $ echo c > a | |
1859 $ hg ci -m3 | |
1860 | |
1861 Two files shown here in diff: | |
1862 | |
1863 $ hg diff --rev 2:3 | |
1864 diff -r b09be438c43a -r 8e07aafe1edc a | |
1865 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1866 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1867 @@ -1,1 +1,1 @@ | |
1868 -b | |
1869 +c | |
1870 diff -r b09be438c43a -r 8e07aafe1edc b | |
1871 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1872 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1873 @@ -0,0 +1,1 @@ | |
1874 +b | |
1875 | |
1876 Diff here should be the same: | |
1877 | |
1878 $ hg log -vpr 3 | |
1879 changeset: 3:8e07aafe1edc | |
1880 tag: tip | |
1881 parent: 2:b09be438c43a | |
1882 parent: 1:925d80f479bb | |
1883 user: test | |
1884 date: Thu Jan 01 00:00:00 1970 +0000 | |
1885 files: a | |
1886 description: | |
1887 3 | |
1888 | |
1889 | |
1890 diff -r b09be438c43a -r 8e07aafe1edc a | |
1891 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1892 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1893 @@ -1,1 +1,1 @@ | |
1894 -b | |
1895 +c | |
1896 diff -r b09be438c43a -r 8e07aafe1edc b | |
1897 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1898 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1899 @@ -0,0 +1,1 @@ | |
1900 +b | |
1901 | |
1902 $ 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
|
1903 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1904 '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
|
1905 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1906 $ 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
|
1907 $ 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
|
1908 $ 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
|
1909 $ 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
|
1910 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
|
1911 $ 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
|
1912 $ 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
|
1913 |
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1914 $ 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
|
1915 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
|
1916 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
|
1917 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
|
1918 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
|
1919 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1920 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
|
1921 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1922 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
21998
diff
changeset
|
1923 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34455
diff
changeset
|
1924 > evolution.createmarkers=True |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1925 > EOF |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1926 |
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1927 $ 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
|
1928 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1929 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1930 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
1931 obsoleted 1 changesets |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1932 $ 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
|
1933 $ 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
|
1934 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1935 $ 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
|
1936 1:a765632148dc55d38c35c4f247c618701886cb2f |
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1937 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1938 $ 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
|
1939 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
|
1940 (use --hidden to access hidden revisions) |
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1941 [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
|
1942 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1943 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
|
1944 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18250
diff
changeset
|
1945 $ hg up 1 -q --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
37776
diff
changeset
|
1946 updated to hidden changeset a765632148dc |
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35704
diff
changeset
|
1947 (hidden revision 'a765632148dc' is pruned) |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1948 $ 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
|
1949 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1950 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1951 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1952 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
|
1953 |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1954 $ 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
|
1955 $ 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
|
1956 1:a765632148dc55d38c35c4f247c618701886cb2f |
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1957 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1958 $ hg debugsetparents 1 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1959 $ hg up -q null |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1960 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1961 bookmarks prevent a changeset being hidden |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1962 |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1963 $ 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
|
1964 bookmarking hidden changeset a765632148dc |
35712
a1a5c3842b6f
bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents:
35711
diff
changeset
|
1965 (hidden revision 'a765632148dc' is pruned) |
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1966 $ hg log --template '{rev}:{node}\n' |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1967 1:a765632148dc55d38c35c4f247c618701886cb2f |
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1968 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1969 $ hg bookmark -d X |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1970 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1971 divergent bookmarks are not hidden |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1972 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1973 $ 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
|
1974 bookmarking hidden changeset a765632148dc |
35712
a1a5c3842b6f
bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents:
35711
diff
changeset
|
1975 (hidden revision 'a765632148dc' is pruned) |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1976 $ 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
|
1977 1:a765632148dc55d38c35c4f247c618701886cb2f |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1978 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1979 |
30044
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1980 test hidden revision 0 (issue5385) |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1981 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1982 $ hg bookmark -d X@foo |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1983 $ hg up null -q |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1984 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
1985 obsoleted 1 changesets |
30044
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1986 $ echo f > b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1987 $ 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
|
1988 adding b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1989 $ echo f >> b |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1990 $ 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
|
1991 $ 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
|
1992 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1993 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1994 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1995 $ 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
|
1996 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1997 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
1998 $ 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
|
1999 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
2000 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
2001 $ 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
|
2002 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
|
2003 (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
|
2004 [255] |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
2005 $ 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
|
2006 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
2007 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
69b61d0bb008
revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents:
30016
diff
changeset
|
2008 |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2009 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
|
2010 $ echo '[extensions]' >> $HGRCPATH |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
2011 $ 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
|
2012 $ cd .. |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2013 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2014 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
|
2015 # 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
|
2016 # 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
|
2017 # 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
|
2018 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2019 $ 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
|
2020 $ 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
|
2021 |
36693
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2022 >>> with open('setup.sh', 'wb') as f: |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2023 ... f.write(u''' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2024 ... echo a > text |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2025 ... hg add text |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2026 ... hg --encoding utf-8 commit -u '\u30A2' -m none |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2027 ... echo b > text |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2028 ... hg --encoding utf-8 commit -u '\u30C2' -m none |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2029 ... echo c > text |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2030 ... hg --encoding utf-8 commit -u none -m '\u30A2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2031 ... echo d > text |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2032 ... hg --encoding utf-8 commit -u none -m '\u30C2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2033 ... '''.encode('utf-8')) and None |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2034 $ 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
|
2035 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2036 test in problematic encoding |
36693
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2037 >>> with open('test.sh', 'wb') as f: |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2038 ... f.write(u''' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2039 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2040 ... echo ==== |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2041 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2042 ... echo ==== |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2043 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2044 ... echo ==== |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2045 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2046 ... '''.encode('cp932')) and None |
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2047 $ 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
|
2048 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2049 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2050 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2051 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2052 2 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2053 0 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2054 ==== |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2055 3 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2056 1 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2057 |
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
2058 $ cd .. |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2059 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2060 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
|
2061 $ hg init issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2062 $ cd issue1340 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2063 $ 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
|
2064 $ echo 1 > d1/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2065 $ echo 1 > D2/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2066 $ echo 1 > D3.i/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2067 $ echo 1 > d4.hg/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2068 $ echo 1 > d5.d/f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2069 $ 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
|
2070 $ hg -q add . |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2071 $ hg commit -m "a bunch of weird directories" |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2072 $ hg log -l1 d1/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2073 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2074 $ hg log -l1 f1 |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2075 $ hg log -l1 . | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2076 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2077 $ hg log -l1 ./ | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2078 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2079 $ hg log -l1 d1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2080 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2081 $ hg log -l1 D2 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2082 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2083 $ hg log -l1 D2/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2084 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2085 $ hg log -l1 D3.i | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2086 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2087 $ hg log -l1 D3.i/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2088 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2089 $ hg log -l1 d4.hg | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2090 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2091 $ hg log -l1 d4.hg/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2092 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2093 $ hg log -l1 d5.d | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2094 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2095 $ hg log -l1 d5.d/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2096 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2097 $ hg log -l1 .d6 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2098 changeset: 0:65624cd9070a |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2099 $ hg log -l1 .d6/f1 | grep changeset |
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2100 changeset: 0:65624cd9070a |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2101 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2102 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
|
2103 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2104 $ 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
|
2105 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
|
2106 tag: tip |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
2107 user: test |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
2108 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
|
2109 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
|
2110 |
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2111 changeset: -1:000000000000 |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2112 user: |
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
2113 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
|
2114 |
18468
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2115 $ hg log -r null:null |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2116 changeset: -1:000000000000 |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2117 user: |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
2118 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
|
2119 |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2120 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
|
2121 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2122 clean: |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2123 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2124 $ 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
|
2125 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2126 phase: draft |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2127 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2128 parent: -1:0000000000000000000000000000000000000000 |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
2129 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2130 user: test |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2131 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
|
2132 extra: branch=default |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2133 |
28566
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2134 $ 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
|
2135 changeset: 2147483647:ffffffffffff |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2136 parent: 0:65624cd9070a |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2137 user: test |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2138 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
|
2139 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2140 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2141 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2142 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2143 dirty: |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2144 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2145 $ 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
|
2146 $ 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
|
2147 $ 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
|
2148 $ 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
|
2149 $ hg status |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2150 M d1/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2151 A d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2152 R .d6/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2153 |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2154 $ hg log -r 'wdir()' |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2155 changeset: 2147483647:ffffffffffff |
25739
3dabc9b7494a
changeset_printer: use node.wdirrev to calculate meaningful parentrevs
Yuya Nishihara <yuya@tcha.org>
parents:
25688
diff
changeset
|
2156 parent: 0:65624cd9070a |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2157 user: test |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2158 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
|
2159 |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2160 $ hg log -r 'wdir()' -q |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2161 2147483647:ffffffffffff |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24533
diff
changeset
|
2162 |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2163 $ hg log -r 'wdir()' --debug |
25762
f4412380d357
changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
25739
diff
changeset
|
2164 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2165 phase: draft |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2166 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2167 parent: -1:0000000000000000000000000000000000000000 |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
2168 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2169 user: test |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2170 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
|
2171 files: d1/f1 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2172 files+: d1/f2 |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2173 files-: .d6/f1 |
24585
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2174 extra: branch=default |
e191d5d8d515
changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24584
diff
changeset
|
2175 |
28566
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2176 $ 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
|
2177 changeset: 2147483647:ffffffffffff |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2178 parent: 0:65624cd9070a |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2179 user: test |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2180 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
|
2181 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2182 .d6/f1 | 1 - |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2183 d1/f1 | 1 + |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2184 d1/f2 | 1 + |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2185 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
|
2186 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2187 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
|
2188 deleted file mode 100644 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2189 --- a/.d6/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2190 +++ /dev/null |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2191 @@ -1,1 +0,0 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2192 -1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2193 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
|
2194 --- a/d1/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2195 +++ b/d1/f1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2196 @@ -1,1 +1,2 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2197 1 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2198 +2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2199 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
|
2200 new file mode 100644 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2201 --- /dev/null |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2202 +++ b/d1/f2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2203 @@ -0,0 +1,1 @@ |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2204 +2 |
34f798bec3dc
tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents:
28565
diff
changeset
|
2205 |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2206 $ hg log -r 'wdir()' -Tjson |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2207 [ |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2208 { |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2209 "bookmarks": [], |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2210 "branch": "default", |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2211 "date": [*, 0], (glob) |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2212 "desc": "", |
39795
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2213 "node": "ffffffffffffffffffffffffffffffffffffffff", |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2214 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2215 "phase": "draft", |
39795
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2216 "rev": 2147483647, |
25688
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
25006
diff
changeset
|
2217 "tags": [], |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2218 "user": "test" |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2219 } |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2220 ] |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2221 |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2222 $ 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
|
2223 [ |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2224 { |
39795
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2225 "node": "ffffffffffffffffffffffffffffffffffffffff", |
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2226 "rev": 2147483647 |
24602
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2227 } |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2228 ] |
201caa10536b
jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24585
diff
changeset
|
2229 |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2230 $ hg log -r 'wdir()' -Tjson --debug |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2231 [ |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2232 { |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2233 "added": ["d1/f2"], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2234 "bookmarks": [], |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2235 "branch": "default", |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2236 "date": [*, 0], (glob) |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2237 "desc": "", |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2238 "extra": {"branch": "default"}, |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
2239 "manifest": "ffffffffffffffffffffffffffffffffffffffff", |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2240 "modified": ["d1/f1"], |
39795
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2241 "node": "ffffffffffffffffffffffffffffffffffffffff", |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2242 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2243 "phase": "draft", |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2244 "removed": [".d6/f1"], |
39795
ba93db1745ba
log: have changesetformatter fill in wdir() rev and node (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
2245 "rev": 2147483647, |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2246 "tags": [], |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
36693
diff
changeset
|
2247 "user": "test" |
24603
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2248 } |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2249 ] |
e74f819e9160
jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24602
diff
changeset
|
2250 |
28565
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2251 $ hg revert -aqC |
bfc7f20c76c7
tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents:
28253
diff
changeset
|
2252 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2253 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
|
2254 |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2255 $ cat > ../names.py <<EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2256 > """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
|
2257 > from __future__ import absolute_import |
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2258 > from mercurial import namespaces |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2259 > |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2260 > def reposetup(ui, repo): |
36693
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2261 > foo = {b'foo': repo[0].node()} |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2262 > names = lambda r: foo.keys() |
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2263 > namemap = lambda r, name: foo.get(name) |
36327
58c1368ab629
py3: use dict.items() instead of dict.iteritems() in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35712
diff
changeset
|
2264 > nodemap = lambda r, node: [name for name, n in foo.items() |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2265 > if n == node] |
33965
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2266 > ns = namespaces.namespace( |
36693
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2267 > b"bars", templatename=b"bar", logname=b"barlog", |
19e859cad54c
tests: port test-log to Python 3
Augie Fackler <augie@google.com>
parents:
36691
diff
changeset
|
2268 > colorname=b"barcolor", listnames=names, namemap=namemap, |
33965
251bd3fddd9b
tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33773
diff
changeset
|
2269 > nodemap=nodemap) |
23873
9ef234021667
namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents:
23865
diff
changeset
|
2270 > |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2271 > repo.names.addnamespace(ns) |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2272 > EOF |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2273 |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2274 $ 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
|
2275 changeset: 0:65624cd9070a |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2276 tag: tip |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2277 barlog: foo |
23773
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2278 user: test |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2279 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
|
2280 summary: a bunch of weird directories |
c517b97c7609
namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents:
23771
diff
changeset
|
2281 |
23876
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2282 $ hg --config extensions.names=../names.py \ |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2283 > --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
|
2284 > --color=always log -r 0 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2285 \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
|
2286 tag: tip |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2287 \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
|
2288 user: test |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2289 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
|
2290 summary: a bunch of weird directories |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2291 |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2292 $ 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
|
2293 foo |
48fd1dfb99aa
log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents:
23873
diff
changeset
|
2294 |
36669
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2295 Templater parse errors: |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2296 |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2297 simple error |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2298 $ hg log -r . -T '{shortest(node}' |
36691
1b179d151578
templater: fix position of terminator character in error message
Yuya Nishihara <yuya@tcha.org>
parents:
36670
diff
changeset
|
2299 hg: parse error at 14: unexpected token: end |
36669
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2300 ({shortest(node} |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2301 ^ here) |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2302 [255] |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2303 |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2304 multi-line template with error |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2305 $ hg log -r . -T 'line 1 |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2306 > line2 |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2307 > {shortest(node} |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2308 > line4\nline5' |
36691
1b179d151578
templater: fix position of terminator character in error message
Yuya Nishihara <yuya@tcha.org>
parents:
36670
diff
changeset
|
2309 hg: parse error at 27: unexpected token: end |
36670
44048f1bcee5
templater: provide hint for multi-line templates with parse errors
Ryan McElroy <rmcelroy@fb.com>
parents:
36669
diff
changeset
|
2310 (line 1\nline2\n{shortest(node}\nline4\nline5 |
44048f1bcee5
templater: provide hint for multi-line templates with parse errors
Ryan McElroy <rmcelroy@fb.com>
parents:
36669
diff
changeset
|
2311 ^ here) |
36669
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2312 [255] |
80d7fb6c2dec
templater: add hint to template parse errors to help locate issues
Ryan McElroy <rmcelroy@fb.com>
parents:
36327
diff
changeset
|
2313 |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
2314 $ cd .. |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2315 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2316 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
|
2317 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2318 $ hg init acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2319 $ cd acrossbranches |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2320 $ mkdir d |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2321 $ 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
|
2322 $ 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
|
2323 $ hg up -q 0 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2324 $ 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
|
2325 $ 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
|
2326 @ c |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2327 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2328 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2329 |
24180
d8e0c591781c
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
24064
diff
changeset
|
2330 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
|
2331 $ 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
|
2332 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
|
2333 @ c |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2334 | |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2335 o a |
344939126579
largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents:
23956
diff
changeset
|
2336 |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2337 $ 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
|
2338 @ c |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2339 | |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2340 o a |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2341 |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
23046
diff
changeset
|
2342 $ 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
|
2343 |
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
|
2344 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
|
2345 ------------------------------------------------- |
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
|
2346 |
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
|
2347 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
|
2348 |
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
|
2349 $ 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
|
2350 $ 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
|
2351 $ 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
|
2352 $ 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
|
2353 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
|
2354 $ 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
|
2355 $ 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
|
2356 $ 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
|
2357 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
|
2358 $ 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
|
2359 $ 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
|
2360 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
|
2361 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
|
2362 $ 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
|
2363 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
|
2364 $ 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
|
2365 $ 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
|
2366 $ 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
|
2367 @ 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
|
2368 | 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
|
2369 | 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
|
2370 | 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
|
2371 | 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
|
2372 | |
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
|
2373 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
|
2374 | 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
|
2375 | 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
|
2376 | 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
|
2377 | |
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
|
2378 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
|
2379 | 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
|
2380 | 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
|
2381 | 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
|
2382 | 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
|
2383 | |
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
|
2384 | 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
|
2385 |/ 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
|
2386 | 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
|
2387 | 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
|
2388 | |
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
|
2389 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
|
2390 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
|
2391 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
|
2392 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
|
2393 |
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
|
2394 |
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
|
2395 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
|
2396 |
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 $ 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
|
2398 @ 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
|
2399 | 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
|
2400 | 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
|
2401 | 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
|
2402 | 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
|
2403 | |
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
|
2404 o changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2405 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2406 : 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
|
2407 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2408 : |
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
|
2409 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
|
2410 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
|
2411 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
|
2412 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
|
2413 |
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
|
2414 |
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
|
2415 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
|
2416 (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
|
2417 |
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
|
2418 $ 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
|
2419 @ changeset: 4:50b9b36e9c5d |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2420 : tag: tip |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2421 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2422 : 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
|
2423 : summary: content3 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2424 : |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2425 : o changeset: 1:2294ae80ad84 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2426 :/ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2427 : 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
|
2428 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2429 : |
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
|
2430 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
|
2431 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
|
2432 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
|
2433 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
|
2434 |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2435 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2436 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
|
2437 (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
|
2438 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2439 $ 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
|
2440 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
|
2441 $ 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
|
2442 @ changeset: 3:15b2327059e5 |
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: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2446 : |
23704
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2447 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
|
2448 user: test |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2449 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
|
2450 summary: content1 |
c624fb2c4239
linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
2451 |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2452 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2453 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
|
2454 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2455 (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
|
2456 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2457 $ 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
|
2458 2294ae80ad8447bc78383182eeac50cb049df623 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2459 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
2460 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
|
2461 $ 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
|
2462 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
|
2463 | 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
|
2464 | 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
|
2465 | 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
|
2466 | 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
|
2467 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2468 @ 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
|
2469 | 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
|
2470 | 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
|
2471 | 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
|
2472 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2473 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
|
2474 | 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
|
2475 | 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
|
2476 | 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
|
2477 | 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
|
2478 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2479 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
|
2480 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
|
2481 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
|
2482 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
|
2483 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2484 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2485 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
|
2486 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2487 $ 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
|
2488 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
|
2489 | 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
|
2490 | 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
|
2491 | 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
|
2492 | 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
|
2493 | |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2494 @ changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2495 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2496 : 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
|
2497 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2498 : |
23719
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2499 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
|
2500 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
|
2501 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
|
2502 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
|
2503 |
34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23704
diff
changeset
|
2504 |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2505 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
|
2506 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2507 $ 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
|
2508 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2509 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33262
diff
changeset
|
2510 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
|
2511 $ 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
|
2512 @ changeset: 3:15b2327059e5 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2513 : tag: tip |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2514 : user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2515 : 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
|
2516 : summary: content2 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2517 : |
23720
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2518 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
|
2519 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
|
2520 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
|
2521 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
|
2522 |
8ec03e0ef51a
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23719
diff
changeset
|
2523 |
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
|
2524 $ 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
|
2525 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2526 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
|
2527 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2528 $ 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
|
2529 $ 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
|
2530 $ echo '[experimental]' >> .hg/hgrc |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34455
diff
changeset
|
2531 $ 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
|
2532 $ 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
|
2533 $ 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
|
2534 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
|
2535 $ 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
|
2536 $ 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
|
2537 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
|
2538 $ 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
|
2539 $ 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
|
2540 $ 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
|
2541 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
|
2542 $ 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
|
2543 $ 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
|
2544 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
|
2545 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
|
2546 $ 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
|
2547 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
|
2548 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2549 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
|
2550 | 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
|
2551 | 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
|
2552 | 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
|
2553 | 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
|
2554 | 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
|
2555 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2556 | @ 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
|
2557 |/ 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
|
2558 | 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
|
2559 | 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
|
2560 | 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
|
2561 | |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2562 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
|
2563 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
|
2564 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
|
2565 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
|
2566 |
07a6faf939dc
revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23720
diff
changeset
|
2567 $ hg log -f -G b |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2568 @ 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
|
2569 | parent: 0:f7b1eb17ad24 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2570 ~ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2571 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
|
2572 summary: 1 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2573 |
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
|
2574 $ hg log -G b |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33965
diff
changeset
|
2575 @ 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
|
2576 | parent: 0:f7b1eb17ad24 |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2577 ~ user: test |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2578 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
|
2579 summary: 1 |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
28566
diff
changeset
|
2580 |
23865
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2581 $ cd .. |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2582 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2583 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
|
2584 ------------------------------------------------------------------------ |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2585 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2586 $ 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
|
2587 $ 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
|
2588 $ 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
|
2589 > 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
|
2590 > 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
|
2591 > done |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2592 $ 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
|
2593 $ 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
|
2594 $ 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
|
2595 $ 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
|
2596 $ 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
|
2597 $ 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
|
2598 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
|
2599 $ 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
|
2600 $ 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
|
2601 $ 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
|
2602 $ 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
|
2603 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
|
2604 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2605 $ 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
|
2606 @ 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
|
2607 | 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
|
2608 | 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
|
2609 | 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
|
2610 | 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
|
2611 | 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
|
2612 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2613 | 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
|
2614 |/ 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
|
2615 | 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
|
2616 | 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
|
2617 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2618 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
|
2619 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
|
2620 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
|
2621 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
|
2622 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2623 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2624 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
|
2625 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2626 $ 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
|
2627 @ 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
|
2628 | 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
|
2629 | 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
|
2630 | 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
|
2631 | 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
|
2632 | 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
|
2633 | |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2634 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
|
2635 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
|
2636 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
|
2637 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
|
2638 |
81349f4b47f4
linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23773
diff
changeset
|
2639 $ cd .. |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2640 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2641 --- going to test line wrap fix on using both --stat and -G (issue5800) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2642 $ hg init issue5800 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2643 $ cd issue5800 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2644 $ touch a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2645 $ hg ci -Am 'add a' |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2646 adding a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2647 ---- now we are going to add 300 lines to a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2648 $ for i in `$TESTDIR/seq.py 1 300`; do echo $i >> a; done |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2649 $ hg ci -m 'modify a' |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2650 $ hg log |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2651 changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2652 tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2653 user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2654 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2655 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2656 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2657 changeset: 0:ac82d8b1f7c4 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2658 user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2659 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2660 summary: add a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2661 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2662 ---- now visualise the changes we made without template |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2663 $ hg log -l1 -r a98683e6a834 --stat -G |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2664 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2665 | tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2666 ~ user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2667 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2668 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2669 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2670 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2671 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2672 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2673 ---- with template |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2674 $ hg log -l1 -r a98683e6a834 --stat -G -T bisect |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2675 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2676 | bisect: |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2677 ~ tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2678 user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2679 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2680 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2681 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2682 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2683 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2684 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2685 $ hg log -l1 -r a98683e6a834 --stat -G -T changelog |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2686 1970-01-01 test <test> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2687 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2688 @ * a: |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2689 | modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2690 ~ [a98683e6a834] [tip] |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2691 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2692 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2693 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2694 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2695 $ hg log -l1 -r a98683e6a834 --stat -G -T compact |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2696 @ 1[tip] a98683e6a834 1970-01-01 00:00 +0000 test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2697 | modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2698 ~ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2699 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2700 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2701 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2702 $ hg log -l1 -r a98683e6a834 --stat -G -T default |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2703 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2704 | tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2705 ~ user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2706 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2707 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2708 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2709 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2710 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2711 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2712 $ hg log -l1 -r a98683e6a834 --stat -G -T phases |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2713 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2714 | tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2715 ~ phase: draft |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2716 user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2717 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2718 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2719 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2720 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2721 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2722 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2723 $ hg log -l1 -r a98683e6a834 --stat -G -T show |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2724 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2725 | tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2726 ~ user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2727 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2728 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2729 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2730 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2731 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2732 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2733 $ hg log -l1 -r a98683e6a834 --stat -G -T status |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2734 @ changeset: 1:a98683e6a834 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2735 | tag: tip |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2736 ~ user: test |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2737 date: Thu Jan 01 00:00:00 1970 +0000 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2738 summary: modify a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2739 files: |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2740 M a |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2741 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2742 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2743 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2744 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2745 $ hg log -l1 -r a98683e6a834 --stat -G -T xml |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2746 <?xml version="1.0"?> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2747 <log> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2748 @ <logentry revision="1" node="a98683e6a8340830a7683909768b62871e84bc9d"> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2749 | <tag>tip</tag> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2750 ~ <author email="test">test</author> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2751 <date>1970-01-01T00:00:00+00:00</date> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2752 <msg xml:space="preserve">modify a</msg> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2753 </logentry> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2754 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2755 1 files changed, 300 insertions(+), 0 deletions(-) |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2756 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2757 </log> |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2758 |
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39796
diff
changeset
|
2759 $ cd .. |