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