Show More
@@ -1,2393 +1,2395 b'' | |||||
1 | Log on empty repository: checking consistency |
|
1 | Log on empty repository: checking consistency | |
2 |
|
2 | |||
3 | $ hg init empty |
|
3 | $ hg init empty | |
4 | $ cd empty |
|
4 | $ cd empty | |
5 | $ hg log |
|
5 | $ hg log | |
6 | $ hg log -r 1 |
|
6 | $ hg log -r 1 | |
7 | abort: unknown revision '1'! |
|
7 | abort: unknown revision '1'! | |
8 | [255] |
|
8 | [255] | |
9 | $ hg log -r -1:0 |
|
9 | $ hg log -r -1:0 | |
10 | abort: unknown revision '-1'! |
|
10 | abort: unknown revision '-1'! | |
11 | [255] |
|
11 | [255] | |
12 | $ hg log -r 'branch(name)' |
|
12 | $ hg log -r 'branch(name)' | |
13 | abort: unknown revision 'name'! |
|
13 | abort: unknown revision 'name'! | |
14 | [255] |
|
14 | [255] | |
15 | $ hg log -r null -q |
|
15 | $ hg log -r null -q | |
16 | -1:000000000000 |
|
16 | -1:000000000000 | |
17 |
|
17 | |||
|
18 | $ cd .. | |||
|
19 | ||||
18 | The g is crafted to have 2 filelog topological heads in a linear |
|
20 | The g is crafted to have 2 filelog topological heads in a linear | |
19 | changeset graph |
|
21 | changeset graph | |
20 |
|
22 | |||
21 | $ hg init a |
|
23 | $ hg init a | |
22 | $ cd a |
|
24 | $ cd a | |
23 | $ echo a > a |
|
25 | $ echo a > a | |
24 | $ echo f > f |
|
26 | $ echo f > f | |
25 | $ hg ci -Ama -d '1 0' |
|
27 | $ hg ci -Ama -d '1 0' | |
26 | adding a |
|
28 | adding a | |
27 | adding f |
|
29 | adding f | |
28 |
|
30 | |||
29 | $ hg cp a b |
|
31 | $ hg cp a b | |
30 | $ hg cp f g |
|
32 | $ hg cp f g | |
31 | $ hg ci -mb -d '2 0' |
|
33 | $ hg ci -mb -d '2 0' | |
32 |
|
34 | |||
33 | $ mkdir dir |
|
35 | $ mkdir dir | |
34 | $ hg mv b dir |
|
36 | $ hg mv b dir | |
35 | $ echo g >> g |
|
37 | $ echo g >> g | |
36 | $ echo f >> f |
|
38 | $ echo f >> f | |
37 | $ hg ci -mc -d '3 0' |
|
39 | $ hg ci -mc -d '3 0' | |
38 |
|
40 | |||
39 | $ hg mv a b |
|
41 | $ hg mv a b | |
40 | $ hg cp -f f g |
|
42 | $ hg cp -f f g | |
41 | $ echo a > d |
|
43 | $ echo a > d | |
42 | $ hg add d |
|
44 | $ hg add d | |
43 | $ hg ci -md -d '4 0' |
|
45 | $ hg ci -md -d '4 0' | |
44 |
|
46 | |||
45 | $ hg mv dir/b e |
|
47 | $ hg mv dir/b e | |
46 | $ hg ci -me -d '5 0' |
|
48 | $ hg ci -me -d '5 0' | |
47 |
|
49 | |||
48 | Make sure largefiles doesn't interfere with logging a regular file |
|
50 | Make sure largefiles doesn't interfere with logging a regular file | |
49 | $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
51 | $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= | |
50 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
52 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) | |
51 | updated patterns: .hglf/a, a |
|
53 | updated patterns: .hglf/a, a | |
52 | 0: a |
|
54 | 0: a | |
53 | $ hg log a |
|
55 | $ hg log a | |
54 | changeset: 0:9161b9aeaf16 |
|
56 | changeset: 0:9161b9aeaf16 | |
55 | user: test |
|
57 | user: test | |
56 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
58 | date: Thu Jan 01 00:00:01 1970 +0000 | |
57 | summary: a |
|
59 | summary: a | |
58 |
|
60 | |||
59 | $ hg log glob:a* |
|
61 | $ hg log glob:a* | |
60 | changeset: 3:2ca5ba701980 |
|
62 | changeset: 3:2ca5ba701980 | |
61 | user: test |
|
63 | user: test | |
62 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
64 | date: Thu Jan 01 00:00:04 1970 +0000 | |
63 | summary: d |
|
65 | summary: d | |
64 |
|
66 | |||
65 | changeset: 0:9161b9aeaf16 |
|
67 | changeset: 0:9161b9aeaf16 | |
66 | user: test |
|
68 | user: test | |
67 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
69 | date: Thu Jan 01 00:00:01 1970 +0000 | |
68 | summary: a |
|
70 | summary: a | |
69 |
|
71 | |||
70 | $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
72 | $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= | |
71 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
73 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) | |
72 | updated patterns: glob:.hglf/a*, glob:a* |
|
74 | updated patterns: glob:.hglf/a*, glob:a* | |
73 | 3: d |
|
75 | 3: d | |
74 | 0: a |
|
76 | 0: a | |
75 |
|
77 | |||
76 | log on directory |
|
78 | log on directory | |
77 |
|
79 | |||
78 | $ hg log dir |
|
80 | $ hg log dir | |
79 | changeset: 4:7e4639b4691b |
|
81 | changeset: 4:7e4639b4691b | |
80 | tag: tip |
|
82 | tag: tip | |
81 | user: test |
|
83 | user: test | |
82 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
84 | date: Thu Jan 01 00:00:05 1970 +0000 | |
83 | summary: e |
|
85 | summary: e | |
84 |
|
86 | |||
85 | changeset: 2:f8954cd4dc1f |
|
87 | changeset: 2:f8954cd4dc1f | |
86 | user: test |
|
88 | user: test | |
87 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
89 | date: Thu Jan 01 00:00:03 1970 +0000 | |
88 | summary: c |
|
90 | summary: c | |
89 |
|
91 | |||
90 | $ hg log somethingthatdoesntexist dir |
|
92 | $ hg log somethingthatdoesntexist dir | |
91 | changeset: 4:7e4639b4691b |
|
93 | changeset: 4:7e4639b4691b | |
92 | tag: tip |
|
94 | tag: tip | |
93 | user: test |
|
95 | user: test | |
94 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
96 | date: Thu Jan 01 00:00:05 1970 +0000 | |
95 | summary: e |
|
97 | summary: e | |
96 |
|
98 | |||
97 | changeset: 2:f8954cd4dc1f |
|
99 | changeset: 2:f8954cd4dc1f | |
98 | user: test |
|
100 | user: test | |
99 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
101 | date: Thu Jan 01 00:00:03 1970 +0000 | |
100 | summary: c |
|
102 | summary: c | |
101 |
|
103 | |||
102 |
|
104 | |||
103 | -f, non-existent directory |
|
105 | -f, non-existent directory | |
104 |
|
106 | |||
105 | $ hg log -f dir |
|
107 | $ hg log -f dir | |
106 | abort: cannot follow file not in parent revision: "dir" |
|
108 | abort: cannot follow file not in parent revision: "dir" | |
107 | [255] |
|
109 | [255] | |
108 |
|
110 | |||
109 | -f, directory |
|
111 | -f, directory | |
110 |
|
112 | |||
111 | $ hg up -q 3 |
|
113 | $ hg up -q 3 | |
112 | $ hg log -f dir |
|
114 | $ hg log -f dir | |
113 | changeset: 2:f8954cd4dc1f |
|
115 | changeset: 2:f8954cd4dc1f | |
114 | user: test |
|
116 | user: test | |
115 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
117 | date: Thu Jan 01 00:00:03 1970 +0000 | |
116 | summary: c |
|
118 | summary: c | |
117 |
|
119 | |||
118 | -f, directory with --patch |
|
120 | -f, directory with --patch | |
119 |
|
121 | |||
120 | $ hg log -f dir -p |
|
122 | $ hg log -f dir -p | |
121 | changeset: 2:f8954cd4dc1f |
|
123 | changeset: 2:f8954cd4dc1f | |
122 | user: test |
|
124 | user: test | |
123 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
125 | date: Thu Jan 01 00:00:03 1970 +0000 | |
124 | summary: c |
|
126 | summary: c | |
125 |
|
127 | |||
126 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
128 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
127 | --- /dev/null* (glob) |
|
129 | --- /dev/null* (glob) | |
128 | +++ b/dir/b* (glob) |
|
130 | +++ b/dir/b* (glob) | |
129 | @@ -0,0 +1,1 @@ |
|
131 | @@ -0,0 +1,1 @@ | |
130 | +a |
|
132 | +a | |
131 |
|
133 | |||
132 |
|
134 | |||
133 | -f, pattern |
|
135 | -f, pattern | |
134 |
|
136 | |||
135 | $ hg log -f -I 'dir**' -p |
|
137 | $ hg log -f -I 'dir**' -p | |
136 | changeset: 2:f8954cd4dc1f |
|
138 | changeset: 2:f8954cd4dc1f | |
137 | user: test |
|
139 | user: test | |
138 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
140 | date: Thu Jan 01 00:00:03 1970 +0000 | |
139 | summary: c |
|
141 | summary: c | |
140 |
|
142 | |||
141 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
143 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
142 | --- /dev/null* (glob) |
|
144 | --- /dev/null* (glob) | |
143 | +++ b/dir/b* (glob) |
|
145 | +++ b/dir/b* (glob) | |
144 | @@ -0,0 +1,1 @@ |
|
146 | @@ -0,0 +1,1 @@ | |
145 | +a |
|
147 | +a | |
146 |
|
148 | |||
147 | $ hg up -q 4 |
|
149 | $ hg up -q 4 | |
148 |
|
150 | |||
149 | -f, a wrong style |
|
151 | -f, a wrong style | |
150 |
|
152 | |||
151 | $ hg log -f -l1 --style something |
|
153 | $ hg log -f -l1 --style something | |
152 | abort: style 'something' not found |
|
154 | abort: style 'something' not found | |
153 | (available styles: bisect, changelog, compact, default, phases, show, status, xml) |
|
155 | (available styles: bisect, changelog, compact, default, phases, show, status, xml) | |
154 | [255] |
|
156 | [255] | |
155 |
|
157 | |||
156 | -f, phases style |
|
158 | -f, phases style | |
157 |
|
159 | |||
158 |
|
160 | |||
159 | $ hg log -f -l1 --style phases |
|
161 | $ hg log -f -l1 --style phases | |
160 | changeset: 4:7e4639b4691b |
|
162 | changeset: 4:7e4639b4691b | |
161 | tag: tip |
|
163 | tag: tip | |
162 | phase: draft |
|
164 | phase: draft | |
163 | user: test |
|
165 | user: test | |
164 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
166 | date: Thu Jan 01 00:00:05 1970 +0000 | |
165 | summary: e |
|
167 | summary: e | |
166 |
|
168 | |||
167 |
|
169 | |||
168 | $ hg log -f -l1 --style phases -q |
|
170 | $ hg log -f -l1 --style phases -q | |
169 | 4:7e4639b4691b |
|
171 | 4:7e4639b4691b | |
170 |
|
172 | |||
171 | -f, but no args |
|
173 | -f, but no args | |
172 |
|
174 | |||
173 | $ hg log -f |
|
175 | $ hg log -f | |
174 | changeset: 4:7e4639b4691b |
|
176 | changeset: 4:7e4639b4691b | |
175 | tag: tip |
|
177 | tag: tip | |
176 | user: test |
|
178 | user: test | |
177 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
179 | date: Thu Jan 01 00:00:05 1970 +0000 | |
178 | summary: e |
|
180 | summary: e | |
179 |
|
181 | |||
180 | changeset: 3:2ca5ba701980 |
|
182 | changeset: 3:2ca5ba701980 | |
181 | user: test |
|
183 | user: test | |
182 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
184 | date: Thu Jan 01 00:00:04 1970 +0000 | |
183 | summary: d |
|
185 | summary: d | |
184 |
|
186 | |||
185 | changeset: 2:f8954cd4dc1f |
|
187 | changeset: 2:f8954cd4dc1f | |
186 | user: test |
|
188 | user: test | |
187 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
189 | date: Thu Jan 01 00:00:03 1970 +0000 | |
188 | summary: c |
|
190 | summary: c | |
189 |
|
191 | |||
190 | changeset: 1:d89b0a12d229 |
|
192 | changeset: 1:d89b0a12d229 | |
191 | user: test |
|
193 | user: test | |
192 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
194 | date: Thu Jan 01 00:00:02 1970 +0000 | |
193 | summary: b |
|
195 | summary: b | |
194 |
|
196 | |||
195 | changeset: 0:9161b9aeaf16 |
|
197 | changeset: 0:9161b9aeaf16 | |
196 | user: test |
|
198 | user: test | |
197 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
199 | date: Thu Jan 01 00:00:01 1970 +0000 | |
198 | summary: a |
|
200 | summary: a | |
199 |
|
201 | |||
200 |
|
202 | |||
201 | one rename |
|
203 | one rename | |
202 |
|
204 | |||
203 | $ hg up -q 2 |
|
205 | $ hg up -q 2 | |
204 | $ hg log -vf a |
|
206 | $ hg log -vf a | |
205 | changeset: 0:9161b9aeaf16 |
|
207 | changeset: 0:9161b9aeaf16 | |
206 | user: test |
|
208 | user: test | |
207 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
209 | date: Thu Jan 01 00:00:01 1970 +0000 | |
208 | files: a f |
|
210 | files: a f | |
209 | description: |
|
211 | description: | |
210 | a |
|
212 | a | |
211 |
|
213 | |||
212 |
|
214 | |||
213 |
|
215 | |||
214 | many renames |
|
216 | many renames | |
215 |
|
217 | |||
216 | $ hg up -q tip |
|
218 | $ hg up -q tip | |
217 | $ hg log -vf e |
|
219 | $ hg log -vf e | |
218 | changeset: 4:7e4639b4691b |
|
220 | changeset: 4:7e4639b4691b | |
219 | tag: tip |
|
221 | tag: tip | |
220 | user: test |
|
222 | user: test | |
221 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
223 | date: Thu Jan 01 00:00:05 1970 +0000 | |
222 | files: dir/b e |
|
224 | files: dir/b e | |
223 | description: |
|
225 | description: | |
224 | e |
|
226 | e | |
225 |
|
227 | |||
226 |
|
228 | |||
227 | changeset: 2:f8954cd4dc1f |
|
229 | changeset: 2:f8954cd4dc1f | |
228 | user: test |
|
230 | user: test | |
229 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
231 | date: Thu Jan 01 00:00:03 1970 +0000 | |
230 | files: b dir/b f g |
|
232 | files: b dir/b f g | |
231 | description: |
|
233 | description: | |
232 | c |
|
234 | c | |
233 |
|
235 | |||
234 |
|
236 | |||
235 | changeset: 1:d89b0a12d229 |
|
237 | changeset: 1:d89b0a12d229 | |
236 | user: test |
|
238 | user: test | |
237 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
239 | date: Thu Jan 01 00:00:02 1970 +0000 | |
238 | files: b g |
|
240 | files: b g | |
239 | description: |
|
241 | description: | |
240 | b |
|
242 | b | |
241 |
|
243 | |||
242 |
|
244 | |||
243 | changeset: 0:9161b9aeaf16 |
|
245 | changeset: 0:9161b9aeaf16 | |
244 | user: test |
|
246 | user: test | |
245 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
247 | date: Thu Jan 01 00:00:01 1970 +0000 | |
246 | files: a f |
|
248 | files: a f | |
247 | description: |
|
249 | description: | |
248 | a |
|
250 | a | |
249 |
|
251 | |||
250 |
|
252 | |||
251 |
|
253 | |||
252 |
|
254 | |||
253 | log -pf dir/b |
|
255 | log -pf dir/b | |
254 |
|
256 | |||
255 | $ hg up -q 3 |
|
257 | $ hg up -q 3 | |
256 | $ hg log -pf dir/b |
|
258 | $ hg log -pf dir/b | |
257 | changeset: 2:f8954cd4dc1f |
|
259 | changeset: 2:f8954cd4dc1f | |
258 | user: test |
|
260 | user: test | |
259 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
261 | date: Thu Jan 01 00:00:03 1970 +0000 | |
260 | summary: c |
|
262 | summary: c | |
261 |
|
263 | |||
262 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
264 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
263 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
265 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
264 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
266 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
265 | @@ -0,0 +1,1 @@ |
|
267 | @@ -0,0 +1,1 @@ | |
266 | +a |
|
268 | +a | |
267 |
|
269 | |||
268 | changeset: 1:d89b0a12d229 |
|
270 | changeset: 1:d89b0a12d229 | |
269 | user: test |
|
271 | user: test | |
270 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
272 | date: Thu Jan 01 00:00:02 1970 +0000 | |
271 | summary: b |
|
273 | summary: b | |
272 |
|
274 | |||
273 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
275 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
274 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
276 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
275 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
277 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
276 | @@ -0,0 +1,1 @@ |
|
278 | @@ -0,0 +1,1 @@ | |
277 | +a |
|
279 | +a | |
278 |
|
280 | |||
279 | changeset: 0:9161b9aeaf16 |
|
281 | changeset: 0:9161b9aeaf16 | |
280 | user: test |
|
282 | user: test | |
281 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
283 | date: Thu Jan 01 00:00:01 1970 +0000 | |
282 | summary: a |
|
284 | summary: a | |
283 |
|
285 | |||
284 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
286 | diff -r 000000000000 -r 9161b9aeaf16 a | |
285 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
287 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
286 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
288 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
287 | @@ -0,0 +1,1 @@ |
|
289 | @@ -0,0 +1,1 @@ | |
288 | +a |
|
290 | +a | |
289 |
|
291 | |||
290 |
|
292 | |||
291 | log -pf b inside dir |
|
293 | log -pf b inside dir | |
292 |
|
294 | |||
293 | $ hg --cwd=dir log -pf b |
|
295 | $ hg --cwd=dir log -pf b | |
294 | changeset: 2:f8954cd4dc1f |
|
296 | changeset: 2:f8954cd4dc1f | |
295 | user: test |
|
297 | user: test | |
296 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
298 | date: Thu Jan 01 00:00:03 1970 +0000 | |
297 | summary: c |
|
299 | summary: c | |
298 |
|
300 | |||
299 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
301 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
300 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
302 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
301 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
303 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
302 | @@ -0,0 +1,1 @@ |
|
304 | @@ -0,0 +1,1 @@ | |
303 | +a |
|
305 | +a | |
304 |
|
306 | |||
305 | changeset: 1:d89b0a12d229 |
|
307 | changeset: 1:d89b0a12d229 | |
306 | user: test |
|
308 | user: test | |
307 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
309 | date: Thu Jan 01 00:00:02 1970 +0000 | |
308 | summary: b |
|
310 | summary: b | |
309 |
|
311 | |||
310 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
312 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
311 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
313 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
312 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
314 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
313 | @@ -0,0 +1,1 @@ |
|
315 | @@ -0,0 +1,1 @@ | |
314 | +a |
|
316 | +a | |
315 |
|
317 | |||
316 | changeset: 0:9161b9aeaf16 |
|
318 | changeset: 0:9161b9aeaf16 | |
317 | user: test |
|
319 | user: test | |
318 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
320 | date: Thu Jan 01 00:00:01 1970 +0000 | |
319 | summary: a |
|
321 | summary: a | |
320 |
|
322 | |||
321 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
323 | diff -r 000000000000 -r 9161b9aeaf16 a | |
322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
324 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
323 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
325 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
324 | @@ -0,0 +1,1 @@ |
|
326 | @@ -0,0 +1,1 @@ | |
325 | +a |
|
327 | +a | |
326 |
|
328 | |||
327 |
|
329 | |||
328 | log -pf, but no args |
|
330 | log -pf, but no args | |
329 |
|
331 | |||
330 | $ hg log -pf |
|
332 | $ hg log -pf | |
331 | changeset: 3:2ca5ba701980 |
|
333 | changeset: 3:2ca5ba701980 | |
332 | user: test |
|
334 | user: test | |
333 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
335 | date: Thu Jan 01 00:00:04 1970 +0000 | |
334 | summary: d |
|
336 | summary: d | |
335 |
|
337 | |||
336 | diff -r f8954cd4dc1f -r 2ca5ba701980 a |
|
338 | diff -r f8954cd4dc1f -r 2ca5ba701980 a | |
337 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
339 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
338 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
340 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
339 | @@ -1,1 +0,0 @@ |
|
341 | @@ -1,1 +0,0 @@ | |
340 | -a |
|
342 | -a | |
341 | diff -r f8954cd4dc1f -r 2ca5ba701980 b |
|
343 | diff -r f8954cd4dc1f -r 2ca5ba701980 b | |
342 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
344 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
343 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 |
|
345 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 | |
344 | @@ -0,0 +1,1 @@ |
|
346 | @@ -0,0 +1,1 @@ | |
345 | +a |
|
347 | +a | |
346 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
348 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
347 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
349 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
348 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
350 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
349 | @@ -0,0 +1,1 @@ |
|
351 | @@ -0,0 +1,1 @@ | |
350 | +a |
|
352 | +a | |
351 | diff -r f8954cd4dc1f -r 2ca5ba701980 g |
|
353 | diff -r f8954cd4dc1f -r 2ca5ba701980 g | |
352 | --- a/g Thu Jan 01 00:00:03 1970 +0000 |
|
354 | --- a/g Thu Jan 01 00:00:03 1970 +0000 | |
353 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
|
355 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 | |
354 | @@ -1,2 +1,2 @@ |
|
356 | @@ -1,2 +1,2 @@ | |
355 | f |
|
357 | f | |
356 | -g |
|
358 | -g | |
357 | +f |
|
359 | +f | |
358 |
|
360 | |||
359 | changeset: 2:f8954cd4dc1f |
|
361 | changeset: 2:f8954cd4dc1f | |
360 | user: test |
|
362 | user: test | |
361 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
363 | date: Thu Jan 01 00:00:03 1970 +0000 | |
362 | summary: c |
|
364 | summary: c | |
363 |
|
365 | |||
364 | diff -r d89b0a12d229 -r f8954cd4dc1f b |
|
366 | diff -r d89b0a12d229 -r f8954cd4dc1f b | |
365 | --- a/b Thu Jan 01 00:00:02 1970 +0000 |
|
367 | --- a/b Thu Jan 01 00:00:02 1970 +0000 | |
366 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
368 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
367 | @@ -1,1 +0,0 @@ |
|
369 | @@ -1,1 +0,0 @@ | |
368 | -a |
|
370 | -a | |
369 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
371 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
370 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
372 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
371 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
373 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
372 | @@ -0,0 +1,1 @@ |
|
374 | @@ -0,0 +1,1 @@ | |
373 | +a |
|
375 | +a | |
374 | diff -r d89b0a12d229 -r f8954cd4dc1f f |
|
376 | diff -r d89b0a12d229 -r f8954cd4dc1f f | |
375 | --- a/f Thu Jan 01 00:00:02 1970 +0000 |
|
377 | --- a/f Thu Jan 01 00:00:02 1970 +0000 | |
376 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
|
378 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 | |
377 | @@ -1,1 +1,2 @@ |
|
379 | @@ -1,1 +1,2 @@ | |
378 | f |
|
380 | f | |
379 | +f |
|
381 | +f | |
380 | diff -r d89b0a12d229 -r f8954cd4dc1f g |
|
382 | diff -r d89b0a12d229 -r f8954cd4dc1f g | |
381 | --- a/g Thu Jan 01 00:00:02 1970 +0000 |
|
383 | --- a/g Thu Jan 01 00:00:02 1970 +0000 | |
382 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 |
|
384 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 | |
383 | @@ -1,1 +1,2 @@ |
|
385 | @@ -1,1 +1,2 @@ | |
384 | f |
|
386 | f | |
385 | +g |
|
387 | +g | |
386 |
|
388 | |||
387 | changeset: 1:d89b0a12d229 |
|
389 | changeset: 1:d89b0a12d229 | |
388 | user: test |
|
390 | user: test | |
389 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
391 | date: Thu Jan 01 00:00:02 1970 +0000 | |
390 | summary: b |
|
392 | summary: b | |
391 |
|
393 | |||
392 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
394 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
393 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
395 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
394 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
396 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
395 | @@ -0,0 +1,1 @@ |
|
397 | @@ -0,0 +1,1 @@ | |
396 | +a |
|
398 | +a | |
397 | diff -r 9161b9aeaf16 -r d89b0a12d229 g |
|
399 | diff -r 9161b9aeaf16 -r d89b0a12d229 g | |
398 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
400 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
399 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 |
|
401 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 | |
400 | @@ -0,0 +1,1 @@ |
|
402 | @@ -0,0 +1,1 @@ | |
401 | +f |
|
403 | +f | |
402 |
|
404 | |||
403 | changeset: 0:9161b9aeaf16 |
|
405 | changeset: 0:9161b9aeaf16 | |
404 | user: test |
|
406 | user: test | |
405 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
407 | date: Thu Jan 01 00:00:01 1970 +0000 | |
406 | summary: a |
|
408 | summary: a | |
407 |
|
409 | |||
408 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
410 | diff -r 000000000000 -r 9161b9aeaf16 a | |
409 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
411 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
410 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
412 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
411 | @@ -0,0 +1,1 @@ |
|
413 | @@ -0,0 +1,1 @@ | |
412 | +a |
|
414 | +a | |
413 | diff -r 000000000000 -r 9161b9aeaf16 f |
|
415 | diff -r 000000000000 -r 9161b9aeaf16 f | |
414 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
416 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
415 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
|
417 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 | |
416 | @@ -0,0 +1,1 @@ |
|
418 | @@ -0,0 +1,1 @@ | |
417 | +f |
|
419 | +f | |
418 |
|
420 | |||
419 |
|
421 | |||
420 | log -vf dir/b |
|
422 | log -vf dir/b | |
421 |
|
423 | |||
422 | $ hg log -vf dir/b |
|
424 | $ hg log -vf dir/b | |
423 | changeset: 2:f8954cd4dc1f |
|
425 | changeset: 2:f8954cd4dc1f | |
424 | user: test |
|
426 | user: test | |
425 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
427 | date: Thu Jan 01 00:00:03 1970 +0000 | |
426 | files: b dir/b f g |
|
428 | files: b dir/b f g | |
427 | description: |
|
429 | description: | |
428 | c |
|
430 | c | |
429 |
|
431 | |||
430 |
|
432 | |||
431 | changeset: 1:d89b0a12d229 |
|
433 | changeset: 1:d89b0a12d229 | |
432 | user: test |
|
434 | user: test | |
433 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
435 | date: Thu Jan 01 00:00:02 1970 +0000 | |
434 | files: b g |
|
436 | files: b g | |
435 | description: |
|
437 | description: | |
436 | b |
|
438 | b | |
437 |
|
439 | |||
438 |
|
440 | |||
439 | changeset: 0:9161b9aeaf16 |
|
441 | changeset: 0:9161b9aeaf16 | |
440 | user: test |
|
442 | user: test | |
441 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
443 | date: Thu Jan 01 00:00:01 1970 +0000 | |
442 | files: a f |
|
444 | files: a f | |
443 | description: |
|
445 | description: | |
444 | a |
|
446 | a | |
445 |
|
447 | |||
446 |
|
448 | |||
447 |
|
449 | |||
448 |
|
450 | |||
449 | -f and multiple filelog heads |
|
451 | -f and multiple filelog heads | |
450 |
|
452 | |||
451 | $ hg up -q 2 |
|
453 | $ hg up -q 2 | |
452 | $ hg log -f g --template '{rev}\n' |
|
454 | $ hg log -f g --template '{rev}\n' | |
453 | 2 |
|
455 | 2 | |
454 | 1 |
|
456 | 1 | |
455 | 0 |
|
457 | 0 | |
456 | $ hg up -q tip |
|
458 | $ hg up -q tip | |
457 | $ hg log -f g --template '{rev}\n' |
|
459 | $ hg log -f g --template '{rev}\n' | |
458 | 3 |
|
460 | 3 | |
459 | 2 |
|
461 | 2 | |
460 | 0 |
|
462 | 0 | |
461 |
|
463 | |||
462 |
|
464 | |||
463 | log copies with --copies |
|
465 | log copies with --copies | |
464 |
|
466 | |||
465 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
467 | $ hg log -vC --template '{rev} {file_copies}\n' | |
466 | 4 e (dir/b) |
|
468 | 4 e (dir/b) | |
467 | 3 b (a)g (f) |
|
469 | 3 b (a)g (f) | |
468 | 2 dir/b (b) |
|
470 | 2 dir/b (b) | |
469 | 1 b (a)g (f) |
|
471 | 1 b (a)g (f) | |
470 | 0 |
|
472 | 0 | |
471 |
|
473 | |||
472 | log copies switch without --copies, with old filecopy template |
|
474 | log copies switch without --copies, with old filecopy template | |
473 |
|
475 | |||
474 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
476 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' | |
475 | 4 |
|
477 | 4 | |
476 | 3 |
|
478 | 3 | |
477 | 2 |
|
479 | 2 | |
478 | 1 |
|
480 | 1 | |
479 | 0 |
|
481 | 0 | |
480 |
|
482 | |||
481 | log copies switch with --copies |
|
483 | log copies switch with --copies | |
482 |
|
484 | |||
483 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
485 | $ hg log -vC --template '{rev} {file_copies_switch}\n' | |
484 | 4 e (dir/b) |
|
486 | 4 e (dir/b) | |
485 | 3 b (a)g (f) |
|
487 | 3 b (a)g (f) | |
486 | 2 dir/b (b) |
|
488 | 2 dir/b (b) | |
487 | 1 b (a)g (f) |
|
489 | 1 b (a)g (f) | |
488 | 0 |
|
490 | 0 | |
489 |
|
491 | |||
490 |
|
492 | |||
491 | log copies with hardcoded style and with --style=default |
|
493 | log copies with hardcoded style and with --style=default | |
492 |
|
494 | |||
493 | $ hg log -vC -r4 |
|
495 | $ hg log -vC -r4 | |
494 | changeset: 4:7e4639b4691b |
|
496 | changeset: 4:7e4639b4691b | |
495 | tag: tip |
|
497 | tag: tip | |
496 | user: test |
|
498 | user: test | |
497 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
499 | date: Thu Jan 01 00:00:05 1970 +0000 | |
498 | files: dir/b e |
|
500 | files: dir/b e | |
499 | copies: e (dir/b) |
|
501 | copies: e (dir/b) | |
500 | description: |
|
502 | description: | |
501 | e |
|
503 | e | |
502 |
|
504 | |||
503 |
|
505 | |||
504 | $ hg log -vC -r4 --style=default |
|
506 | $ hg log -vC -r4 --style=default | |
505 | changeset: 4:7e4639b4691b |
|
507 | changeset: 4:7e4639b4691b | |
506 | tag: tip |
|
508 | tag: tip | |
507 | user: test |
|
509 | user: test | |
508 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
510 | date: Thu Jan 01 00:00:05 1970 +0000 | |
509 | files: dir/b e |
|
511 | files: dir/b e | |
510 | copies: e (dir/b) |
|
512 | copies: e (dir/b) | |
511 | description: |
|
513 | description: | |
512 | e |
|
514 | e | |
513 |
|
515 | |||
514 |
|
516 | |||
515 | $ hg log -vC -r4 -Tjson |
|
517 | $ hg log -vC -r4 -Tjson | |
516 | [ |
|
518 | [ | |
517 | { |
|
519 | { | |
518 | "rev": 4, |
|
520 | "rev": 4, | |
519 | "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
|
521 | "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", | |
520 | "branch": "default", |
|
522 | "branch": "default", | |
521 | "phase": "draft", |
|
523 | "phase": "draft", | |
522 | "user": "test", |
|
524 | "user": "test", | |
523 | "date": [5, 0], |
|
525 | "date": [5, 0], | |
524 | "desc": "e", |
|
526 | "desc": "e", | |
525 | "bookmarks": [], |
|
527 | "bookmarks": [], | |
526 | "tags": ["tip"], |
|
528 | "tags": ["tip"], | |
527 | "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
|
529 | "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], | |
528 | "files": ["dir/b", "e"], |
|
530 | "files": ["dir/b", "e"], | |
529 | "copies": {"e": "dir/b"} |
|
531 | "copies": {"e": "dir/b"} | |
530 | } |
|
532 | } | |
531 | ] |
|
533 | ] | |
532 |
|
534 | |||
533 | log copies, non-linear manifest |
|
535 | log copies, non-linear manifest | |
534 |
|
536 | |||
535 | $ hg up -C 3 |
|
537 | $ hg up -C 3 | |
536 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
538 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
537 | $ hg mv dir/b e |
|
539 | $ hg mv dir/b e | |
538 | $ echo foo > foo |
|
540 | $ echo foo > foo | |
539 | $ hg ci -Ame2 -d '6 0' |
|
541 | $ hg ci -Ame2 -d '6 0' | |
540 | adding foo |
|
542 | adding foo | |
541 | created new head |
|
543 | created new head | |
542 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
544 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 | |
543 | 5 e (dir/b) |
|
545 | 5 e (dir/b) | |
544 |
|
546 | |||
545 |
|
547 | |||
546 | log copies, execute bit set |
|
548 | log copies, execute bit set | |
547 |
|
549 | |||
548 | #if execbit |
|
550 | #if execbit | |
549 | $ chmod +x e |
|
551 | $ chmod +x e | |
550 | $ hg ci -me3 -d '7 0' |
|
552 | $ hg ci -me3 -d '7 0' | |
551 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
553 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 | |
552 | 6 |
|
554 | 6 | |
553 | #endif |
|
555 | #endif | |
554 |
|
556 | |||
555 |
|
557 | |||
556 | log -p d |
|
558 | log -p d | |
557 |
|
559 | |||
558 | $ hg log -pv d |
|
560 | $ hg log -pv d | |
559 | changeset: 3:2ca5ba701980 |
|
561 | changeset: 3:2ca5ba701980 | |
560 | user: test |
|
562 | user: test | |
561 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
563 | date: Thu Jan 01 00:00:04 1970 +0000 | |
562 | files: a b d g |
|
564 | files: a b d g | |
563 | description: |
|
565 | description: | |
564 | d |
|
566 | d | |
565 |
|
567 | |||
566 |
|
568 | |||
567 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
569 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
568 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
570 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
569 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
571 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
570 | @@ -0,0 +1,1 @@ |
|
572 | @@ -0,0 +1,1 @@ | |
571 | +a |
|
573 | +a | |
572 |
|
574 | |||
573 |
|
575 | |||
574 |
|
576 | |||
575 | log --removed file |
|
577 | log --removed file | |
576 |
|
578 | |||
577 | $ hg log --removed -v a |
|
579 | $ hg log --removed -v a | |
578 | changeset: 3:2ca5ba701980 |
|
580 | changeset: 3:2ca5ba701980 | |
579 | user: test |
|
581 | user: test | |
580 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
582 | date: Thu Jan 01 00:00:04 1970 +0000 | |
581 | files: a b d g |
|
583 | files: a b d g | |
582 | description: |
|
584 | description: | |
583 | d |
|
585 | d | |
584 |
|
586 | |||
585 |
|
587 | |||
586 | changeset: 0:9161b9aeaf16 |
|
588 | changeset: 0:9161b9aeaf16 | |
587 | user: test |
|
589 | user: test | |
588 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
590 | date: Thu Jan 01 00:00:01 1970 +0000 | |
589 | files: a f |
|
591 | files: a f | |
590 | description: |
|
592 | description: | |
591 | a |
|
593 | a | |
592 |
|
594 | |||
593 |
|
595 | |||
594 |
|
596 | |||
595 | log --removed revrange file |
|
597 | log --removed revrange file | |
596 |
|
598 | |||
597 | $ hg log --removed -v -r0:2 a |
|
599 | $ hg log --removed -v -r0:2 a | |
598 | changeset: 0:9161b9aeaf16 |
|
600 | changeset: 0:9161b9aeaf16 | |
599 | user: test |
|
601 | user: test | |
600 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
602 | date: Thu Jan 01 00:00:01 1970 +0000 | |
601 | files: a f |
|
603 | files: a f | |
602 | description: |
|
604 | description: | |
603 | a |
|
605 | a | |
604 |
|
606 | |||
605 |
|
607 | |||
606 | $ cd .. |
|
608 | $ cd .. | |
607 |
|
609 | |||
608 | log --follow tests |
|
610 | log --follow tests | |
609 |
|
611 | |||
610 | $ hg init follow |
|
612 | $ hg init follow | |
611 | $ cd follow |
|
613 | $ cd follow | |
612 |
|
614 | |||
613 | $ echo base > base |
|
615 | $ echo base > base | |
614 | $ hg ci -Ambase -d '1 0' |
|
616 | $ hg ci -Ambase -d '1 0' | |
615 | adding base |
|
617 | adding base | |
616 |
|
618 | |||
617 | $ echo r1 >> base |
|
619 | $ echo r1 >> base | |
618 | $ hg ci -Amr1 -d '1 0' |
|
620 | $ hg ci -Amr1 -d '1 0' | |
619 | $ echo r2 >> base |
|
621 | $ echo r2 >> base | |
620 | $ hg ci -Amr2 -d '1 0' |
|
622 | $ hg ci -Amr2 -d '1 0' | |
621 |
|
623 | |||
622 | $ hg up -C 1 |
|
624 | $ hg up -C 1 | |
623 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
625 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
624 | $ echo b1 > b1 |
|
626 | $ echo b1 > b1 | |
625 |
|
627 | |||
626 | log -r "follow('set:clean()')" |
|
628 | log -r "follow('set:clean()')" | |
627 |
|
629 | |||
628 | $ hg log -r "follow('set:clean()')" |
|
630 | $ hg log -r "follow('set:clean()')" | |
629 | changeset: 0:67e992f2c4f3 |
|
631 | changeset: 0:67e992f2c4f3 | |
630 | user: test |
|
632 | user: test | |
631 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
633 | date: Thu Jan 01 00:00:01 1970 +0000 | |
632 | summary: base |
|
634 | summary: base | |
633 |
|
635 | |||
634 | changeset: 1:3d5bf5654eda |
|
636 | changeset: 1:3d5bf5654eda | |
635 | user: test |
|
637 | user: test | |
636 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
638 | date: Thu Jan 01 00:00:01 1970 +0000 | |
637 | summary: r1 |
|
639 | summary: r1 | |
638 |
|
640 | |||
639 |
|
641 | |||
640 | $ hg ci -Amb1 -d '1 0' |
|
642 | $ hg ci -Amb1 -d '1 0' | |
641 | adding b1 |
|
643 | adding b1 | |
642 | created new head |
|
644 | created new head | |
643 |
|
645 | |||
644 |
|
646 | |||
645 | log -f |
|
647 | log -f | |
646 |
|
648 | |||
647 | $ hg log -f |
|
649 | $ hg log -f | |
648 | changeset: 3:e62f78d544b4 |
|
650 | changeset: 3:e62f78d544b4 | |
649 | tag: tip |
|
651 | tag: tip | |
650 | parent: 1:3d5bf5654eda |
|
652 | parent: 1:3d5bf5654eda | |
651 | user: test |
|
653 | user: test | |
652 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
654 | date: Thu Jan 01 00:00:01 1970 +0000 | |
653 | summary: b1 |
|
655 | summary: b1 | |
654 |
|
656 | |||
655 | changeset: 1:3d5bf5654eda |
|
657 | changeset: 1:3d5bf5654eda | |
656 | user: test |
|
658 | user: test | |
657 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
659 | date: Thu Jan 01 00:00:01 1970 +0000 | |
658 | summary: r1 |
|
660 | summary: r1 | |
659 |
|
661 | |||
660 | changeset: 0:67e992f2c4f3 |
|
662 | changeset: 0:67e992f2c4f3 | |
661 | user: test |
|
663 | user: test | |
662 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
664 | date: Thu Jan 01 00:00:01 1970 +0000 | |
663 | summary: base |
|
665 | summary: base | |
664 |
|
666 | |||
665 |
|
667 | |||
666 | log -r follow('glob:b*') |
|
668 | log -r follow('glob:b*') | |
667 |
|
669 | |||
668 | $ hg log -r "follow('glob:b*')" |
|
670 | $ hg log -r "follow('glob:b*')" | |
669 | changeset: 0:67e992f2c4f3 |
|
671 | changeset: 0:67e992f2c4f3 | |
670 | user: test |
|
672 | user: test | |
671 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
673 | date: Thu Jan 01 00:00:01 1970 +0000 | |
672 | summary: base |
|
674 | summary: base | |
673 |
|
675 | |||
674 | changeset: 1:3d5bf5654eda |
|
676 | changeset: 1:3d5bf5654eda | |
675 | user: test |
|
677 | user: test | |
676 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
678 | date: Thu Jan 01 00:00:01 1970 +0000 | |
677 | summary: r1 |
|
679 | summary: r1 | |
678 |
|
680 | |||
679 | changeset: 3:e62f78d544b4 |
|
681 | changeset: 3:e62f78d544b4 | |
680 | tag: tip |
|
682 | tag: tip | |
681 | parent: 1:3d5bf5654eda |
|
683 | parent: 1:3d5bf5654eda | |
682 | user: test |
|
684 | user: test | |
683 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
685 | date: Thu Jan 01 00:00:01 1970 +0000 | |
684 | summary: b1 |
|
686 | summary: b1 | |
685 |
|
687 | |||
686 | log -f -r '1 + 4' |
|
688 | log -f -r '1 + 4' | |
687 |
|
689 | |||
688 | $ hg up -C 0 |
|
690 | $ hg up -C 0 | |
689 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
691 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
690 | $ echo b2 > b2 |
|
692 | $ echo b2 > b2 | |
691 | $ hg ci -Amb2 -d '1 0' |
|
693 | $ hg ci -Amb2 -d '1 0' | |
692 | adding b2 |
|
694 | adding b2 | |
693 | created new head |
|
695 | created new head | |
694 | $ hg log -f -r '1 + 4' |
|
696 | $ hg log -f -r '1 + 4' | |
695 | changeset: 4:ddb82e70d1a1 |
|
697 | changeset: 4:ddb82e70d1a1 | |
696 | tag: tip |
|
698 | tag: tip | |
697 | parent: 0:67e992f2c4f3 |
|
699 | parent: 0:67e992f2c4f3 | |
698 | user: test |
|
700 | user: test | |
699 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
701 | date: Thu Jan 01 00:00:01 1970 +0000 | |
700 | summary: b2 |
|
702 | summary: b2 | |
701 |
|
703 | |||
702 | changeset: 1:3d5bf5654eda |
|
704 | changeset: 1:3d5bf5654eda | |
703 | user: test |
|
705 | user: test | |
704 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
706 | date: Thu Jan 01 00:00:01 1970 +0000 | |
705 | summary: r1 |
|
707 | summary: r1 | |
706 |
|
708 | |||
707 | changeset: 0:67e992f2c4f3 |
|
709 | changeset: 0:67e992f2c4f3 | |
708 | user: test |
|
710 | user: test | |
709 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
711 | date: Thu Jan 01 00:00:01 1970 +0000 | |
710 | summary: base |
|
712 | summary: base | |
711 |
|
713 | |||
712 | log -r "follow('set:grep(b2)')" |
|
714 | log -r "follow('set:grep(b2)')" | |
713 |
|
715 | |||
714 | $ hg log -r "follow('set:grep(b2)')" |
|
716 | $ hg log -r "follow('set:grep(b2)')" | |
715 | changeset: 4:ddb82e70d1a1 |
|
717 | changeset: 4:ddb82e70d1a1 | |
716 | tag: tip |
|
718 | tag: tip | |
717 | parent: 0:67e992f2c4f3 |
|
719 | parent: 0:67e992f2c4f3 | |
718 | user: test |
|
720 | user: test | |
719 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
721 | date: Thu Jan 01 00:00:01 1970 +0000 | |
720 | summary: b2 |
|
722 | summary: b2 | |
721 |
|
723 | |||
722 | log -r "follow('set:grep(b2)', 4)" |
|
724 | log -r "follow('set:grep(b2)', 4)" | |
723 |
|
725 | |||
724 | $ hg up -qC 0 |
|
726 | $ hg up -qC 0 | |
725 | $ hg log -r "follow('set:grep(b2)', 4)" |
|
727 | $ hg log -r "follow('set:grep(b2)', 4)" | |
726 | changeset: 4:ddb82e70d1a1 |
|
728 | changeset: 4:ddb82e70d1a1 | |
727 | tag: tip |
|
729 | tag: tip | |
728 | parent: 0:67e992f2c4f3 |
|
730 | parent: 0:67e992f2c4f3 | |
729 | user: test |
|
731 | user: test | |
730 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
732 | date: Thu Jan 01 00:00:01 1970 +0000 | |
731 | summary: b2 |
|
733 | summary: b2 | |
732 |
|
734 | |||
733 | $ hg up -qC 4 |
|
735 | $ hg up -qC 4 | |
734 |
|
736 | |||
735 | log -f -r null |
|
737 | log -f -r null | |
736 |
|
738 | |||
737 | $ hg log -f -r null |
|
739 | $ hg log -f -r null | |
738 | changeset: -1:000000000000 |
|
740 | changeset: -1:000000000000 | |
739 | user: |
|
741 | user: | |
740 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
742 | date: Thu Jan 01 00:00:00 1970 +0000 | |
741 |
|
743 | |||
742 | $ hg log -f -r null -G |
|
744 | $ hg log -f -r null -G | |
743 | o changeset: -1:000000000000 |
|
745 | o changeset: -1:000000000000 | |
744 | user: |
|
746 | user: | |
745 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
747 | date: Thu Jan 01 00:00:00 1970 +0000 | |
746 |
|
748 | |||
747 |
|
749 | |||
748 |
|
750 | |||
749 | log -f with null parent |
|
751 | log -f with null parent | |
750 |
|
752 | |||
751 | $ hg up -C null |
|
753 | $ hg up -C null | |
752 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
754 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
753 | $ hg log -f |
|
755 | $ hg log -f | |
754 |
|
756 | |||
755 |
|
757 | |||
756 | log -r . with two parents |
|
758 | log -r . with two parents | |
757 |
|
759 | |||
758 | $ hg up -C 3 |
|
760 | $ hg up -C 3 | |
759 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
761 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
760 | $ hg merge tip |
|
762 | $ hg merge tip | |
761 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
763 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
762 | (branch merge, don't forget to commit) |
|
764 | (branch merge, don't forget to commit) | |
763 | $ hg log -r . |
|
765 | $ hg log -r . | |
764 | changeset: 3:e62f78d544b4 |
|
766 | changeset: 3:e62f78d544b4 | |
765 | parent: 1:3d5bf5654eda |
|
767 | parent: 1:3d5bf5654eda | |
766 | user: test |
|
768 | user: test | |
767 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
769 | date: Thu Jan 01 00:00:01 1970 +0000 | |
768 | summary: b1 |
|
770 | summary: b1 | |
769 |
|
771 | |||
770 |
|
772 | |||
771 |
|
773 | |||
772 | log -r . with one parent |
|
774 | log -r . with one parent | |
773 |
|
775 | |||
774 | $ hg ci -mm12 -d '1 0' |
|
776 | $ hg ci -mm12 -d '1 0' | |
775 | $ hg log -r . |
|
777 | $ hg log -r . | |
776 | changeset: 5:302e9dd6890d |
|
778 | changeset: 5:302e9dd6890d | |
777 | tag: tip |
|
779 | tag: tip | |
778 | parent: 3:e62f78d544b4 |
|
780 | parent: 3:e62f78d544b4 | |
779 | parent: 4:ddb82e70d1a1 |
|
781 | parent: 4:ddb82e70d1a1 | |
780 | user: test |
|
782 | user: test | |
781 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
783 | date: Thu Jan 01 00:00:01 1970 +0000 | |
782 | summary: m12 |
|
784 | summary: m12 | |
783 |
|
785 | |||
784 |
|
786 | |||
785 | $ echo postm >> b1 |
|
787 | $ echo postm >> b1 | |
786 | $ hg ci -Amb1.1 -d'1 0' |
|
788 | $ hg ci -Amb1.1 -d'1 0' | |
787 |
|
789 | |||
788 |
|
790 | |||
789 | log --follow-first |
|
791 | log --follow-first | |
790 |
|
792 | |||
791 | $ hg log --follow-first |
|
793 | $ hg log --follow-first | |
792 | changeset: 6:2404bbcab562 |
|
794 | changeset: 6:2404bbcab562 | |
793 | tag: tip |
|
795 | tag: tip | |
794 | user: test |
|
796 | user: test | |
795 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
797 | date: Thu Jan 01 00:00:01 1970 +0000 | |
796 | summary: b1.1 |
|
798 | summary: b1.1 | |
797 |
|
799 | |||
798 | changeset: 5:302e9dd6890d |
|
800 | changeset: 5:302e9dd6890d | |
799 | parent: 3:e62f78d544b4 |
|
801 | parent: 3:e62f78d544b4 | |
800 | parent: 4:ddb82e70d1a1 |
|
802 | parent: 4:ddb82e70d1a1 | |
801 | user: test |
|
803 | user: test | |
802 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
804 | date: Thu Jan 01 00:00:01 1970 +0000 | |
803 | summary: m12 |
|
805 | summary: m12 | |
804 |
|
806 | |||
805 | changeset: 3:e62f78d544b4 |
|
807 | changeset: 3:e62f78d544b4 | |
806 | parent: 1:3d5bf5654eda |
|
808 | parent: 1:3d5bf5654eda | |
807 | user: test |
|
809 | user: test | |
808 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
810 | date: Thu Jan 01 00:00:01 1970 +0000 | |
809 | summary: b1 |
|
811 | summary: b1 | |
810 |
|
812 | |||
811 | changeset: 1:3d5bf5654eda |
|
813 | changeset: 1:3d5bf5654eda | |
812 | user: test |
|
814 | user: test | |
813 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
815 | date: Thu Jan 01 00:00:01 1970 +0000 | |
814 | summary: r1 |
|
816 | summary: r1 | |
815 |
|
817 | |||
816 | changeset: 0:67e992f2c4f3 |
|
818 | changeset: 0:67e992f2c4f3 | |
817 | user: test |
|
819 | user: test | |
818 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
820 | date: Thu Jan 01 00:00:01 1970 +0000 | |
819 | summary: base |
|
821 | summary: base | |
820 |
|
822 | |||
821 |
|
823 | |||
822 |
|
824 | |||
823 | log -P 2 |
|
825 | log -P 2 | |
824 |
|
826 | |||
825 | $ hg log -P 2 |
|
827 | $ hg log -P 2 | |
826 | changeset: 6:2404bbcab562 |
|
828 | changeset: 6:2404bbcab562 | |
827 | tag: tip |
|
829 | tag: tip | |
828 | user: test |
|
830 | user: test | |
829 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
831 | date: Thu Jan 01 00:00:01 1970 +0000 | |
830 | summary: b1.1 |
|
832 | summary: b1.1 | |
831 |
|
833 | |||
832 | changeset: 5:302e9dd6890d |
|
834 | changeset: 5:302e9dd6890d | |
833 | parent: 3:e62f78d544b4 |
|
835 | parent: 3:e62f78d544b4 | |
834 | parent: 4:ddb82e70d1a1 |
|
836 | parent: 4:ddb82e70d1a1 | |
835 | user: test |
|
837 | user: test | |
836 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
838 | date: Thu Jan 01 00:00:01 1970 +0000 | |
837 | summary: m12 |
|
839 | summary: m12 | |
838 |
|
840 | |||
839 | changeset: 4:ddb82e70d1a1 |
|
841 | changeset: 4:ddb82e70d1a1 | |
840 | parent: 0:67e992f2c4f3 |
|
842 | parent: 0:67e992f2c4f3 | |
841 | user: test |
|
843 | user: test | |
842 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
844 | date: Thu Jan 01 00:00:01 1970 +0000 | |
843 | summary: b2 |
|
845 | summary: b2 | |
844 |
|
846 | |||
845 | changeset: 3:e62f78d544b4 |
|
847 | changeset: 3:e62f78d544b4 | |
846 | parent: 1:3d5bf5654eda |
|
848 | parent: 1:3d5bf5654eda | |
847 | user: test |
|
849 | user: test | |
848 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
850 | date: Thu Jan 01 00:00:01 1970 +0000 | |
849 | summary: b1 |
|
851 | summary: b1 | |
850 |
|
852 | |||
851 |
|
853 | |||
852 |
|
854 | |||
853 | log -r tip -p --git |
|
855 | log -r tip -p --git | |
854 |
|
856 | |||
855 | $ hg log -r tip -p --git |
|
857 | $ hg log -r tip -p --git | |
856 | changeset: 6:2404bbcab562 |
|
858 | changeset: 6:2404bbcab562 | |
857 | tag: tip |
|
859 | tag: tip | |
858 | user: test |
|
860 | user: test | |
859 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
861 | date: Thu Jan 01 00:00:01 1970 +0000 | |
860 | summary: b1.1 |
|
862 | summary: b1.1 | |
861 |
|
863 | |||
862 | diff --git a/b1 b/b1 |
|
864 | diff --git a/b1 b/b1 | |
863 | --- a/b1 |
|
865 | --- a/b1 | |
864 | +++ b/b1 |
|
866 | +++ b/b1 | |
865 | @@ -1,1 +1,2 @@ |
|
867 | @@ -1,1 +1,2 @@ | |
866 | b1 |
|
868 | b1 | |
867 | +postm |
|
869 | +postm | |
868 |
|
870 | |||
869 |
|
871 | |||
870 |
|
872 | |||
871 | log -r "" |
|
873 | log -r "" | |
872 |
|
874 | |||
873 | $ hg log -r '' |
|
875 | $ hg log -r '' | |
874 | hg: parse error: empty query |
|
876 | hg: parse error: empty query | |
875 | [255] |
|
877 | [255] | |
876 |
|
878 | |||
877 | log -r <some unknown node id> |
|
879 | log -r <some unknown node id> | |
878 |
|
880 | |||
879 | $ hg log -r 1000000000000000000000000000000000000000 |
|
881 | $ hg log -r 1000000000000000000000000000000000000000 | |
880 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
882 | abort: unknown revision '1000000000000000000000000000000000000000'! | |
881 | [255] |
|
883 | [255] | |
882 |
|
884 | |||
883 | log -k r1 |
|
885 | log -k r1 | |
884 |
|
886 | |||
885 | $ hg log -k r1 |
|
887 | $ hg log -k r1 | |
886 | changeset: 1:3d5bf5654eda |
|
888 | changeset: 1:3d5bf5654eda | |
887 | user: test |
|
889 | user: test | |
888 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
890 | date: Thu Jan 01 00:00:01 1970 +0000 | |
889 | summary: r1 |
|
891 | summary: r1 | |
890 |
|
892 | |||
891 | log -p -l2 --color=always |
|
893 | log -p -l2 --color=always | |
892 |
|
894 | |||
893 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
895 | $ hg --config extensions.color= --config color.mode=ansi \ | |
894 | > log -p -l2 --color=always |
|
896 | > log -p -l2 --color=always | |
895 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
897 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) | |
896 | tag: tip |
|
898 | tag: tip | |
897 | user: test |
|
899 | user: test | |
898 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
900 | date: Thu Jan 01 00:00:01 1970 +0000 | |
899 | summary: b1.1 |
|
901 | summary: b1.1 | |
900 |
|
902 | |||
901 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
903 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) | |
902 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
904 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
903 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
905 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
904 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
906 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | |
905 | b1 |
|
907 | b1 | |
906 | \x1b[0;32m+postm\x1b[0m (esc) |
|
908 | \x1b[0;32m+postm\x1b[0m (esc) | |
907 |
|
909 | |||
908 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
910 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) | |
909 | parent: 3:e62f78d544b4 |
|
911 | parent: 3:e62f78d544b4 | |
910 | parent: 4:ddb82e70d1a1 |
|
912 | parent: 4:ddb82e70d1a1 | |
911 | user: test |
|
913 | user: test | |
912 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
914 | date: Thu Jan 01 00:00:01 1970 +0000 | |
913 | summary: m12 |
|
915 | summary: m12 | |
914 |
|
916 | |||
915 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
917 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) | |
916 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
918 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) | |
917 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
919 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
918 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
920 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) | |
919 | \x1b[0;32m+b2\x1b[0m (esc) |
|
921 | \x1b[0;32m+b2\x1b[0m (esc) | |
920 |
|
922 | |||
921 |
|
923 | |||
922 |
|
924 | |||
923 | log -r tip --stat |
|
925 | log -r tip --stat | |
924 |
|
926 | |||
925 | $ hg log -r tip --stat |
|
927 | $ hg log -r tip --stat | |
926 | changeset: 6:2404bbcab562 |
|
928 | changeset: 6:2404bbcab562 | |
927 | tag: tip |
|
929 | tag: tip | |
928 | user: test |
|
930 | user: test | |
929 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
931 | date: Thu Jan 01 00:00:01 1970 +0000 | |
930 | summary: b1.1 |
|
932 | summary: b1.1 | |
931 |
|
933 | |||
932 | b1 | 1 + |
|
934 | b1 | 1 + | |
933 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
935 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
934 |
|
936 | |||
935 |
|
937 | |||
936 | $ cd .. |
|
938 | $ cd .. | |
937 |
|
939 | |||
938 | log --follow --patch FILE in repository where linkrev isn't trustworthy |
|
940 | log --follow --patch FILE in repository where linkrev isn't trustworthy | |
939 | (issue5376) |
|
941 | (issue5376) | |
940 |
|
942 | |||
941 | $ hg init follow-dup |
|
943 | $ hg init follow-dup | |
942 | $ cd follow-dup |
|
944 | $ cd follow-dup | |
943 | $ cat <<EOF >> .hg/hgrc |
|
945 | $ cat <<EOF >> .hg/hgrc | |
944 | > [ui] |
|
946 | > [ui] | |
945 | > logtemplate = '=== {rev}: {desc}\n' |
|
947 | > logtemplate = '=== {rev}: {desc}\n' | |
946 | > [diff] |
|
948 | > [diff] | |
947 | > nodates = True |
|
949 | > nodates = True | |
948 | > EOF |
|
950 | > EOF | |
949 | $ echo 0 >> a |
|
951 | $ echo 0 >> a | |
950 | $ hg ci -qAm 'a0' |
|
952 | $ hg ci -qAm 'a0' | |
951 | $ echo 1 >> a |
|
953 | $ echo 1 >> a | |
952 | $ hg ci -m 'a1' |
|
954 | $ hg ci -m 'a1' | |
953 | $ hg up -q 0 |
|
955 | $ hg up -q 0 | |
954 | $ echo 1 >> a |
|
956 | $ echo 1 >> a | |
955 | $ touch b |
|
957 | $ touch b | |
956 | $ hg ci -qAm 'a1 with b' |
|
958 | $ hg ci -qAm 'a1 with b' | |
957 | $ echo 3 >> a |
|
959 | $ echo 3 >> a | |
958 | $ hg ci -m 'a3' |
|
960 | $ hg ci -m 'a3' | |
959 |
|
961 | |||
960 | fctx.rev() == 2, but fctx.linkrev() == 1 |
|
962 | fctx.rev() == 2, but fctx.linkrev() == 1 | |
961 |
|
963 | |||
962 | $ hg log -pf a |
|
964 | $ hg log -pf a | |
963 | === 3: a3 |
|
965 | === 3: a3 | |
964 | diff -r 4ea02ba94d66 -r e7a6331a34f0 a |
|
966 | diff -r 4ea02ba94d66 -r e7a6331a34f0 a | |
965 | --- a/a |
|
967 | --- a/a | |
966 | +++ b/a |
|
968 | +++ b/a | |
967 | @@ -1,2 +1,3 @@ |
|
969 | @@ -1,2 +1,3 @@ | |
968 | 0 |
|
970 | 0 | |
969 | 1 |
|
971 | 1 | |
970 | +3 |
|
972 | +3 | |
971 |
|
973 | |||
972 | === 2: a1 with b |
|
974 | === 2: a1 with b | |
973 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
|
975 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a | |
974 | --- a/a |
|
976 | --- a/a | |
975 | +++ b/a |
|
977 | +++ b/a | |
976 | @@ -1,1 +1,2 @@ |
|
978 | @@ -1,1 +1,2 @@ | |
977 | 0 |
|
979 | 0 | |
978 | +1 |
|
980 | +1 | |
979 |
|
981 | |||
980 | === 0: a0 |
|
982 | === 0: a0 | |
981 | diff -r 000000000000 -r 49b5e81287e2 a |
|
983 | diff -r 000000000000 -r 49b5e81287e2 a | |
982 | --- /dev/null |
|
984 | --- /dev/null | |
983 | +++ b/a |
|
985 | +++ b/a | |
984 | @@ -0,0 +1,1 @@ |
|
986 | @@ -0,0 +1,1 @@ | |
985 | +0 |
|
987 | +0 | |
986 |
|
988 | |||
987 |
|
989 | |||
988 | fctx.introrev() == 2, but fctx.linkrev() == 1 |
|
990 | fctx.introrev() == 2, but fctx.linkrev() == 1 | |
989 |
|
991 | |||
990 | $ hg up -q 2 |
|
992 | $ hg up -q 2 | |
991 | $ hg log -pf a |
|
993 | $ hg log -pf a | |
992 | === 2: a1 with b |
|
994 | === 2: a1 with b | |
993 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
|
995 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a | |
994 | --- a/a |
|
996 | --- a/a | |
995 | +++ b/a |
|
997 | +++ b/a | |
996 | @@ -1,1 +1,2 @@ |
|
998 | @@ -1,1 +1,2 @@ | |
997 | 0 |
|
999 | 0 | |
998 | +1 |
|
1000 | +1 | |
999 |
|
1001 | |||
1000 | === 0: a0 |
|
1002 | === 0: a0 | |
1001 | diff -r 000000000000 -r 49b5e81287e2 a |
|
1003 | diff -r 000000000000 -r 49b5e81287e2 a | |
1002 | --- /dev/null |
|
1004 | --- /dev/null | |
1003 | +++ b/a |
|
1005 | +++ b/a | |
1004 | @@ -0,0 +1,1 @@ |
|
1006 | @@ -0,0 +1,1 @@ | |
1005 | +0 |
|
1007 | +0 | |
1006 |
|
1008 | |||
1007 |
|
1009 | |||
1008 | $ cd .. |
|
1010 | $ cd .. | |
1009 |
|
1011 | |||
1010 | Test that log should respect the order of -rREV even if multiple OR conditions |
|
1012 | Test that log should respect the order of -rREV even if multiple OR conditions | |
1011 | are specified (issue5100): |
|
1013 | are specified (issue5100): | |
1012 |
|
1014 | |||
1013 | $ hg init revorder |
|
1015 | $ hg init revorder | |
1014 | $ cd revorder |
|
1016 | $ cd revorder | |
1015 |
|
1017 | |||
1016 | $ hg branch -q b0 |
|
1018 | $ hg branch -q b0 | |
1017 | $ echo 0 >> f0 |
|
1019 | $ echo 0 >> f0 | |
1018 | $ hg ci -qAm k0 -u u0 |
|
1020 | $ hg ci -qAm k0 -u u0 | |
1019 | $ hg branch -q b1 |
|
1021 | $ hg branch -q b1 | |
1020 | $ echo 1 >> f1 |
|
1022 | $ echo 1 >> f1 | |
1021 | $ hg ci -qAm k1 -u u1 |
|
1023 | $ hg ci -qAm k1 -u u1 | |
1022 | $ hg branch -q b2 |
|
1024 | $ hg branch -q b2 | |
1023 | $ echo 2 >> f2 |
|
1025 | $ echo 2 >> f2 | |
1024 | $ hg ci -qAm k2 -u u2 |
|
1026 | $ hg ci -qAm k2 -u u2 | |
1025 |
|
1027 | |||
1026 | $ hg update -q b2 |
|
1028 | $ hg update -q b2 | |
1027 | $ echo 3 >> f2 |
|
1029 | $ echo 3 >> f2 | |
1028 | $ hg ci -qAm k2 -u u2 |
|
1030 | $ hg ci -qAm k2 -u u2 | |
1029 | $ hg update -q b1 |
|
1031 | $ hg update -q b1 | |
1030 | $ echo 4 >> f1 |
|
1032 | $ echo 4 >> f1 | |
1031 | $ hg ci -qAm k1 -u u1 |
|
1033 | $ hg ci -qAm k1 -u u1 | |
1032 | $ hg update -q b0 |
|
1034 | $ hg update -q b0 | |
1033 | $ echo 5 >> f0 |
|
1035 | $ echo 5 >> f0 | |
1034 | $ hg ci -qAm k0 -u u0 |
|
1036 | $ hg ci -qAm k0 -u u0 | |
1035 |
|
1037 | |||
1036 | summary of revisions: |
|
1038 | summary of revisions: | |
1037 |
|
1039 | |||
1038 | $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' |
|
1040 | $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' | |
1039 | @ 5 b0 u0 k0 f0 |
|
1041 | @ 5 b0 u0 k0 f0 | |
1040 | | |
|
1042 | | | |
1041 | | o 4 b1 u1 k1 f1 |
|
1043 | | o 4 b1 u1 k1 f1 | |
1042 | | | |
|
1044 | | | | |
1043 | | | o 3 b2 u2 k2 f2 |
|
1045 | | | o 3 b2 u2 k2 f2 | |
1044 | | | | |
|
1046 | | | | | |
1045 | | | o 2 b2 u2 k2 f2 |
|
1047 | | | o 2 b2 u2 k2 f2 | |
1046 | | |/ |
|
1048 | | |/ | |
1047 | | o 1 b1 u1 k1 f1 |
|
1049 | | o 1 b1 u1 k1 f1 | |
1048 | |/ |
|
1050 | |/ | |
1049 | o 0 b0 u0 k0 f0 |
|
1051 | o 0 b0 u0 k0 f0 | |
1050 |
|
1052 | |||
1051 |
|
1053 | |||
1052 | log -b BRANCH in ascending order: |
|
1054 | log -b BRANCH in ascending order: | |
1053 |
|
1055 | |||
1054 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 |
|
1056 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 | |
1055 | 0 b0 |
|
1057 | 0 b0 | |
1056 | 1 b1 |
|
1058 | 1 b1 | |
1057 | 4 b1 |
|
1059 | 4 b1 | |
1058 | 5 b0 |
|
1060 | 5 b0 | |
1059 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 |
|
1061 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 | |
1060 | 0 b0 |
|
1062 | 0 b0 | |
1061 | 1 b1 |
|
1063 | 1 b1 | |
1062 | 4 b1 |
|
1064 | 4 b1 | |
1063 | 5 b0 |
|
1065 | 5 b0 | |
1064 |
|
1066 | |||
1065 | log --only-branch BRANCH in descending order: |
|
1067 | log --only-branch BRANCH in descending order: | |
1066 |
|
1068 | |||
1067 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 |
|
1069 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 | |
1068 | 4 b1 |
|
1070 | 4 b1 | |
1069 | 3 b2 |
|
1071 | 3 b2 | |
1070 | 2 b2 |
|
1072 | 2 b2 | |
1071 | 1 b1 |
|
1073 | 1 b1 | |
1072 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 |
|
1074 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 | |
1073 | 4 b1 |
|
1075 | 4 b1 | |
1074 | 3 b2 |
|
1076 | 3 b2 | |
1075 | 2 b2 |
|
1077 | 2 b2 | |
1076 | 1 b1 |
|
1078 | 1 b1 | |
1077 |
|
1079 | |||
1078 | log -u USER in ascending order, against compound set: |
|
1080 | log -u USER in ascending order, against compound set: | |
1079 |
|
1081 | |||
1080 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 |
|
1082 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 | |
1081 | 0 u0 |
|
1083 | 0 u0 | |
1082 | 2 u2 |
|
1084 | 2 u2 | |
1083 | 3 u2 |
|
1085 | 3 u2 | |
1084 | 5 u0 |
|
1086 | 5 u0 | |
1085 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 |
|
1087 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 | |
1086 | 0 u0 |
|
1088 | 0 u0 | |
1087 | 2 u2 |
|
1089 | 2 u2 | |
1088 | 3 u2 |
|
1090 | 3 u2 | |
1089 | 5 u0 |
|
1091 | 5 u0 | |
1090 |
|
1092 | |||
1091 | log -k TEXT in descending order, against compound set: |
|
1093 | log -k TEXT in descending order, against compound set: | |
1092 |
|
1094 | |||
1093 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 |
|
1095 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 | |
1094 | 5 k0 |
|
1096 | 5 k0 | |
1095 | 3 k2 |
|
1097 | 3 k2 | |
1096 | 2 k2 |
|
1098 | 2 k2 | |
1097 | 1 k1 |
|
1099 | 1 k1 | |
1098 | 0 k0 |
|
1100 | 0 k0 | |
1099 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 |
|
1101 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 | |
1100 | 5 k0 |
|
1102 | 5 k0 | |
1101 | 3 k2 |
|
1103 | 3 k2 | |
1102 | 2 k2 |
|
1104 | 2 k2 | |
1103 | 1 k1 |
|
1105 | 1 k1 | |
1104 | 0 k0 |
|
1106 | 0 k0 | |
1105 |
|
1107 | |||
1106 | log FILE in ascending order, against dagrange: |
|
1108 | log FILE in ascending order, against dagrange: | |
1107 |
|
1109 | |||
1108 | $ hg log -r1:: -T '{rev} {files}\n' f1 f2 |
|
1110 | $ hg log -r1:: -T '{rev} {files}\n' f1 f2 | |
1109 | 1 f1 |
|
1111 | 1 f1 | |
1110 | 2 f2 |
|
1112 | 2 f2 | |
1111 | 3 f2 |
|
1113 | 3 f2 | |
1112 | 4 f1 |
|
1114 | 4 f1 | |
1113 | $ hg log -r1:: -T '{rev} {files}\n' f2 f1 |
|
1115 | $ hg log -r1:: -T '{rev} {files}\n' f2 f1 | |
1114 | 1 f1 |
|
1116 | 1 f1 | |
1115 | 2 f2 |
|
1117 | 2 f2 | |
1116 | 3 f2 |
|
1118 | 3 f2 | |
1117 | 4 f1 |
|
1119 | 4 f1 | |
1118 |
|
1120 | |||
1119 | $ cd .. |
|
1121 | $ cd .. | |
1120 |
|
1122 | |||
1121 | User |
|
1123 | User | |
1122 |
|
1124 | |||
1123 | $ hg init usertest |
|
1125 | $ hg init usertest | |
1124 | $ cd usertest |
|
1126 | $ cd usertest | |
1125 |
|
1127 | |||
1126 | $ echo a > a |
|
1128 | $ echo a > a | |
1127 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
1129 | $ hg ci -A -m "a" -u "User One <user1@example.org>" | |
1128 | adding a |
|
1130 | adding a | |
1129 | $ echo b > b |
|
1131 | $ echo b > b | |
1130 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
1132 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" | |
1131 | adding b |
|
1133 | adding b | |
1132 |
|
1134 | |||
1133 | $ hg log -u "User One <user1@example.org>" |
|
1135 | $ hg log -u "User One <user1@example.org>" | |
1134 | changeset: 0:29a4c94f1924 |
|
1136 | changeset: 0:29a4c94f1924 | |
1135 | user: User One <user1@example.org> |
|
1137 | user: User One <user1@example.org> | |
1136 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1138 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1137 | summary: a |
|
1139 | summary: a | |
1138 |
|
1140 | |||
1139 | $ hg log -u "user1" -u "user2" |
|
1141 | $ hg log -u "user1" -u "user2" | |
1140 | changeset: 1:e834b5e69c0e |
|
1142 | changeset: 1:e834b5e69c0e | |
1141 | tag: tip |
|
1143 | tag: tip | |
1142 | user: User Two <user2@example.org> |
|
1144 | user: User Two <user2@example.org> | |
1143 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1145 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1144 | summary: b |
|
1146 | summary: b | |
1145 |
|
1147 | |||
1146 | changeset: 0:29a4c94f1924 |
|
1148 | changeset: 0:29a4c94f1924 | |
1147 | user: User One <user1@example.org> |
|
1149 | user: User One <user1@example.org> | |
1148 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1150 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1149 | summary: a |
|
1151 | summary: a | |
1150 |
|
1152 | |||
1151 | $ hg log -u "user3" |
|
1153 | $ hg log -u "user3" | |
1152 |
|
1154 | |||
1153 | $ cd .. |
|
1155 | $ cd .. | |
1154 |
|
1156 | |||
1155 | $ hg init branches |
|
1157 | $ hg init branches | |
1156 | $ cd branches |
|
1158 | $ cd branches | |
1157 |
|
1159 | |||
1158 | $ echo a > a |
|
1160 | $ echo a > a | |
1159 | $ hg ci -A -m "commit on default" |
|
1161 | $ hg ci -A -m "commit on default" | |
1160 | adding a |
|
1162 | adding a | |
1161 | $ hg branch test |
|
1163 | $ hg branch test | |
1162 | marked working directory as branch test |
|
1164 | marked working directory as branch test | |
1163 | (branches are permanent and global, did you want a bookmark?) |
|
1165 | (branches are permanent and global, did you want a bookmark?) | |
1164 | $ echo b > b |
|
1166 | $ echo b > b | |
1165 | $ hg ci -A -m "commit on test" |
|
1167 | $ hg ci -A -m "commit on test" | |
1166 | adding b |
|
1168 | adding b | |
1167 |
|
1169 | |||
1168 | $ hg up default |
|
1170 | $ hg up default | |
1169 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1171 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1170 | $ echo c > c |
|
1172 | $ echo c > c | |
1171 | $ hg ci -A -m "commit on default" |
|
1173 | $ hg ci -A -m "commit on default" | |
1172 | adding c |
|
1174 | adding c | |
1173 | $ hg up test |
|
1175 | $ hg up test | |
1174 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1176 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1175 | $ echo c > c |
|
1177 | $ echo c > c | |
1176 | $ hg ci -A -m "commit on test" |
|
1178 | $ hg ci -A -m "commit on test" | |
1177 | adding c |
|
1179 | adding c | |
1178 |
|
1180 | |||
1179 |
|
1181 | |||
1180 | log -b default |
|
1182 | log -b default | |
1181 |
|
1183 | |||
1182 | $ hg log -b default |
|
1184 | $ hg log -b default | |
1183 | changeset: 2:c3a4f03cc9a7 |
|
1185 | changeset: 2:c3a4f03cc9a7 | |
1184 | parent: 0:24427303d56f |
|
1186 | parent: 0:24427303d56f | |
1185 | user: test |
|
1187 | user: test | |
1186 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1188 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1187 | summary: commit on default |
|
1189 | summary: commit on default | |
1188 |
|
1190 | |||
1189 | changeset: 0:24427303d56f |
|
1191 | changeset: 0:24427303d56f | |
1190 | user: test |
|
1192 | user: test | |
1191 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1193 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1192 | summary: commit on default |
|
1194 | summary: commit on default | |
1193 |
|
1195 | |||
1194 |
|
1196 | |||
1195 |
|
1197 | |||
1196 | log -b test |
|
1198 | log -b test | |
1197 |
|
1199 | |||
1198 | $ hg log -b test |
|
1200 | $ hg log -b test | |
1199 | changeset: 3:f5d8de11c2e2 |
|
1201 | changeset: 3:f5d8de11c2e2 | |
1200 | branch: test |
|
1202 | branch: test | |
1201 | tag: tip |
|
1203 | tag: tip | |
1202 | parent: 1:d32277701ccb |
|
1204 | parent: 1:d32277701ccb | |
1203 | user: test |
|
1205 | user: test | |
1204 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1206 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1205 | summary: commit on test |
|
1207 | summary: commit on test | |
1206 |
|
1208 | |||
1207 | changeset: 1:d32277701ccb |
|
1209 | changeset: 1:d32277701ccb | |
1208 | branch: test |
|
1210 | branch: test | |
1209 | user: test |
|
1211 | user: test | |
1210 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1212 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1211 | summary: commit on test |
|
1213 | summary: commit on test | |
1212 |
|
1214 | |||
1213 |
|
1215 | |||
1214 |
|
1216 | |||
1215 | log -b dummy |
|
1217 | log -b dummy | |
1216 |
|
1218 | |||
1217 | $ hg log -b dummy |
|
1219 | $ hg log -b dummy | |
1218 | abort: unknown revision 'dummy'! |
|
1220 | abort: unknown revision 'dummy'! | |
1219 | [255] |
|
1221 | [255] | |
1220 |
|
1222 | |||
1221 |
|
1223 | |||
1222 | log -b . |
|
1224 | log -b . | |
1223 |
|
1225 | |||
1224 | $ hg log -b . |
|
1226 | $ hg log -b . | |
1225 | changeset: 3:f5d8de11c2e2 |
|
1227 | changeset: 3:f5d8de11c2e2 | |
1226 | branch: test |
|
1228 | branch: test | |
1227 | tag: tip |
|
1229 | tag: tip | |
1228 | parent: 1:d32277701ccb |
|
1230 | parent: 1:d32277701ccb | |
1229 | user: test |
|
1231 | user: test | |
1230 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1232 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1231 | summary: commit on test |
|
1233 | summary: commit on test | |
1232 |
|
1234 | |||
1233 | changeset: 1:d32277701ccb |
|
1235 | changeset: 1:d32277701ccb | |
1234 | branch: test |
|
1236 | branch: test | |
1235 | user: test |
|
1237 | user: test | |
1236 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1238 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1237 | summary: commit on test |
|
1239 | summary: commit on test | |
1238 |
|
1240 | |||
1239 |
|
1241 | |||
1240 |
|
1242 | |||
1241 | log -b default -b test |
|
1243 | log -b default -b test | |
1242 |
|
1244 | |||
1243 | $ hg log -b default -b test |
|
1245 | $ hg log -b default -b test | |
1244 | changeset: 3:f5d8de11c2e2 |
|
1246 | changeset: 3:f5d8de11c2e2 | |
1245 | branch: test |
|
1247 | branch: test | |
1246 | tag: tip |
|
1248 | tag: tip | |
1247 | parent: 1:d32277701ccb |
|
1249 | parent: 1:d32277701ccb | |
1248 | user: test |
|
1250 | user: test | |
1249 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1251 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1250 | summary: commit on test |
|
1252 | summary: commit on test | |
1251 |
|
1253 | |||
1252 | changeset: 2:c3a4f03cc9a7 |
|
1254 | changeset: 2:c3a4f03cc9a7 | |
1253 | parent: 0:24427303d56f |
|
1255 | parent: 0:24427303d56f | |
1254 | user: test |
|
1256 | user: test | |
1255 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1257 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1256 | summary: commit on default |
|
1258 | summary: commit on default | |
1257 |
|
1259 | |||
1258 | changeset: 1:d32277701ccb |
|
1260 | changeset: 1:d32277701ccb | |
1259 | branch: test |
|
1261 | branch: test | |
1260 | user: test |
|
1262 | user: test | |
1261 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1263 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1262 | summary: commit on test |
|
1264 | summary: commit on test | |
1263 |
|
1265 | |||
1264 | changeset: 0:24427303d56f |
|
1266 | changeset: 0:24427303d56f | |
1265 | user: test |
|
1267 | user: test | |
1266 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1268 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1267 | summary: commit on default |
|
1269 | summary: commit on default | |
1268 |
|
1270 | |||
1269 |
|
1271 | |||
1270 |
|
1272 | |||
1271 | log -b default -b . |
|
1273 | log -b default -b . | |
1272 |
|
1274 | |||
1273 | $ hg log -b default -b . |
|
1275 | $ hg log -b default -b . | |
1274 | changeset: 3:f5d8de11c2e2 |
|
1276 | changeset: 3:f5d8de11c2e2 | |
1275 | branch: test |
|
1277 | branch: test | |
1276 | tag: tip |
|
1278 | tag: tip | |
1277 | parent: 1:d32277701ccb |
|
1279 | parent: 1:d32277701ccb | |
1278 | user: test |
|
1280 | user: test | |
1279 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1281 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1280 | summary: commit on test |
|
1282 | summary: commit on test | |
1281 |
|
1283 | |||
1282 | changeset: 2:c3a4f03cc9a7 |
|
1284 | changeset: 2:c3a4f03cc9a7 | |
1283 | parent: 0:24427303d56f |
|
1285 | parent: 0:24427303d56f | |
1284 | user: test |
|
1286 | user: test | |
1285 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1287 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1286 | summary: commit on default |
|
1288 | summary: commit on default | |
1287 |
|
1289 | |||
1288 | changeset: 1:d32277701ccb |
|
1290 | changeset: 1:d32277701ccb | |
1289 | branch: test |
|
1291 | branch: test | |
1290 | user: test |
|
1292 | user: test | |
1291 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1293 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1292 | summary: commit on test |
|
1294 | summary: commit on test | |
1293 |
|
1295 | |||
1294 | changeset: 0:24427303d56f |
|
1296 | changeset: 0:24427303d56f | |
1295 | user: test |
|
1297 | user: test | |
1296 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1298 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1297 | summary: commit on default |
|
1299 | summary: commit on default | |
1298 |
|
1300 | |||
1299 |
|
1301 | |||
1300 |
|
1302 | |||
1301 | log -b . -b test |
|
1303 | log -b . -b test | |
1302 |
|
1304 | |||
1303 | $ hg log -b . -b test |
|
1305 | $ hg log -b . -b test | |
1304 | changeset: 3:f5d8de11c2e2 |
|
1306 | changeset: 3:f5d8de11c2e2 | |
1305 | branch: test |
|
1307 | branch: test | |
1306 | tag: tip |
|
1308 | tag: tip | |
1307 | parent: 1:d32277701ccb |
|
1309 | parent: 1:d32277701ccb | |
1308 | user: test |
|
1310 | user: test | |
1309 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1311 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1310 | summary: commit on test |
|
1312 | summary: commit on test | |
1311 |
|
1313 | |||
1312 | changeset: 1:d32277701ccb |
|
1314 | changeset: 1:d32277701ccb | |
1313 | branch: test |
|
1315 | branch: test | |
1314 | user: test |
|
1316 | user: test | |
1315 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1317 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1316 | summary: commit on test |
|
1318 | summary: commit on test | |
1317 |
|
1319 | |||
1318 |
|
1320 | |||
1319 |
|
1321 | |||
1320 | log -b 2 |
|
1322 | log -b 2 | |
1321 |
|
1323 | |||
1322 | $ hg log -b 2 |
|
1324 | $ hg log -b 2 | |
1323 | changeset: 2:c3a4f03cc9a7 |
|
1325 | changeset: 2:c3a4f03cc9a7 | |
1324 | parent: 0:24427303d56f |
|
1326 | parent: 0:24427303d56f | |
1325 | user: test |
|
1327 | user: test | |
1326 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1328 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1327 | summary: commit on default |
|
1329 | summary: commit on default | |
1328 |
|
1330 | |||
1329 | changeset: 0:24427303d56f |
|
1331 | changeset: 0:24427303d56f | |
1330 | user: test |
|
1332 | user: test | |
1331 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1333 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1332 | summary: commit on default |
|
1334 | summary: commit on default | |
1333 |
|
1335 | |||
1334 | #if gettext |
|
1336 | #if gettext | |
1335 |
|
1337 | |||
1336 | Test that all log names are translated (e.g. branches, bookmarks, tags): |
|
1338 | Test that all log names are translated (e.g. branches, bookmarks, tags): | |
1337 |
|
1339 | |||
1338 | $ hg bookmark babar -r tip |
|
1340 | $ hg bookmark babar -r tip | |
1339 |
|
1341 | |||
1340 | $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip |
|
1342 | $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip | |
1341 | \xc3\x84nderung: 3:f5d8de11c2e2 (esc) |
|
1343 | \xc3\x84nderung: 3:f5d8de11c2e2 (esc) | |
1342 | Zweig: test |
|
1344 | Zweig: test | |
1343 | Lesezeichen: babar |
|
1345 | Lesezeichen: babar | |
1344 | Marke: tip |
|
1346 | Marke: tip | |
1345 | Vorg\xc3\xa4nger: 1:d32277701ccb (esc) |
|
1347 | Vorg\xc3\xa4nger: 1:d32277701ccb (esc) | |
1346 | Nutzer: test |
|
1348 | Nutzer: test | |
1347 | Datum: Thu Jan 01 00:00:00 1970 +0000 |
|
1349 | Datum: Thu Jan 01 00:00:00 1970 +0000 | |
1348 | Zusammenfassung: commit on test |
|
1350 | Zusammenfassung: commit on test | |
1349 |
|
1351 | |||
1350 | $ hg bookmark -d babar |
|
1352 | $ hg bookmark -d babar | |
1351 |
|
1353 | |||
1352 | #endif |
|
1354 | #endif | |
1353 |
|
1355 | |||
1354 | log -p --cwd dir (in subdir) |
|
1356 | log -p --cwd dir (in subdir) | |
1355 |
|
1357 | |||
1356 | $ mkdir dir |
|
1358 | $ mkdir dir | |
1357 | $ hg log -p --cwd dir |
|
1359 | $ hg log -p --cwd dir | |
1358 | changeset: 3:f5d8de11c2e2 |
|
1360 | changeset: 3:f5d8de11c2e2 | |
1359 | branch: test |
|
1361 | branch: test | |
1360 | tag: tip |
|
1362 | tag: tip | |
1361 | parent: 1:d32277701ccb |
|
1363 | parent: 1:d32277701ccb | |
1362 | user: test |
|
1364 | user: test | |
1363 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1365 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1364 | summary: commit on test |
|
1366 | summary: commit on test | |
1365 |
|
1367 | |||
1366 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
1368 | diff -r d32277701ccb -r f5d8de11c2e2 c | |
1367 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1369 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1368 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1370 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
1369 | @@ -0,0 +1,1 @@ |
|
1371 | @@ -0,0 +1,1 @@ | |
1370 | +c |
|
1372 | +c | |
1371 |
|
1373 | |||
1372 | changeset: 2:c3a4f03cc9a7 |
|
1374 | changeset: 2:c3a4f03cc9a7 | |
1373 | parent: 0:24427303d56f |
|
1375 | parent: 0:24427303d56f | |
1374 | user: test |
|
1376 | user: test | |
1375 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1377 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1376 | summary: commit on default |
|
1378 | summary: commit on default | |
1377 |
|
1379 | |||
1378 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
1380 | diff -r 24427303d56f -r c3a4f03cc9a7 c | |
1379 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1381 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1380 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1382 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
1381 | @@ -0,0 +1,1 @@ |
|
1383 | @@ -0,0 +1,1 @@ | |
1382 | +c |
|
1384 | +c | |
1383 |
|
1385 | |||
1384 | changeset: 1:d32277701ccb |
|
1386 | changeset: 1:d32277701ccb | |
1385 | branch: test |
|
1387 | branch: test | |
1386 | user: test |
|
1388 | user: test | |
1387 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1389 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1388 | summary: commit on test |
|
1390 | summary: commit on test | |
1389 |
|
1391 | |||
1390 | diff -r 24427303d56f -r d32277701ccb b |
|
1392 | diff -r 24427303d56f -r d32277701ccb b | |
1391 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1393 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1392 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1394 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1393 | @@ -0,0 +1,1 @@ |
|
1395 | @@ -0,0 +1,1 @@ | |
1394 | +b |
|
1396 | +b | |
1395 |
|
1397 | |||
1396 | changeset: 0:24427303d56f |
|
1398 | changeset: 0:24427303d56f | |
1397 | user: test |
|
1399 | user: test | |
1398 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1400 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1399 | summary: commit on default |
|
1401 | summary: commit on default | |
1400 |
|
1402 | |||
1401 | diff -r 000000000000 -r 24427303d56f a |
|
1403 | diff -r 000000000000 -r 24427303d56f a | |
1402 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1404 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1403 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1405 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1404 | @@ -0,0 +1,1 @@ |
|
1406 | @@ -0,0 +1,1 @@ | |
1405 | +a |
|
1407 | +a | |
1406 |
|
1408 | |||
1407 |
|
1409 | |||
1408 |
|
1410 | |||
1409 | log -p -R repo |
|
1411 | log -p -R repo | |
1410 |
|
1412 | |||
1411 | $ cd dir |
|
1413 | $ cd dir | |
1412 | $ hg log -p -R .. ../a |
|
1414 | $ hg log -p -R .. ../a | |
1413 | changeset: 0:24427303d56f |
|
1415 | changeset: 0:24427303d56f | |
1414 | user: test |
|
1416 | user: test | |
1415 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1417 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1416 | summary: commit on default |
|
1418 | summary: commit on default | |
1417 |
|
1419 | |||
1418 | diff -r 000000000000 -r 24427303d56f a |
|
1420 | diff -r 000000000000 -r 24427303d56f a | |
1419 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1421 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1420 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1422 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1421 | @@ -0,0 +1,1 @@ |
|
1423 | @@ -0,0 +1,1 @@ | |
1422 | +a |
|
1424 | +a | |
1423 |
|
1425 | |||
1424 |
|
1426 | |||
1425 | $ cd ../.. |
|
1427 | $ cd ../.. | |
1426 |
|
1428 | |||
1427 | $ hg init follow2 |
|
1429 | $ hg init follow2 | |
1428 | $ cd follow2 |
|
1430 | $ cd follow2 | |
1429 |
|
1431 | |||
1430 | # Build the following history: |
|
1432 | # Build the following history: | |
1431 | # tip - o - x - o - x - x |
|
1433 | # tip - o - x - o - x - x | |
1432 | # \ / |
|
1434 | # \ / | |
1433 | # o - o - o - x |
|
1435 | # o - o - o - x | |
1434 | # \ / |
|
1436 | # \ / | |
1435 | # o |
|
1437 | # o | |
1436 | # |
|
1438 | # | |
1437 | # Where "o" is a revision containing "foo" and |
|
1439 | # Where "o" is a revision containing "foo" and | |
1438 | # "x" is a revision without "foo" |
|
1440 | # "x" is a revision without "foo" | |
1439 |
|
1441 | |||
1440 | $ touch init |
|
1442 | $ touch init | |
1441 | $ hg ci -A -m "init, unrelated" |
|
1443 | $ hg ci -A -m "init, unrelated" | |
1442 | adding init |
|
1444 | adding init | |
1443 | $ echo 'foo' > init |
|
1445 | $ echo 'foo' > init | |
1444 | $ hg ci -m "change, unrelated" |
|
1446 | $ hg ci -m "change, unrelated" | |
1445 | $ echo 'foo' > foo |
|
1447 | $ echo 'foo' > foo | |
1446 | $ hg ci -A -m "add unrelated old foo" |
|
1448 | $ hg ci -A -m "add unrelated old foo" | |
1447 | adding foo |
|
1449 | adding foo | |
1448 | $ hg rm foo |
|
1450 | $ hg rm foo | |
1449 | $ hg ci -m "delete foo, unrelated" |
|
1451 | $ hg ci -m "delete foo, unrelated" | |
1450 | $ echo 'related' > foo |
|
1452 | $ echo 'related' > foo | |
1451 | $ hg ci -A -m "add foo, related" |
|
1453 | $ hg ci -A -m "add foo, related" | |
1452 | adding foo |
|
1454 | adding foo | |
1453 |
|
1455 | |||
1454 | $ hg up 0 |
|
1456 | $ hg up 0 | |
1455 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1457 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1456 | $ touch branch |
|
1458 | $ touch branch | |
1457 | $ hg ci -A -m "first branch, unrelated" |
|
1459 | $ hg ci -A -m "first branch, unrelated" | |
1458 | adding branch |
|
1460 | adding branch | |
1459 | created new head |
|
1461 | created new head | |
1460 | $ touch foo |
|
1462 | $ touch foo | |
1461 | $ hg ci -A -m "create foo, related" |
|
1463 | $ hg ci -A -m "create foo, related" | |
1462 | adding foo |
|
1464 | adding foo | |
1463 | $ echo 'change' > foo |
|
1465 | $ echo 'change' > foo | |
1464 | $ hg ci -m "change foo, related" |
|
1466 | $ hg ci -m "change foo, related" | |
1465 |
|
1467 | |||
1466 | $ hg up 6 |
|
1468 | $ hg up 6 | |
1467 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1469 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1468 | $ echo 'change foo in branch' > foo |
|
1470 | $ echo 'change foo in branch' > foo | |
1469 | $ hg ci -m "change foo in branch, related" |
|
1471 | $ hg ci -m "change foo in branch, related" | |
1470 | created new head |
|
1472 | created new head | |
1471 | $ hg merge 7 |
|
1473 | $ hg merge 7 | |
1472 | merging foo |
|
1474 | merging foo | |
1473 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1475 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
1474 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1476 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1475 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1477 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1476 | [1] |
|
1478 | [1] | |
1477 | $ echo 'merge 1' > foo |
|
1479 | $ echo 'merge 1' > foo | |
1478 | $ hg resolve -m foo |
|
1480 | $ hg resolve -m foo | |
1479 | (no more unresolved files) |
|
1481 | (no more unresolved files) | |
1480 | $ hg ci -m "First merge, related" |
|
1482 | $ hg ci -m "First merge, related" | |
1481 |
|
1483 | |||
1482 | $ hg merge 4 |
|
1484 | $ hg merge 4 | |
1483 | merging foo |
|
1485 | merging foo | |
1484 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1486 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
1485 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1487 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1486 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1488 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1487 | [1] |
|
1489 | [1] | |
1488 | $ echo 'merge 2' > foo |
|
1490 | $ echo 'merge 2' > foo | |
1489 | $ hg resolve -m foo |
|
1491 | $ hg resolve -m foo | |
1490 | (no more unresolved files) |
|
1492 | (no more unresolved files) | |
1491 | $ hg ci -m "Last merge, related" |
|
1493 | $ hg ci -m "Last merge, related" | |
1492 |
|
1494 | |||
1493 | $ hg log --graph |
|
1495 | $ hg log --graph | |
1494 | @ changeset: 10:4dae8563d2c5 |
|
1496 | @ changeset: 10:4dae8563d2c5 | |
1495 | |\ tag: tip |
|
1497 | |\ tag: tip | |
1496 | | | parent: 9:7b35701b003e |
|
1498 | | | parent: 9:7b35701b003e | |
1497 | | | parent: 4:88176d361b69 |
|
1499 | | | parent: 4:88176d361b69 | |
1498 | | | user: test |
|
1500 | | | user: test | |
1499 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1501 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1500 | | | summary: Last merge, related |
|
1502 | | | summary: Last merge, related | |
1501 | | | |
|
1503 | | | | |
1502 | | o changeset: 9:7b35701b003e |
|
1504 | | o changeset: 9:7b35701b003e | |
1503 | | |\ parent: 8:e5416ad8a855 |
|
1505 | | |\ parent: 8:e5416ad8a855 | |
1504 | | | | parent: 7:87fe3144dcfa |
|
1506 | | | | parent: 7:87fe3144dcfa | |
1505 | | | | user: test |
|
1507 | | | | user: test | |
1506 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1508 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1507 | | | | summary: First merge, related |
|
1509 | | | | summary: First merge, related | |
1508 | | | | |
|
1510 | | | | | |
1509 | | | o changeset: 8:e5416ad8a855 |
|
1511 | | | o changeset: 8:e5416ad8a855 | |
1510 | | | | parent: 6:dc6c325fe5ee |
|
1512 | | | | parent: 6:dc6c325fe5ee | |
1511 | | | | user: test |
|
1513 | | | | user: test | |
1512 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1514 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1513 | | | | summary: change foo in branch, related |
|
1515 | | | | summary: change foo in branch, related | |
1514 | | | | |
|
1516 | | | | | |
1515 | | o | changeset: 7:87fe3144dcfa |
|
1517 | | o | changeset: 7:87fe3144dcfa | |
1516 | | |/ user: test |
|
1518 | | |/ user: test | |
1517 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1519 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1518 | | | summary: change foo, related |
|
1520 | | | summary: change foo, related | |
1519 | | | |
|
1521 | | | | |
1520 | | o changeset: 6:dc6c325fe5ee |
|
1522 | | o changeset: 6:dc6c325fe5ee | |
1521 | | | user: test |
|
1523 | | | user: test | |
1522 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1524 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1523 | | | summary: create foo, related |
|
1525 | | | summary: create foo, related | |
1524 | | | |
|
1526 | | | | |
1525 | | o changeset: 5:73db34516eb9 |
|
1527 | | o changeset: 5:73db34516eb9 | |
1526 | | | parent: 0:e87515fd044a |
|
1528 | | | parent: 0:e87515fd044a | |
1527 | | | user: test |
|
1529 | | | user: test | |
1528 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1530 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1529 | | | summary: first branch, unrelated |
|
1531 | | | summary: first branch, unrelated | |
1530 | | | |
|
1532 | | | | |
1531 | o | changeset: 4:88176d361b69 |
|
1533 | o | changeset: 4:88176d361b69 | |
1532 | | | user: test |
|
1534 | | | user: test | |
1533 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1535 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1534 | | | summary: add foo, related |
|
1536 | | | summary: add foo, related | |
1535 | | | |
|
1537 | | | | |
1536 | o | changeset: 3:dd78ae4afb56 |
|
1538 | o | changeset: 3:dd78ae4afb56 | |
1537 | | | user: test |
|
1539 | | | user: test | |
1538 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1540 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1539 | | | summary: delete foo, unrelated |
|
1541 | | | summary: delete foo, unrelated | |
1540 | | | |
|
1542 | | | | |
1541 | o | changeset: 2:c4c64aedf0f7 |
|
1543 | o | changeset: 2:c4c64aedf0f7 | |
1542 | | | user: test |
|
1544 | | | user: test | |
1543 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1545 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1544 | | | summary: add unrelated old foo |
|
1546 | | | summary: add unrelated old foo | |
1545 | | | |
|
1547 | | | | |
1546 | o | changeset: 1:e5faa7440653 |
|
1548 | o | changeset: 1:e5faa7440653 | |
1547 | |/ user: test |
|
1549 | |/ user: test | |
1548 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1550 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1549 | | summary: change, unrelated |
|
1551 | | summary: change, unrelated | |
1550 | | |
|
1552 | | | |
1551 | o changeset: 0:e87515fd044a |
|
1553 | o changeset: 0:e87515fd044a | |
1552 | user: test |
|
1554 | user: test | |
1553 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1555 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1554 | summary: init, unrelated |
|
1556 | summary: init, unrelated | |
1555 |
|
1557 | |||
1556 |
|
1558 | |||
1557 | $ hg --traceback log -f foo |
|
1559 | $ hg --traceback log -f foo | |
1558 | changeset: 10:4dae8563d2c5 |
|
1560 | changeset: 10:4dae8563d2c5 | |
1559 | tag: tip |
|
1561 | tag: tip | |
1560 | parent: 9:7b35701b003e |
|
1562 | parent: 9:7b35701b003e | |
1561 | parent: 4:88176d361b69 |
|
1563 | parent: 4:88176d361b69 | |
1562 | user: test |
|
1564 | user: test | |
1563 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1565 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1564 | summary: Last merge, related |
|
1566 | summary: Last merge, related | |
1565 |
|
1567 | |||
1566 | changeset: 9:7b35701b003e |
|
1568 | changeset: 9:7b35701b003e | |
1567 | parent: 8:e5416ad8a855 |
|
1569 | parent: 8:e5416ad8a855 | |
1568 | parent: 7:87fe3144dcfa |
|
1570 | parent: 7:87fe3144dcfa | |
1569 | user: test |
|
1571 | user: test | |
1570 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1572 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1571 | summary: First merge, related |
|
1573 | summary: First merge, related | |
1572 |
|
1574 | |||
1573 | changeset: 8:e5416ad8a855 |
|
1575 | changeset: 8:e5416ad8a855 | |
1574 | parent: 6:dc6c325fe5ee |
|
1576 | parent: 6:dc6c325fe5ee | |
1575 | user: test |
|
1577 | user: test | |
1576 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1578 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1577 | summary: change foo in branch, related |
|
1579 | summary: change foo in branch, related | |
1578 |
|
1580 | |||
1579 | changeset: 7:87fe3144dcfa |
|
1581 | changeset: 7:87fe3144dcfa | |
1580 | user: test |
|
1582 | user: test | |
1581 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1583 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1582 | summary: change foo, related |
|
1584 | summary: change foo, related | |
1583 |
|
1585 | |||
1584 | changeset: 6:dc6c325fe5ee |
|
1586 | changeset: 6:dc6c325fe5ee | |
1585 | user: test |
|
1587 | user: test | |
1586 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1588 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1587 | summary: create foo, related |
|
1589 | summary: create foo, related | |
1588 |
|
1590 | |||
1589 | changeset: 4:88176d361b69 |
|
1591 | changeset: 4:88176d361b69 | |
1590 | user: test |
|
1592 | user: test | |
1591 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1593 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1592 | summary: add foo, related |
|
1594 | summary: add foo, related | |
1593 |
|
1595 | |||
1594 |
|
1596 | |||
1595 | Also check when maxrev < lastrevfilelog |
|
1597 | Also check when maxrev < lastrevfilelog | |
1596 |
|
1598 | |||
1597 | $ hg --traceback log -f -r4 foo |
|
1599 | $ hg --traceback log -f -r4 foo | |
1598 | changeset: 4:88176d361b69 |
|
1600 | changeset: 4:88176d361b69 | |
1599 | user: test |
|
1601 | user: test | |
1600 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1602 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1601 | summary: add foo, related |
|
1603 | summary: add foo, related | |
1602 |
|
1604 | |||
1603 | changeset: 2:c4c64aedf0f7 |
|
1605 | changeset: 2:c4c64aedf0f7 | |
1604 | user: test |
|
1606 | user: test | |
1605 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1607 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1606 | summary: add unrelated old foo |
|
1608 | summary: add unrelated old foo | |
1607 |
|
1609 | |||
1608 | $ cd .. |
|
1610 | $ cd .. | |
1609 |
|
1611 | |||
1610 | Issue2383: hg log showing _less_ differences than hg diff |
|
1612 | Issue2383: hg log showing _less_ differences than hg diff | |
1611 |
|
1613 | |||
1612 | $ hg init issue2383 |
|
1614 | $ hg init issue2383 | |
1613 | $ cd issue2383 |
|
1615 | $ cd issue2383 | |
1614 |
|
1616 | |||
1615 | Create a test repo: |
|
1617 | Create a test repo: | |
1616 |
|
1618 | |||
1617 | $ echo a > a |
|
1619 | $ echo a > a | |
1618 | $ hg ci -Am0 |
|
1620 | $ hg ci -Am0 | |
1619 | adding a |
|
1621 | adding a | |
1620 | $ echo b > b |
|
1622 | $ echo b > b | |
1621 | $ hg ci -Am1 |
|
1623 | $ hg ci -Am1 | |
1622 | adding b |
|
1624 | adding b | |
1623 | $ hg co 0 |
|
1625 | $ hg co 0 | |
1624 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1626 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1625 | $ echo b > a |
|
1627 | $ echo b > a | |
1626 | $ hg ci -m2 |
|
1628 | $ hg ci -m2 | |
1627 | created new head |
|
1629 | created new head | |
1628 |
|
1630 | |||
1629 | Merge: |
|
1631 | Merge: | |
1630 |
|
1632 | |||
1631 | $ hg merge |
|
1633 | $ hg merge | |
1632 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1634 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1633 | (branch merge, don't forget to commit) |
|
1635 | (branch merge, don't forget to commit) | |
1634 |
|
1636 | |||
1635 | Make sure there's a file listed in the merge to trigger the bug: |
|
1637 | Make sure there's a file listed in the merge to trigger the bug: | |
1636 |
|
1638 | |||
1637 | $ echo c > a |
|
1639 | $ echo c > a | |
1638 | $ hg ci -m3 |
|
1640 | $ hg ci -m3 | |
1639 |
|
1641 | |||
1640 | Two files shown here in diff: |
|
1642 | Two files shown here in diff: | |
1641 |
|
1643 | |||
1642 | $ hg diff --rev 2:3 |
|
1644 | $ hg diff --rev 2:3 | |
1643 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1645 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1644 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1646 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1645 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1647 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1646 | @@ -1,1 +1,1 @@ |
|
1648 | @@ -1,1 +1,1 @@ | |
1647 | -b |
|
1649 | -b | |
1648 | +c |
|
1650 | +c | |
1649 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1651 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1650 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1652 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1651 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1653 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1652 | @@ -0,0 +1,1 @@ |
|
1654 | @@ -0,0 +1,1 @@ | |
1653 | +b |
|
1655 | +b | |
1654 |
|
1656 | |||
1655 | Diff here should be the same: |
|
1657 | Diff here should be the same: | |
1656 |
|
1658 | |||
1657 | $ hg log -vpr 3 |
|
1659 | $ hg log -vpr 3 | |
1658 | changeset: 3:8e07aafe1edc |
|
1660 | changeset: 3:8e07aafe1edc | |
1659 | tag: tip |
|
1661 | tag: tip | |
1660 | parent: 2:b09be438c43a |
|
1662 | parent: 2:b09be438c43a | |
1661 | parent: 1:925d80f479bb |
|
1663 | parent: 1:925d80f479bb | |
1662 | user: test |
|
1664 | user: test | |
1663 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1665 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1664 | files: a |
|
1666 | files: a | |
1665 | description: |
|
1667 | description: | |
1666 | 3 |
|
1668 | 3 | |
1667 |
|
1669 | |||
1668 |
|
1670 | |||
1669 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1671 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1670 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1672 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1671 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1673 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1672 | @@ -1,1 +1,1 @@ |
|
1674 | @@ -1,1 +1,1 @@ | |
1673 | -b |
|
1675 | -b | |
1674 | +c |
|
1676 | +c | |
1675 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1677 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1676 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1678 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1677 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1679 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1678 | @@ -0,0 +1,1 @@ |
|
1680 | @@ -0,0 +1,1 @@ | |
1679 | +b |
|
1681 | +b | |
1680 |
|
1682 | |||
1681 | $ cd .. |
|
1683 | $ cd .. | |
1682 |
|
1684 | |||
1683 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1685 | 'hg log -r rev fn' when last(filelog(fn)) != rev | |
1684 |
|
1686 | |||
1685 | $ hg init simplelog |
|
1687 | $ hg init simplelog | |
1686 | $ cd simplelog |
|
1688 | $ cd simplelog | |
1687 | $ echo f > a |
|
1689 | $ echo f > a | |
1688 | $ hg ci -Am'a' -d '0 0' |
|
1690 | $ hg ci -Am'a' -d '0 0' | |
1689 | adding a |
|
1691 | adding a | |
1690 | $ echo f >> a |
|
1692 | $ echo f >> a | |
1691 | $ hg ci -Am'a bis' -d '1 0' |
|
1693 | $ hg ci -Am'a bis' -d '1 0' | |
1692 |
|
1694 | |||
1693 | $ hg log -r0 a |
|
1695 | $ hg log -r0 a | |
1694 | changeset: 0:9f758d63dcde |
|
1696 | changeset: 0:9f758d63dcde | |
1695 | user: test |
|
1697 | user: test | |
1696 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1698 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1697 | summary: a |
|
1699 | summary: a | |
1698 |
|
1700 | |||
1699 | enable obsolete to test hidden feature |
|
1701 | enable obsolete to test hidden feature | |
1700 |
|
1702 | |||
1701 | $ cat >> $HGRCPATH << EOF |
|
1703 | $ cat >> $HGRCPATH << EOF | |
1702 | > [experimental] |
|
1704 | > [experimental] | |
1703 | > stabilization=createmarkers |
|
1705 | > stabilization=createmarkers | |
1704 | > EOF |
|
1706 | > EOF | |
1705 |
|
1707 | |||
1706 | $ hg log --template='{rev}:{node}\n' |
|
1708 | $ hg log --template='{rev}:{node}\n' | |
1707 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1709 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1708 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1710 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1709 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1711 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f | |
1710 | obsoleted 1 changesets |
|
1712 | obsoleted 1 changesets | |
1711 | $ hg up null -q |
|
1713 | $ hg up null -q | |
1712 | $ hg log --template='{rev}:{node}\n' |
|
1714 | $ hg log --template='{rev}:{node}\n' | |
1713 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1715 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1714 | $ hg log --template='{rev}:{node}\n' --hidden |
|
1716 | $ hg log --template='{rev}:{node}\n' --hidden | |
1715 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1717 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1716 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1718 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1717 | $ hg log -r a |
|
1719 | $ hg log -r a | |
1718 | abort: hidden revision 'a'! |
|
1720 | abort: hidden revision 'a'! | |
1719 | (use --hidden to access hidden revisions) |
|
1721 | (use --hidden to access hidden revisions) | |
1720 | [255] |
|
1722 | [255] | |
1721 |
|
1723 | |||
1722 | test that parent prevent a changeset to be hidden |
|
1724 | test that parent prevent a changeset to be hidden | |
1723 |
|
1725 | |||
1724 | $ hg up 1 -q --hidden |
|
1726 | $ hg up 1 -q --hidden | |
1725 | $ hg log --template='{rev}:{node}\n' |
|
1727 | $ hg log --template='{rev}:{node}\n' | |
1726 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1728 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1727 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1729 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1728 |
|
1730 | |||
1729 | test that second parent prevent a changeset to be hidden too |
|
1731 | test that second parent prevent a changeset to be hidden too | |
1730 |
|
1732 | |||
1731 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1733 | $ hg debugsetparents 0 1 # nothing suitable to merge here | |
1732 | $ hg log --template='{rev}:{node}\n' |
|
1734 | $ hg log --template='{rev}:{node}\n' | |
1733 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1735 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1734 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1736 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1735 | $ hg debugsetparents 1 |
|
1737 | $ hg debugsetparents 1 | |
1736 | $ hg up -q null |
|
1738 | $ hg up -q null | |
1737 |
|
1739 | |||
1738 | bookmarks prevent a changeset being hidden |
|
1740 | bookmarks prevent a changeset being hidden | |
1739 |
|
1741 | |||
1740 | $ hg bookmark --hidden -r 1 X |
|
1742 | $ hg bookmark --hidden -r 1 X | |
1741 | $ hg log --template '{rev}:{node}\n' |
|
1743 | $ hg log --template '{rev}:{node}\n' | |
1742 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1744 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1743 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1745 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1744 | $ hg bookmark -d X |
|
1746 | $ hg bookmark -d X | |
1745 |
|
1747 | |||
1746 | divergent bookmarks are not hidden |
|
1748 | divergent bookmarks are not hidden | |
1747 |
|
1749 | |||
1748 | $ hg bookmark --hidden -r 1 X@foo |
|
1750 | $ hg bookmark --hidden -r 1 X@foo | |
1749 | $ hg log --template '{rev}:{node}\n' |
|
1751 | $ hg log --template '{rev}:{node}\n' | |
1750 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1752 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1751 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1753 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1752 |
|
1754 | |||
1753 | test hidden revision 0 (issue5385) |
|
1755 | test hidden revision 0 (issue5385) | |
1754 |
|
1756 | |||
1755 | $ hg bookmark -d X@foo |
|
1757 | $ hg bookmark -d X@foo | |
1756 | $ hg up null -q |
|
1758 | $ hg up null -q | |
1757 | $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1759 | $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1758 | obsoleted 1 changesets |
|
1760 | obsoleted 1 changesets | |
1759 | $ echo f > b |
|
1761 | $ echo f > b | |
1760 | $ hg ci -Am'b' -d '2 0' |
|
1762 | $ hg ci -Am'b' -d '2 0' | |
1761 | adding b |
|
1763 | adding b | |
1762 | $ echo f >> b |
|
1764 | $ echo f >> b | |
1763 | $ hg ci -m'b bis' -d '3 0' |
|
1765 | $ hg ci -m'b bis' -d '3 0' | |
1764 | $ hg log -T'{rev}:{node}\n' |
|
1766 | $ hg log -T'{rev}:{node}\n' | |
1765 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
1767 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e | |
1766 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
1768 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 | |
1767 |
|
1769 | |||
1768 | $ hg log -T'{rev}:{node}\n' -r: |
|
1770 | $ hg log -T'{rev}:{node}\n' -r: | |
1769 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
1771 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 | |
1770 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
1772 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e | |
1771 | $ hg log -T'{rev}:{node}\n' -r:tip |
|
1773 | $ hg log -T'{rev}:{node}\n' -r:tip | |
1772 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
1774 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 | |
1773 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
1775 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e | |
1774 | $ hg log -T'{rev}:{node}\n' -r:0 |
|
1776 | $ hg log -T'{rev}:{node}\n' -r:0 | |
1775 | abort: hidden revision '0'! |
|
1777 | abort: hidden revision '0'! | |
1776 | (use --hidden to access hidden revisions) |
|
1778 | (use --hidden to access hidden revisions) | |
1777 | [255] |
|
1779 | [255] | |
1778 | $ hg log -T'{rev}:{node}\n' -f |
|
1780 | $ hg log -T'{rev}:{node}\n' -f | |
1779 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
1781 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e | |
1780 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
1782 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 | |
1781 |
|
1783 | |||
1782 | clear extensions configuration |
|
1784 | clear extensions configuration | |
1783 | $ echo '[extensions]' >> $HGRCPATH |
|
1785 | $ echo '[extensions]' >> $HGRCPATH | |
1784 | $ echo "obs=!" >> $HGRCPATH |
|
1786 | $ echo "obs=!" >> $HGRCPATH | |
1785 | $ cd .. |
|
1787 | $ cd .. | |
1786 |
|
1788 | |||
1787 | test -u/-k for problematic encoding |
|
1789 | test -u/-k for problematic encoding | |
1788 | # unicode: cp932: |
|
1790 | # unicode: cp932: | |
1789 | # u30A2 0x83 0x41(= 'A') |
|
1791 | # u30A2 0x83 0x41(= 'A') | |
1790 | # u30C2 0x83 0x61(= 'a') |
|
1792 | # u30C2 0x83 0x61(= 'a') | |
1791 |
|
1793 | |||
1792 | $ hg init problematicencoding |
|
1794 | $ hg init problematicencoding | |
1793 | $ cd problematicencoding |
|
1795 | $ cd problematicencoding | |
1794 |
|
1796 | |||
1795 | $ $PYTHON > setup.sh <<EOF |
|
1797 | $ $PYTHON > setup.sh <<EOF | |
1796 | > print(u''' |
|
1798 | > print(u''' | |
1797 | > echo a > text |
|
1799 | > echo a > text | |
1798 | > hg add text |
|
1800 | > hg add text | |
1799 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
1801 | > hg --encoding utf-8 commit -u '\u30A2' -m none | |
1800 | > echo b > text |
|
1802 | > echo b > text | |
1801 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
1803 | > hg --encoding utf-8 commit -u '\u30C2' -m none | |
1802 | > echo c > text |
|
1804 | > echo c > text | |
1803 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
1805 | > hg --encoding utf-8 commit -u none -m '\u30A2' | |
1804 | > echo d > text |
|
1806 | > echo d > text | |
1805 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
1807 | > hg --encoding utf-8 commit -u none -m '\u30C2' | |
1806 | > '''.encode('utf-8')) |
|
1808 | > '''.encode('utf-8')) | |
1807 | > EOF |
|
1809 | > EOF | |
1808 | $ sh < setup.sh |
|
1810 | $ sh < setup.sh | |
1809 |
|
1811 | |||
1810 | test in problematic encoding |
|
1812 | test in problematic encoding | |
1811 | $ $PYTHON > test.sh <<EOF |
|
1813 | $ $PYTHON > test.sh <<EOF | |
1812 | > print(u''' |
|
1814 | > print(u''' | |
1813 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
1815 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' | |
1814 | > echo ==== |
|
1816 | > echo ==== | |
1815 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
1817 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' | |
1816 | > echo ==== |
|
1818 | > echo ==== | |
1817 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
1819 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' | |
1818 | > echo ==== |
|
1820 | > echo ==== | |
1819 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
1821 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' | |
1820 | > '''.encode('cp932')) |
|
1822 | > '''.encode('cp932')) | |
1821 | > EOF |
|
1823 | > EOF | |
1822 | $ sh < test.sh |
|
1824 | $ sh < test.sh | |
1823 | 0 |
|
1825 | 0 | |
1824 | ==== |
|
1826 | ==== | |
1825 | 1 |
|
1827 | 1 | |
1826 | ==== |
|
1828 | ==== | |
1827 | 2 |
|
1829 | 2 | |
1828 | 0 |
|
1830 | 0 | |
1829 | ==== |
|
1831 | ==== | |
1830 | 3 |
|
1832 | 3 | |
1831 | 1 |
|
1833 | 1 | |
1832 |
|
1834 | |||
1833 | $ cd .. |
|
1835 | $ cd .. | |
1834 |
|
1836 | |||
1835 | test hg log on non-existent files and on directories |
|
1837 | test hg log on non-existent files and on directories | |
1836 | $ hg init issue1340 |
|
1838 | $ hg init issue1340 | |
1837 | $ cd issue1340 |
|
1839 | $ cd issue1340 | |
1838 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
1840 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 | |
1839 | $ echo 1 > d1/f1 |
|
1841 | $ echo 1 > d1/f1 | |
1840 | $ echo 1 > D2/f1 |
|
1842 | $ echo 1 > D2/f1 | |
1841 | $ echo 1 > D3.i/f1 |
|
1843 | $ echo 1 > D3.i/f1 | |
1842 | $ echo 1 > d4.hg/f1 |
|
1844 | $ echo 1 > d4.hg/f1 | |
1843 | $ echo 1 > d5.d/f1 |
|
1845 | $ echo 1 > d5.d/f1 | |
1844 | $ echo 1 > .d6/f1 |
|
1846 | $ echo 1 > .d6/f1 | |
1845 | $ hg -q add . |
|
1847 | $ hg -q add . | |
1846 | $ hg commit -m "a bunch of weird directories" |
|
1848 | $ hg commit -m "a bunch of weird directories" | |
1847 | $ hg log -l1 d1/f1 | grep changeset |
|
1849 | $ hg log -l1 d1/f1 | grep changeset | |
1848 | changeset: 0:65624cd9070a |
|
1850 | changeset: 0:65624cd9070a | |
1849 | $ hg log -l1 f1 |
|
1851 | $ hg log -l1 f1 | |
1850 | $ hg log -l1 . | grep changeset |
|
1852 | $ hg log -l1 . | grep changeset | |
1851 | changeset: 0:65624cd9070a |
|
1853 | changeset: 0:65624cd9070a | |
1852 | $ hg log -l1 ./ | grep changeset |
|
1854 | $ hg log -l1 ./ | grep changeset | |
1853 | changeset: 0:65624cd9070a |
|
1855 | changeset: 0:65624cd9070a | |
1854 | $ hg log -l1 d1 | grep changeset |
|
1856 | $ hg log -l1 d1 | grep changeset | |
1855 | changeset: 0:65624cd9070a |
|
1857 | changeset: 0:65624cd9070a | |
1856 | $ hg log -l1 D2 | grep changeset |
|
1858 | $ hg log -l1 D2 | grep changeset | |
1857 | changeset: 0:65624cd9070a |
|
1859 | changeset: 0:65624cd9070a | |
1858 | $ hg log -l1 D2/f1 | grep changeset |
|
1860 | $ hg log -l1 D2/f1 | grep changeset | |
1859 | changeset: 0:65624cd9070a |
|
1861 | changeset: 0:65624cd9070a | |
1860 | $ hg log -l1 D3.i | grep changeset |
|
1862 | $ hg log -l1 D3.i | grep changeset | |
1861 | changeset: 0:65624cd9070a |
|
1863 | changeset: 0:65624cd9070a | |
1862 | $ hg log -l1 D3.i/f1 | grep changeset |
|
1864 | $ hg log -l1 D3.i/f1 | grep changeset | |
1863 | changeset: 0:65624cd9070a |
|
1865 | changeset: 0:65624cd9070a | |
1864 | $ hg log -l1 d4.hg | grep changeset |
|
1866 | $ hg log -l1 d4.hg | grep changeset | |
1865 | changeset: 0:65624cd9070a |
|
1867 | changeset: 0:65624cd9070a | |
1866 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
1868 | $ hg log -l1 d4.hg/f1 | grep changeset | |
1867 | changeset: 0:65624cd9070a |
|
1869 | changeset: 0:65624cd9070a | |
1868 | $ hg log -l1 d5.d | grep changeset |
|
1870 | $ hg log -l1 d5.d | grep changeset | |
1869 | changeset: 0:65624cd9070a |
|
1871 | changeset: 0:65624cd9070a | |
1870 | $ hg log -l1 d5.d/f1 | grep changeset |
|
1872 | $ hg log -l1 d5.d/f1 | grep changeset | |
1871 | changeset: 0:65624cd9070a |
|
1873 | changeset: 0:65624cd9070a | |
1872 | $ hg log -l1 .d6 | grep changeset |
|
1874 | $ hg log -l1 .d6 | grep changeset | |
1873 | changeset: 0:65624cd9070a |
|
1875 | changeset: 0:65624cd9070a | |
1874 | $ hg log -l1 .d6/f1 | grep changeset |
|
1876 | $ hg log -l1 .d6/f1 | grep changeset | |
1875 | changeset: 0:65624cd9070a |
|
1877 | changeset: 0:65624cd9070a | |
1876 |
|
1878 | |||
1877 | issue3772: hg log -r :null showing revision 0 as well |
|
1879 | issue3772: hg log -r :null showing revision 0 as well | |
1878 |
|
1880 | |||
1879 | $ hg log -r :null |
|
1881 | $ hg log -r :null | |
1880 | changeset: 0:65624cd9070a |
|
1882 | changeset: 0:65624cd9070a | |
1881 | tag: tip |
|
1883 | tag: tip | |
1882 | user: test |
|
1884 | user: test | |
1883 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1885 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1884 | summary: a bunch of weird directories |
|
1886 | summary: a bunch of weird directories | |
1885 |
|
1887 | |||
1886 | changeset: -1:000000000000 |
|
1888 | changeset: -1:000000000000 | |
1887 | user: |
|
1889 | user: | |
1888 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1890 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1889 |
|
1891 | |||
1890 | $ hg log -r null:null |
|
1892 | $ hg log -r null:null | |
1891 | changeset: -1:000000000000 |
|
1893 | changeset: -1:000000000000 | |
1892 | user: |
|
1894 | user: | |
1893 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1895 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1894 |
|
1896 | |||
1895 | working-directory revision requires special treatment |
|
1897 | working-directory revision requires special treatment | |
1896 |
|
1898 | |||
1897 | clean: |
|
1899 | clean: | |
1898 |
|
1900 | |||
1899 | $ hg log -r 'wdir()' --debug |
|
1901 | $ hg log -r 'wdir()' --debug | |
1900 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
1902 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff | |
1901 | phase: draft |
|
1903 | phase: draft | |
1902 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
|
1904 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 | |
1903 | parent: -1:0000000000000000000000000000000000000000 |
|
1905 | parent: -1:0000000000000000000000000000000000000000 | |
1904 | user: test |
|
1906 | user: test | |
1905 | date: [A-Za-z0-9:+ ]+ (re) |
|
1907 | date: [A-Za-z0-9:+ ]+ (re) | |
1906 | extra: branch=default |
|
1908 | extra: branch=default | |
1907 |
|
1909 | |||
1908 | $ hg log -r 'wdir()' -p --stat |
|
1910 | $ hg log -r 'wdir()' -p --stat | |
1909 | changeset: 2147483647:ffffffffffff |
|
1911 | changeset: 2147483647:ffffffffffff | |
1910 | parent: 0:65624cd9070a |
|
1912 | parent: 0:65624cd9070a | |
1911 | user: test |
|
1913 | user: test | |
1912 | date: [A-Za-z0-9:+ ]+ (re) |
|
1914 | date: [A-Za-z0-9:+ ]+ (re) | |
1913 |
|
1915 | |||
1914 |
|
1916 | |||
1915 |
|
1917 | |||
1916 |
|
1918 | |||
1917 | dirty: |
|
1919 | dirty: | |
1918 |
|
1920 | |||
1919 | $ echo 2 >> d1/f1 |
|
1921 | $ echo 2 >> d1/f1 | |
1920 | $ echo 2 > d1/f2 |
|
1922 | $ echo 2 > d1/f2 | |
1921 | $ hg add d1/f2 |
|
1923 | $ hg add d1/f2 | |
1922 | $ hg remove .d6/f1 |
|
1924 | $ hg remove .d6/f1 | |
1923 | $ hg status |
|
1925 | $ hg status | |
1924 | M d1/f1 |
|
1926 | M d1/f1 | |
1925 | A d1/f2 |
|
1927 | A d1/f2 | |
1926 | R .d6/f1 |
|
1928 | R .d6/f1 | |
1927 |
|
1929 | |||
1928 | $ hg log -r 'wdir()' |
|
1930 | $ hg log -r 'wdir()' | |
1929 | changeset: 2147483647:ffffffffffff |
|
1931 | changeset: 2147483647:ffffffffffff | |
1930 | parent: 0:65624cd9070a |
|
1932 | parent: 0:65624cd9070a | |
1931 | user: test |
|
1933 | user: test | |
1932 | date: [A-Za-z0-9:+ ]+ (re) |
|
1934 | date: [A-Za-z0-9:+ ]+ (re) | |
1933 |
|
1935 | |||
1934 | $ hg log -r 'wdir()' -q |
|
1936 | $ hg log -r 'wdir()' -q | |
1935 | 2147483647:ffffffffffff |
|
1937 | 2147483647:ffffffffffff | |
1936 |
|
1938 | |||
1937 | $ hg log -r 'wdir()' --debug |
|
1939 | $ hg log -r 'wdir()' --debug | |
1938 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
1940 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff | |
1939 | phase: draft |
|
1941 | phase: draft | |
1940 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
|
1942 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 | |
1941 | parent: -1:0000000000000000000000000000000000000000 |
|
1943 | parent: -1:0000000000000000000000000000000000000000 | |
1942 | user: test |
|
1944 | user: test | |
1943 | date: [A-Za-z0-9:+ ]+ (re) |
|
1945 | date: [A-Za-z0-9:+ ]+ (re) | |
1944 | files: d1/f1 |
|
1946 | files: d1/f1 | |
1945 | files+: d1/f2 |
|
1947 | files+: d1/f2 | |
1946 | files-: .d6/f1 |
|
1948 | files-: .d6/f1 | |
1947 | extra: branch=default |
|
1949 | extra: branch=default | |
1948 |
|
1950 | |||
1949 | $ hg log -r 'wdir()' -p --stat --git |
|
1951 | $ hg log -r 'wdir()' -p --stat --git | |
1950 | changeset: 2147483647:ffffffffffff |
|
1952 | changeset: 2147483647:ffffffffffff | |
1951 | parent: 0:65624cd9070a |
|
1953 | parent: 0:65624cd9070a | |
1952 | user: test |
|
1954 | user: test | |
1953 | date: [A-Za-z0-9:+ ]+ (re) |
|
1955 | date: [A-Za-z0-9:+ ]+ (re) | |
1954 |
|
1956 | |||
1955 | .d6/f1 | 1 - |
|
1957 | .d6/f1 | 1 - | |
1956 | d1/f1 | 1 + |
|
1958 | d1/f1 | 1 + | |
1957 | d1/f2 | 1 + |
|
1959 | d1/f2 | 1 + | |
1958 | 3 files changed, 2 insertions(+), 1 deletions(-) |
|
1960 | 3 files changed, 2 insertions(+), 1 deletions(-) | |
1959 |
|
1961 | |||
1960 | diff --git a/.d6/f1 b/.d6/f1 |
|
1962 | diff --git a/.d6/f1 b/.d6/f1 | |
1961 | deleted file mode 100644 |
|
1963 | deleted file mode 100644 | |
1962 | --- a/.d6/f1 |
|
1964 | --- a/.d6/f1 | |
1963 | +++ /dev/null |
|
1965 | +++ /dev/null | |
1964 | @@ -1,1 +0,0 @@ |
|
1966 | @@ -1,1 +0,0 @@ | |
1965 | -1 |
|
1967 | -1 | |
1966 | diff --git a/d1/f1 b/d1/f1 |
|
1968 | diff --git a/d1/f1 b/d1/f1 | |
1967 | --- a/d1/f1 |
|
1969 | --- a/d1/f1 | |
1968 | +++ b/d1/f1 |
|
1970 | +++ b/d1/f1 | |
1969 | @@ -1,1 +1,2 @@ |
|
1971 | @@ -1,1 +1,2 @@ | |
1970 | 1 |
|
1972 | 1 | |
1971 | +2 |
|
1973 | +2 | |
1972 | diff --git a/d1/f2 b/d1/f2 |
|
1974 | diff --git a/d1/f2 b/d1/f2 | |
1973 | new file mode 100644 |
|
1975 | new file mode 100644 | |
1974 | --- /dev/null |
|
1976 | --- /dev/null | |
1975 | +++ b/d1/f2 |
|
1977 | +++ b/d1/f2 | |
1976 | @@ -0,0 +1,1 @@ |
|
1978 | @@ -0,0 +1,1 @@ | |
1977 | +2 |
|
1979 | +2 | |
1978 |
|
1980 | |||
1979 | $ hg log -r 'wdir()' -Tjson |
|
1981 | $ hg log -r 'wdir()' -Tjson | |
1980 | [ |
|
1982 | [ | |
1981 | { |
|
1983 | { | |
1982 | "rev": null, |
|
1984 | "rev": null, | |
1983 | "node": null, |
|
1985 | "node": null, | |
1984 | "branch": "default", |
|
1986 | "branch": "default", | |
1985 | "phase": "draft", |
|
1987 | "phase": "draft", | |
1986 | "user": "test", |
|
1988 | "user": "test", | |
1987 | "date": [*, 0], (glob) |
|
1989 | "date": [*, 0], (glob) | |
1988 | "desc": "", |
|
1990 | "desc": "", | |
1989 | "bookmarks": [], |
|
1991 | "bookmarks": [], | |
1990 | "tags": [], |
|
1992 | "tags": [], | |
1991 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] |
|
1993 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] | |
1992 | } |
|
1994 | } | |
1993 | ] |
|
1995 | ] | |
1994 |
|
1996 | |||
1995 | $ hg log -r 'wdir()' -Tjson -q |
|
1997 | $ hg log -r 'wdir()' -Tjson -q | |
1996 | [ |
|
1998 | [ | |
1997 | { |
|
1999 | { | |
1998 | "rev": null, |
|
2000 | "rev": null, | |
1999 | "node": null |
|
2001 | "node": null | |
2000 | } |
|
2002 | } | |
2001 | ] |
|
2003 | ] | |
2002 |
|
2004 | |||
2003 | $ hg log -r 'wdir()' -Tjson --debug |
|
2005 | $ hg log -r 'wdir()' -Tjson --debug | |
2004 | [ |
|
2006 | [ | |
2005 | { |
|
2007 | { | |
2006 | "rev": null, |
|
2008 | "rev": null, | |
2007 | "node": null, |
|
2009 | "node": null, | |
2008 | "branch": "default", |
|
2010 | "branch": "default", | |
2009 | "phase": "draft", |
|
2011 | "phase": "draft", | |
2010 | "user": "test", |
|
2012 | "user": "test", | |
2011 | "date": [*, 0], (glob) |
|
2013 | "date": [*, 0], (glob) | |
2012 | "desc": "", |
|
2014 | "desc": "", | |
2013 | "bookmarks": [], |
|
2015 | "bookmarks": [], | |
2014 | "tags": [], |
|
2016 | "tags": [], | |
2015 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
|
2017 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], | |
2016 | "manifest": null, |
|
2018 | "manifest": null, | |
2017 | "extra": {"branch": "default"}, |
|
2019 | "extra": {"branch": "default"}, | |
2018 | "modified": ["d1/f1"], |
|
2020 | "modified": ["d1/f1"], | |
2019 | "added": ["d1/f2"], |
|
2021 | "added": ["d1/f2"], | |
2020 | "removed": [".d6/f1"] |
|
2022 | "removed": [".d6/f1"] | |
2021 | } |
|
2023 | } | |
2022 | ] |
|
2024 | ] | |
2023 |
|
2025 | |||
2024 | $ hg revert -aqC |
|
2026 | $ hg revert -aqC | |
2025 |
|
2027 | |||
2026 | Check that adding an arbitrary name shows up in log automatically |
|
2028 | Check that adding an arbitrary name shows up in log automatically | |
2027 |
|
2029 | |||
2028 | $ cat > ../names.py <<EOF |
|
2030 | $ cat > ../names.py <<EOF | |
2029 | > """A small extension to test adding arbitrary names to a repo""" |
|
2031 | > """A small extension to test adding arbitrary names to a repo""" | |
2030 | > from __future__ import absolute_import |
|
2032 | > from __future__ import absolute_import | |
2031 | > from mercurial import namespaces |
|
2033 | > from mercurial import namespaces | |
2032 | > |
|
2034 | > | |
2033 | > def reposetup(ui, repo): |
|
2035 | > def reposetup(ui, repo): | |
2034 | > foo = {'foo': repo[0].node()} |
|
2036 | > foo = {'foo': repo[0].node()} | |
2035 | > names = lambda r: foo.keys() |
|
2037 | > names = lambda r: foo.keys() | |
2036 | > namemap = lambda r, name: foo.get(name) |
|
2038 | > namemap = lambda r, name: foo.get(name) | |
2037 | > nodemap = lambda r, node: [name for name, n in foo.iteritems() |
|
2039 | > nodemap = lambda r, node: [name for name, n in foo.iteritems() | |
2038 | > if n == node] |
|
2040 | > if n == node] | |
2039 | > ns = namespaces.namespace( |
|
2041 | > ns = namespaces.namespace( | |
2040 | > "bars", templatename="bar", logname="barlog", |
|
2042 | > "bars", templatename="bar", logname="barlog", | |
2041 | > colorname="barcolor", listnames=names, namemap=namemap, |
|
2043 | > colorname="barcolor", listnames=names, namemap=namemap, | |
2042 | > nodemap=nodemap) |
|
2044 | > nodemap=nodemap) | |
2043 | > |
|
2045 | > | |
2044 | > repo.names.addnamespace(ns) |
|
2046 | > repo.names.addnamespace(ns) | |
2045 | > EOF |
|
2047 | > EOF | |
2046 |
|
2048 | |||
2047 | $ hg --config extensions.names=../names.py log -r 0 |
|
2049 | $ hg --config extensions.names=../names.py log -r 0 | |
2048 | changeset: 0:65624cd9070a |
|
2050 | changeset: 0:65624cd9070a | |
2049 | tag: tip |
|
2051 | tag: tip | |
2050 | barlog: foo |
|
2052 | barlog: foo | |
2051 | user: test |
|
2053 | user: test | |
2052 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2054 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2053 | summary: a bunch of weird directories |
|
2055 | summary: a bunch of weird directories | |
2054 |
|
2056 | |||
2055 | $ hg --config extensions.names=../names.py \ |
|
2057 | $ hg --config extensions.names=../names.py \ | |
2056 | > --config extensions.color= --config color.log.barcolor=red \ |
|
2058 | > --config extensions.color= --config color.log.barcolor=red \ | |
2057 | > --color=always log -r 0 |
|
2059 | > --color=always log -r 0 | |
2058 | \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) |
|
2060 | \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) | |
2059 | tag: tip |
|
2061 | tag: tip | |
2060 | \x1b[0;31mbarlog: foo\x1b[0m (esc) |
|
2062 | \x1b[0;31mbarlog: foo\x1b[0m (esc) | |
2061 | user: test |
|
2063 | user: test | |
2062 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2064 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2063 | summary: a bunch of weird directories |
|
2065 | summary: a bunch of weird directories | |
2064 |
|
2066 | |||
2065 | $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' |
|
2067 | $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' | |
2066 | foo |
|
2068 | foo | |
2067 |
|
2069 | |||
2068 | $ cd .. |
|
2070 | $ cd .. | |
2069 |
|
2071 | |||
2070 | hg log -f dir across branches |
|
2072 | hg log -f dir across branches | |
2071 |
|
2073 | |||
2072 | $ hg init acrossbranches |
|
2074 | $ hg init acrossbranches | |
2073 | $ cd acrossbranches |
|
2075 | $ cd acrossbranches | |
2074 | $ mkdir d |
|
2076 | $ mkdir d | |
2075 | $ echo a > d/a && hg ci -Aqm a |
|
2077 | $ echo a > d/a && hg ci -Aqm a | |
2076 | $ echo b > d/a && hg ci -Aqm b |
|
2078 | $ echo b > d/a && hg ci -Aqm b | |
2077 | $ hg up -q 0 |
|
2079 | $ hg up -q 0 | |
2078 | $ echo b > d/a && hg ci -Aqm c |
|
2080 | $ echo b > d/a && hg ci -Aqm c | |
2079 | $ hg log -f d -T '{desc}' -G |
|
2081 | $ hg log -f d -T '{desc}' -G | |
2080 | @ c |
|
2082 | @ c | |
2081 | | |
|
2083 | | | |
2082 | o a |
|
2084 | o a | |
2083 |
|
2085 | |||
2084 | Ensure that largefiles doesn't interfere with following a normal file |
|
2086 | Ensure that largefiles doesn't interfere with following a normal file | |
2085 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G |
|
2087 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G | |
2086 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
2088 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) | |
2087 | @ c |
|
2089 | @ c | |
2088 | | |
|
2090 | | | |
2089 | o a |
|
2091 | o a | |
2090 |
|
2092 | |||
2091 | $ hg log -f d/a -T '{desc}' -G |
|
2093 | $ hg log -f d/a -T '{desc}' -G | |
2092 | @ c |
|
2094 | @ c | |
2093 | | |
|
2095 | | | |
2094 | o a |
|
2096 | o a | |
2095 |
|
2097 | |||
2096 | $ cd .. |
|
2098 | $ cd .. | |
2097 |
|
2099 | |||
2098 | hg log -f with linkrev pointing to another branch |
|
2100 | hg log -f with linkrev pointing to another branch | |
2099 | ------------------------------------------------- |
|
2101 | ------------------------------------------------- | |
2100 |
|
2102 | |||
2101 | create history with a filerev whose linkrev points to another branch |
|
2103 | create history with a filerev whose linkrev points to another branch | |
2102 |
|
2104 | |||
2103 | $ hg init branchedlinkrev |
|
2105 | $ hg init branchedlinkrev | |
2104 | $ cd branchedlinkrev |
|
2106 | $ cd branchedlinkrev | |
2105 | $ echo 1 > a |
|
2107 | $ echo 1 > a | |
2106 | $ hg commit -Am 'content1' |
|
2108 | $ hg commit -Am 'content1' | |
2107 | adding a |
|
2109 | adding a | |
2108 | $ echo 2 > a |
|
2110 | $ echo 2 > a | |
2109 | $ hg commit -m 'content2' |
|
2111 | $ hg commit -m 'content2' | |
2110 | $ hg up --rev 'desc(content1)' |
|
2112 | $ hg up --rev 'desc(content1)' | |
2111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2113 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2112 | $ echo unrelated > unrelated |
|
2114 | $ echo unrelated > unrelated | |
2113 | $ hg commit -Am 'unrelated' |
|
2115 | $ hg commit -Am 'unrelated' | |
2114 | adding unrelated |
|
2116 | adding unrelated | |
2115 | created new head |
|
2117 | created new head | |
2116 | $ hg graft -r 'desc(content2)' |
|
2118 | $ hg graft -r 'desc(content2)' | |
2117 | grafting 1:2294ae80ad84 "content2" |
|
2119 | grafting 1:2294ae80ad84 "content2" | |
2118 | $ echo 3 > a |
|
2120 | $ echo 3 > a | |
2119 | $ hg commit -m 'content3' |
|
2121 | $ hg commit -m 'content3' | |
2120 | $ hg log -G |
|
2122 | $ hg log -G | |
2121 | @ changeset: 4:50b9b36e9c5d |
|
2123 | @ changeset: 4:50b9b36e9c5d | |
2122 | | tag: tip |
|
2124 | | tag: tip | |
2123 | | user: test |
|
2125 | | user: test | |
2124 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2126 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2125 | | summary: content3 |
|
2127 | | summary: content3 | |
2126 | | |
|
2128 | | | |
2127 | o changeset: 3:15b2327059e5 |
|
2129 | o changeset: 3:15b2327059e5 | |
2128 | | user: test |
|
2130 | | user: test | |
2129 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2131 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2130 | | summary: content2 |
|
2132 | | summary: content2 | |
2131 | | |
|
2133 | | | |
2132 | o changeset: 2:2029acd1168c |
|
2134 | o changeset: 2:2029acd1168c | |
2133 | | parent: 0:ae0a3c9f9e95 |
|
2135 | | parent: 0:ae0a3c9f9e95 | |
2134 | | user: test |
|
2136 | | user: test | |
2135 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2137 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2136 | | summary: unrelated |
|
2138 | | summary: unrelated | |
2137 | | |
|
2139 | | | |
2138 | | o changeset: 1:2294ae80ad84 |
|
2140 | | o changeset: 1:2294ae80ad84 | |
2139 | |/ user: test |
|
2141 | |/ user: test | |
2140 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2142 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2141 | | summary: content2 |
|
2143 | | summary: content2 | |
2142 | | |
|
2144 | | | |
2143 | o changeset: 0:ae0a3c9f9e95 |
|
2145 | o changeset: 0:ae0a3c9f9e95 | |
2144 | user: test |
|
2146 | user: test | |
2145 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2146 | summary: content1 |
|
2148 | summary: content1 | |
2147 |
|
2149 | |||
2148 |
|
2150 | |||
2149 | log -f on the file should list the graft result. |
|
2151 | log -f on the file should list the graft result. | |
2150 |
|
2152 | |||
2151 | $ hg log -Gf a |
|
2153 | $ hg log -Gf a | |
2152 | @ changeset: 4:50b9b36e9c5d |
|
2154 | @ changeset: 4:50b9b36e9c5d | |
2153 | | tag: tip |
|
2155 | | tag: tip | |
2154 | | user: test |
|
2156 | | user: test | |
2155 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2157 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2156 | | summary: content3 |
|
2158 | | summary: content3 | |
2157 | | |
|
2159 | | | |
2158 | o changeset: 3:15b2327059e5 |
|
2160 | o changeset: 3:15b2327059e5 | |
2159 | : user: test |
|
2161 | : user: test | |
2160 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2162 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2161 | : summary: content2 |
|
2163 | : summary: content2 | |
2162 | : |
|
2164 | : | |
2163 | o changeset: 0:ae0a3c9f9e95 |
|
2165 | o changeset: 0:ae0a3c9f9e95 | |
2164 | user: test |
|
2166 | user: test | |
2165 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2167 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2166 | summary: content1 |
|
2168 | summary: content1 | |
2167 |
|
2169 | |||
2168 |
|
2170 | |||
2169 | plain log lists the original version |
|
2171 | plain log lists the original version | |
2170 | (XXX we should probably list both) |
|
2172 | (XXX we should probably list both) | |
2171 |
|
2173 | |||
2172 | $ hg log -G a |
|
2174 | $ hg log -G a | |
2173 | @ changeset: 4:50b9b36e9c5d |
|
2175 | @ changeset: 4:50b9b36e9c5d | |
2174 | : tag: tip |
|
2176 | : tag: tip | |
2175 | : user: test |
|
2177 | : user: test | |
2176 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2178 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2177 | : summary: content3 |
|
2179 | : summary: content3 | |
2178 | : |
|
2180 | : | |
2179 | : o changeset: 1:2294ae80ad84 |
|
2181 | : o changeset: 1:2294ae80ad84 | |
2180 | :/ user: test |
|
2182 | :/ user: test | |
2181 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2183 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2182 | : summary: content2 |
|
2184 | : summary: content2 | |
2183 | : |
|
2185 | : | |
2184 | o changeset: 0:ae0a3c9f9e95 |
|
2186 | o changeset: 0:ae0a3c9f9e95 | |
2185 | user: test |
|
2187 | user: test | |
2186 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2188 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2187 | summary: content1 |
|
2189 | summary: content1 | |
2188 |
|
2190 | |||
2189 |
|
2191 | |||
2190 | hg log -f from the grafted changeset |
|
2192 | hg log -f from the grafted changeset | |
2191 | (The bootstrap should properly take the topology in account) |
|
2193 | (The bootstrap should properly take the topology in account) | |
2192 |
|
2194 | |||
2193 | $ hg up 'desc(content3)^' |
|
2195 | $ hg up 'desc(content3)^' | |
2194 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2195 | $ hg log -Gf a |
|
2197 | $ hg log -Gf a | |
2196 | @ changeset: 3:15b2327059e5 |
|
2198 | @ changeset: 3:15b2327059e5 | |
2197 | : user: test |
|
2199 | : user: test | |
2198 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2200 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2199 | : summary: content2 |
|
2201 | : summary: content2 | |
2200 | : |
|
2202 | : | |
2201 | o changeset: 0:ae0a3c9f9e95 |
|
2203 | o changeset: 0:ae0a3c9f9e95 | |
2202 | user: test |
|
2204 | user: test | |
2203 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2205 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2204 | summary: content1 |
|
2206 | summary: content1 | |
2205 |
|
2207 | |||
2206 |
|
2208 | |||
2207 | Test that we use the first non-hidden changeset in that case. |
|
2209 | Test that we use the first non-hidden changeset in that case. | |
2208 |
|
2210 | |||
2209 | (hide the changeset) |
|
2211 | (hide the changeset) | |
2210 |
|
2212 | |||
2211 | $ hg log -T '{node}\n' -r 1 |
|
2213 | $ hg log -T '{node}\n' -r 1 | |
2212 | 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2214 | 2294ae80ad8447bc78383182eeac50cb049df623 | |
2213 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2215 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 | |
2214 | obsoleted 1 changesets |
|
2216 | obsoleted 1 changesets | |
2215 | $ hg log -G |
|
2217 | $ hg log -G | |
2216 | o changeset: 4:50b9b36e9c5d |
|
2218 | o changeset: 4:50b9b36e9c5d | |
2217 | | tag: tip |
|
2219 | | tag: tip | |
2218 | | user: test |
|
2220 | | user: test | |
2219 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2221 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2220 | | summary: content3 |
|
2222 | | summary: content3 | |
2221 | | |
|
2223 | | | |
2222 | @ changeset: 3:15b2327059e5 |
|
2224 | @ changeset: 3:15b2327059e5 | |
2223 | | user: test |
|
2225 | | user: test | |
2224 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2226 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2225 | | summary: content2 |
|
2227 | | summary: content2 | |
2226 | | |
|
2228 | | | |
2227 | o changeset: 2:2029acd1168c |
|
2229 | o changeset: 2:2029acd1168c | |
2228 | | parent: 0:ae0a3c9f9e95 |
|
2230 | | parent: 0:ae0a3c9f9e95 | |
2229 | | user: test |
|
2231 | | user: test | |
2230 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2232 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2231 | | summary: unrelated |
|
2233 | | summary: unrelated | |
2232 | | |
|
2234 | | | |
2233 | o changeset: 0:ae0a3c9f9e95 |
|
2235 | o changeset: 0:ae0a3c9f9e95 | |
2234 | user: test |
|
2236 | user: test | |
2235 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2237 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2236 | summary: content1 |
|
2238 | summary: content1 | |
2237 |
|
2239 | |||
2238 |
|
2240 | |||
2239 | Check that log on the file does not drop the file revision. |
|
2241 | Check that log on the file does not drop the file revision. | |
2240 |
|
2242 | |||
2241 | $ hg log -G a |
|
2243 | $ hg log -G a | |
2242 | o changeset: 4:50b9b36e9c5d |
|
2244 | o changeset: 4:50b9b36e9c5d | |
2243 | | tag: tip |
|
2245 | | tag: tip | |
2244 | | user: test |
|
2246 | | user: test | |
2245 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2247 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2246 | | summary: content3 |
|
2248 | | summary: content3 | |
2247 | | |
|
2249 | | | |
2248 | @ changeset: 3:15b2327059e5 |
|
2250 | @ changeset: 3:15b2327059e5 | |
2249 | : user: test |
|
2251 | : user: test | |
2250 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2252 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2251 | : summary: content2 |
|
2253 | : summary: content2 | |
2252 | : |
|
2254 | : | |
2253 | o changeset: 0:ae0a3c9f9e95 |
|
2255 | o changeset: 0:ae0a3c9f9e95 | |
2254 | user: test |
|
2256 | user: test | |
2255 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2257 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2256 | summary: content1 |
|
2258 | summary: content1 | |
2257 |
|
2259 | |||
2258 |
|
2260 | |||
2259 | Even when a head revision is linkrev-shadowed. |
|
2261 | Even when a head revision is linkrev-shadowed. | |
2260 |
|
2262 | |||
2261 | $ hg log -T '{node}\n' -r 4 |
|
2263 | $ hg log -T '{node}\n' -r 4 | |
2262 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2264 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
2263 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2265 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
2264 | obsoleted 1 changesets |
|
2266 | obsoleted 1 changesets | |
2265 | $ hg log -G a |
|
2267 | $ hg log -G a | |
2266 | @ changeset: 3:15b2327059e5 |
|
2268 | @ changeset: 3:15b2327059e5 | |
2267 | : tag: tip |
|
2269 | : tag: tip | |
2268 | : user: test |
|
2270 | : user: test | |
2269 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2271 | : date: Thu Jan 01 00:00:00 1970 +0000 | |
2270 | : summary: content2 |
|
2272 | : summary: content2 | |
2271 | : |
|
2273 | : | |
2272 | o changeset: 0:ae0a3c9f9e95 |
|
2274 | o changeset: 0:ae0a3c9f9e95 | |
2273 | user: test |
|
2275 | user: test | |
2274 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2275 | summary: content1 |
|
2277 | summary: content1 | |
2276 |
|
2278 | |||
2277 |
|
2279 | |||
2278 | $ cd .. |
|
2280 | $ cd .. | |
2279 |
|
2281 | |||
2280 | Even when the file revision is missing from some head: |
|
2282 | Even when the file revision is missing from some head: | |
2281 |
|
2283 | |||
2282 | $ hg init issue4490 |
|
2284 | $ hg init issue4490 | |
2283 | $ cd issue4490 |
|
2285 | $ cd issue4490 | |
2284 | $ echo '[experimental]' >> .hg/hgrc |
|
2286 | $ echo '[experimental]' >> .hg/hgrc | |
2285 | $ echo 'stabilization=createmarkers' >> .hg/hgrc |
|
2287 | $ echo 'stabilization=createmarkers' >> .hg/hgrc | |
2286 | $ echo a > a |
|
2288 | $ echo a > a | |
2287 | $ hg ci -Am0 |
|
2289 | $ hg ci -Am0 | |
2288 | adding a |
|
2290 | adding a | |
2289 | $ echo b > b |
|
2291 | $ echo b > b | |
2290 | $ hg ci -Am1 |
|
2292 | $ hg ci -Am1 | |
2291 | adding b |
|
2293 | adding b | |
2292 | $ echo B > b |
|
2294 | $ echo B > b | |
2293 | $ hg ci --amend -m 1 |
|
2295 | $ hg ci --amend -m 1 | |
2294 | $ hg up 0 |
|
2296 | $ hg up 0 | |
2295 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2297 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2296 | $ echo c > c |
|
2298 | $ echo c > c | |
2297 | $ hg ci -Am2 |
|
2299 | $ hg ci -Am2 | |
2298 | adding c |
|
2300 | adding c | |
2299 | created new head |
|
2301 | created new head | |
2300 | $ hg up 'head() and not .' |
|
2302 | $ hg up 'head() and not .' | |
2301 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2303 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2302 | $ hg log -G |
|
2304 | $ hg log -G | |
2303 | o changeset: 3:db815d6d32e6 |
|
2305 | o changeset: 3:db815d6d32e6 | |
2304 | | tag: tip |
|
2306 | | tag: tip | |
2305 | | parent: 0:f7b1eb17ad24 |
|
2307 | | parent: 0:f7b1eb17ad24 | |
2306 | | user: test |
|
2308 | | user: test | |
2307 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2309 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2308 | | summary: 2 |
|
2310 | | summary: 2 | |
2309 | | |
|
2311 | | | |
2310 | | @ changeset: 2:9bc8ce7f9356 |
|
2312 | | @ changeset: 2:9bc8ce7f9356 | |
2311 | |/ parent: 0:f7b1eb17ad24 |
|
2313 | |/ parent: 0:f7b1eb17ad24 | |
2312 | | user: test |
|
2314 | | user: test | |
2313 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2315 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2314 | | summary: 1 |
|
2316 | | summary: 1 | |
2315 | | |
|
2317 | | | |
2316 | o changeset: 0:f7b1eb17ad24 |
|
2318 | o changeset: 0:f7b1eb17ad24 | |
2317 | user: test |
|
2319 | user: test | |
2318 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2320 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2319 | summary: 0 |
|
2321 | summary: 0 | |
2320 |
|
2322 | |||
2321 | $ hg log -f -G b |
|
2323 | $ hg log -f -G b | |
2322 | @ changeset: 2:9bc8ce7f9356 |
|
2324 | @ changeset: 2:9bc8ce7f9356 | |
2323 | | parent: 0:f7b1eb17ad24 |
|
2325 | | parent: 0:f7b1eb17ad24 | |
2324 | ~ user: test |
|
2326 | ~ user: test | |
2325 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2327 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2326 | summary: 1 |
|
2328 | summary: 1 | |
2327 |
|
2329 | |||
2328 | $ hg log -G b |
|
2330 | $ hg log -G b | |
2329 | @ changeset: 2:9bc8ce7f9356 |
|
2331 | @ changeset: 2:9bc8ce7f9356 | |
2330 | | parent: 0:f7b1eb17ad24 |
|
2332 | | parent: 0:f7b1eb17ad24 | |
2331 | ~ user: test |
|
2333 | ~ user: test | |
2332 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2334 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2333 | summary: 1 |
|
2335 | summary: 1 | |
2334 |
|
2336 | |||
2335 | $ cd .. |
|
2337 | $ cd .. | |
2336 |
|
2338 | |||
2337 | Check proper report when the manifest changes but not the file issue4499 |
|
2339 | Check proper report when the manifest changes but not the file issue4499 | |
2338 | ------------------------------------------------------------------------ |
|
2340 | ------------------------------------------------------------------------ | |
2339 |
|
2341 | |||
2340 | $ hg init issue4499 |
|
2342 | $ hg init issue4499 | |
2341 | $ cd issue4499 |
|
2343 | $ cd issue4499 | |
2342 | $ 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 |
|
2344 | $ 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 | |
2343 | > echo 1 > $f; |
|
2345 | > echo 1 > $f; | |
2344 | > hg add $f; |
|
2346 | > hg add $f; | |
2345 | > done |
|
2347 | > done | |
2346 | $ hg commit -m 'A1B1C1' |
|
2348 | $ hg commit -m 'A1B1C1' | |
2347 | $ echo 2 > A |
|
2349 | $ echo 2 > A | |
2348 | $ echo 2 > B |
|
2350 | $ echo 2 > B | |
2349 | $ echo 2 > C |
|
2351 | $ echo 2 > C | |
2350 | $ hg commit -m 'A2B2C2' |
|
2352 | $ hg commit -m 'A2B2C2' | |
2351 | $ hg up 0 |
|
2353 | $ hg up 0 | |
2352 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2354 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2353 | $ echo 3 > A |
|
2355 | $ echo 3 > A | |
2354 | $ echo 2 > B |
|
2356 | $ echo 2 > B | |
2355 | $ echo 2 > C |
|
2357 | $ echo 2 > C | |
2356 | $ hg commit -m 'A3B2C2' |
|
2358 | $ hg commit -m 'A3B2C2' | |
2357 | created new head |
|
2359 | created new head | |
2358 |
|
2360 | |||
2359 | $ hg log -G |
|
2361 | $ hg log -G | |
2360 | @ changeset: 2:fe5fc3d0eb17 |
|
2362 | @ changeset: 2:fe5fc3d0eb17 | |
2361 | | tag: tip |
|
2363 | | tag: tip | |
2362 | | parent: 0:abf4f0e38563 |
|
2364 | | parent: 0:abf4f0e38563 | |
2363 | | user: test |
|
2365 | | user: test | |
2364 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2366 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2365 | | summary: A3B2C2 |
|
2367 | | summary: A3B2C2 | |
2366 | | |
|
2368 | | | |
2367 | | o changeset: 1:07dcc6b312c0 |
|
2369 | | o changeset: 1:07dcc6b312c0 | |
2368 | |/ user: test |
|
2370 | |/ user: test | |
2369 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2371 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2370 | | summary: A2B2C2 |
|
2372 | | summary: A2B2C2 | |
2371 | | |
|
2373 | | | |
2372 | o changeset: 0:abf4f0e38563 |
|
2374 | o changeset: 0:abf4f0e38563 | |
2373 | user: test |
|
2375 | user: test | |
2374 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2376 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2375 | summary: A1B1C1 |
|
2377 | summary: A1B1C1 | |
2376 |
|
2378 | |||
2377 |
|
2379 | |||
2378 | Log -f on B should reports current changesets |
|
2380 | Log -f on B should reports current changesets | |
2379 |
|
2381 | |||
2380 | $ hg log -fG B |
|
2382 | $ hg log -fG B | |
2381 | @ changeset: 2:fe5fc3d0eb17 |
|
2383 | @ changeset: 2:fe5fc3d0eb17 | |
2382 | | tag: tip |
|
2384 | | tag: tip | |
2383 | | parent: 0:abf4f0e38563 |
|
2385 | | parent: 0:abf4f0e38563 | |
2384 | | user: test |
|
2386 | | user: test | |
2385 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2387 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2386 | | summary: A3B2C2 |
|
2388 | | summary: A3B2C2 | |
2387 | | |
|
2389 | | | |
2388 | o changeset: 0:abf4f0e38563 |
|
2390 | o changeset: 0:abf4f0e38563 | |
2389 | user: test |
|
2391 | user: test | |
2390 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2392 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2391 | summary: A1B1C1 |
|
2393 | summary: A1B1C1 | |
2392 |
|
2394 | |||
2393 | $ cd .. |
|
2395 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now