##// END OF EJS Templates
test-glog.t: use printrevset extension to trace rewritten revsets...
Patrick Mezard -
r16146:267cebac default
parent child Browse files
Show More
@@ -1,1471 +1,1490 b''
1 1 @ (34) head
2 2 |
3 3 | o (33) head
4 4 | |
5 5 o | (32) expand
6 6 |\ \
7 7 | o \ (31) expand
8 8 | |\ \
9 9 | | o \ (30) expand
10 10 | | |\ \
11 11 | | | o | (29) regular commit
12 12 | | | | |
13 13 | | o | | (28) merge zero known
14 14 | | |\ \ \
15 15 o | | | | | (27) collapse
16 16 |/ / / / /
17 17 | | o---+ (26) merge one known; far right
18 18 | | | | |
19 19 +---o | | (25) merge one known; far left
20 20 | | | | |
21 21 | | o | | (24) merge one known; immediate right
22 22 | | |\| |
23 23 | | o | | (23) merge one known; immediate left
24 24 | |/| | |
25 25 +---o---+ (22) merge two known; one far left, one far right
26 26 | | / /
27 27 o | | | (21) expand
28 28 |\ \ \ \
29 29 | o---+-+ (20) merge two known; two far right
30 30 | / / /
31 31 o | | | (19) expand
32 32 |\ \ \ \
33 33 +---+---o (18) merge two known; two far left
34 34 | | | |
35 35 | o | | (17) expand
36 36 | |\ \ \
37 37 | | o---+ (16) merge two known; one immediate right, one near right
38 38 | | |/ /
39 39 o | | | (15) expand
40 40 |\ \ \ \
41 41 | o-----+ (14) merge two known; one immediate right, one far right
42 42 | |/ / /
43 43 o | | | (13) expand
44 44 |\ \ \ \
45 45 +---o | | (12) merge two known; one immediate right, one far left
46 46 | | |/ /
47 47 | o | | (11) expand
48 48 | |\ \ \
49 49 | | o---+ (10) merge two known; one immediate left, one near right
50 50 | |/ / /
51 51 o | | | (9) expand
52 52 |\ \ \ \
53 53 | o-----+ (8) merge two known; one immediate left, one far right
54 54 |/ / / /
55 55 o | | | (7) expand
56 56 |\ \ \ \
57 57 +---o | | (6) merge two known; one immediate left, one far left
58 58 | |/ / /
59 59 | o | | (5) expand
60 60 | |\ \ \
61 61 | | o | | (4) merge two known; one immediate left, one immediate right
62 62 | |/|/ /
63 63 | o / / (3) collapse
64 64 |/ / /
65 65 o / / (2) collapse
66 66 |/ /
67 67 o / (1) collapse
68 68 |/
69 69 o (0) root
70 70
71 71
72 72 $ "$TESTDIR/hghave" no-outer-repo || exit 80
73 73
74 74 $ commit()
75 75 > {
76 76 > rev=$1
77 77 > msg=$2
78 78 > shift 2
79 79 > if [ "$#" -gt 0 ]; then
80 80 > hg debugsetparents "$@"
81 81 > fi
82 82 > echo $rev > a
83 83 > hg commit -Aqd "$rev 0" -m "($rev) $msg"
84 84 > }
85 85
86 $ cat > printrevset.py <<EOF
87 > from mercurial import extensions, revset, commands
88 > from hgext import graphlog
89 >
90 > def uisetup(ui):
91 > def printrevset(orig, ui, repo, *pats, **opts):
92 > if opts.get('print_revset'):
93 > expr = graphlog.revset(pats, opts)
94 > tree = revset.parse(expr)[0]
95 > ui.write(tree, "\n")
96 > return 0
97 > return orig(ui, repo, *pats, **opts)
98 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
99 > entry[1].append(('', 'print-revset', False,
100 > 'print generated revset and exit (DEPRECATED)'))
101 > EOF
102
86 103 $ echo "[extensions]" >> $HGRCPATH
87 104 $ echo "graphlog=" >> $HGRCPATH
105 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
88 106
89 107 $ hg init repo
90 108 $ cd repo
91 109
92 110 Empty repo:
93 111
94 112 $ hg glog
95 113
96 114
97 115 Building DAG:
98 116
99 117 $ commit 0 "root"
100 118 $ commit 1 "collapse" 0
101 119 $ commit 2 "collapse" 1
102 120 $ commit 3 "collapse" 2
103 121 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
104 122 $ commit 5 "expand" 3 4
105 123 $ commit 6 "merge two known; one immediate left, one far left" 2 5
106 124 $ commit 7 "expand" 2 5
107 125 $ commit 8 "merge two known; one immediate left, one far right" 0 7
108 126 $ commit 9 "expand" 7 8
109 127 $ commit 10 "merge two known; one immediate left, one near right" 0 6
110 128 $ commit 11 "expand" 6 10
111 129 $ commit 12 "merge two known; one immediate right, one far left" 1 9
112 130 $ commit 13 "expand" 9 11
113 131 $ commit 14 "merge two known; one immediate right, one far right" 0 12
114 132 $ commit 15 "expand" 13 14
115 133 $ commit 16 "merge two known; one immediate right, one near right" 0 1
116 134 $ commit 17 "expand" 12 16
117 135 $ commit 18 "merge two known; two far left" 1 15
118 136 $ commit 19 "expand" 15 17
119 137 $ commit 20 "merge two known; two far right" 0 18
120 138 $ commit 21 "expand" 19 20
121 139 $ commit 22 "merge two known; one far left, one far right" 18 21
122 140 $ commit 23 "merge one known; immediate left" 1 22
123 141 $ commit 24 "merge one known; immediate right" 0 23
124 142 $ commit 25 "merge one known; far left" 21 24
125 143 $ commit 26 "merge one known; far right" 18 25
126 144 $ commit 27 "collapse" 21
127 145 $ commit 28 "merge zero known" 1 26
128 146 $ commit 29 "regular commit" 0
129 147 $ commit 30 "expand" 28 29
130 148 $ commit 31 "expand" 21 30
131 149 $ commit 32 "expand" 27 31
132 150 $ commit 33 "head" 18
133 151 $ commit 34 "head" 32
134 152
135 153
136 154 $ hg glog -q
137 155 @ 34:fea3ac5810e0
138 156 |
139 157 | o 33:68608f5145f9
140 158 | |
141 159 o | 32:d06dffa21a31
142 160 |\ \
143 161 | o \ 31:621d83e11f67
144 162 | |\ \
145 163 | | o \ 30:6e11cd4b648f
146 164 | | |\ \
147 165 | | | o | 29:cd9bb2be7593
148 166 | | | | |
149 167 | | o | | 28:44ecd0b9ae99
150 168 | | |\ \ \
151 169 o | | | | | 27:886ed638191b
152 170 |/ / / / /
153 171 | | o---+ 26:7f25b6c2f0b9
154 172 | | | | |
155 173 +---o | | 25:91da8ed57247
156 174 | | | | |
157 175 | | o | | 24:a9c19a3d96b7
158 176 | | |\| |
159 177 | | o | | 23:a01cddf0766d
160 178 | |/| | |
161 179 +---o---+ 22:e0d9cccacb5d
162 180 | | / /
163 181 o | | | 21:d42a756af44d
164 182 |\ \ \ \
165 183 | o---+-+ 20:d30ed6450e32
166 184 | / / /
167 185 o | | | 19:31ddc2c1573b
168 186 |\ \ \ \
169 187 +---+---o 18:1aa84d96232a
170 188 | | | |
171 189 | o | | 17:44765d7c06e0
172 190 | |\ \ \
173 191 | | o---+ 16:3677d192927d
174 192 | | |/ /
175 193 o | | | 15:1dda3f72782d
176 194 |\ \ \ \
177 195 | o-----+ 14:8eac370358ef
178 196 | |/ / /
179 197 o | | | 13:22d8966a97e3
180 198 |\ \ \ \
181 199 +---o | | 12:86b91144a6e9
182 200 | | |/ /
183 201 | o | | 11:832d76e6bdf2
184 202 | |\ \ \
185 203 | | o---+ 10:74c64d036d72
186 204 | |/ / /
187 205 o | | | 9:7010c0af0a35
188 206 |\ \ \ \
189 207 | o-----+ 8:7a0b11f71937
190 208 |/ / / /
191 209 o | | | 7:b632bb1b1224
192 210 |\ \ \ \
193 211 +---o | | 6:b105a072e251
194 212 | |/ / /
195 213 | o | | 5:4409d547b708
196 214 | |\ \ \
197 215 | | o | | 4:26a8bac39d9f
198 216 | |/|/ /
199 217 | o / / 3:27eef8ed80b4
200 218 |/ / /
201 219 o / / 2:3d9a33b8d1e1
202 220 |/ /
203 221 o / 1:6db2ef61d156
204 222 |/
205 223 o 0:e6eb3150255d
206 224
207 225
208 226 $ hg glog
209 227 @ changeset: 34:fea3ac5810e0
210 228 | tag: tip
211 229 | parent: 32:d06dffa21a31
212 230 | user: test
213 231 | date: Thu Jan 01 00:00:34 1970 +0000
214 232 | summary: (34) head
215 233 |
216 234 | o changeset: 33:68608f5145f9
217 235 | | parent: 18:1aa84d96232a
218 236 | | user: test
219 237 | | date: Thu Jan 01 00:00:33 1970 +0000
220 238 | | summary: (33) head
221 239 | |
222 240 o | changeset: 32:d06dffa21a31
223 241 |\ \ parent: 27:886ed638191b
224 242 | | | parent: 31:621d83e11f67
225 243 | | | user: test
226 244 | | | date: Thu Jan 01 00:00:32 1970 +0000
227 245 | | | summary: (32) expand
228 246 | | |
229 247 | o | changeset: 31:621d83e11f67
230 248 | |\ \ parent: 21:d42a756af44d
231 249 | | | | parent: 30:6e11cd4b648f
232 250 | | | | user: test
233 251 | | | | date: Thu Jan 01 00:00:31 1970 +0000
234 252 | | | | summary: (31) expand
235 253 | | | |
236 254 | | o | changeset: 30:6e11cd4b648f
237 255 | | |\ \ parent: 28:44ecd0b9ae99
238 256 | | | | | parent: 29:cd9bb2be7593
239 257 | | | | | user: test
240 258 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
241 259 | | | | | summary: (30) expand
242 260 | | | | |
243 261 | | | o | changeset: 29:cd9bb2be7593
244 262 | | | | | parent: 0:e6eb3150255d
245 263 | | | | | user: test
246 264 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
247 265 | | | | | summary: (29) regular commit
248 266 | | | | |
249 267 | | o | | changeset: 28:44ecd0b9ae99
250 268 | | |\ \ \ parent: 1:6db2ef61d156
251 269 | | | | | | parent: 26:7f25b6c2f0b9
252 270 | | | | | | user: test
253 271 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
254 272 | | | | | | summary: (28) merge zero known
255 273 | | | | | |
256 274 o | | | | | changeset: 27:886ed638191b
257 275 |/ / / / / parent: 21:d42a756af44d
258 276 | | | | | user: test
259 277 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
260 278 | | | | | summary: (27) collapse
261 279 | | | | |
262 280 | | o---+ changeset: 26:7f25b6c2f0b9
263 281 | | | | | parent: 18:1aa84d96232a
264 282 | | | | | parent: 25:91da8ed57247
265 283 | | | | | user: test
266 284 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
267 285 | | | | | summary: (26) merge one known; far right
268 286 | | | | |
269 287 +---o | | changeset: 25:91da8ed57247
270 288 | | | | | parent: 21:d42a756af44d
271 289 | | | | | parent: 24:a9c19a3d96b7
272 290 | | | | | user: test
273 291 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
274 292 | | | | | summary: (25) merge one known; far left
275 293 | | | | |
276 294 | | o | | changeset: 24:a9c19a3d96b7
277 295 | | |\| | parent: 0:e6eb3150255d
278 296 | | | | | parent: 23:a01cddf0766d
279 297 | | | | | user: test
280 298 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
281 299 | | | | | summary: (24) merge one known; immediate right
282 300 | | | | |
283 301 | | o | | changeset: 23:a01cddf0766d
284 302 | |/| | | parent: 1:6db2ef61d156
285 303 | | | | | parent: 22:e0d9cccacb5d
286 304 | | | | | user: test
287 305 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
288 306 | | | | | summary: (23) merge one known; immediate left
289 307 | | | | |
290 308 +---o---+ changeset: 22:e0d9cccacb5d
291 309 | | | | parent: 18:1aa84d96232a
292 310 | | / / parent: 21:d42a756af44d
293 311 | | | | user: test
294 312 | | | | date: Thu Jan 01 00:00:22 1970 +0000
295 313 | | | | summary: (22) merge two known; one far left, one far right
296 314 | | | |
297 315 o | | | changeset: 21:d42a756af44d
298 316 |\ \ \ \ parent: 19:31ddc2c1573b
299 317 | | | | | parent: 20:d30ed6450e32
300 318 | | | | | user: test
301 319 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
302 320 | | | | | summary: (21) expand
303 321 | | | | |
304 322 | o---+-+ changeset: 20:d30ed6450e32
305 323 | | | | parent: 0:e6eb3150255d
306 324 | / / / parent: 18:1aa84d96232a
307 325 | | | | user: test
308 326 | | | | date: Thu Jan 01 00:00:20 1970 +0000
309 327 | | | | summary: (20) merge two known; two far right
310 328 | | | |
311 329 o | | | changeset: 19:31ddc2c1573b
312 330 |\ \ \ \ parent: 15:1dda3f72782d
313 331 | | | | | parent: 17:44765d7c06e0
314 332 | | | | | user: test
315 333 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
316 334 | | | | | summary: (19) expand
317 335 | | | | |
318 336 +---+---o changeset: 18:1aa84d96232a
319 337 | | | | parent: 1:6db2ef61d156
320 338 | | | | parent: 15:1dda3f72782d
321 339 | | | | user: test
322 340 | | | | date: Thu Jan 01 00:00:18 1970 +0000
323 341 | | | | summary: (18) merge two known; two far left
324 342 | | | |
325 343 | o | | changeset: 17:44765d7c06e0
326 344 | |\ \ \ parent: 12:86b91144a6e9
327 345 | | | | | parent: 16:3677d192927d
328 346 | | | | | user: test
329 347 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
330 348 | | | | | summary: (17) expand
331 349 | | | | |
332 350 | | o---+ changeset: 16:3677d192927d
333 351 | | | | | parent: 0:e6eb3150255d
334 352 | | |/ / parent: 1:6db2ef61d156
335 353 | | | | user: test
336 354 | | | | date: Thu Jan 01 00:00:16 1970 +0000
337 355 | | | | summary: (16) merge two known; one immediate right, one near right
338 356 | | | |
339 357 o | | | changeset: 15:1dda3f72782d
340 358 |\ \ \ \ parent: 13:22d8966a97e3
341 359 | | | | | parent: 14:8eac370358ef
342 360 | | | | | user: test
343 361 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
344 362 | | | | | summary: (15) expand
345 363 | | | | |
346 364 | o-----+ changeset: 14:8eac370358ef
347 365 | | | | | parent: 0:e6eb3150255d
348 366 | |/ / / parent: 12:86b91144a6e9
349 367 | | | | user: test
350 368 | | | | date: Thu Jan 01 00:00:14 1970 +0000
351 369 | | | | summary: (14) merge two known; one immediate right, one far right
352 370 | | | |
353 371 o | | | changeset: 13:22d8966a97e3
354 372 |\ \ \ \ parent: 9:7010c0af0a35
355 373 | | | | | parent: 11:832d76e6bdf2
356 374 | | | | | user: test
357 375 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
358 376 | | | | | summary: (13) expand
359 377 | | | | |
360 378 +---o | | changeset: 12:86b91144a6e9
361 379 | | |/ / parent: 1:6db2ef61d156
362 380 | | | | parent: 9:7010c0af0a35
363 381 | | | | user: test
364 382 | | | | date: Thu Jan 01 00:00:12 1970 +0000
365 383 | | | | summary: (12) merge two known; one immediate right, one far left
366 384 | | | |
367 385 | o | | changeset: 11:832d76e6bdf2
368 386 | |\ \ \ parent: 6:b105a072e251
369 387 | | | | | parent: 10:74c64d036d72
370 388 | | | | | user: test
371 389 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
372 390 | | | | | summary: (11) expand
373 391 | | | | |
374 392 | | o---+ changeset: 10:74c64d036d72
375 393 | | | | | parent: 0:e6eb3150255d
376 394 | |/ / / parent: 6:b105a072e251
377 395 | | | | user: test
378 396 | | | | date: Thu Jan 01 00:00:10 1970 +0000
379 397 | | | | summary: (10) merge two known; one immediate left, one near right
380 398 | | | |
381 399 o | | | changeset: 9:7010c0af0a35
382 400 |\ \ \ \ parent: 7:b632bb1b1224
383 401 | | | | | parent: 8:7a0b11f71937
384 402 | | | | | user: test
385 403 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
386 404 | | | | | summary: (9) expand
387 405 | | | | |
388 406 | o-----+ changeset: 8:7a0b11f71937
389 407 | | | | | parent: 0:e6eb3150255d
390 408 |/ / / / parent: 7:b632bb1b1224
391 409 | | | | user: test
392 410 | | | | date: Thu Jan 01 00:00:08 1970 +0000
393 411 | | | | summary: (8) merge two known; one immediate left, one far right
394 412 | | | |
395 413 o | | | changeset: 7:b632bb1b1224
396 414 |\ \ \ \ parent: 2:3d9a33b8d1e1
397 415 | | | | | parent: 5:4409d547b708
398 416 | | | | | user: test
399 417 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
400 418 | | | | | summary: (7) expand
401 419 | | | | |
402 420 +---o | | changeset: 6:b105a072e251
403 421 | |/ / / parent: 2:3d9a33b8d1e1
404 422 | | | | parent: 5:4409d547b708
405 423 | | | | user: test
406 424 | | | | date: Thu Jan 01 00:00:06 1970 +0000
407 425 | | | | summary: (6) merge two known; one immediate left, one far left
408 426 | | | |
409 427 | o | | changeset: 5:4409d547b708
410 428 | |\ \ \ parent: 3:27eef8ed80b4
411 429 | | | | | parent: 4:26a8bac39d9f
412 430 | | | | | user: test
413 431 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
414 432 | | | | | summary: (5) expand
415 433 | | | | |
416 434 | | o | | changeset: 4:26a8bac39d9f
417 435 | |/|/ / parent: 1:6db2ef61d156
418 436 | | | | parent: 3:27eef8ed80b4
419 437 | | | | user: test
420 438 | | | | date: Thu Jan 01 00:00:04 1970 +0000
421 439 | | | | summary: (4) merge two known; one immediate left, one immediate right
422 440 | | | |
423 441 | o | | changeset: 3:27eef8ed80b4
424 442 |/ / / user: test
425 443 | | | date: Thu Jan 01 00:00:03 1970 +0000
426 444 | | | summary: (3) collapse
427 445 | | |
428 446 o | | changeset: 2:3d9a33b8d1e1
429 447 |/ / user: test
430 448 | | date: Thu Jan 01 00:00:02 1970 +0000
431 449 | | summary: (2) collapse
432 450 | |
433 451 o | changeset: 1:6db2ef61d156
434 452 |/ user: test
435 453 | date: Thu Jan 01 00:00:01 1970 +0000
436 454 | summary: (1) collapse
437 455 |
438 456 o changeset: 0:e6eb3150255d
439 457 user: test
440 458 date: Thu Jan 01 00:00:00 1970 +0000
441 459 summary: (0) root
442 460
443 461
444 462 File glog:
445 463 $ hg glog a
446 464 @ changeset: 34:fea3ac5810e0
447 465 | tag: tip
448 466 | parent: 32:d06dffa21a31
449 467 | user: test
450 468 | date: Thu Jan 01 00:00:34 1970 +0000
451 469 | summary: (34) head
452 470 |
453 471 | o changeset: 33:68608f5145f9
454 472 | | parent: 18:1aa84d96232a
455 473 | | user: test
456 474 | | date: Thu Jan 01 00:00:33 1970 +0000
457 475 | | summary: (33) head
458 476 | |
459 477 o | changeset: 32:d06dffa21a31
460 478 |\ \ parent: 27:886ed638191b
461 479 | | | parent: 31:621d83e11f67
462 480 | | | user: test
463 481 | | | date: Thu Jan 01 00:00:32 1970 +0000
464 482 | | | summary: (32) expand
465 483 | | |
466 484 | o | changeset: 31:621d83e11f67
467 485 | |\ \ parent: 21:d42a756af44d
468 486 | | | | parent: 30:6e11cd4b648f
469 487 | | | | user: test
470 488 | | | | date: Thu Jan 01 00:00:31 1970 +0000
471 489 | | | | summary: (31) expand
472 490 | | | |
473 491 | | o | changeset: 30:6e11cd4b648f
474 492 | | |\ \ parent: 28:44ecd0b9ae99
475 493 | | | | | parent: 29:cd9bb2be7593
476 494 | | | | | user: test
477 495 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
478 496 | | | | | summary: (30) expand
479 497 | | | | |
480 498 | | | o | changeset: 29:cd9bb2be7593
481 499 | | | | | parent: 0:e6eb3150255d
482 500 | | | | | user: test
483 501 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
484 502 | | | | | summary: (29) regular commit
485 503 | | | | |
486 504 | | o | | changeset: 28:44ecd0b9ae99
487 505 | | |\ \ \ parent: 1:6db2ef61d156
488 506 | | | | | | parent: 26:7f25b6c2f0b9
489 507 | | | | | | user: test
490 508 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
491 509 | | | | | | summary: (28) merge zero known
492 510 | | | | | |
493 511 o | | | | | changeset: 27:886ed638191b
494 512 |/ / / / / parent: 21:d42a756af44d
495 513 | | | | | user: test
496 514 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
497 515 | | | | | summary: (27) collapse
498 516 | | | | |
499 517 | | o---+ changeset: 26:7f25b6c2f0b9
500 518 | | | | | parent: 18:1aa84d96232a
501 519 | | | | | parent: 25:91da8ed57247
502 520 | | | | | user: test
503 521 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
504 522 | | | | | summary: (26) merge one known; far right
505 523 | | | | |
506 524 +---o | | changeset: 25:91da8ed57247
507 525 | | | | | parent: 21:d42a756af44d
508 526 | | | | | parent: 24:a9c19a3d96b7
509 527 | | | | | user: test
510 528 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
511 529 | | | | | summary: (25) merge one known; far left
512 530 | | | | |
513 531 | | o | | changeset: 24:a9c19a3d96b7
514 532 | | |\| | parent: 0:e6eb3150255d
515 533 | | | | | parent: 23:a01cddf0766d
516 534 | | | | | user: test
517 535 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
518 536 | | | | | summary: (24) merge one known; immediate right
519 537 | | | | |
520 538 | | o | | changeset: 23:a01cddf0766d
521 539 | |/| | | parent: 1:6db2ef61d156
522 540 | | | | | parent: 22:e0d9cccacb5d
523 541 | | | | | user: test
524 542 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
525 543 | | | | | summary: (23) merge one known; immediate left
526 544 | | | | |
527 545 +---o---+ changeset: 22:e0d9cccacb5d
528 546 | | | | parent: 18:1aa84d96232a
529 547 | | / / parent: 21:d42a756af44d
530 548 | | | | user: test
531 549 | | | | date: Thu Jan 01 00:00:22 1970 +0000
532 550 | | | | summary: (22) merge two known; one far left, one far right
533 551 | | | |
534 552 o | | | changeset: 21:d42a756af44d
535 553 |\ \ \ \ parent: 19:31ddc2c1573b
536 554 | | | | | parent: 20:d30ed6450e32
537 555 | | | | | user: test
538 556 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
539 557 | | | | | summary: (21) expand
540 558 | | | | |
541 559 | o---+-+ changeset: 20:d30ed6450e32
542 560 | | | | parent: 0:e6eb3150255d
543 561 | / / / parent: 18:1aa84d96232a
544 562 | | | | user: test
545 563 | | | | date: Thu Jan 01 00:00:20 1970 +0000
546 564 | | | | summary: (20) merge two known; two far right
547 565 | | | |
548 566 o | | | changeset: 19:31ddc2c1573b
549 567 |\ \ \ \ parent: 15:1dda3f72782d
550 568 | | | | | parent: 17:44765d7c06e0
551 569 | | | | | user: test
552 570 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
553 571 | | | | | summary: (19) expand
554 572 | | | | |
555 573 +---+---o changeset: 18:1aa84d96232a
556 574 | | | | parent: 1:6db2ef61d156
557 575 | | | | parent: 15:1dda3f72782d
558 576 | | | | user: test
559 577 | | | | date: Thu Jan 01 00:00:18 1970 +0000
560 578 | | | | summary: (18) merge two known; two far left
561 579 | | | |
562 580 | o | | changeset: 17:44765d7c06e0
563 581 | |\ \ \ parent: 12:86b91144a6e9
564 582 | | | | | parent: 16:3677d192927d
565 583 | | | | | user: test
566 584 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
567 585 | | | | | summary: (17) expand
568 586 | | | | |
569 587 | | o---+ changeset: 16:3677d192927d
570 588 | | | | | parent: 0:e6eb3150255d
571 589 | | |/ / parent: 1:6db2ef61d156
572 590 | | | | user: test
573 591 | | | | date: Thu Jan 01 00:00:16 1970 +0000
574 592 | | | | summary: (16) merge two known; one immediate right, one near right
575 593 | | | |
576 594 o | | | changeset: 15:1dda3f72782d
577 595 |\ \ \ \ parent: 13:22d8966a97e3
578 596 | | | | | parent: 14:8eac370358ef
579 597 | | | | | user: test
580 598 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
581 599 | | | | | summary: (15) expand
582 600 | | | | |
583 601 | o-----+ changeset: 14:8eac370358ef
584 602 | | | | | parent: 0:e6eb3150255d
585 603 | |/ / / parent: 12:86b91144a6e9
586 604 | | | | user: test
587 605 | | | | date: Thu Jan 01 00:00:14 1970 +0000
588 606 | | | | summary: (14) merge two known; one immediate right, one far right
589 607 | | | |
590 608 o | | | changeset: 13:22d8966a97e3
591 609 |\ \ \ \ parent: 9:7010c0af0a35
592 610 | | | | | parent: 11:832d76e6bdf2
593 611 | | | | | user: test
594 612 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
595 613 | | | | | summary: (13) expand
596 614 | | | | |
597 615 +---o | | changeset: 12:86b91144a6e9
598 616 | | |/ / parent: 1:6db2ef61d156
599 617 | | | | parent: 9:7010c0af0a35
600 618 | | | | user: test
601 619 | | | | date: Thu Jan 01 00:00:12 1970 +0000
602 620 | | | | summary: (12) merge two known; one immediate right, one far left
603 621 | | | |
604 622 | o | | changeset: 11:832d76e6bdf2
605 623 | |\ \ \ parent: 6:b105a072e251
606 624 | | | | | parent: 10:74c64d036d72
607 625 | | | | | user: test
608 626 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
609 627 | | | | | summary: (11) expand
610 628 | | | | |
611 629 | | o---+ changeset: 10:74c64d036d72
612 630 | | | | | parent: 0:e6eb3150255d
613 631 | |/ / / parent: 6:b105a072e251
614 632 | | | | user: test
615 633 | | | | date: Thu Jan 01 00:00:10 1970 +0000
616 634 | | | | summary: (10) merge two known; one immediate left, one near right
617 635 | | | |
618 636 o | | | changeset: 9:7010c0af0a35
619 637 |\ \ \ \ parent: 7:b632bb1b1224
620 638 | | | | | parent: 8:7a0b11f71937
621 639 | | | | | user: test
622 640 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
623 641 | | | | | summary: (9) expand
624 642 | | | | |
625 643 | o-----+ changeset: 8:7a0b11f71937
626 644 | | | | | parent: 0:e6eb3150255d
627 645 |/ / / / parent: 7:b632bb1b1224
628 646 | | | | user: test
629 647 | | | | date: Thu Jan 01 00:00:08 1970 +0000
630 648 | | | | summary: (8) merge two known; one immediate left, one far right
631 649 | | | |
632 650 o | | | changeset: 7:b632bb1b1224
633 651 |\ \ \ \ parent: 2:3d9a33b8d1e1
634 652 | | | | | parent: 5:4409d547b708
635 653 | | | | | user: test
636 654 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
637 655 | | | | | summary: (7) expand
638 656 | | | | |
639 657 +---o | | changeset: 6:b105a072e251
640 658 | |/ / / parent: 2:3d9a33b8d1e1
641 659 | | | | parent: 5:4409d547b708
642 660 | | | | user: test
643 661 | | | | date: Thu Jan 01 00:00:06 1970 +0000
644 662 | | | | summary: (6) merge two known; one immediate left, one far left
645 663 | | | |
646 664 | o | | changeset: 5:4409d547b708
647 665 | |\ \ \ parent: 3:27eef8ed80b4
648 666 | | | | | parent: 4:26a8bac39d9f
649 667 | | | | | user: test
650 668 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
651 669 | | | | | summary: (5) expand
652 670 | | | | |
653 671 | | o | | changeset: 4:26a8bac39d9f
654 672 | |/|/ / parent: 1:6db2ef61d156
655 673 | | | | parent: 3:27eef8ed80b4
656 674 | | | | user: test
657 675 | | | | date: Thu Jan 01 00:00:04 1970 +0000
658 676 | | | | summary: (4) merge two known; one immediate left, one immediate right
659 677 | | | |
660 678 | o | | changeset: 3:27eef8ed80b4
661 679 |/ / / user: test
662 680 | | | date: Thu Jan 01 00:00:03 1970 +0000
663 681 | | | summary: (3) collapse
664 682 | | |
665 683 o | | changeset: 2:3d9a33b8d1e1
666 684 |/ / user: test
667 685 | | date: Thu Jan 01 00:00:02 1970 +0000
668 686 | | summary: (2) collapse
669 687 | |
670 688 o | changeset: 1:6db2ef61d156
671 689 |/ user: test
672 690 | date: Thu Jan 01 00:00:01 1970 +0000
673 691 | summary: (1) collapse
674 692 |
675 693 o changeset: 0:e6eb3150255d
676 694 user: test
677 695 date: Thu Jan 01 00:00:00 1970 +0000
678 696 summary: (0) root
679 697
680 698
681 699 File glog per revset:
682 700
683 701 $ hg glog -r 'file("a")'
684 702 @ changeset: 34:fea3ac5810e0
685 703 | tag: tip
686 704 | parent: 32:d06dffa21a31
687 705 | user: test
688 706 | date: Thu Jan 01 00:00:34 1970 +0000
689 707 | summary: (34) head
690 708 |
691 709 | o changeset: 33:68608f5145f9
692 710 | | parent: 18:1aa84d96232a
693 711 | | user: test
694 712 | | date: Thu Jan 01 00:00:33 1970 +0000
695 713 | | summary: (33) head
696 714 | |
697 715 o | changeset: 32:d06dffa21a31
698 716 |\ \ parent: 27:886ed638191b
699 717 | | | parent: 31:621d83e11f67
700 718 | | | user: test
701 719 | | | date: Thu Jan 01 00:00:32 1970 +0000
702 720 | | | summary: (32) expand
703 721 | | |
704 722 | o | changeset: 31:621d83e11f67
705 723 | |\ \ parent: 21:d42a756af44d
706 724 | | | | parent: 30:6e11cd4b648f
707 725 | | | | user: test
708 726 | | | | date: Thu Jan 01 00:00:31 1970 +0000
709 727 | | | | summary: (31) expand
710 728 | | | |
711 729 | | o | changeset: 30:6e11cd4b648f
712 730 | | |\ \ parent: 28:44ecd0b9ae99
713 731 | | | | | parent: 29:cd9bb2be7593
714 732 | | | | | user: test
715 733 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
716 734 | | | | | summary: (30) expand
717 735 | | | | |
718 736 | | | o | changeset: 29:cd9bb2be7593
719 737 | | | | | parent: 0:e6eb3150255d
720 738 | | | | | user: test
721 739 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
722 740 | | | | | summary: (29) regular commit
723 741 | | | | |
724 742 | | o | | changeset: 28:44ecd0b9ae99
725 743 | | |\ \ \ parent: 1:6db2ef61d156
726 744 | | | | | | parent: 26:7f25b6c2f0b9
727 745 | | | | | | user: test
728 746 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
729 747 | | | | | | summary: (28) merge zero known
730 748 | | | | | |
731 749 o | | | | | changeset: 27:886ed638191b
732 750 |/ / / / / parent: 21:d42a756af44d
733 751 | | | | | user: test
734 752 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
735 753 | | | | | summary: (27) collapse
736 754 | | | | |
737 755 | | o---+ changeset: 26:7f25b6c2f0b9
738 756 | | | | | parent: 18:1aa84d96232a
739 757 | | | | | parent: 25:91da8ed57247
740 758 | | | | | user: test
741 759 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
742 760 | | | | | summary: (26) merge one known; far right
743 761 | | | | |
744 762 +---o | | changeset: 25:91da8ed57247
745 763 | | | | | parent: 21:d42a756af44d
746 764 | | | | | parent: 24:a9c19a3d96b7
747 765 | | | | | user: test
748 766 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
749 767 | | | | | summary: (25) merge one known; far left
750 768 | | | | |
751 769 | | o | | changeset: 24:a9c19a3d96b7
752 770 | | |\| | parent: 0:e6eb3150255d
753 771 | | | | | parent: 23:a01cddf0766d
754 772 | | | | | user: test
755 773 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
756 774 | | | | | summary: (24) merge one known; immediate right
757 775 | | | | |
758 776 | | o | | changeset: 23:a01cddf0766d
759 777 | |/| | | parent: 1:6db2ef61d156
760 778 | | | | | parent: 22:e0d9cccacb5d
761 779 | | | | | user: test
762 780 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
763 781 | | | | | summary: (23) merge one known; immediate left
764 782 | | | | |
765 783 +---o---+ changeset: 22:e0d9cccacb5d
766 784 | | | | parent: 18:1aa84d96232a
767 785 | | / / parent: 21:d42a756af44d
768 786 | | | | user: test
769 787 | | | | date: Thu Jan 01 00:00:22 1970 +0000
770 788 | | | | summary: (22) merge two known; one far left, one far right
771 789 | | | |
772 790 o | | | changeset: 21:d42a756af44d
773 791 |\ \ \ \ parent: 19:31ddc2c1573b
774 792 | | | | | parent: 20:d30ed6450e32
775 793 | | | | | user: test
776 794 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
777 795 | | | | | summary: (21) expand
778 796 | | | | |
779 797 | o---+-+ changeset: 20:d30ed6450e32
780 798 | | | | parent: 0:e6eb3150255d
781 799 | / / / parent: 18:1aa84d96232a
782 800 | | | | user: test
783 801 | | | | date: Thu Jan 01 00:00:20 1970 +0000
784 802 | | | | summary: (20) merge two known; two far right
785 803 | | | |
786 804 o | | | changeset: 19:31ddc2c1573b
787 805 |\ \ \ \ parent: 15:1dda3f72782d
788 806 | | | | | parent: 17:44765d7c06e0
789 807 | | | | | user: test
790 808 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
791 809 | | | | | summary: (19) expand
792 810 | | | | |
793 811 +---+---o changeset: 18:1aa84d96232a
794 812 | | | | parent: 1:6db2ef61d156
795 813 | | | | parent: 15:1dda3f72782d
796 814 | | | | user: test
797 815 | | | | date: Thu Jan 01 00:00:18 1970 +0000
798 816 | | | | summary: (18) merge two known; two far left
799 817 | | | |
800 818 | o | | changeset: 17:44765d7c06e0
801 819 | |\ \ \ parent: 12:86b91144a6e9
802 820 | | | | | parent: 16:3677d192927d
803 821 | | | | | user: test
804 822 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
805 823 | | | | | summary: (17) expand
806 824 | | | | |
807 825 | | o---+ changeset: 16:3677d192927d
808 826 | | | | | parent: 0:e6eb3150255d
809 827 | | |/ / parent: 1:6db2ef61d156
810 828 | | | | user: test
811 829 | | | | date: Thu Jan 01 00:00:16 1970 +0000
812 830 | | | | summary: (16) merge two known; one immediate right, one near right
813 831 | | | |
814 832 o | | | changeset: 15:1dda3f72782d
815 833 |\ \ \ \ parent: 13:22d8966a97e3
816 834 | | | | | parent: 14:8eac370358ef
817 835 | | | | | user: test
818 836 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
819 837 | | | | | summary: (15) expand
820 838 | | | | |
821 839 | o-----+ changeset: 14:8eac370358ef
822 840 | | | | | parent: 0:e6eb3150255d
823 841 | |/ / / parent: 12:86b91144a6e9
824 842 | | | | user: test
825 843 | | | | date: Thu Jan 01 00:00:14 1970 +0000
826 844 | | | | summary: (14) merge two known; one immediate right, one far right
827 845 | | | |
828 846 o | | | changeset: 13:22d8966a97e3
829 847 |\ \ \ \ parent: 9:7010c0af0a35
830 848 | | | | | parent: 11:832d76e6bdf2
831 849 | | | | | user: test
832 850 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
833 851 | | | | | summary: (13) expand
834 852 | | | | |
835 853 +---o | | changeset: 12:86b91144a6e9
836 854 | | |/ / parent: 1:6db2ef61d156
837 855 | | | | parent: 9:7010c0af0a35
838 856 | | | | user: test
839 857 | | | | date: Thu Jan 01 00:00:12 1970 +0000
840 858 | | | | summary: (12) merge two known; one immediate right, one far left
841 859 | | | |
842 860 | o | | changeset: 11:832d76e6bdf2
843 861 | |\ \ \ parent: 6:b105a072e251
844 862 | | | | | parent: 10:74c64d036d72
845 863 | | | | | user: test
846 864 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
847 865 | | | | | summary: (11) expand
848 866 | | | | |
849 867 | | o---+ changeset: 10:74c64d036d72
850 868 | | | | | parent: 0:e6eb3150255d
851 869 | |/ / / parent: 6:b105a072e251
852 870 | | | | user: test
853 871 | | | | date: Thu Jan 01 00:00:10 1970 +0000
854 872 | | | | summary: (10) merge two known; one immediate left, one near right
855 873 | | | |
856 874 o | | | changeset: 9:7010c0af0a35
857 875 |\ \ \ \ parent: 7:b632bb1b1224
858 876 | | | | | parent: 8:7a0b11f71937
859 877 | | | | | user: test
860 878 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
861 879 | | | | | summary: (9) expand
862 880 | | | | |
863 881 | o-----+ changeset: 8:7a0b11f71937
864 882 | | | | | parent: 0:e6eb3150255d
865 883 |/ / / / parent: 7:b632bb1b1224
866 884 | | | | user: test
867 885 | | | | date: Thu Jan 01 00:00:08 1970 +0000
868 886 | | | | summary: (8) merge two known; one immediate left, one far right
869 887 | | | |
870 888 o | | | changeset: 7:b632bb1b1224
871 889 |\ \ \ \ parent: 2:3d9a33b8d1e1
872 890 | | | | | parent: 5:4409d547b708
873 891 | | | | | user: test
874 892 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
875 893 | | | | | summary: (7) expand
876 894 | | | | |
877 895 +---o | | changeset: 6:b105a072e251
878 896 | |/ / / parent: 2:3d9a33b8d1e1
879 897 | | | | parent: 5:4409d547b708
880 898 | | | | user: test
881 899 | | | | date: Thu Jan 01 00:00:06 1970 +0000
882 900 | | | | summary: (6) merge two known; one immediate left, one far left
883 901 | | | |
884 902 | o | | changeset: 5:4409d547b708
885 903 | |\ \ \ parent: 3:27eef8ed80b4
886 904 | | | | | parent: 4:26a8bac39d9f
887 905 | | | | | user: test
888 906 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
889 907 | | | | | summary: (5) expand
890 908 | | | | |
891 909 | | o | | changeset: 4:26a8bac39d9f
892 910 | |/|/ / parent: 1:6db2ef61d156
893 911 | | | | parent: 3:27eef8ed80b4
894 912 | | | | user: test
895 913 | | | | date: Thu Jan 01 00:00:04 1970 +0000
896 914 | | | | summary: (4) merge two known; one immediate left, one immediate right
897 915 | | | |
898 916 | o | | changeset: 3:27eef8ed80b4
899 917 |/ / / user: test
900 918 | | | date: Thu Jan 01 00:00:03 1970 +0000
901 919 | | | summary: (3) collapse
902 920 | | |
903 921 o | | changeset: 2:3d9a33b8d1e1
904 922 |/ / user: test
905 923 | | date: Thu Jan 01 00:00:02 1970 +0000
906 924 | | summary: (2) collapse
907 925 | |
908 926 o | changeset: 1:6db2ef61d156
909 927 |/ user: test
910 928 | date: Thu Jan 01 00:00:01 1970 +0000
911 929 | summary: (1) collapse
912 930 |
913 931 o changeset: 0:e6eb3150255d
914 932 user: test
915 933 date: Thu Jan 01 00:00:00 1970 +0000
916 934 summary: (0) root
917 935
918 936
919 937
920 938 File glog per revset (only merges):
921 939
922 940 $ hg log -G -r 'file("a")' -m
923 941 o changeset: 32:d06dffa21a31
924 942 |\ parent: 27:886ed638191b
925 943 | | parent: 31:621d83e11f67
926 944 | | user: test
927 945 | | date: Thu Jan 01 00:00:32 1970 +0000
928 946 | | summary: (32) expand
929 947 | |
930 948 o | changeset: 31:621d83e11f67
931 949 |\| parent: 21:d42a756af44d
932 950 | | parent: 30:6e11cd4b648f
933 951 | | user: test
934 952 | | date: Thu Jan 01 00:00:31 1970 +0000
935 953 | | summary: (31) expand
936 954 | |
937 955 o | changeset: 30:6e11cd4b648f
938 956 |\ \ parent: 28:44ecd0b9ae99
939 957 | | | parent: 29:cd9bb2be7593
940 958 | | | user: test
941 959 | | | date: Thu Jan 01 00:00:30 1970 +0000
942 960 | | | summary: (30) expand
943 961 | | |
944 962 o | | changeset: 28:44ecd0b9ae99
945 963 |\ \ \ parent: 1:6db2ef61d156
946 964 | | | | parent: 26:7f25b6c2f0b9
947 965 | | | | user: test
948 966 | | | | date: Thu Jan 01 00:00:28 1970 +0000
949 967 | | | | summary: (28) merge zero known
950 968 | | | |
951 969 o | | | changeset: 26:7f25b6c2f0b9
952 970 |\ \ \ \ parent: 18:1aa84d96232a
953 971 | | | | | parent: 25:91da8ed57247
954 972 | | | | | user: test
955 973 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
956 974 | | | | | summary: (26) merge one known; far right
957 975 | | | | |
958 976 | o-----+ changeset: 25:91da8ed57247
959 977 | | | | | parent: 21:d42a756af44d
960 978 | | | | | parent: 24:a9c19a3d96b7
961 979 | | | | | user: test
962 980 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
963 981 | | | | | summary: (25) merge one known; far left
964 982 | | | | |
965 983 | o | | | changeset: 24:a9c19a3d96b7
966 984 | |\ \ \ \ parent: 0:e6eb3150255d
967 985 | | | | | | parent: 23:a01cddf0766d
968 986 | | | | | | user: test
969 987 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
970 988 | | | | | | summary: (24) merge one known; immediate right
971 989 | | | | | |
972 990 | o---+ | | changeset: 23:a01cddf0766d
973 991 | | | | | | parent: 1:6db2ef61d156
974 992 | | | | | | parent: 22:e0d9cccacb5d
975 993 | | | | | | user: test
976 994 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
977 995 | | | | | | summary: (23) merge one known; immediate left
978 996 | | | | | |
979 997 | o-------+ changeset: 22:e0d9cccacb5d
980 998 | | | | | | parent: 18:1aa84d96232a
981 999 |/ / / / / parent: 21:d42a756af44d
982 1000 | | | | | user: test
983 1001 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
984 1002 | | | | | summary: (22) merge two known; one far left, one far right
985 1003 | | | | |
986 1004 | | | | o changeset: 21:d42a756af44d
987 1005 | | | | |\ parent: 19:31ddc2c1573b
988 1006 | | | | | | parent: 20:d30ed6450e32
989 1007 | | | | | | user: test
990 1008 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
991 1009 | | | | | | summary: (21) expand
992 1010 | | | | | |
993 1011 +-+-------o changeset: 20:d30ed6450e32
994 1012 | | | | | parent: 0:e6eb3150255d
995 1013 | | | | | parent: 18:1aa84d96232a
996 1014 | | | | | user: test
997 1015 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
998 1016 | | | | | summary: (20) merge two known; two far right
999 1017 | | | | |
1000 1018 | | | | o changeset: 19:31ddc2c1573b
1001 1019 | | | | |\ parent: 15:1dda3f72782d
1002 1020 | | | | | | parent: 17:44765d7c06e0
1003 1021 | | | | | | user: test
1004 1022 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
1005 1023 | | | | | | summary: (19) expand
1006 1024 | | | | | |
1007 1025 o---+---+ | changeset: 18:1aa84d96232a
1008 1026 | | | | | parent: 1:6db2ef61d156
1009 1027 / / / / / parent: 15:1dda3f72782d
1010 1028 | | | | | user: test
1011 1029 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
1012 1030 | | | | | summary: (18) merge two known; two far left
1013 1031 | | | | |
1014 1032 | | | | o changeset: 17:44765d7c06e0
1015 1033 | | | | |\ parent: 12:86b91144a6e9
1016 1034 | | | | | | parent: 16:3677d192927d
1017 1035 | | | | | | user: test
1018 1036 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
1019 1037 | | | | | | summary: (17) expand
1020 1038 | | | | | |
1021 1039 +-+-------o changeset: 16:3677d192927d
1022 1040 | | | | | parent: 0:e6eb3150255d
1023 1041 | | | | | parent: 1:6db2ef61d156
1024 1042 | | | | | user: test
1025 1043 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
1026 1044 | | | | | summary: (16) merge two known; one immediate right, one near right
1027 1045 | | | | |
1028 1046 | | | o | changeset: 15:1dda3f72782d
1029 1047 | | | |\ \ parent: 13:22d8966a97e3
1030 1048 | | | | | | parent: 14:8eac370358ef
1031 1049 | | | | | | user: test
1032 1050 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
1033 1051 | | | | | | summary: (15) expand
1034 1052 | | | | | |
1035 1053 +-------o | changeset: 14:8eac370358ef
1036 1054 | | | | |/ parent: 0:e6eb3150255d
1037 1055 | | | | | parent: 12:86b91144a6e9
1038 1056 | | | | | user: test
1039 1057 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
1040 1058 | | | | | summary: (14) merge two known; one immediate right, one far right
1041 1059 | | | | |
1042 1060 | | | o | changeset: 13:22d8966a97e3
1043 1061 | | | |\ \ parent: 9:7010c0af0a35
1044 1062 | | | | | | parent: 11:832d76e6bdf2
1045 1063 | | | | | | user: test
1046 1064 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
1047 1065 | | | | | | summary: (13) expand
1048 1066 | | | | | |
1049 1067 | +---+---o changeset: 12:86b91144a6e9
1050 1068 | | | | | parent: 1:6db2ef61d156
1051 1069 | | | | | parent: 9:7010c0af0a35
1052 1070 | | | | | user: test
1053 1071 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
1054 1072 | | | | | summary: (12) merge two known; one immediate right, one far left
1055 1073 | | | | |
1056 1074 | | | | o changeset: 11:832d76e6bdf2
1057 1075 | | | | |\ parent: 6:b105a072e251
1058 1076 | | | | | | parent: 10:74c64d036d72
1059 1077 | | | | | | user: test
1060 1078 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
1061 1079 | | | | | | summary: (11) expand
1062 1080 | | | | | |
1063 1081 +---------o changeset: 10:74c64d036d72
1064 1082 | | | | |/ parent: 0:e6eb3150255d
1065 1083 | | | | | parent: 6:b105a072e251
1066 1084 | | | | | user: test
1067 1085 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
1068 1086 | | | | | summary: (10) merge two known; one immediate left, one near right
1069 1087 | | | | |
1070 1088 | | | o | changeset: 9:7010c0af0a35
1071 1089 | | | |\ \ parent: 7:b632bb1b1224
1072 1090 | | | | | | parent: 8:7a0b11f71937
1073 1091 | | | | | | user: test
1074 1092 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
1075 1093 | | | | | | summary: (9) expand
1076 1094 | | | | | |
1077 1095 +-------o | changeset: 8:7a0b11f71937
1078 1096 | | | |/ / parent: 0:e6eb3150255d
1079 1097 | | | | | parent: 7:b632bb1b1224
1080 1098 | | | | | user: test
1081 1099 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
1082 1100 | | | | | summary: (8) merge two known; one immediate left, one far right
1083 1101 | | | | |
1084 1102 | | | o | changeset: 7:b632bb1b1224
1085 1103 | | | |\ \ parent: 2:3d9a33b8d1e1
1086 1104 | | | | | | parent: 5:4409d547b708
1087 1105 | | | | | | user: test
1088 1106 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
1089 1107 | | | | | | summary: (7) expand
1090 1108 | | | | | |
1091 1109 | | | +---o changeset: 6:b105a072e251
1092 1110 | | | | |/ parent: 2:3d9a33b8d1e1
1093 1111 | | | | | parent: 5:4409d547b708
1094 1112 | | | | | user: test
1095 1113 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
1096 1114 | | | | | summary: (6) merge two known; one immediate left, one far left
1097 1115 | | | | |
1098 1116 | | | o | changeset: 5:4409d547b708
1099 1117 | | | |\ \ parent: 3:27eef8ed80b4
1100 1118 | | | | | | parent: 4:26a8bac39d9f
1101 1119 | | | | | | user: test
1102 1120 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
1103 1121 | | | | | | summary: (5) expand
1104 1122 | | | | | |
1105 1123 | +---o | | changeset: 4:26a8bac39d9f
1106 1124 | | | |/ / parent: 1:6db2ef61d156
1107 1125 | | | | | parent: 3:27eef8ed80b4
1108 1126 | | | | | user: test
1109 1127 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
1110 1128 | | | | | summary: (4) merge two known; one immediate left, one immediate right
1111 1129 | | | | |
1112 1130
1113 1131
1114 1132 Empty revision range - display nothing:
1115 1133 $ hg glog -r 1..0
1116 1134
1117 1135 From outer space:
1118 1136 $ cd ..
1119 1137 $ hg glog -l1 repo
1120 1138 @ changeset: 34:fea3ac5810e0
1121 1139 | tag: tip
1122 1140 | parent: 32:d06dffa21a31
1123 1141 | user: test
1124 1142 | date: Thu Jan 01 00:00:34 1970 +0000
1125 1143 | summary: (34) head
1126 1144 |
1127 1145 $ hg glog -l1 repo/a
1128 1146 @ changeset: 34:fea3ac5810e0
1129 1147 | tag: tip
1130 1148 | parent: 32:d06dffa21a31
1131 1149 | user: test
1132 1150 | date: Thu Jan 01 00:00:34 1970 +0000
1133 1151 | summary: (34) head
1134 1152 |
1135 1153 $ hg glog -l1 repo/missing
1136 1154
1137 1155 File log with revs != cset revs:
1138 1156 $ hg init flog
1139 1157 $ cd flog
1140 1158 $ echo one >one
1141 1159 $ hg add one
1142 1160 $ hg commit -mone
1143 1161 $ echo two >two
1144 1162 $ hg add two
1145 1163 $ hg commit -mtwo
1146 1164 $ echo more >two
1147 1165 $ hg commit -mmore
1148 1166 $ hg glog two
1149 1167 @ changeset: 2:12c28321755b
1150 1168 | tag: tip
1151 1169 | user: test
1152 1170 | date: Thu Jan 01 00:00:00 1970 +0000
1153 1171 | summary: more
1154 1172 |
1155 1173 o changeset: 1:5ac72c0599bf
1156 1174 | user: test
1157 1175 | date: Thu Jan 01 00:00:00 1970 +0000
1158 1176 | summary: two
1159 1177 |
1160 1178
1161 1179 Issue1896: File log with explicit style
1162 1180 $ hg glog --style=default one
1163 1181 o changeset: 0:3d578b4a1f53
1164 1182 user: test
1165 1183 date: Thu Jan 01 00:00:00 1970 +0000
1166 1184 summary: one
1167 1185
1168 1186 Issue2395: glog --style header and footer
1169 1187 $ hg glog --style=xml one
1170 1188 <?xml version="1.0"?>
1171 1189 <log>
1172 1190 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1173 1191 <author email="test">test</author>
1174 1192 <date>1970-01-01T00:00:00+00:00</date>
1175 1193 <msg xml:space="preserve">one</msg>
1176 1194 </logentry>
1177 1195 </log>
1178 1196
1179 1197 $ cd ..
1180 1198
1181 1199 Incoming and outgoing:
1182 1200
1183 1201 $ hg clone -U -r31 repo repo2
1184 1202 adding changesets
1185 1203 adding manifests
1186 1204 adding file changes
1187 1205 added 31 changesets with 31 changes to 1 files
1188 1206 $ cd repo2
1189 1207
1190 1208 $ hg incoming --graph ../repo
1191 1209 comparing with ../repo
1192 1210 searching for changes
1193 1211 o changeset: 34:fea3ac5810e0
1194 1212 | tag: tip
1195 1213 | parent: 32:d06dffa21a31
1196 1214 | user: test
1197 1215 | date: Thu Jan 01 00:00:34 1970 +0000
1198 1216 | summary: (34) head
1199 1217 |
1200 1218 | o changeset: 33:68608f5145f9
1201 1219 | parent: 18:1aa84d96232a
1202 1220 | user: test
1203 1221 | date: Thu Jan 01 00:00:33 1970 +0000
1204 1222 | summary: (33) head
1205 1223 |
1206 1224 o changeset: 32:d06dffa21a31
1207 1225 | parent: 27:886ed638191b
1208 1226 | parent: 31:621d83e11f67
1209 1227 | user: test
1210 1228 | date: Thu Jan 01 00:00:32 1970 +0000
1211 1229 | summary: (32) expand
1212 1230 |
1213 1231 o changeset: 27:886ed638191b
1214 1232 parent: 21:d42a756af44d
1215 1233 user: test
1216 1234 date: Thu Jan 01 00:00:27 1970 +0000
1217 1235 summary: (27) collapse
1218 1236
1219 1237 $ cd ..
1220 1238
1221 1239 $ hg -R repo outgoing --graph repo2
1222 1240 comparing with repo2
1223 1241 searching for changes
1224 1242 @ changeset: 34:fea3ac5810e0
1225 1243 | tag: tip
1226 1244 | parent: 32:d06dffa21a31
1227 1245 | user: test
1228 1246 | date: Thu Jan 01 00:00:34 1970 +0000
1229 1247 | summary: (34) head
1230 1248 |
1231 1249 | o changeset: 33:68608f5145f9
1232 1250 | parent: 18:1aa84d96232a
1233 1251 | user: test
1234 1252 | date: Thu Jan 01 00:00:33 1970 +0000
1235 1253 | summary: (33) head
1236 1254 |
1237 1255 o changeset: 32:d06dffa21a31
1238 1256 | parent: 27:886ed638191b
1239 1257 | parent: 31:621d83e11f67
1240 1258 | user: test
1241 1259 | date: Thu Jan 01 00:00:32 1970 +0000
1242 1260 | summary: (32) expand
1243 1261 |
1244 1262 o changeset: 27:886ed638191b
1245 1263 parent: 21:d42a756af44d
1246 1264 user: test
1247 1265 date: Thu Jan 01 00:00:27 1970 +0000
1248 1266 summary: (27) collapse
1249 1267
1250 1268
1251 1269 File + limit with revs != cset revs:
1252 1270 $ cd repo
1253 1271 $ touch b
1254 1272 $ hg ci -Aqm0
1255 1273 $ hg glog -l2 a
1256 1274 o changeset: 34:fea3ac5810e0
1257 1275 | parent: 32:d06dffa21a31
1258 1276 | user: test
1259 1277 | date: Thu Jan 01 00:00:34 1970 +0000
1260 1278 | summary: (34) head
1261 1279 |
1262 1280 | o changeset: 33:68608f5145f9
1263 1281 | | parent: 18:1aa84d96232a
1264 1282 | | user: test
1265 1283 | | date: Thu Jan 01 00:00:33 1970 +0000
1266 1284 | | summary: (33) head
1267 1285 | |
1268 1286
1269 1287 File + limit + -ra:b, (b - a) < limit:
1270 1288 $ hg glog -l3000 -r32:tip a
1271 1289 o changeset: 34:fea3ac5810e0
1272 1290 | parent: 32:d06dffa21a31
1273 1291 | user: test
1274 1292 | date: Thu Jan 01 00:00:34 1970 +0000
1275 1293 | summary: (34) head
1276 1294 |
1277 1295 | o changeset: 33:68608f5145f9
1278 1296 | | parent: 18:1aa84d96232a
1279 1297 | | user: test
1280 1298 | | date: Thu Jan 01 00:00:33 1970 +0000
1281 1299 | | summary: (33) head
1282 1300 | |
1283 1301 o | changeset: 32:d06dffa21a31
1284 1302 |\ \ parent: 27:886ed638191b
1285 1303 | | | parent: 31:621d83e11f67
1286 1304 | | | user: test
1287 1305 | | | date: Thu Jan 01 00:00:32 1970 +0000
1288 1306 | | | summary: (32) expand
1289 1307 | | |
1290 1308
1291 1309 Point out a common and an uncommon unshown parent
1292 1310
1293 1311 $ hg glog -r 'rev(8) or rev(9)'
1294 1312 o changeset: 9:7010c0af0a35
1295 1313 |\ parent: 7:b632bb1b1224
1296 1314 | | parent: 8:7a0b11f71937
1297 1315 | | user: test
1298 1316 | | date: Thu Jan 01 00:00:09 1970 +0000
1299 1317 | | summary: (9) expand
1300 1318 | |
1301 1319 o | changeset: 8:7a0b11f71937
1302 1320 |\| parent: 0:e6eb3150255d
1303 1321 | | parent: 7:b632bb1b1224
1304 1322 | | user: test
1305 1323 | | date: Thu Jan 01 00:00:08 1970 +0000
1306 1324 | | summary: (8) merge two known; one immediate left, one far right
1307 1325 | |
1308 1326
1309 1327 File + limit + -ra:b, b < tip:
1310 1328
1311 1329 $ hg glog -l1 -r32:34 a
1312 1330 o changeset: 34:fea3ac5810e0
1313 1331 | parent: 32:d06dffa21a31
1314 1332 | user: test
1315 1333 | date: Thu Jan 01 00:00:34 1970 +0000
1316 1334 | summary: (34) head
1317 1335 |
1318 1336
1319 1337 file(File) + limit + -ra:b, b < tip:
1320 1338
1321 1339 $ hg glog -l1 -r32:34 -r 'file("a")'
1322 1340 o changeset: 34:fea3ac5810e0
1323 1341 | parent: 32:d06dffa21a31
1324 1342 | user: test
1325 1343 | date: Thu Jan 01 00:00:34 1970 +0000
1326 1344 | summary: (34) head
1327 1345 |
1328 1346
1329 1347 limit(file(File) and a::b), b < tip:
1330 1348
1331 1349 $ hg glog -r 'limit(file("a") and 32::34, 1)'
1332 1350 o changeset: 32:d06dffa21a31
1333 1351 |\ parent: 27:886ed638191b
1334 1352 | | parent: 31:621d83e11f67
1335 1353 | | user: test
1336 1354 | | date: Thu Jan 01 00:00:32 1970 +0000
1337 1355 | | summary: (32) expand
1338 1356 | |
1339 1357
1340 1358 File + limit + -ra:b, b < tip:
1341 1359
1342 1360 $ hg glog -r 'limit(file("a") and 34::32, 1)'
1343 1361
1344 1362 File + limit + -ra:b, b < tip, (b - a) < limit:
1345 1363
1346 1364 $ hg glog -l10 -r33:34 a
1347 1365 o changeset: 34:fea3ac5810e0
1348 1366 | parent: 32:d06dffa21a31
1349 1367 | user: test
1350 1368 | date: Thu Jan 01 00:00:34 1970 +0000
1351 1369 | summary: (34) head
1352 1370 |
1353 1371 | o changeset: 33:68608f5145f9
1354 1372 | | parent: 18:1aa84d96232a
1355 1373 | | user: test
1356 1374 | | date: Thu Jan 01 00:00:33 1970 +0000
1357 1375 | | summary: (33) head
1358 1376 | |
1359 1377
1360 1378 Do not crash or produce strange graphs if history is buggy
1361 1379
1362 1380 $ commit 36 "buggy merge: identical parents" 35 35
1363 1381 $ hg glog -l5
1364 1382 @ changeset: 36:95fa8febd08a
1365 1383 | tag: tip
1366 1384 | parent: 35:9159c3644c5e
1367 1385 | parent: 35:9159c3644c5e
1368 1386 | user: test
1369 1387 | date: Thu Jan 01 00:00:36 1970 +0000
1370 1388 | summary: (36) buggy merge: identical parents
1371 1389 |
1372 1390 o changeset: 35:9159c3644c5e
1373 1391 | user: test
1374 1392 | date: Thu Jan 01 00:00:00 1970 +0000
1375 1393 | summary: 0
1376 1394 |
1377 1395 o changeset: 34:fea3ac5810e0
1378 1396 | parent: 32:d06dffa21a31
1379 1397 | user: test
1380 1398 | date: Thu Jan 01 00:00:34 1970 +0000
1381 1399 | summary: (34) head
1382 1400 |
1383 1401 | o changeset: 33:68608f5145f9
1384 1402 | | parent: 18:1aa84d96232a
1385 1403 | | user: test
1386 1404 | | date: Thu Jan 01 00:00:33 1970 +0000
1387 1405 | | summary: (33) head
1388 1406 | |
1389 1407 o | changeset: 32:d06dffa21a31
1390 1408 |\ \ parent: 27:886ed638191b
1391 1409 | | | parent: 31:621d83e11f67
1392 1410 | | | user: test
1393 1411 | | | date: Thu Jan 01 00:00:32 1970 +0000
1394 1412 | | | summary: (32) expand
1395 1413 | | |
1396 1414
1397 1415 Test log -G options
1398 1416
1399 1417 $ hg log -G -u 'something nice'
1400 1418 $ hg log -G -b 'something nice'
1401 1419 abort: unknown revision 'something nice'!
1402 1420 [255]
1403 $ hg log -G -k 'something nice'
1421 $ hg log -G --print-revset -k 'something' -k 'nice'
1422 ('group', ('and', ('func', ('symbol', 'keyword'), ('string', 'something')), ('func', ('symbol', 'keyword'), ('string', 'nice'))))
1404 1423 $ hg log -G --only-branch 'something nice'
1405 1424 abort: unknown revision 'something nice'!
1406 1425 [255]
1407 1426 $ hg log -G --include 'some file' --exclude 'another file'
1408 1427 $ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l
1409 1428 \s*36 (re)
1410 1429 $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l
1411 1430 \s*0 (re)
1412 1431 $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
1413 1432 \s*28 (re)
1414 1433 $ hg log -G --no-merges --template 'nodetag {rev}\n'
1415 1434 o nodetag 35
1416 1435 |
1417 1436 o nodetag 34
1418 1437 |\
1419 1438 | \
1420 1439 | |\
1421 1440 | | \
1422 1441 | | |\
1423 1442 | | | \
1424 1443 | | | |\
1425 1444 | | | | \
1426 1445 | | | | |\
1427 1446 +-+-+-+-----o nodetag 33
1428 1447 | | | | | |
1429 1448 +---------o nodetag 29
1430 1449 | | | | |
1431 1450 +-+-+---o nodetag 27
1432 1451 | | | |/
1433 1452 | | | o nodetag 3
1434 1453 | | |/
1435 1454 | | o nodetag 2
1436 1455 | |/
1437 1456 | o nodetag 1
1438 1457 |/
1439 1458 o nodetag 0
1440 1459
1441 1460 $ hg log -G -d 'brace ) in a date'
1442 1461 abort: invalid date: 'brace ) in a date'
1443 1462 [255]
1444 1463 $ hg log -G -P 32 --template '{rev}\n'
1445 1464 @ 36
1446 1465 |
1447 1466 o 35
1448 1467 |
1449 1468 o 34
1450 1469 |
1451 1470 | o 33
1452 1471 | |
1453 1472 $ hg log -G --follow a
1454 1473 abort: -G/--graph option is incompatible with --follow with file argument
1455 1474 [255]
1456 1475
1457 1476 Test multiple revision specifications are correctly handled
1458 1477
1459 1478 $ hg log -G -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 --template '{rev}\n'
1460 1479 o 34
1461 1480 |
1462 1481 o 32
1463 1482 |\
1464 1483 | o 31
1465 1484 | |\
1466 1485 o | | 27
1467 1486 |/ /
1468 1487 | o 25
1469 1488 |/
1470 1489 o 21
1471 1490 |\
General Comments 0
You need to be logged in to leave comments. Login now