##// END OF EJS Templates
tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit...
Martin von Zweigbergk -
r42567:7a64ad3f default
parent child Browse files
Show More
@@ -1,1363 +1,1380 b''
1 Test template keywords
1 Test template keywords
2 ======================
2 ======================
3
3
4 $ hg init a
4 $ hg init a
5 $ cd a
5 $ cd a
6 $ echo a > a
6 $ echo a > a
7 $ hg add a
7 $ hg add a
8 $ echo line 1 > b
8 $ echo line 1 > b
9 $ echo line 2 >> b
9 $ echo line 2 >> b
10 $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
10 $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
11
11
12 $ hg add b
12 $ hg add b
13 $ echo other 1 > c
13 $ echo other 1 > c
14 $ echo other 2 >> c
14 $ echo other 2 >> c
15 $ echo >> c
15 $ echo >> c
16 $ echo other 3 >> c
16 $ echo other 3 >> c
17 $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
17 $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
18
18
19 $ hg add c
19 $ hg add c
20 $ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
20 $ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
21 $ echo c >> c
21 $ echo c >> c
22 $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
22 $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
23
23
24 $ echo foo > .hg/branch
24 $ echo foo > .hg/branch
25 $ hg commit -m 'new branch' -d '1400000 0' -u 'person'
25 $ hg commit -m 'new branch' -d '1400000 0' -u 'person'
26
26
27 $ hg co -q 3
27 $ hg co -q 3
28 $ echo other 4 >> d
28 $ echo other 4 >> d
29 $ hg add d
29 $ hg add d
30 $ hg commit -m 'new head' -d '1500000 0' -u 'person'
30 $ hg commit -m 'new head' -d '1500000 0' -u 'person'
31
31
32 $ hg merge -q foo
32 $ hg merge -q foo
33 $ hg commit -m 'merge' -d '1500001 0' -u 'person'
33 $ hg commit -m 'merge' -d '1500001 0' -u 'person'
34
34
35 Second branch starting at nullrev:
35 Second branch starting at nullrev:
36
36
37 $ hg update null
37 $ hg update null
38 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
38 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
39 $ echo second > second
39 $ echo second > second
40 $ hg add second
40 $ hg add second
41 $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
41 $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
42 created new head
42 created new head
43
43
44 $ echo third > third
44 $ echo third > third
45 $ hg add third
45 $ hg add third
46 $ hg mv second fourth
46 $ hg mv second fourth
47 $ hg commit -m third -d "2020-01-01 10:01"
47 $ hg commit -m third -d "2020-01-01 10:01"
48
48
49 Working-directory revision has special identifiers, though they are still
49 Working-directory revision has special identifiers, though they are still
50 experimental:
50 experimental:
51
51
52 $ hg log -r 'wdir()' -T '{rev}:{node}\n'
52 $ hg log -r 'wdir()' -T '{rev}:{node}\n'
53 2147483647:ffffffffffffffffffffffffffffffffffffffff
53 2147483647:ffffffffffffffffffffffffffffffffffffffff
54
54
55 $ hg log -r 'wdir()' -Tjson --debug
55 $ hg log -r 'wdir()' -Tjson --debug
56 [
56 [
57 {
57 {
58 "added": [],
58 "added": [],
59 "bookmarks": [],
59 "bookmarks": [],
60 "branch": "default",
60 "branch": "default",
61 "date": [0, 0],
61 "date": [0, 0],
62 "desc": "",
62 "desc": "",
63 "extra": {"branch": "default"},
63 "extra": {"branch": "default"},
64 "manifest": "ffffffffffffffffffffffffffffffffffffffff",
64 "manifest": "ffffffffffffffffffffffffffffffffffffffff",
65 "modified": [],
65 "modified": [],
66 "node": "ffffffffffffffffffffffffffffffffffffffff",
66 "node": "ffffffffffffffffffffffffffffffffffffffff",
67 "parents": ["95c24699272ef57d062b8bccc32c878bf841784a"],
67 "parents": ["95c24699272ef57d062b8bccc32c878bf841784a"],
68 "phase": "draft",
68 "phase": "draft",
69 "removed": [],
69 "removed": [],
70 "rev": 2147483647,
70 "rev": 2147483647,
71 "tags": [],
71 "tags": [],
72 "user": "test"
72 "user": "test"
73 }
73 }
74 ]
74 ]
75
75
76 $ hg log -r 'wdir()' -T '{manifest}\n'
76 $ hg log -r 'wdir()' -T '{manifest}\n'
77 2147483647:ffffffffffff
77 2147483647:ffffffffffff
78
78
79 However, for negrev, we refuse to output anything (as well as for null)
79 However, for negrev, we refuse to output anything (as well as for null)
80
80
81 $ hg log -r 'wdir() + null' -T 'bla{negrev}nk\n'
81 $ hg log -r 'wdir() + null' -T 'bla{negrev}nk\n'
82 blank
82 blank
83 blank
83 blank
84
84
85 Changectx-derived keywords are disabled within {manifest} as {node} changes:
85 Changectx-derived keywords are disabled within {manifest} as {node} changes:
86
86
87 $ hg log -r0 -T 'outer:{p1node} {manifest % "inner:{p1node}"}\n'
87 $ hg log -r0 -T 'outer:{p1node} {manifest % "inner:{p1node}"}\n'
88 outer:0000000000000000000000000000000000000000 inner:
88 outer:0000000000000000000000000000000000000000 inner:
89
89
90 Check that {phase} works correctly on parents:
90 Check that {phase} works correctly on parents:
91
91
92 $ cat << EOF > parentphase
92 $ cat << EOF > parentphase
93 > changeset_debug = '{rev} ({phase}):{parents}\n'
93 > changeset_debug = '{rev} ({phase}):{parents}\n'
94 > parent = ' {rev} ({phase})'
94 > parent = ' {rev} ({phase})'
95 > EOF
95 > EOF
96 $ hg phase -r 5 --public
96 $ hg phase -r 5 --public
97 $ hg phase -r 7 --secret --force
97 $ hg phase -r 7 --secret --force
98 $ hg log --debug -G --style ./parentphase
98 $ hg log --debug -G --style ./parentphase
99 @ 8 (secret): 7 (secret) -1 (public)
99 @ 8 (secret): 7 (secret) -1 (public)
100 |
100 |
101 o 7 (secret): -1 (public) -1 (public)
101 o 7 (secret): -1 (public) -1 (public)
102
102
103 o 6 (draft): 5 (public) 4 (draft)
103 o 6 (draft): 5 (public) 4 (draft)
104 |\
104 |\
105 | o 5 (public): 3 (public) -1 (public)
105 | o 5 (public): 3 (public) -1 (public)
106 | |
106 | |
107 o | 4 (draft): 3 (public) -1 (public)
107 o | 4 (draft): 3 (public) -1 (public)
108 |/
108 |/
109 o 3 (public): 2 (public) -1 (public)
109 o 3 (public): 2 (public) -1 (public)
110 |
110 |
111 o 2 (public): 1 (public) -1 (public)
111 o 2 (public): 1 (public) -1 (public)
112 |
112 |
113 o 1 (public): 0 (public) -1 (public)
113 o 1 (public): 0 (public) -1 (public)
114 |
114 |
115 o 0 (public): -1 (public) -1 (public)
115 o 0 (public): -1 (public) -1 (public)
116
116
117
117
118 Keys work:
118 Keys work:
119
119
120 $ for key in author branch branches date desc file_adds file_dels file_mods \
120 $ for key in author branch branches date desc file_adds file_dels file_mods \
121 > file_copies file_copies_switch files \
121 > file_copies file_copies_switch files \
122 > manifest node parents rev tags diffstat extras \
122 > manifest node parents rev tags diffstat extras \
123 > p1rev p2rev p1node p2node user; do
123 > p1rev p2rev p1node p2node user; do
124 > for mode in '' --verbose --debug; do
124 > for mode in '' --verbose --debug; do
125 > hg log $mode --template "$key$mode: {$key}\n"
125 > hg log $mode --template "$key$mode: {$key}\n"
126 > done
126 > done
127 > done
127 > done
128 author: test
128 author: test
129 author: User Name <user@hostname>
129 author: User Name <user@hostname>
130 author: person
130 author: person
131 author: person
131 author: person
132 author: person
132 author: person
133 author: person
133 author: person
134 author: other@place
134 author: other@place
135 author: A. N. Other <other@place>
135 author: A. N. Other <other@place>
136 author: User Name <user@hostname>
136 author: User Name <user@hostname>
137 author--verbose: test
137 author--verbose: test
138 author--verbose: User Name <user@hostname>
138 author--verbose: User Name <user@hostname>
139 author--verbose: person
139 author--verbose: person
140 author--verbose: person
140 author--verbose: person
141 author--verbose: person
141 author--verbose: person
142 author--verbose: person
142 author--verbose: person
143 author--verbose: other@place
143 author--verbose: other@place
144 author--verbose: A. N. Other <other@place>
144 author--verbose: A. N. Other <other@place>
145 author--verbose: User Name <user@hostname>
145 author--verbose: User Name <user@hostname>
146 author--debug: test
146 author--debug: test
147 author--debug: User Name <user@hostname>
147 author--debug: User Name <user@hostname>
148 author--debug: person
148 author--debug: person
149 author--debug: person
149 author--debug: person
150 author--debug: person
150 author--debug: person
151 author--debug: person
151 author--debug: person
152 author--debug: other@place
152 author--debug: other@place
153 author--debug: A. N. Other <other@place>
153 author--debug: A. N. Other <other@place>
154 author--debug: User Name <user@hostname>
154 author--debug: User Name <user@hostname>
155 branch: default
155 branch: default
156 branch: default
156 branch: default
157 branch: default
157 branch: default
158 branch: default
158 branch: default
159 branch: foo
159 branch: foo
160 branch: default
160 branch: default
161 branch: default
161 branch: default
162 branch: default
162 branch: default
163 branch: default
163 branch: default
164 branch--verbose: default
164 branch--verbose: default
165 branch--verbose: default
165 branch--verbose: default
166 branch--verbose: default
166 branch--verbose: default
167 branch--verbose: default
167 branch--verbose: default
168 branch--verbose: foo
168 branch--verbose: foo
169 branch--verbose: default
169 branch--verbose: default
170 branch--verbose: default
170 branch--verbose: default
171 branch--verbose: default
171 branch--verbose: default
172 branch--verbose: default
172 branch--verbose: default
173 branch--debug: default
173 branch--debug: default
174 branch--debug: default
174 branch--debug: default
175 branch--debug: default
175 branch--debug: default
176 branch--debug: default
176 branch--debug: default
177 branch--debug: foo
177 branch--debug: foo
178 branch--debug: default
178 branch--debug: default
179 branch--debug: default
179 branch--debug: default
180 branch--debug: default
180 branch--debug: default
181 branch--debug: default
181 branch--debug: default
182 branches:
182 branches:
183 branches:
183 branches:
184 branches:
184 branches:
185 branches:
185 branches:
186 branches: foo
186 branches: foo
187 branches:
187 branches:
188 branches:
188 branches:
189 branches:
189 branches:
190 branches:
190 branches:
191 branches--verbose:
191 branches--verbose:
192 branches--verbose:
192 branches--verbose:
193 branches--verbose:
193 branches--verbose:
194 branches--verbose:
194 branches--verbose:
195 branches--verbose: foo
195 branches--verbose: foo
196 branches--verbose:
196 branches--verbose:
197 branches--verbose:
197 branches--verbose:
198 branches--verbose:
198 branches--verbose:
199 branches--verbose:
199 branches--verbose:
200 branches--debug:
200 branches--debug:
201 branches--debug:
201 branches--debug:
202 branches--debug:
202 branches--debug:
203 branches--debug:
203 branches--debug:
204 branches--debug: foo
204 branches--debug: foo
205 branches--debug:
205 branches--debug:
206 branches--debug:
206 branches--debug:
207 branches--debug:
207 branches--debug:
208 branches--debug:
208 branches--debug:
209 date: 1577872860.00
209 date: 1577872860.00
210 date: 1000000.00
210 date: 1000000.00
211 date: 1500001.00
211 date: 1500001.00
212 date: 1500000.00
212 date: 1500000.00
213 date: 1400000.00
213 date: 1400000.00
214 date: 1300000.00
214 date: 1300000.00
215 date: 1200000.00
215 date: 1200000.00
216 date: 1100000.00
216 date: 1100000.00
217 date: 1000000.00
217 date: 1000000.00
218 date--verbose: 1577872860.00
218 date--verbose: 1577872860.00
219 date--verbose: 1000000.00
219 date--verbose: 1000000.00
220 date--verbose: 1500001.00
220 date--verbose: 1500001.00
221 date--verbose: 1500000.00
221 date--verbose: 1500000.00
222 date--verbose: 1400000.00
222 date--verbose: 1400000.00
223 date--verbose: 1300000.00
223 date--verbose: 1300000.00
224 date--verbose: 1200000.00
224 date--verbose: 1200000.00
225 date--verbose: 1100000.00
225 date--verbose: 1100000.00
226 date--verbose: 1000000.00
226 date--verbose: 1000000.00
227 date--debug: 1577872860.00
227 date--debug: 1577872860.00
228 date--debug: 1000000.00
228 date--debug: 1000000.00
229 date--debug: 1500001.00
229 date--debug: 1500001.00
230 date--debug: 1500000.00
230 date--debug: 1500000.00
231 date--debug: 1400000.00
231 date--debug: 1400000.00
232 date--debug: 1300000.00
232 date--debug: 1300000.00
233 date--debug: 1200000.00
233 date--debug: 1200000.00
234 date--debug: 1100000.00
234 date--debug: 1100000.00
235 date--debug: 1000000.00
235 date--debug: 1000000.00
236 desc: third
236 desc: third
237 desc: second
237 desc: second
238 desc: merge
238 desc: merge
239 desc: new head
239 desc: new head
240 desc: new branch
240 desc: new branch
241 desc: no user, no domain
241 desc: no user, no domain
242 desc: no person
242 desc: no person
243 desc: other 1
243 desc: other 1
244 other 2
244 other 2
245
245
246 other 3
246 other 3
247 desc: line 1
247 desc: line 1
248 line 2
248 line 2
249 desc--verbose: third
249 desc--verbose: third
250 desc--verbose: second
250 desc--verbose: second
251 desc--verbose: merge
251 desc--verbose: merge
252 desc--verbose: new head
252 desc--verbose: new head
253 desc--verbose: new branch
253 desc--verbose: new branch
254 desc--verbose: no user, no domain
254 desc--verbose: no user, no domain
255 desc--verbose: no person
255 desc--verbose: no person
256 desc--verbose: other 1
256 desc--verbose: other 1
257 other 2
257 other 2
258
258
259 other 3
259 other 3
260 desc--verbose: line 1
260 desc--verbose: line 1
261 line 2
261 line 2
262 desc--debug: third
262 desc--debug: third
263 desc--debug: second
263 desc--debug: second
264 desc--debug: merge
264 desc--debug: merge
265 desc--debug: new head
265 desc--debug: new head
266 desc--debug: new branch
266 desc--debug: new branch
267 desc--debug: no user, no domain
267 desc--debug: no user, no domain
268 desc--debug: no person
268 desc--debug: no person
269 desc--debug: other 1
269 desc--debug: other 1
270 other 2
270 other 2
271
271
272 other 3
272 other 3
273 desc--debug: line 1
273 desc--debug: line 1
274 line 2
274 line 2
275 file_adds: fourth third
275 file_adds: fourth third
276 file_adds: second
276 file_adds: second
277 file_adds:
277 file_adds:
278 file_adds: d
278 file_adds: d
279 file_adds:
279 file_adds:
280 file_adds:
280 file_adds:
281 file_adds: c
281 file_adds: c
282 file_adds: b
282 file_adds: b
283 file_adds: a
283 file_adds: a
284 file_adds--verbose: fourth third
284 file_adds--verbose: fourth third
285 file_adds--verbose: second
285 file_adds--verbose: second
286 file_adds--verbose:
286 file_adds--verbose:
287 file_adds--verbose: d
287 file_adds--verbose: d
288 file_adds--verbose:
288 file_adds--verbose:
289 file_adds--verbose:
289 file_adds--verbose:
290 file_adds--verbose: c
290 file_adds--verbose: c
291 file_adds--verbose: b
291 file_adds--verbose: b
292 file_adds--verbose: a
292 file_adds--verbose: a
293 file_adds--debug: fourth third
293 file_adds--debug: fourth third
294 file_adds--debug: second
294 file_adds--debug: second
295 file_adds--debug:
295 file_adds--debug:
296 file_adds--debug: d
296 file_adds--debug: d
297 file_adds--debug:
297 file_adds--debug:
298 file_adds--debug:
298 file_adds--debug:
299 file_adds--debug: c
299 file_adds--debug: c
300 file_adds--debug: b
300 file_adds--debug: b
301 file_adds--debug: a
301 file_adds--debug: a
302 file_dels: second
302 file_dels: second
303 file_dels:
303 file_dels:
304 file_dels:
304 file_dels:
305 file_dels:
305 file_dels:
306 file_dels:
306 file_dels:
307 file_dels:
307 file_dels:
308 file_dels:
308 file_dels:
309 file_dels:
309 file_dels:
310 file_dels:
310 file_dels:
311 file_dels--verbose: second
311 file_dels--verbose: second
312 file_dels--verbose:
312 file_dels--verbose:
313 file_dels--verbose:
313 file_dels--verbose:
314 file_dels--verbose:
314 file_dels--verbose:
315 file_dels--verbose:
315 file_dels--verbose:
316 file_dels--verbose:
316 file_dels--verbose:
317 file_dels--verbose:
317 file_dels--verbose:
318 file_dels--verbose:
318 file_dels--verbose:
319 file_dels--verbose:
319 file_dels--verbose:
320 file_dels--debug: second
320 file_dels--debug: second
321 file_dels--debug:
321 file_dels--debug:
322 file_dels--debug:
322 file_dels--debug:
323 file_dels--debug:
323 file_dels--debug:
324 file_dels--debug:
324 file_dels--debug:
325 file_dels--debug:
325 file_dels--debug:
326 file_dels--debug:
326 file_dels--debug:
327 file_dels--debug:
327 file_dels--debug:
328 file_dels--debug:
328 file_dels--debug:
329 file_mods:
329 file_mods:
330 file_mods:
330 file_mods:
331 file_mods:
331 file_mods:
332 file_mods:
332 file_mods:
333 file_mods:
333 file_mods:
334 file_mods: c
334 file_mods: c
335 file_mods:
335 file_mods:
336 file_mods:
336 file_mods:
337 file_mods:
337 file_mods:
338 file_mods--verbose:
338 file_mods--verbose:
339 file_mods--verbose:
339 file_mods--verbose:
340 file_mods--verbose:
340 file_mods--verbose:
341 file_mods--verbose:
341 file_mods--verbose:
342 file_mods--verbose:
342 file_mods--verbose:
343 file_mods--verbose: c
343 file_mods--verbose: c
344 file_mods--verbose:
344 file_mods--verbose:
345 file_mods--verbose:
345 file_mods--verbose:
346 file_mods--verbose:
346 file_mods--verbose:
347 file_mods--debug:
347 file_mods--debug:
348 file_mods--debug:
348 file_mods--debug:
349 file_mods--debug:
349 file_mods--debug:
350 file_mods--debug:
350 file_mods--debug:
351 file_mods--debug:
351 file_mods--debug:
352 file_mods--debug: c
352 file_mods--debug: c
353 file_mods--debug:
353 file_mods--debug:
354 file_mods--debug:
354 file_mods--debug:
355 file_mods--debug:
355 file_mods--debug:
356 file_copies: fourth (second)
356 file_copies: fourth (second)
357 file_copies:
357 file_copies:
358 file_copies:
358 file_copies:
359 file_copies:
359 file_copies:
360 file_copies:
360 file_copies:
361 file_copies:
361 file_copies:
362 file_copies:
362 file_copies:
363 file_copies:
363 file_copies:
364 file_copies:
364 file_copies:
365 file_copies--verbose: fourth (second)
365 file_copies--verbose: fourth (second)
366 file_copies--verbose:
366 file_copies--verbose:
367 file_copies--verbose:
367 file_copies--verbose:
368 file_copies--verbose:
368 file_copies--verbose:
369 file_copies--verbose:
369 file_copies--verbose:
370 file_copies--verbose:
370 file_copies--verbose:
371 file_copies--verbose:
371 file_copies--verbose:
372 file_copies--verbose:
372 file_copies--verbose:
373 file_copies--verbose:
373 file_copies--verbose:
374 file_copies--debug: fourth (second)
374 file_copies--debug: fourth (second)
375 file_copies--debug:
375 file_copies--debug:
376 file_copies--debug:
376 file_copies--debug:
377 file_copies--debug:
377 file_copies--debug:
378 file_copies--debug:
378 file_copies--debug:
379 file_copies--debug:
379 file_copies--debug:
380 file_copies--debug:
380 file_copies--debug:
381 file_copies--debug:
381 file_copies--debug:
382 file_copies--debug:
382 file_copies--debug:
383 file_copies_switch:
383 file_copies_switch:
384 file_copies_switch:
384 file_copies_switch:
385 file_copies_switch:
385 file_copies_switch:
386 file_copies_switch:
386 file_copies_switch:
387 file_copies_switch:
387 file_copies_switch:
388 file_copies_switch:
388 file_copies_switch:
389 file_copies_switch:
389 file_copies_switch:
390 file_copies_switch:
390 file_copies_switch:
391 file_copies_switch:
391 file_copies_switch:
392 file_copies_switch--verbose:
392 file_copies_switch--verbose:
393 file_copies_switch--verbose:
393 file_copies_switch--verbose:
394 file_copies_switch--verbose:
394 file_copies_switch--verbose:
395 file_copies_switch--verbose:
395 file_copies_switch--verbose:
396 file_copies_switch--verbose:
396 file_copies_switch--verbose:
397 file_copies_switch--verbose:
397 file_copies_switch--verbose:
398 file_copies_switch--verbose:
398 file_copies_switch--verbose:
399 file_copies_switch--verbose:
399 file_copies_switch--verbose:
400 file_copies_switch--verbose:
400 file_copies_switch--verbose:
401 file_copies_switch--debug:
401 file_copies_switch--debug:
402 file_copies_switch--debug:
402 file_copies_switch--debug:
403 file_copies_switch--debug:
403 file_copies_switch--debug:
404 file_copies_switch--debug:
404 file_copies_switch--debug:
405 file_copies_switch--debug:
405 file_copies_switch--debug:
406 file_copies_switch--debug:
406 file_copies_switch--debug:
407 file_copies_switch--debug:
407 file_copies_switch--debug:
408 file_copies_switch--debug:
408 file_copies_switch--debug:
409 file_copies_switch--debug:
409 file_copies_switch--debug:
410 files: fourth second third
410 files: fourth second third
411 files: second
411 files: second
412 files:
412 files:
413 files: d
413 files: d
414 files:
414 files:
415 files: c
415 files: c
416 files: c
416 files: c
417 files: b
417 files: b
418 files: a
418 files: a
419 files--verbose: fourth second third
419 files--verbose: fourth second third
420 files--verbose: second
420 files--verbose: second
421 files--verbose:
421 files--verbose:
422 files--verbose: d
422 files--verbose: d
423 files--verbose:
423 files--verbose:
424 files--verbose: c
424 files--verbose: c
425 files--verbose: c
425 files--verbose: c
426 files--verbose: b
426 files--verbose: b
427 files--verbose: a
427 files--verbose: a
428 files--debug: fourth second third
428 files--debug: fourth second third
429 files--debug: second
429 files--debug: second
430 files--debug:
430 files--debug:
431 files--debug: d
431 files--debug: d
432 files--debug:
432 files--debug:
433 files--debug: c
433 files--debug: c
434 files--debug: c
434 files--debug: c
435 files--debug: b
435 files--debug: b
436 files--debug: a
436 files--debug: a
437 manifest: 6:94961b75a2da
437 manifest: 6:94961b75a2da
438 manifest: 5:f2dbc354b94e
438 manifest: 5:f2dbc354b94e
439 manifest: 4:4dc3def4f9b4
439 manifest: 4:4dc3def4f9b4
440 manifest: 4:4dc3def4f9b4
440 manifest: 4:4dc3def4f9b4
441 manifest: 3:cb5a1327723b
441 manifest: 3:cb5a1327723b
442 manifest: 3:cb5a1327723b
442 manifest: 3:cb5a1327723b
443 manifest: 2:6e0e82995c35
443 manifest: 2:6e0e82995c35
444 manifest: 1:4e8d705b1e53
444 manifest: 1:4e8d705b1e53
445 manifest: 0:a0c8bcbbb45c
445 manifest: 0:a0c8bcbbb45c
446 manifest--verbose: 6:94961b75a2da
446 manifest--verbose: 6:94961b75a2da
447 manifest--verbose: 5:f2dbc354b94e
447 manifest--verbose: 5:f2dbc354b94e
448 manifest--verbose: 4:4dc3def4f9b4
448 manifest--verbose: 4:4dc3def4f9b4
449 manifest--verbose: 4:4dc3def4f9b4
449 manifest--verbose: 4:4dc3def4f9b4
450 manifest--verbose: 3:cb5a1327723b
450 manifest--verbose: 3:cb5a1327723b
451 manifest--verbose: 3:cb5a1327723b
451 manifest--verbose: 3:cb5a1327723b
452 manifest--verbose: 2:6e0e82995c35
452 manifest--verbose: 2:6e0e82995c35
453 manifest--verbose: 1:4e8d705b1e53
453 manifest--verbose: 1:4e8d705b1e53
454 manifest--verbose: 0:a0c8bcbbb45c
454 manifest--verbose: 0:a0c8bcbbb45c
455 manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
455 manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
456 manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
456 manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
457 manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
457 manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
458 manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
458 manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
459 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
459 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
460 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
460 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
461 manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
461 manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
462 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
462 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
463 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
463 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
464 node: 95c24699272ef57d062b8bccc32c878bf841784a
464 node: 95c24699272ef57d062b8bccc32c878bf841784a
465 node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
465 node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
466 node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
466 node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
467 node: 13207e5a10d9fd28ec424934298e176197f2c67f
467 node: 13207e5a10d9fd28ec424934298e176197f2c67f
468 node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
468 node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
469 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
469 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
470 node: 97054abb4ab824450e9164180baf491ae0078465
470 node: 97054abb4ab824450e9164180baf491ae0078465
471 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
471 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
472 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
472 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
473 node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
473 node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
474 node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
474 node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
475 node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
475 node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
476 node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
476 node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
477 node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
477 node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
478 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
478 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
479 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
479 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
480 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
480 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
481 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
481 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
482 node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
482 node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
483 node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
483 node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
484 node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
484 node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
485 node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
485 node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
486 node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
486 node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
487 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
487 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
488 node--debug: 97054abb4ab824450e9164180baf491ae0078465
488 node--debug: 97054abb4ab824450e9164180baf491ae0078465
489 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
489 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
490 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
490 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
491 parents:
491 parents:
492 parents: -1:000000000000
492 parents: -1:000000000000
493 parents: 5:13207e5a10d9 4:bbe44766e73d
493 parents: 5:13207e5a10d9 4:bbe44766e73d
494 parents: 3:10e46f2dcbf4
494 parents: 3:10e46f2dcbf4
495 parents:
495 parents:
496 parents:
496 parents:
497 parents:
497 parents:
498 parents:
498 parents:
499 parents:
499 parents:
500 parents--verbose:
500 parents--verbose:
501 parents--verbose: -1:000000000000
501 parents--verbose: -1:000000000000
502 parents--verbose: 5:13207e5a10d9 4:bbe44766e73d
502 parents--verbose: 5:13207e5a10d9 4:bbe44766e73d
503 parents--verbose: 3:10e46f2dcbf4
503 parents--verbose: 3:10e46f2dcbf4
504 parents--verbose:
504 parents--verbose:
505 parents--verbose:
505 parents--verbose:
506 parents--verbose:
506 parents--verbose:
507 parents--verbose:
507 parents--verbose:
508 parents--verbose:
508 parents--verbose:
509 parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000
509 parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000
510 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
510 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
511 parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
511 parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
512 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
512 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
513 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
513 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
514 parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000
514 parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000
515 parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000
515 parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000
516 parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000
516 parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000
517 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
517 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
518 rev: 8
518 rev: 8
519 rev: 7
519 rev: 7
520 rev: 6
520 rev: 6
521 rev: 5
521 rev: 5
522 rev: 4
522 rev: 4
523 rev: 3
523 rev: 3
524 rev: 2
524 rev: 2
525 rev: 1
525 rev: 1
526 rev: 0
526 rev: 0
527 rev--verbose: 8
527 rev--verbose: 8
528 rev--verbose: 7
528 rev--verbose: 7
529 rev--verbose: 6
529 rev--verbose: 6
530 rev--verbose: 5
530 rev--verbose: 5
531 rev--verbose: 4
531 rev--verbose: 4
532 rev--verbose: 3
532 rev--verbose: 3
533 rev--verbose: 2
533 rev--verbose: 2
534 rev--verbose: 1
534 rev--verbose: 1
535 rev--verbose: 0
535 rev--verbose: 0
536 rev--debug: 8
536 rev--debug: 8
537 rev--debug: 7
537 rev--debug: 7
538 rev--debug: 6
538 rev--debug: 6
539 rev--debug: 5
539 rev--debug: 5
540 rev--debug: 4
540 rev--debug: 4
541 rev--debug: 3
541 rev--debug: 3
542 rev--debug: 2
542 rev--debug: 2
543 rev--debug: 1
543 rev--debug: 1
544 rev--debug: 0
544 rev--debug: 0
545 tags: tip
545 tags: tip
546 tags:
546 tags:
547 tags:
547 tags:
548 tags:
548 tags:
549 tags:
549 tags:
550 tags:
550 tags:
551 tags:
551 tags:
552 tags:
552 tags:
553 tags:
553 tags:
554 tags--verbose: tip
554 tags--verbose: tip
555 tags--verbose:
555 tags--verbose:
556 tags--verbose:
556 tags--verbose:
557 tags--verbose:
557 tags--verbose:
558 tags--verbose:
558 tags--verbose:
559 tags--verbose:
559 tags--verbose:
560 tags--verbose:
560 tags--verbose:
561 tags--verbose:
561 tags--verbose:
562 tags--verbose:
562 tags--verbose:
563 tags--debug: tip
563 tags--debug: tip
564 tags--debug:
564 tags--debug:
565 tags--debug:
565 tags--debug:
566 tags--debug:
566 tags--debug:
567 tags--debug:
567 tags--debug:
568 tags--debug:
568 tags--debug:
569 tags--debug:
569 tags--debug:
570 tags--debug:
570 tags--debug:
571 tags--debug:
571 tags--debug:
572 diffstat: 3: +2/-1
572 diffstat: 3: +2/-1
573 diffstat: 1: +1/-0
573 diffstat: 1: +1/-0
574 diffstat: 0: +0/-0
574 diffstat: 0: +0/-0
575 diffstat: 1: +1/-0
575 diffstat: 1: +1/-0
576 diffstat: 0: +0/-0
576 diffstat: 0: +0/-0
577 diffstat: 1: +1/-0
577 diffstat: 1: +1/-0
578 diffstat: 1: +4/-0
578 diffstat: 1: +4/-0
579 diffstat: 1: +2/-0
579 diffstat: 1: +2/-0
580 diffstat: 1: +1/-0
580 diffstat: 1: +1/-0
581 diffstat--verbose: 3: +2/-1
581 diffstat--verbose: 3: +2/-1
582 diffstat--verbose: 1: +1/-0
582 diffstat--verbose: 1: +1/-0
583 diffstat--verbose: 0: +0/-0
583 diffstat--verbose: 0: +0/-0
584 diffstat--verbose: 1: +1/-0
584 diffstat--verbose: 1: +1/-0
585 diffstat--verbose: 0: +0/-0
585 diffstat--verbose: 0: +0/-0
586 diffstat--verbose: 1: +1/-0
586 diffstat--verbose: 1: +1/-0
587 diffstat--verbose: 1: +4/-0
587 diffstat--verbose: 1: +4/-0
588 diffstat--verbose: 1: +2/-0
588 diffstat--verbose: 1: +2/-0
589 diffstat--verbose: 1: +1/-0
589 diffstat--verbose: 1: +1/-0
590 diffstat--debug: 3: +2/-1
590 diffstat--debug: 3: +2/-1
591 diffstat--debug: 1: +1/-0
591 diffstat--debug: 1: +1/-0
592 diffstat--debug: 0: +0/-0
592 diffstat--debug: 0: +0/-0
593 diffstat--debug: 1: +1/-0
593 diffstat--debug: 1: +1/-0
594 diffstat--debug: 0: +0/-0
594 diffstat--debug: 0: +0/-0
595 diffstat--debug: 1: +1/-0
595 diffstat--debug: 1: +1/-0
596 diffstat--debug: 1: +4/-0
596 diffstat--debug: 1: +4/-0
597 diffstat--debug: 1: +2/-0
597 diffstat--debug: 1: +2/-0
598 diffstat--debug: 1: +1/-0
598 diffstat--debug: 1: +1/-0
599 extras: branch=default
599 extras: branch=default
600 extras: branch=default
600 extras: branch=default
601 extras: branch=default
601 extras: branch=default
602 extras: branch=default
602 extras: branch=default
603 extras: branch=foo
603 extras: branch=foo
604 extras: branch=default
604 extras: branch=default
605 extras: branch=default
605 extras: branch=default
606 extras: branch=default
606 extras: branch=default
607 extras: branch=default
607 extras: branch=default
608 extras--verbose: branch=default
608 extras--verbose: branch=default
609 extras--verbose: branch=default
609 extras--verbose: branch=default
610 extras--verbose: branch=default
610 extras--verbose: branch=default
611 extras--verbose: branch=default
611 extras--verbose: branch=default
612 extras--verbose: branch=foo
612 extras--verbose: branch=foo
613 extras--verbose: branch=default
613 extras--verbose: branch=default
614 extras--verbose: branch=default
614 extras--verbose: branch=default
615 extras--verbose: branch=default
615 extras--verbose: branch=default
616 extras--verbose: branch=default
616 extras--verbose: branch=default
617 extras--debug: branch=default
617 extras--debug: branch=default
618 extras--debug: branch=default
618 extras--debug: branch=default
619 extras--debug: branch=default
619 extras--debug: branch=default
620 extras--debug: branch=default
620 extras--debug: branch=default
621 extras--debug: branch=foo
621 extras--debug: branch=foo
622 extras--debug: branch=default
622 extras--debug: branch=default
623 extras--debug: branch=default
623 extras--debug: branch=default
624 extras--debug: branch=default
624 extras--debug: branch=default
625 extras--debug: branch=default
625 extras--debug: branch=default
626 p1rev: 7
626 p1rev: 7
627 p1rev: -1
627 p1rev: -1
628 p1rev: 5
628 p1rev: 5
629 p1rev: 3
629 p1rev: 3
630 p1rev: 3
630 p1rev: 3
631 p1rev: 2
631 p1rev: 2
632 p1rev: 1
632 p1rev: 1
633 p1rev: 0
633 p1rev: 0
634 p1rev: -1
634 p1rev: -1
635 p1rev--verbose: 7
635 p1rev--verbose: 7
636 p1rev--verbose: -1
636 p1rev--verbose: -1
637 p1rev--verbose: 5
637 p1rev--verbose: 5
638 p1rev--verbose: 3
638 p1rev--verbose: 3
639 p1rev--verbose: 3
639 p1rev--verbose: 3
640 p1rev--verbose: 2
640 p1rev--verbose: 2
641 p1rev--verbose: 1
641 p1rev--verbose: 1
642 p1rev--verbose: 0
642 p1rev--verbose: 0
643 p1rev--verbose: -1
643 p1rev--verbose: -1
644 p1rev--debug: 7
644 p1rev--debug: 7
645 p1rev--debug: -1
645 p1rev--debug: -1
646 p1rev--debug: 5
646 p1rev--debug: 5
647 p1rev--debug: 3
647 p1rev--debug: 3
648 p1rev--debug: 3
648 p1rev--debug: 3
649 p1rev--debug: 2
649 p1rev--debug: 2
650 p1rev--debug: 1
650 p1rev--debug: 1
651 p1rev--debug: 0
651 p1rev--debug: 0
652 p1rev--debug: -1
652 p1rev--debug: -1
653 p2rev: -1
653 p2rev: -1
654 p2rev: -1
654 p2rev: -1
655 p2rev: 4
655 p2rev: 4
656 p2rev: -1
656 p2rev: -1
657 p2rev: -1
657 p2rev: -1
658 p2rev: -1
658 p2rev: -1
659 p2rev: -1
659 p2rev: -1
660 p2rev: -1
660 p2rev: -1
661 p2rev: -1
661 p2rev: -1
662 p2rev--verbose: -1
662 p2rev--verbose: -1
663 p2rev--verbose: -1
663 p2rev--verbose: -1
664 p2rev--verbose: 4
664 p2rev--verbose: 4
665 p2rev--verbose: -1
665 p2rev--verbose: -1
666 p2rev--verbose: -1
666 p2rev--verbose: -1
667 p2rev--verbose: -1
667 p2rev--verbose: -1
668 p2rev--verbose: -1
668 p2rev--verbose: -1
669 p2rev--verbose: -1
669 p2rev--verbose: -1
670 p2rev--verbose: -1
670 p2rev--verbose: -1
671 p2rev--debug: -1
671 p2rev--debug: -1
672 p2rev--debug: -1
672 p2rev--debug: -1
673 p2rev--debug: 4
673 p2rev--debug: 4
674 p2rev--debug: -1
674 p2rev--debug: -1
675 p2rev--debug: -1
675 p2rev--debug: -1
676 p2rev--debug: -1
676 p2rev--debug: -1
677 p2rev--debug: -1
677 p2rev--debug: -1
678 p2rev--debug: -1
678 p2rev--debug: -1
679 p2rev--debug: -1
679 p2rev--debug: -1
680 p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
680 p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
681 p1node: 0000000000000000000000000000000000000000
681 p1node: 0000000000000000000000000000000000000000
682 p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
682 p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
683 p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
683 p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
684 p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
684 p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
685 p1node: 97054abb4ab824450e9164180baf491ae0078465
685 p1node: 97054abb4ab824450e9164180baf491ae0078465
686 p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
686 p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
687 p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
687 p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
688 p1node: 0000000000000000000000000000000000000000
688 p1node: 0000000000000000000000000000000000000000
689 p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
689 p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
690 p1node--verbose: 0000000000000000000000000000000000000000
690 p1node--verbose: 0000000000000000000000000000000000000000
691 p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
691 p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
692 p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
692 p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
693 p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
693 p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
694 p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
694 p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
695 p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
695 p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
696 p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
696 p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
697 p1node--verbose: 0000000000000000000000000000000000000000
697 p1node--verbose: 0000000000000000000000000000000000000000
698 p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
698 p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
699 p1node--debug: 0000000000000000000000000000000000000000
699 p1node--debug: 0000000000000000000000000000000000000000
700 p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
700 p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
701 p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
701 p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
702 p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
702 p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
703 p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
703 p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
704 p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
704 p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
705 p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
705 p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
706 p1node--debug: 0000000000000000000000000000000000000000
706 p1node--debug: 0000000000000000000000000000000000000000
707 p2node: 0000000000000000000000000000000000000000
707 p2node: 0000000000000000000000000000000000000000
708 p2node: 0000000000000000000000000000000000000000
708 p2node: 0000000000000000000000000000000000000000
709 p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
709 p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
710 p2node: 0000000000000000000000000000000000000000
710 p2node: 0000000000000000000000000000000000000000
711 p2node: 0000000000000000000000000000000000000000
711 p2node: 0000000000000000000000000000000000000000
712 p2node: 0000000000000000000000000000000000000000
712 p2node: 0000000000000000000000000000000000000000
713 p2node: 0000000000000000000000000000000000000000
713 p2node: 0000000000000000000000000000000000000000
714 p2node: 0000000000000000000000000000000000000000
714 p2node: 0000000000000000000000000000000000000000
715 p2node: 0000000000000000000000000000000000000000
715 p2node: 0000000000000000000000000000000000000000
716 p2node--verbose: 0000000000000000000000000000000000000000
716 p2node--verbose: 0000000000000000000000000000000000000000
717 p2node--verbose: 0000000000000000000000000000000000000000
717 p2node--verbose: 0000000000000000000000000000000000000000
718 p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
718 p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
719 p2node--verbose: 0000000000000000000000000000000000000000
719 p2node--verbose: 0000000000000000000000000000000000000000
720 p2node--verbose: 0000000000000000000000000000000000000000
720 p2node--verbose: 0000000000000000000000000000000000000000
721 p2node--verbose: 0000000000000000000000000000000000000000
721 p2node--verbose: 0000000000000000000000000000000000000000
722 p2node--verbose: 0000000000000000000000000000000000000000
722 p2node--verbose: 0000000000000000000000000000000000000000
723 p2node--verbose: 0000000000000000000000000000000000000000
723 p2node--verbose: 0000000000000000000000000000000000000000
724 p2node--verbose: 0000000000000000000000000000000000000000
724 p2node--verbose: 0000000000000000000000000000000000000000
725 p2node--debug: 0000000000000000000000000000000000000000
725 p2node--debug: 0000000000000000000000000000000000000000
726 p2node--debug: 0000000000000000000000000000000000000000
726 p2node--debug: 0000000000000000000000000000000000000000
727 p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
727 p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
728 p2node--debug: 0000000000000000000000000000000000000000
728 p2node--debug: 0000000000000000000000000000000000000000
729 p2node--debug: 0000000000000000000000000000000000000000
729 p2node--debug: 0000000000000000000000000000000000000000
730 p2node--debug: 0000000000000000000000000000000000000000
730 p2node--debug: 0000000000000000000000000000000000000000
731 p2node--debug: 0000000000000000000000000000000000000000
731 p2node--debug: 0000000000000000000000000000000000000000
732 p2node--debug: 0000000000000000000000000000000000000000
732 p2node--debug: 0000000000000000000000000000000000000000
733 p2node--debug: 0000000000000000000000000000000000000000
733 p2node--debug: 0000000000000000000000000000000000000000
734 user: test
734 user: test
735 user: User Name <user@hostname>
735 user: User Name <user@hostname>
736 user: person
736 user: person
737 user: person
737 user: person
738 user: person
738 user: person
739 user: person
739 user: person
740 user: other@place
740 user: other@place
741 user: A. N. Other <other@place>
741 user: A. N. Other <other@place>
742 user: User Name <user@hostname>
742 user: User Name <user@hostname>
743 user--verbose: test
743 user--verbose: test
744 user--verbose: User Name <user@hostname>
744 user--verbose: User Name <user@hostname>
745 user--verbose: person
745 user--verbose: person
746 user--verbose: person
746 user--verbose: person
747 user--verbose: person
747 user--verbose: person
748 user--verbose: person
748 user--verbose: person
749 user--verbose: other@place
749 user--verbose: other@place
750 user--verbose: A. N. Other <other@place>
750 user--verbose: A. N. Other <other@place>
751 user--verbose: User Name <user@hostname>
751 user--verbose: User Name <user@hostname>
752 user--debug: test
752 user--debug: test
753 user--debug: User Name <user@hostname>
753 user--debug: User Name <user@hostname>
754 user--debug: person
754 user--debug: person
755 user--debug: person
755 user--debug: person
756 user--debug: person
756 user--debug: person
757 user--debug: person
757 user--debug: person
758 user--debug: other@place
758 user--debug: other@place
759 user--debug: A. N. Other <other@place>
759 user--debug: A. N. Other <other@place>
760 user--debug: User Name <user@hostname>
760 user--debug: User Name <user@hostname>
761
761
762 Add a dummy commit to make up for the instability of the above:
762 Add a dummy commit to make up for the instability of the above:
763
763
764 $ echo a > a
764 $ echo a > a
765 $ hg add a
765 $ hg add a
766 $ hg ci -m future
766 $ hg ci -m future
767
767
768 Add a commit that does all possible modifications at once
768 Add a commit that does all possible modifications at once
769
769
770 $ echo modify >> third
770 $ echo modify >> third
771 $ touch b
771 $ touch b
772 $ hg add b
772 $ hg add b
773 $ hg mv fourth fifth
773 $ hg mv fourth fifth
774 $ hg rm a
774 $ hg rm a
775 $ hg ci -m "Modify, add, remove, rename"
775 $ hg ci -m "Modify, add, remove, rename"
776
776
777 Test files list:
777 Test files list:
778
778
779 $ hg log -l1 -T '{join(file_mods, " ")}\n'
779 $ hg log -l1 -T '{join(file_mods, " ")}\n'
780 third
780 third
781 $ hg log -l1 -T '{file_mods % "{file}\n"}'
781 $ hg log -l1 -T '{file_mods % "{file}\n"}'
782 third
782 third
783 $ hg log -l1 -T '{file_mods % "{path}\n"}'
783 $ hg log -l1 -T '{file_mods % "{path}\n"}'
784 third
784 third
785
785
786 $ hg log -l1 -T '{join(files, " ")}\n'
786 $ hg log -l1 -T '{join(files, " ")}\n'
787 a b fifth fourth third
787 a b fifth fourth third
788 $ hg log -l1 -T '{files % "{file}\n"}'
788 $ hg log -l1 -T '{files % "{file}\n"}'
789 a
789 a
790 b
790 b
791 fifth
791 fifth
792 fourth
792 fourth
793 third
793 third
794 $ hg log -l1 -T '{files % "{path}\n"}'
794 $ hg log -l1 -T '{files % "{path}\n"}'
795 a
795 a
796 b
796 b
797 fifth
797 fifth
798 fourth
798 fourth
799 third
799 third
800
800
801 Test files lists on merge commit:
802
803 $ hg co '.^' -q
804 $ touch c
805 $ hg add c
806 $ hg ci -qm 'add file'
807 $ hg merge 10 -q
808 $ hg ci -m 'merge'
809 $ hg log -l1 -T '{files}\n'
810 a fourth
811 $ hg log -l1 -T '{file_mods}\n'
812 third
813 $ hg log -l1 -T '{file_adds}\n'
814 b fifth
815 $ hg log -l1 -T '{file_dels}\n'
816 a fourth
817
801 Test file copies dict:
818 Test file copies dict:
802
819
803 $ hg log -r8 -T '{join(file_copies, " ")}\n'
820 $ hg log -r8 -T '{join(file_copies, " ")}\n'
804 fourth (second)
821 fourth (second)
805 $ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
822 $ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
806 fourth <- second
823 fourth <- second
807 $ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'
824 $ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'
808 fourth <- second
825 fourth <- second
809
826
810 $ hg log -r8 -T '{join(file_copies_switch, " ")}\n'
827 $ hg log -r8 -T '{join(file_copies_switch, " ")}\n'
811
828
812 $ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'
829 $ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'
813 fourth (second)
830 fourth (second)
814 $ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'
831 $ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'
815 fourth <- second
832 fourth <- second
816 $ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'
833 $ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'
817 fourth <- second
834 fourth <- second
818
835
819 Test file attributes:
836 Test file attributes:
820
837
821 $ hg log -l1 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}'
838 $ hg log -r10 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}'
822 R a
839 R a
823 A 0 b
840 A 0 b
824 A 7 fifth
841 A 7 fifth
825 R fourth
842 R fourth
826 M 13 third
843 M 13 third
827
844
828 Test file status including clean ones:
845 Test file status including clean ones:
829
846
830 $ hg log -r9 -T '{files("**") % "{status} {path}\n"}'
847 $ hg log -r9 -T '{files("**") % "{status} {path}\n"}'
831 A a
848 A a
832 C fourth
849 C fourth
833 C third
850 C third
834
851
835 Test index keyword:
852 Test index keyword:
836
853
837 $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'
854 $ hg log -r 10:9 -T '{index + 10}{files % " {index}:{file}"}\n'
838 10 0:a 1:b 2:fifth 3:fourth 4:third
855 10 0:a 1:b 2:fifth 3:fourth 4:third
839 11 0:a
856 11 0:a
840
857
841 $ hg branches -T '{index} {branch}\n'
858 $ hg branches -T '{index} {branch}\n'
842 0 default
859 0 default
843 1 foo
860 1 foo
844
861
845 p1/p2 keywords:
862 p1/p2 keywords:
846
863
847 $ hg log -r4:7 -GT '{rev} p1:{p1} p2:{p2} p1.rev:{p1.rev} p2.node:{p2.node}\n'
864 $ hg log -r4:7 -GT '{rev} p1:{p1} p2:{p2} p1.rev:{p1.rev} p2.node:{p2.node}\n'
848 o 7 p1:-1:000000000000 p2:-1:000000000000 p1.rev:-1 p2.node:0000000000000000000000000000000000000000
865 o 7 p1:-1:000000000000 p2:-1:000000000000 p1.rev:-1 p2.node:0000000000000000000000000000000000000000
849
866
850 o 6 p1:5:13207e5a10d9 p2:4:bbe44766e73d p1.rev:5 p2.node:bbe44766e73d5f11ed2177f1838de10c53ef3e74
867 o 6 p1:5:13207e5a10d9 p2:4:bbe44766e73d p1.rev:5 p2.node:bbe44766e73d5f11ed2177f1838de10c53ef3e74
851 |\
868 |\
852 | o 5 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
869 | o 5 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
853 | |
870 | |
854 | ~
871 | ~
855 o 4 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
872 o 4 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
856 |
873 |
857 ~
874 ~
858
875
859 TODO: no idea what should be displayed as a JSON representation
876 TODO: no idea what should be displayed as a JSON representation
860 $ hg log -r6 -T 'p1:{p1|json}\np2:{p2|json}\n'
877 $ hg log -r6 -T 'p1:{p1|json}\np2:{p2|json}\n'
861 p1:{}
878 p1:{}
862 p2:{}
879 p2:{}
863
880
864 ui verbosity:
881 ui verbosity:
865
882
866 $ hg log -l1 -T '{verbosity}\n'
883 $ hg log -l1 -T '{verbosity}\n'
867
884
868 $ hg log -l1 -T '{verbosity}\n' --debug
885 $ hg log -l1 -T '{verbosity}\n' --debug
869 debug
886 debug
870 $ hg log -l1 -T '{verbosity}\n' --quiet
887 $ hg log -l1 -T '{verbosity}\n' --quiet
871 quiet
888 quiet
872 $ hg log -l1 -T '{verbosity}\n' --verbose
889 $ hg log -l1 -T '{verbosity}\n' --verbose
873 verbose
890 verbose
874
891
875 $ cd ..
892 $ cd ..
876
893
877 latesttag:
894 latesttag:
878
895
879 $ hg init latesttag
896 $ hg init latesttag
880 $ cd latesttag
897 $ cd latesttag
881
898
882 $ echo a > file
899 $ echo a > file
883 $ hg ci -Am a -d '0 0'
900 $ hg ci -Am a -d '0 0'
884 adding file
901 adding file
885
902
886 $ echo b >> file
903 $ echo b >> file
887 $ hg ci -m b -d '1 0'
904 $ hg ci -m b -d '1 0'
888
905
889 $ echo c >> head1
906 $ echo c >> head1
890 $ hg ci -Am h1c -d '2 0'
907 $ hg ci -Am h1c -d '2 0'
891 adding head1
908 adding head1
892
909
893 $ hg update -q 1
910 $ hg update -q 1
894 $ echo d >> head2
911 $ echo d >> head2
895 $ hg ci -Am h2d -d '3 0'
912 $ hg ci -Am h2d -d '3 0'
896 adding head2
913 adding head2
897 created new head
914 created new head
898
915
899 $ echo e >> head2
916 $ echo e >> head2
900 $ hg ci -m h2e -d '4 0'
917 $ hg ci -m h2e -d '4 0'
901
918
902 $ hg merge -q
919 $ hg merge -q
903 $ hg ci -m merge -d '5 -3600'
920 $ hg ci -m merge -d '5 -3600'
904
921
905 No tag set:
922 No tag set:
906
923
907 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
924 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
908 @ 5: null+5
925 @ 5: null+5
909 |\
926 |\
910 | o 4: null+4
927 | o 4: null+4
911 | |
928 | |
912 | o 3: null+3
929 | o 3: null+3
913 | |
930 | |
914 o | 2: null+3
931 o | 2: null+3
915 |/
932 |/
916 o 1: null+2
933 o 1: null+2
917 |
934 |
918 o 0: null+1
935 o 0: null+1
919
936
920
937
921 One common tag: longest path wins for {latesttagdistance}:
938 One common tag: longest path wins for {latesttagdistance}:
922
939
923 $ hg tag -r 1 -m t1 -d '6 0' t1
940 $ hg tag -r 1 -m t1 -d '6 0' t1
924 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
941 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
925 @ 6: t1+4
942 @ 6: t1+4
926 |
943 |
927 o 5: t1+3
944 o 5: t1+3
928 |\
945 |\
929 | o 4: t1+2
946 | o 4: t1+2
930 | |
947 | |
931 | o 3: t1+1
948 | o 3: t1+1
932 | |
949 | |
933 o | 2: t1+1
950 o | 2: t1+1
934 |/
951 |/
935 o 1: t1+0
952 o 1: t1+0
936 |
953 |
937 o 0: null+1
954 o 0: null+1
938
955
939
956
940 One ancestor tag: closest wins:
957 One ancestor tag: closest wins:
941
958
942 $ hg tag -r 2 -m t2 -d '7 0' t2
959 $ hg tag -r 2 -m t2 -d '7 0' t2
943 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
960 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
944 @ 7: t2+3
961 @ 7: t2+3
945 |
962 |
946 o 6: t2+2
963 o 6: t2+2
947 |
964 |
948 o 5: t2+1
965 o 5: t2+1
949 |\
966 |\
950 | o 4: t1+2
967 | o 4: t1+2
951 | |
968 | |
952 | o 3: t1+1
969 | o 3: t1+1
953 | |
970 | |
954 o | 2: t2+0
971 o | 2: t2+0
955 |/
972 |/
956 o 1: t1+0
973 o 1: t1+0
957 |
974 |
958 o 0: null+1
975 o 0: null+1
959
976
960
977
961 Two branch tags: more recent wins if same number of changes:
978 Two branch tags: more recent wins if same number of changes:
962
979
963 $ hg tag -r 3 -m t3 -d '8 0' t3
980 $ hg tag -r 3 -m t3 -d '8 0' t3
964 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
981 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
965 @ 8: t3+5
982 @ 8: t3+5
966 |
983 |
967 o 7: t3+4
984 o 7: t3+4
968 |
985 |
969 o 6: t3+3
986 o 6: t3+3
970 |
987 |
971 o 5: t3+2
988 o 5: t3+2
972 |\
989 |\
973 | o 4: t3+1
990 | o 4: t3+1
974 | |
991 | |
975 | o 3: t3+0
992 | o 3: t3+0
976 | |
993 | |
977 o | 2: t2+0
994 o | 2: t2+0
978 |/
995 |/
979 o 1: t1+0
996 o 1: t1+0
980 |
997 |
981 o 0: null+1
998 o 0: null+1
982
999
983
1000
984 Two branch tags: fewest changes wins:
1001 Two branch tags: fewest changes wins:
985
1002
986 $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
1003 $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
987 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1004 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
988 @ 9: t4+5,6
1005 @ 9: t4+5,6
989 |
1006 |
990 o 8: t4+4,5
1007 o 8: t4+4,5
991 |
1008 |
992 o 7: t4+3,4
1009 o 7: t4+3,4
993 |
1010 |
994 o 6: t4+2,3
1011 o 6: t4+2,3
995 |
1012 |
996 o 5: t4+1,2
1013 o 5: t4+1,2
997 |\
1014 |\
998 | o 4: t4+0,0
1015 | o 4: t4+0,0
999 | |
1016 | |
1000 | o 3: t3+0,0
1017 | o 3: t3+0,0
1001 | |
1018 | |
1002 o | 2: t2+0,0
1019 o | 2: t2+0,0
1003 |/
1020 |/
1004 o 1: t1+0,0
1021 o 1: t1+0,0
1005 |
1022 |
1006 o 0: null+1,1
1023 o 0: null+1,1
1007
1024
1008
1025
1009 Merged tag overrides:
1026 Merged tag overrides:
1010
1027
1011 $ hg tag -r 5 -m t5 -d '9 0' t5
1028 $ hg tag -r 5 -m t5 -d '9 0' t5
1012 $ hg tag -r 3 -m at3 -d '10 0' at3
1029 $ hg tag -r 3 -m at3 -d '10 0' at3
1013 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
1030 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
1014 @ 11: t5+6
1031 @ 11: t5+6
1015 |
1032 |
1016 o 10: t5+5
1033 o 10: t5+5
1017 |
1034 |
1018 o 9: t5+4
1035 o 9: t5+4
1019 |
1036 |
1020 o 8: t5+3
1037 o 8: t5+3
1021 |
1038 |
1022 o 7: t5+2
1039 o 7: t5+2
1023 |
1040 |
1024 o 6: t5+1
1041 o 6: t5+1
1025 |
1042 |
1026 o 5: t5+0
1043 o 5: t5+0
1027 |\
1044 |\
1028 | o 4: t4+0
1045 | o 4: t4+0
1029 | |
1046 | |
1030 | o 3: at3:t3+0
1047 | o 3: at3:t3+0
1031 | |
1048 | |
1032 o | 2: t2+0
1049 o | 2: t2+0
1033 |/
1050 |/
1034 o 1: t1+0
1051 o 1: t1+0
1035 |
1052 |
1036 o 0: null+1
1053 o 0: null+1
1037
1054
1038
1055
1039 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1056 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1040 @ 11: t5+6,6
1057 @ 11: t5+6,6
1041 |
1058 |
1042 o 10: t5+5,5
1059 o 10: t5+5,5
1043 |
1060 |
1044 o 9: t5+4,4
1061 o 9: t5+4,4
1045 |
1062 |
1046 o 8: t5+3,3
1063 o 8: t5+3,3
1047 |
1064 |
1048 o 7: t5+2,2
1065 o 7: t5+2,2
1049 |
1066 |
1050 o 6: t5+1,1
1067 o 6: t5+1,1
1051 |
1068 |
1052 o 5: t5+0,0
1069 o 5: t5+0,0
1053 |\
1070 |\
1054 | o 4: t4+0,0
1071 | o 4: t4+0,0
1055 | |
1072 | |
1056 | o 3: at3+0,0 t3+0,0
1073 | o 3: at3+0,0 t3+0,0
1057 | |
1074 | |
1058 o | 2: t2+0,0
1075 o | 2: t2+0,0
1059 |/
1076 |/
1060 o 1: t1+0,0
1077 o 1: t1+0,0
1061 |
1078 |
1062 o 0: null+1,1
1079 o 0: null+1,1
1063
1080
1064
1081
1065 Tags of working-directory parents (issue6055):
1082 Tags of working-directory parents (issue6055):
1066
1083
1067 $ hg update -q 3
1084 $ hg update -q 3
1068 $ echo a > head3
1085 $ echo a > head3
1069 $ hg ci -qAm h3a
1086 $ hg ci -qAm h3a
1070 $ hg merge -q 2
1087 $ hg merge -q 2
1071 $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1088 $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1072 o 2147483647: at3+2,3 t3+2,3
1089 o 2147483647: at3+2,3 t3+2,3
1073 |\
1090 |\
1074 | @ 12: at3+1,1 t3+1,1
1091 | @ 12: at3+1,1 t3+1,1
1075 | |
1092 | |
1076 | o 3: at3+0,0 t3+0,0
1093 | o 3: at3+0,0 t3+0,0
1077 | |
1094 | |
1078 @ | 2: t2+0,0
1095 @ | 2: t2+0,0
1079 |/
1096 |/
1080 o 1: t1+0,0
1097 o 1: t1+0,0
1081 |
1098 |
1082 o 0: null+1,1
1099 o 0: null+1,1
1083
1100
1084
1101
1085 $ hg ci -m merge
1102 $ hg ci -m merge
1086 $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1103 $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
1087 @ 13: at3+2,3 t3+2,3
1104 @ 13: at3+2,3 t3+2,3
1088 |\
1105 |\
1089 | o 12: at3+1,1 t3+1,1
1106 | o 12: at3+1,1 t3+1,1
1090 | |
1107 | |
1091 | o 3: at3+0,0 t3+0,0
1108 | o 3: at3+0,0 t3+0,0
1092 | |
1109 | |
1093 o | 2: t2+0,0
1110 o | 2: t2+0,0
1094 |/
1111 |/
1095 o 1: t1+0,0
1112 o 1: t1+0,0
1096 |
1113 |
1097 o 0: null+1,1
1114 o 0: null+1,1
1098
1115
1099
1116
1100 $ cd ..
1117 $ cd ..
1101
1118
1102 Set up repository containing template fragments in commit metadata:
1119 Set up repository containing template fragments in commit metadata:
1103
1120
1104 $ hg init r
1121 $ hg init r
1105 $ cd r
1122 $ cd r
1106 $ echo a > a
1123 $ echo a > a
1107 $ hg ci -Am '{rev}'
1124 $ hg ci -Am '{rev}'
1108 adding a
1125 adding a
1109
1126
1110 $ hg branch -q 'text.{rev}'
1127 $ hg branch -q 'text.{rev}'
1111 $ echo aa >> aa
1128 $ echo aa >> aa
1112 $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
1129 $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
1113
1130
1114 Test termwidth:
1131 Test termwidth:
1115
1132
1116 $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
1133 $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
1117 bcc7ff960b8e:desc to be
1134 bcc7ff960b8e:desc to be
1118 termwidth.1:wrapped desc
1135 termwidth.1:wrapped desc
1119 termwidth.1:to be wrapped (no-eol)
1136 termwidth.1:to be wrapped (no-eol)
1120
1137
1121 Just one more commit:
1138 Just one more commit:
1122
1139
1123 $ echo b > b
1140 $ echo b > b
1124 $ hg ci -qAm b
1141 $ hg ci -qAm b
1125
1142
1126 Test 'originalnode'
1143 Test 'originalnode'
1127
1144
1128 $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n'
1145 $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n'
1129 000000000000 bcc7ff960b8e
1146 000000000000 bcc7ff960b8e
1130 $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
1147 $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
1131 a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
1148 a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
1132
1149
1133 Test active bookmark templating
1150 Test active bookmark templating
1134
1151
1135 $ hg book foo
1152 $ hg book foo
1136 $ hg book bar
1153 $ hg book bar
1137 $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
1154 $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
1138 2 bar* foo
1155 2 bar* foo
1139 1
1156 1
1140 0
1157 0
1141 $ hg log --template "{rev} {activebookmark}\n"
1158 $ hg log --template "{rev} {activebookmark}\n"
1142 2 bar
1159 2 bar
1143 1
1160 1
1144 0
1161 0
1145 $ hg bookmarks --inactive bar
1162 $ hg bookmarks --inactive bar
1146 $ hg log --template "{rev} {activebookmark}\n"
1163 $ hg log --template "{rev} {activebookmark}\n"
1147 2
1164 2
1148 1
1165 1
1149 0
1166 0
1150 $ hg book -r1 baz
1167 $ hg book -r1 baz
1151 $ hg log --template "{rev} {join(bookmarks, ' ')}\n"
1168 $ hg log --template "{rev} {join(bookmarks, ' ')}\n"
1152 2 bar foo
1169 2 bar foo
1153 1 baz
1170 1 baz
1154 0
1171 0
1155 $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
1172 $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
1156 2 t
1173 2 t
1157 1 f
1174 1 f
1158 0 f
1175 0 f
1159
1176
1160 Test namespaces dict
1177 Test namespaces dict
1161
1178
1162 $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n {join(names, ",")}\n"}\n'
1179 $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n {join(names, ",")}\n"}\n'
1163 2
1180 2
1164 bookmarks color=bookmark builtin=True
1181 bookmarks color=bookmark builtin=True
1165 bar,foo
1182 bar,foo
1166 tags color=tag builtin=True
1183 tags color=tag builtin=True
1167 tip
1184 tip
1168 branches color=branch builtin=True
1185 branches color=branch builtin=True
1169 text.{rev}
1186 text.{rev}
1170 revnames color=revname builtin=False
1187 revnames color=revname builtin=False
1171 r2
1188 r2
1172
1189
1173 1
1190 1
1174 bookmarks color=bookmark builtin=True
1191 bookmarks color=bookmark builtin=True
1175 baz
1192 baz
1176 tags color=tag builtin=True
1193 tags color=tag builtin=True
1177
1194
1178 branches color=branch builtin=True
1195 branches color=branch builtin=True
1179 text.{rev}
1196 text.{rev}
1180 revnames color=revname builtin=False
1197 revnames color=revname builtin=False
1181 r1
1198 r1
1182
1199
1183 0
1200 0
1184 bookmarks color=bookmark builtin=True
1201 bookmarks color=bookmark builtin=True
1185
1202
1186 tags color=tag builtin=True
1203 tags color=tag builtin=True
1187
1204
1188 branches color=branch builtin=True
1205 branches color=branch builtin=True
1189 default
1206 default
1190 revnames color=revname builtin=False
1207 revnames color=revname builtin=False
1191 r0
1208 r0
1192
1209
1193 $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
1210 $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
1194 bookmarks: bar foo
1211 bookmarks: bar foo
1195 tags: tip
1212 tags: tip
1196 branches: text.{rev}
1213 branches: text.{rev}
1197 $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
1214 $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
1198 bookmarks:
1215 bookmarks:
1199 bar
1216 bar
1200 foo
1217 foo
1201 tags:
1218 tags:
1202 tip
1219 tip
1203 branches:
1220 branches:
1204 text.{rev}
1221 text.{rev}
1205 $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
1222 $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
1206 bar
1223 bar
1207 foo
1224 foo
1208 $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
1225 $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
1209 bar
1226 bar
1210 foo
1227 foo
1211
1228
1212 $ cd ..
1229 $ cd ..
1213
1230
1214 Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
1231 Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
1215 printed graphwidths 3, 5, 7, etc. should all line up in their respective
1232 printed graphwidths 3, 5, 7, etc. should all line up in their respective
1216 columns. We don't care about other aspects of the graph rendering here.
1233 columns. We don't care about other aspects of the graph rendering here.
1217
1234
1218 $ hg init graphwidth
1235 $ hg init graphwidth
1219 $ cd graphwidth
1236 $ cd graphwidth
1220
1237
1221 $ wrappabletext="a a a a a a a a a a a a"
1238 $ wrappabletext="a a a a a a a a a a a a"
1222
1239
1223 $ printf "first\n" > file
1240 $ printf "first\n" > file
1224 $ hg add file
1241 $ hg add file
1225 $ hg commit -m "$wrappabletext"
1242 $ hg commit -m "$wrappabletext"
1226
1243
1227 $ printf "first\nsecond\n" > file
1244 $ printf "first\nsecond\n" > file
1228 $ hg commit -m "$wrappabletext"
1245 $ hg commit -m "$wrappabletext"
1229
1246
1230 $ hg checkout 0
1247 $ hg checkout 0
1231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1248 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1232 $ printf "third\nfirst\n" > file
1249 $ printf "third\nfirst\n" > file
1233 $ hg commit -m "$wrappabletext"
1250 $ hg commit -m "$wrappabletext"
1234 created new head
1251 created new head
1235
1252
1236 $ hg merge
1253 $ hg merge
1237 merging file
1254 merging file
1238 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1255 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1239 (branch merge, don't forget to commit)
1256 (branch merge, don't forget to commit)
1240
1257
1241 $ hg log --graph -T "{graphwidth}"
1258 $ hg log --graph -T "{graphwidth}"
1242 @ 3
1259 @ 3
1243 |
1260 |
1244 | @ 5
1261 | @ 5
1245 |/
1262 |/
1246 o 3
1263 o 3
1247
1264
1248 $ hg commit -m "$wrappabletext"
1265 $ hg commit -m "$wrappabletext"
1249
1266
1250 $ hg log --graph -T "{graphwidth}"
1267 $ hg log --graph -T "{graphwidth}"
1251 @ 5
1268 @ 5
1252 |\
1269 |\
1253 | o 5
1270 | o 5
1254 | |
1271 | |
1255 o | 5
1272 o | 5
1256 |/
1273 |/
1257 o 3
1274 o 3
1258
1275
1259
1276
1260 $ hg checkout 0
1277 $ hg checkout 0
1261 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1278 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1262 $ printf "third\nfirst\nsecond\n" > file
1279 $ printf "third\nfirst\nsecond\n" > file
1263 $ hg commit -m "$wrappabletext"
1280 $ hg commit -m "$wrappabletext"
1264 created new head
1281 created new head
1265
1282
1266 $ hg log --graph -T "{graphwidth}"
1283 $ hg log --graph -T "{graphwidth}"
1267 @ 3
1284 @ 3
1268 |
1285 |
1269 | o 7
1286 | o 7
1270 | |\
1287 | |\
1271 +---o 7
1288 +---o 7
1272 | |
1289 | |
1273 | o 5
1290 | o 5
1274 |/
1291 |/
1275 o 3
1292 o 3
1276
1293
1277
1294
1278 $ hg log --graph -T "{graphwidth}" -r 3
1295 $ hg log --graph -T "{graphwidth}" -r 3
1279 o 5
1296 o 5
1280 |\
1297 |\
1281 ~ ~
1298 ~ ~
1282
1299
1283 $ hg log --graph -T "{graphwidth}" -r 1
1300 $ hg log --graph -T "{graphwidth}" -r 1
1284 o 3
1301 o 3
1285 |
1302 |
1286 ~
1303 ~
1287
1304
1288 $ hg merge
1305 $ hg merge
1289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1290 (branch merge, don't forget to commit)
1307 (branch merge, don't forget to commit)
1291 $ hg commit -m "$wrappabletext"
1308 $ hg commit -m "$wrappabletext"
1292
1309
1293 $ printf "seventh\n" >> file
1310 $ printf "seventh\n" >> file
1294 $ hg commit -m "$wrappabletext"
1311 $ hg commit -m "$wrappabletext"
1295
1312
1296 $ hg log --graph -T "{graphwidth}"
1313 $ hg log --graph -T "{graphwidth}"
1297 @ 3
1314 @ 3
1298 |
1315 |
1299 o 5
1316 o 5
1300 |\
1317 |\
1301 | o 5
1318 | o 5
1302 | |
1319 | |
1303 o | 7
1320 o | 7
1304 |\ \
1321 |\ \
1305 | o | 7
1322 | o | 7
1306 | |/
1323 | |/
1307 o / 5
1324 o / 5
1308 |/
1325 |/
1309 o 3
1326 o 3
1310
1327
1311
1328
1312 The point of graphwidth is to allow wrapping that accounts for the space taken
1329 The point of graphwidth is to allow wrapping that accounts for the space taken
1313 by the graph.
1330 by the graph.
1314
1331
1315 $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
1332 $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
1316 @ a a a a
1333 @ a a a a
1317 | a a a a
1334 | a a a a
1318 | a a a a
1335 | a a a a
1319 o a a a
1336 o a a a
1320 |\ a a a
1337 |\ a a a
1321 | | a a a
1338 | | a a a
1322 | | a a a
1339 | | a a a
1323 | o a a a
1340 | o a a a
1324 | | a a a
1341 | | a a a
1325 | | a a a
1342 | | a a a
1326 | | a a a
1343 | | a a a
1327 o | a a
1344 o | a a
1328 |\ \ a a
1345 |\ \ a a
1329 | | | a a
1346 | | | a a
1330 | | | a a
1347 | | | a a
1331 | | | a a
1348 | | | a a
1332 | | | a a
1349 | | | a a
1333 | o | a a
1350 | o | a a
1334 | |/ a a
1351 | |/ a a
1335 | | a a
1352 | | a a
1336 | | a a
1353 | | a a
1337 | | a a
1354 | | a a
1338 | | a a
1355 | | a a
1339 o | a a a
1356 o | a a a
1340 |/ a a a
1357 |/ a a a
1341 | a a a
1358 | a a a
1342 | a a a
1359 | a a a
1343 o a a a a
1360 o a a a a
1344 a a a a
1361 a a a a
1345 a a a a
1362 a a a a
1346
1363
1347 Something tricky happens when there are elided nodes; the next drawn row of
1364 Something tricky happens when there are elided nodes; the next drawn row of
1348 edges can be more than one column wider, but the graph width only increases by
1365 edges can be more than one column wider, but the graph width only increases by
1349 one column. The remaining columns are added in between the nodes.
1366 one column. The remaining columns are added in between the nodes.
1350
1367
1351 $ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
1368 $ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
1352 o 5
1369 o 5
1353 |\
1370 |\
1354 | \
1371 | \
1355 | :\
1372 | :\
1356 o : : 7
1373 o : : 7
1357 :/ /
1374 :/ /
1358 : o 5
1375 : o 5
1359 :/
1376 :/
1360 o 3
1377 o 3
1361
1378
1362
1379
1363 $ cd ..
1380 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now