##// END OF EJS Templates
tests: hide diff -u saying 'No differences encountered' on solaris
Mads Kiilerich -
r16484:bf877ebe stable
parent child Browse files
Show More
@@ -1,2061 +1,2058 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 86 $ cat > printrevset.py <<EOF
87 87 > from mercurial import extensions, revset, commands
88 88 > from hgext import graphlog
89 89 >
90 90 > def uisetup(ui):
91 91 > def printrevset(orig, ui, repo, *pats, **opts):
92 92 > if opts.get('print_revset'):
93 93 > expr = graphlog.getlogrevs(repo, pats, opts)[1]
94 94 > if expr:
95 95 > tree = revset.parse(expr)[0]
96 96 > else:
97 97 > tree = []
98 98 > ui.write('%r\n' % (opts.get('rev', []),))
99 99 > ui.write(revset.prettyformat(tree) + '\n')
100 100 > return 0
101 101 > return orig(ui, repo, *pats, **opts)
102 102 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
103 103 > entry[1].append(('', 'print-revset', False,
104 104 > 'print generated revset and exit (DEPRECATED)'))
105 105 > EOF
106 106
107 107 $ echo "[extensions]" >> $HGRCPATH
108 108 $ echo "graphlog=" >> $HGRCPATH
109 109 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
110 110
111 111 $ hg init repo
112 112 $ cd repo
113 113
114 114 Empty repo:
115 115
116 116 $ hg glog
117 117
118 118
119 119 Building DAG:
120 120
121 121 $ commit 0 "root"
122 122 $ commit 1 "collapse" 0
123 123 $ commit 2 "collapse" 1
124 124 $ commit 3 "collapse" 2
125 125 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
126 126 $ commit 5 "expand" 3 4
127 127 $ commit 6 "merge two known; one immediate left, one far left" 2 5
128 128 $ commit 7 "expand" 2 5
129 129 $ commit 8 "merge two known; one immediate left, one far right" 0 7
130 130 $ commit 9 "expand" 7 8
131 131 $ commit 10 "merge two known; one immediate left, one near right" 0 6
132 132 $ commit 11 "expand" 6 10
133 133 $ commit 12 "merge two known; one immediate right, one far left" 1 9
134 134 $ commit 13 "expand" 9 11
135 135 $ commit 14 "merge two known; one immediate right, one far right" 0 12
136 136 $ commit 15 "expand" 13 14
137 137 $ commit 16 "merge two known; one immediate right, one near right" 0 1
138 138 $ commit 17 "expand" 12 16
139 139 $ commit 18 "merge two known; two far left" 1 15
140 140 $ commit 19 "expand" 15 17
141 141 $ commit 20 "merge two known; two far right" 0 18
142 142 $ commit 21 "expand" 19 20
143 143 $ commit 22 "merge two known; one far left, one far right" 18 21
144 144 $ commit 23 "merge one known; immediate left" 1 22
145 145 $ commit 24 "merge one known; immediate right" 0 23
146 146 $ commit 25 "merge one known; far left" 21 24
147 147 $ commit 26 "merge one known; far right" 18 25
148 148 $ commit 27 "collapse" 21
149 149 $ commit 28 "merge zero known" 1 26
150 150 $ commit 29 "regular commit" 0
151 151 $ commit 30 "expand" 28 29
152 152 $ commit 31 "expand" 21 30
153 153 $ commit 32 "expand" 27 31
154 154 $ commit 33 "head" 18
155 155 $ commit 34 "head" 32
156 156
157 157
158 158 $ hg glog -q
159 159 @ 34:fea3ac5810e0
160 160 |
161 161 | o 33:68608f5145f9
162 162 | |
163 163 o | 32:d06dffa21a31
164 164 |\ \
165 165 | o \ 31:621d83e11f67
166 166 | |\ \
167 167 | | o \ 30:6e11cd4b648f
168 168 | | |\ \
169 169 | | | o | 29:cd9bb2be7593
170 170 | | | | |
171 171 | | o | | 28:44ecd0b9ae99
172 172 | | |\ \ \
173 173 o | | | | | 27:886ed638191b
174 174 |/ / / / /
175 175 | | o---+ 26:7f25b6c2f0b9
176 176 | | | | |
177 177 +---o | | 25:91da8ed57247
178 178 | | | | |
179 179 | | o | | 24:a9c19a3d96b7
180 180 | | |\| |
181 181 | | o | | 23:a01cddf0766d
182 182 | |/| | |
183 183 +---o---+ 22:e0d9cccacb5d
184 184 | | / /
185 185 o | | | 21:d42a756af44d
186 186 |\ \ \ \
187 187 | o---+-+ 20:d30ed6450e32
188 188 | / / /
189 189 o | | | 19:31ddc2c1573b
190 190 |\ \ \ \
191 191 +---+---o 18:1aa84d96232a
192 192 | | | |
193 193 | o | | 17:44765d7c06e0
194 194 | |\ \ \
195 195 | | o---+ 16:3677d192927d
196 196 | | |/ /
197 197 o | | | 15:1dda3f72782d
198 198 |\ \ \ \
199 199 | o-----+ 14:8eac370358ef
200 200 | |/ / /
201 201 o | | | 13:22d8966a97e3
202 202 |\ \ \ \
203 203 +---o | | 12:86b91144a6e9
204 204 | | |/ /
205 205 | o | | 11:832d76e6bdf2
206 206 | |\ \ \
207 207 | | o---+ 10:74c64d036d72
208 208 | |/ / /
209 209 o | | | 9:7010c0af0a35
210 210 |\ \ \ \
211 211 | o-----+ 8:7a0b11f71937
212 212 |/ / / /
213 213 o | | | 7:b632bb1b1224
214 214 |\ \ \ \
215 215 +---o | | 6:b105a072e251
216 216 | |/ / /
217 217 | o | | 5:4409d547b708
218 218 | |\ \ \
219 219 | | o | | 4:26a8bac39d9f
220 220 | |/|/ /
221 221 | o / / 3:27eef8ed80b4
222 222 |/ / /
223 223 o / / 2:3d9a33b8d1e1
224 224 |/ /
225 225 o / 1:6db2ef61d156
226 226 |/
227 227 o 0:e6eb3150255d
228 228
229 229
230 230 $ hg glog
231 231 @ changeset: 34:fea3ac5810e0
232 232 | tag: tip
233 233 | parent: 32:d06dffa21a31
234 234 | user: test
235 235 | date: Thu Jan 01 00:00:34 1970 +0000
236 236 | summary: (34) head
237 237 |
238 238 | o changeset: 33:68608f5145f9
239 239 | | parent: 18:1aa84d96232a
240 240 | | user: test
241 241 | | date: Thu Jan 01 00:00:33 1970 +0000
242 242 | | summary: (33) head
243 243 | |
244 244 o | changeset: 32:d06dffa21a31
245 245 |\ \ parent: 27:886ed638191b
246 246 | | | parent: 31:621d83e11f67
247 247 | | | user: test
248 248 | | | date: Thu Jan 01 00:00:32 1970 +0000
249 249 | | | summary: (32) expand
250 250 | | |
251 251 | o | changeset: 31:621d83e11f67
252 252 | |\ \ parent: 21:d42a756af44d
253 253 | | | | parent: 30:6e11cd4b648f
254 254 | | | | user: test
255 255 | | | | date: Thu Jan 01 00:00:31 1970 +0000
256 256 | | | | summary: (31) expand
257 257 | | | |
258 258 | | o | changeset: 30:6e11cd4b648f
259 259 | | |\ \ parent: 28:44ecd0b9ae99
260 260 | | | | | parent: 29:cd9bb2be7593
261 261 | | | | | user: test
262 262 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
263 263 | | | | | summary: (30) expand
264 264 | | | | |
265 265 | | | o | changeset: 29:cd9bb2be7593
266 266 | | | | | parent: 0:e6eb3150255d
267 267 | | | | | user: test
268 268 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
269 269 | | | | | summary: (29) regular commit
270 270 | | | | |
271 271 | | o | | changeset: 28:44ecd0b9ae99
272 272 | | |\ \ \ parent: 1:6db2ef61d156
273 273 | | | | | | parent: 26:7f25b6c2f0b9
274 274 | | | | | | user: test
275 275 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
276 276 | | | | | | summary: (28) merge zero known
277 277 | | | | | |
278 278 o | | | | | changeset: 27:886ed638191b
279 279 |/ / / / / parent: 21:d42a756af44d
280 280 | | | | | user: test
281 281 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
282 282 | | | | | summary: (27) collapse
283 283 | | | | |
284 284 | | o---+ changeset: 26:7f25b6c2f0b9
285 285 | | | | | parent: 18:1aa84d96232a
286 286 | | | | | parent: 25:91da8ed57247
287 287 | | | | | user: test
288 288 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
289 289 | | | | | summary: (26) merge one known; far right
290 290 | | | | |
291 291 +---o | | changeset: 25:91da8ed57247
292 292 | | | | | parent: 21:d42a756af44d
293 293 | | | | | parent: 24:a9c19a3d96b7
294 294 | | | | | user: test
295 295 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
296 296 | | | | | summary: (25) merge one known; far left
297 297 | | | | |
298 298 | | o | | changeset: 24:a9c19a3d96b7
299 299 | | |\| | parent: 0:e6eb3150255d
300 300 | | | | | parent: 23:a01cddf0766d
301 301 | | | | | user: test
302 302 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
303 303 | | | | | summary: (24) merge one known; immediate right
304 304 | | | | |
305 305 | | o | | changeset: 23:a01cddf0766d
306 306 | |/| | | parent: 1:6db2ef61d156
307 307 | | | | | parent: 22:e0d9cccacb5d
308 308 | | | | | user: test
309 309 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
310 310 | | | | | summary: (23) merge one known; immediate left
311 311 | | | | |
312 312 +---o---+ changeset: 22:e0d9cccacb5d
313 313 | | | | parent: 18:1aa84d96232a
314 314 | | / / parent: 21:d42a756af44d
315 315 | | | | user: test
316 316 | | | | date: Thu Jan 01 00:00:22 1970 +0000
317 317 | | | | summary: (22) merge two known; one far left, one far right
318 318 | | | |
319 319 o | | | changeset: 21:d42a756af44d
320 320 |\ \ \ \ parent: 19:31ddc2c1573b
321 321 | | | | | parent: 20:d30ed6450e32
322 322 | | | | | user: test
323 323 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
324 324 | | | | | summary: (21) expand
325 325 | | | | |
326 326 | o---+-+ changeset: 20:d30ed6450e32
327 327 | | | | parent: 0:e6eb3150255d
328 328 | / / / parent: 18:1aa84d96232a
329 329 | | | | user: test
330 330 | | | | date: Thu Jan 01 00:00:20 1970 +0000
331 331 | | | | summary: (20) merge two known; two far right
332 332 | | | |
333 333 o | | | changeset: 19:31ddc2c1573b
334 334 |\ \ \ \ parent: 15:1dda3f72782d
335 335 | | | | | parent: 17:44765d7c06e0
336 336 | | | | | user: test
337 337 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
338 338 | | | | | summary: (19) expand
339 339 | | | | |
340 340 +---+---o changeset: 18:1aa84d96232a
341 341 | | | | parent: 1:6db2ef61d156
342 342 | | | | parent: 15:1dda3f72782d
343 343 | | | | user: test
344 344 | | | | date: Thu Jan 01 00:00:18 1970 +0000
345 345 | | | | summary: (18) merge two known; two far left
346 346 | | | |
347 347 | o | | changeset: 17:44765d7c06e0
348 348 | |\ \ \ parent: 12:86b91144a6e9
349 349 | | | | | parent: 16:3677d192927d
350 350 | | | | | user: test
351 351 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
352 352 | | | | | summary: (17) expand
353 353 | | | | |
354 354 | | o---+ changeset: 16:3677d192927d
355 355 | | | | | parent: 0:e6eb3150255d
356 356 | | |/ / parent: 1:6db2ef61d156
357 357 | | | | user: test
358 358 | | | | date: Thu Jan 01 00:00:16 1970 +0000
359 359 | | | | summary: (16) merge two known; one immediate right, one near right
360 360 | | | |
361 361 o | | | changeset: 15:1dda3f72782d
362 362 |\ \ \ \ parent: 13:22d8966a97e3
363 363 | | | | | parent: 14:8eac370358ef
364 364 | | | | | user: test
365 365 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
366 366 | | | | | summary: (15) expand
367 367 | | | | |
368 368 | o-----+ changeset: 14:8eac370358ef
369 369 | | | | | parent: 0:e6eb3150255d
370 370 | |/ / / parent: 12:86b91144a6e9
371 371 | | | | user: test
372 372 | | | | date: Thu Jan 01 00:00:14 1970 +0000
373 373 | | | | summary: (14) merge two known; one immediate right, one far right
374 374 | | | |
375 375 o | | | changeset: 13:22d8966a97e3
376 376 |\ \ \ \ parent: 9:7010c0af0a35
377 377 | | | | | parent: 11:832d76e6bdf2
378 378 | | | | | user: test
379 379 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
380 380 | | | | | summary: (13) expand
381 381 | | | | |
382 382 +---o | | changeset: 12:86b91144a6e9
383 383 | | |/ / parent: 1:6db2ef61d156
384 384 | | | | parent: 9:7010c0af0a35
385 385 | | | | user: test
386 386 | | | | date: Thu Jan 01 00:00:12 1970 +0000
387 387 | | | | summary: (12) merge two known; one immediate right, one far left
388 388 | | | |
389 389 | o | | changeset: 11:832d76e6bdf2
390 390 | |\ \ \ parent: 6:b105a072e251
391 391 | | | | | parent: 10:74c64d036d72
392 392 | | | | | user: test
393 393 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
394 394 | | | | | summary: (11) expand
395 395 | | | | |
396 396 | | o---+ changeset: 10:74c64d036d72
397 397 | | | | | parent: 0:e6eb3150255d
398 398 | |/ / / parent: 6:b105a072e251
399 399 | | | | user: test
400 400 | | | | date: Thu Jan 01 00:00:10 1970 +0000
401 401 | | | | summary: (10) merge two known; one immediate left, one near right
402 402 | | | |
403 403 o | | | changeset: 9:7010c0af0a35
404 404 |\ \ \ \ parent: 7:b632bb1b1224
405 405 | | | | | parent: 8:7a0b11f71937
406 406 | | | | | user: test
407 407 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
408 408 | | | | | summary: (9) expand
409 409 | | | | |
410 410 | o-----+ changeset: 8:7a0b11f71937
411 411 | | | | | parent: 0:e6eb3150255d
412 412 |/ / / / parent: 7:b632bb1b1224
413 413 | | | | user: test
414 414 | | | | date: Thu Jan 01 00:00:08 1970 +0000
415 415 | | | | summary: (8) merge two known; one immediate left, one far right
416 416 | | | |
417 417 o | | | changeset: 7:b632bb1b1224
418 418 |\ \ \ \ parent: 2:3d9a33b8d1e1
419 419 | | | | | parent: 5:4409d547b708
420 420 | | | | | user: test
421 421 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
422 422 | | | | | summary: (7) expand
423 423 | | | | |
424 424 +---o | | changeset: 6:b105a072e251
425 425 | |/ / / parent: 2:3d9a33b8d1e1
426 426 | | | | parent: 5:4409d547b708
427 427 | | | | user: test
428 428 | | | | date: Thu Jan 01 00:00:06 1970 +0000
429 429 | | | | summary: (6) merge two known; one immediate left, one far left
430 430 | | | |
431 431 | o | | changeset: 5:4409d547b708
432 432 | |\ \ \ parent: 3:27eef8ed80b4
433 433 | | | | | parent: 4:26a8bac39d9f
434 434 | | | | | user: test
435 435 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
436 436 | | | | | summary: (5) expand
437 437 | | | | |
438 438 | | o | | changeset: 4:26a8bac39d9f
439 439 | |/|/ / parent: 1:6db2ef61d156
440 440 | | | | parent: 3:27eef8ed80b4
441 441 | | | | user: test
442 442 | | | | date: Thu Jan 01 00:00:04 1970 +0000
443 443 | | | | summary: (4) merge two known; one immediate left, one immediate right
444 444 | | | |
445 445 | o | | changeset: 3:27eef8ed80b4
446 446 |/ / / user: test
447 447 | | | date: Thu Jan 01 00:00:03 1970 +0000
448 448 | | | summary: (3) collapse
449 449 | | |
450 450 o | | changeset: 2:3d9a33b8d1e1
451 451 |/ / user: test
452 452 | | date: Thu Jan 01 00:00:02 1970 +0000
453 453 | | summary: (2) collapse
454 454 | |
455 455 o | changeset: 1:6db2ef61d156
456 456 |/ user: test
457 457 | date: Thu Jan 01 00:00:01 1970 +0000
458 458 | summary: (1) collapse
459 459 |
460 460 o changeset: 0:e6eb3150255d
461 461 user: test
462 462 date: Thu Jan 01 00:00:00 1970 +0000
463 463 summary: (0) root
464 464
465 465
466 466 File glog:
467 467 $ hg glog a
468 468 @ changeset: 34:fea3ac5810e0
469 469 | tag: tip
470 470 | parent: 32:d06dffa21a31
471 471 | user: test
472 472 | date: Thu Jan 01 00:00:34 1970 +0000
473 473 | summary: (34) head
474 474 |
475 475 | o changeset: 33:68608f5145f9
476 476 | | parent: 18:1aa84d96232a
477 477 | | user: test
478 478 | | date: Thu Jan 01 00:00:33 1970 +0000
479 479 | | summary: (33) head
480 480 | |
481 481 o | changeset: 32:d06dffa21a31
482 482 |\ \ parent: 27:886ed638191b
483 483 | | | parent: 31:621d83e11f67
484 484 | | | user: test
485 485 | | | date: Thu Jan 01 00:00:32 1970 +0000
486 486 | | | summary: (32) expand
487 487 | | |
488 488 | o | changeset: 31:621d83e11f67
489 489 | |\ \ parent: 21:d42a756af44d
490 490 | | | | parent: 30:6e11cd4b648f
491 491 | | | | user: test
492 492 | | | | date: Thu Jan 01 00:00:31 1970 +0000
493 493 | | | | summary: (31) expand
494 494 | | | |
495 495 | | o | changeset: 30:6e11cd4b648f
496 496 | | |\ \ parent: 28:44ecd0b9ae99
497 497 | | | | | parent: 29:cd9bb2be7593
498 498 | | | | | user: test
499 499 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
500 500 | | | | | summary: (30) expand
501 501 | | | | |
502 502 | | | o | changeset: 29:cd9bb2be7593
503 503 | | | | | parent: 0:e6eb3150255d
504 504 | | | | | user: test
505 505 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
506 506 | | | | | summary: (29) regular commit
507 507 | | | | |
508 508 | | o | | changeset: 28:44ecd0b9ae99
509 509 | | |\ \ \ parent: 1:6db2ef61d156
510 510 | | | | | | parent: 26:7f25b6c2f0b9
511 511 | | | | | | user: test
512 512 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
513 513 | | | | | | summary: (28) merge zero known
514 514 | | | | | |
515 515 o | | | | | changeset: 27:886ed638191b
516 516 |/ / / / / parent: 21:d42a756af44d
517 517 | | | | | user: test
518 518 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
519 519 | | | | | summary: (27) collapse
520 520 | | | | |
521 521 | | o---+ changeset: 26:7f25b6c2f0b9
522 522 | | | | | parent: 18:1aa84d96232a
523 523 | | | | | parent: 25:91da8ed57247
524 524 | | | | | user: test
525 525 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
526 526 | | | | | summary: (26) merge one known; far right
527 527 | | | | |
528 528 +---o | | changeset: 25:91da8ed57247
529 529 | | | | | parent: 21:d42a756af44d
530 530 | | | | | parent: 24:a9c19a3d96b7
531 531 | | | | | user: test
532 532 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
533 533 | | | | | summary: (25) merge one known; far left
534 534 | | | | |
535 535 | | o | | changeset: 24:a9c19a3d96b7
536 536 | | |\| | parent: 0:e6eb3150255d
537 537 | | | | | parent: 23:a01cddf0766d
538 538 | | | | | user: test
539 539 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
540 540 | | | | | summary: (24) merge one known; immediate right
541 541 | | | | |
542 542 | | o | | changeset: 23:a01cddf0766d
543 543 | |/| | | parent: 1:6db2ef61d156
544 544 | | | | | parent: 22:e0d9cccacb5d
545 545 | | | | | user: test
546 546 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
547 547 | | | | | summary: (23) merge one known; immediate left
548 548 | | | | |
549 549 +---o---+ changeset: 22:e0d9cccacb5d
550 550 | | | | parent: 18:1aa84d96232a
551 551 | | / / parent: 21:d42a756af44d
552 552 | | | | user: test
553 553 | | | | date: Thu Jan 01 00:00:22 1970 +0000
554 554 | | | | summary: (22) merge two known; one far left, one far right
555 555 | | | |
556 556 o | | | changeset: 21:d42a756af44d
557 557 |\ \ \ \ parent: 19:31ddc2c1573b
558 558 | | | | | parent: 20:d30ed6450e32
559 559 | | | | | user: test
560 560 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
561 561 | | | | | summary: (21) expand
562 562 | | | | |
563 563 | o---+-+ changeset: 20:d30ed6450e32
564 564 | | | | parent: 0:e6eb3150255d
565 565 | / / / parent: 18:1aa84d96232a
566 566 | | | | user: test
567 567 | | | | date: Thu Jan 01 00:00:20 1970 +0000
568 568 | | | | summary: (20) merge two known; two far right
569 569 | | | |
570 570 o | | | changeset: 19:31ddc2c1573b
571 571 |\ \ \ \ parent: 15:1dda3f72782d
572 572 | | | | | parent: 17:44765d7c06e0
573 573 | | | | | user: test
574 574 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
575 575 | | | | | summary: (19) expand
576 576 | | | | |
577 577 +---+---o changeset: 18:1aa84d96232a
578 578 | | | | parent: 1:6db2ef61d156
579 579 | | | | parent: 15:1dda3f72782d
580 580 | | | | user: test
581 581 | | | | date: Thu Jan 01 00:00:18 1970 +0000
582 582 | | | | summary: (18) merge two known; two far left
583 583 | | | |
584 584 | o | | changeset: 17:44765d7c06e0
585 585 | |\ \ \ parent: 12:86b91144a6e9
586 586 | | | | | parent: 16:3677d192927d
587 587 | | | | | user: test
588 588 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
589 589 | | | | | summary: (17) expand
590 590 | | | | |
591 591 | | o---+ changeset: 16:3677d192927d
592 592 | | | | | parent: 0:e6eb3150255d
593 593 | | |/ / parent: 1:6db2ef61d156
594 594 | | | | user: test
595 595 | | | | date: Thu Jan 01 00:00:16 1970 +0000
596 596 | | | | summary: (16) merge two known; one immediate right, one near right
597 597 | | | |
598 598 o | | | changeset: 15:1dda3f72782d
599 599 |\ \ \ \ parent: 13:22d8966a97e3
600 600 | | | | | parent: 14:8eac370358ef
601 601 | | | | | user: test
602 602 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
603 603 | | | | | summary: (15) expand
604 604 | | | | |
605 605 | o-----+ changeset: 14:8eac370358ef
606 606 | | | | | parent: 0:e6eb3150255d
607 607 | |/ / / parent: 12:86b91144a6e9
608 608 | | | | user: test
609 609 | | | | date: Thu Jan 01 00:00:14 1970 +0000
610 610 | | | | summary: (14) merge two known; one immediate right, one far right
611 611 | | | |
612 612 o | | | changeset: 13:22d8966a97e3
613 613 |\ \ \ \ parent: 9:7010c0af0a35
614 614 | | | | | parent: 11:832d76e6bdf2
615 615 | | | | | user: test
616 616 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
617 617 | | | | | summary: (13) expand
618 618 | | | | |
619 619 +---o | | changeset: 12:86b91144a6e9
620 620 | | |/ / parent: 1:6db2ef61d156
621 621 | | | | parent: 9:7010c0af0a35
622 622 | | | | user: test
623 623 | | | | date: Thu Jan 01 00:00:12 1970 +0000
624 624 | | | | summary: (12) merge two known; one immediate right, one far left
625 625 | | | |
626 626 | o | | changeset: 11:832d76e6bdf2
627 627 | |\ \ \ parent: 6:b105a072e251
628 628 | | | | | parent: 10:74c64d036d72
629 629 | | | | | user: test
630 630 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
631 631 | | | | | summary: (11) expand
632 632 | | | | |
633 633 | | o---+ changeset: 10:74c64d036d72
634 634 | | | | | parent: 0:e6eb3150255d
635 635 | |/ / / parent: 6:b105a072e251
636 636 | | | | user: test
637 637 | | | | date: Thu Jan 01 00:00:10 1970 +0000
638 638 | | | | summary: (10) merge two known; one immediate left, one near right
639 639 | | | |
640 640 o | | | changeset: 9:7010c0af0a35
641 641 |\ \ \ \ parent: 7:b632bb1b1224
642 642 | | | | | parent: 8:7a0b11f71937
643 643 | | | | | user: test
644 644 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
645 645 | | | | | summary: (9) expand
646 646 | | | | |
647 647 | o-----+ changeset: 8:7a0b11f71937
648 648 | | | | | parent: 0:e6eb3150255d
649 649 |/ / / / parent: 7:b632bb1b1224
650 650 | | | | user: test
651 651 | | | | date: Thu Jan 01 00:00:08 1970 +0000
652 652 | | | | summary: (8) merge two known; one immediate left, one far right
653 653 | | | |
654 654 o | | | changeset: 7:b632bb1b1224
655 655 |\ \ \ \ parent: 2:3d9a33b8d1e1
656 656 | | | | | parent: 5:4409d547b708
657 657 | | | | | user: test
658 658 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
659 659 | | | | | summary: (7) expand
660 660 | | | | |
661 661 +---o | | changeset: 6:b105a072e251
662 662 | |/ / / parent: 2:3d9a33b8d1e1
663 663 | | | | parent: 5:4409d547b708
664 664 | | | | user: test
665 665 | | | | date: Thu Jan 01 00:00:06 1970 +0000
666 666 | | | | summary: (6) merge two known; one immediate left, one far left
667 667 | | | |
668 668 | o | | changeset: 5:4409d547b708
669 669 | |\ \ \ parent: 3:27eef8ed80b4
670 670 | | | | | parent: 4:26a8bac39d9f
671 671 | | | | | user: test
672 672 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
673 673 | | | | | summary: (5) expand
674 674 | | | | |
675 675 | | o | | changeset: 4:26a8bac39d9f
676 676 | |/|/ / parent: 1:6db2ef61d156
677 677 | | | | parent: 3:27eef8ed80b4
678 678 | | | | user: test
679 679 | | | | date: Thu Jan 01 00:00:04 1970 +0000
680 680 | | | | summary: (4) merge two known; one immediate left, one immediate right
681 681 | | | |
682 682 | o | | changeset: 3:27eef8ed80b4
683 683 |/ / / user: test
684 684 | | | date: Thu Jan 01 00:00:03 1970 +0000
685 685 | | | summary: (3) collapse
686 686 | | |
687 687 o | | changeset: 2:3d9a33b8d1e1
688 688 |/ / user: test
689 689 | | date: Thu Jan 01 00:00:02 1970 +0000
690 690 | | summary: (2) collapse
691 691 | |
692 692 o | changeset: 1:6db2ef61d156
693 693 |/ user: test
694 694 | date: Thu Jan 01 00:00:01 1970 +0000
695 695 | summary: (1) collapse
696 696 |
697 697 o changeset: 0:e6eb3150255d
698 698 user: test
699 699 date: Thu Jan 01 00:00:00 1970 +0000
700 700 summary: (0) root
701 701
702 702
703 703 File glog per revset:
704 704
705 705 $ hg glog -r 'file("a")'
706 706 @ changeset: 34:fea3ac5810e0
707 707 | tag: tip
708 708 | parent: 32:d06dffa21a31
709 709 | user: test
710 710 | date: Thu Jan 01 00:00:34 1970 +0000
711 711 | summary: (34) head
712 712 |
713 713 | o changeset: 33:68608f5145f9
714 714 | | parent: 18:1aa84d96232a
715 715 | | user: test
716 716 | | date: Thu Jan 01 00:00:33 1970 +0000
717 717 | | summary: (33) head
718 718 | |
719 719 o | changeset: 32:d06dffa21a31
720 720 |\ \ parent: 27:886ed638191b
721 721 | | | parent: 31:621d83e11f67
722 722 | | | user: test
723 723 | | | date: Thu Jan 01 00:00:32 1970 +0000
724 724 | | | summary: (32) expand
725 725 | | |
726 726 | o | changeset: 31:621d83e11f67
727 727 | |\ \ parent: 21:d42a756af44d
728 728 | | | | parent: 30:6e11cd4b648f
729 729 | | | | user: test
730 730 | | | | date: Thu Jan 01 00:00:31 1970 +0000
731 731 | | | | summary: (31) expand
732 732 | | | |
733 733 | | o | changeset: 30:6e11cd4b648f
734 734 | | |\ \ parent: 28:44ecd0b9ae99
735 735 | | | | | parent: 29:cd9bb2be7593
736 736 | | | | | user: test
737 737 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
738 738 | | | | | summary: (30) expand
739 739 | | | | |
740 740 | | | o | changeset: 29:cd9bb2be7593
741 741 | | | | | parent: 0:e6eb3150255d
742 742 | | | | | user: test
743 743 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
744 744 | | | | | summary: (29) regular commit
745 745 | | | | |
746 746 | | o | | changeset: 28:44ecd0b9ae99
747 747 | | |\ \ \ parent: 1:6db2ef61d156
748 748 | | | | | | parent: 26:7f25b6c2f0b9
749 749 | | | | | | user: test
750 750 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
751 751 | | | | | | summary: (28) merge zero known
752 752 | | | | | |
753 753 o | | | | | changeset: 27:886ed638191b
754 754 |/ / / / / parent: 21:d42a756af44d
755 755 | | | | | user: test
756 756 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
757 757 | | | | | summary: (27) collapse
758 758 | | | | |
759 759 | | o---+ changeset: 26:7f25b6c2f0b9
760 760 | | | | | parent: 18:1aa84d96232a
761 761 | | | | | parent: 25:91da8ed57247
762 762 | | | | | user: test
763 763 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
764 764 | | | | | summary: (26) merge one known; far right
765 765 | | | | |
766 766 +---o | | changeset: 25:91da8ed57247
767 767 | | | | | parent: 21:d42a756af44d
768 768 | | | | | parent: 24:a9c19a3d96b7
769 769 | | | | | user: test
770 770 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
771 771 | | | | | summary: (25) merge one known; far left
772 772 | | | | |
773 773 | | o | | changeset: 24:a9c19a3d96b7
774 774 | | |\| | parent: 0:e6eb3150255d
775 775 | | | | | parent: 23:a01cddf0766d
776 776 | | | | | user: test
777 777 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
778 778 | | | | | summary: (24) merge one known; immediate right
779 779 | | | | |
780 780 | | o | | changeset: 23:a01cddf0766d
781 781 | |/| | | parent: 1:6db2ef61d156
782 782 | | | | | parent: 22:e0d9cccacb5d
783 783 | | | | | user: test
784 784 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
785 785 | | | | | summary: (23) merge one known; immediate left
786 786 | | | | |
787 787 +---o---+ changeset: 22:e0d9cccacb5d
788 788 | | | | parent: 18:1aa84d96232a
789 789 | | / / parent: 21:d42a756af44d
790 790 | | | | user: test
791 791 | | | | date: Thu Jan 01 00:00:22 1970 +0000
792 792 | | | | summary: (22) merge two known; one far left, one far right
793 793 | | | |
794 794 o | | | changeset: 21:d42a756af44d
795 795 |\ \ \ \ parent: 19:31ddc2c1573b
796 796 | | | | | parent: 20:d30ed6450e32
797 797 | | | | | user: test
798 798 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
799 799 | | | | | summary: (21) expand
800 800 | | | | |
801 801 | o---+-+ changeset: 20:d30ed6450e32
802 802 | | | | parent: 0:e6eb3150255d
803 803 | / / / parent: 18:1aa84d96232a
804 804 | | | | user: test
805 805 | | | | date: Thu Jan 01 00:00:20 1970 +0000
806 806 | | | | summary: (20) merge two known; two far right
807 807 | | | |
808 808 o | | | changeset: 19:31ddc2c1573b
809 809 |\ \ \ \ parent: 15:1dda3f72782d
810 810 | | | | | parent: 17:44765d7c06e0
811 811 | | | | | user: test
812 812 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
813 813 | | | | | summary: (19) expand
814 814 | | | | |
815 815 +---+---o changeset: 18:1aa84d96232a
816 816 | | | | parent: 1:6db2ef61d156
817 817 | | | | parent: 15:1dda3f72782d
818 818 | | | | user: test
819 819 | | | | date: Thu Jan 01 00:00:18 1970 +0000
820 820 | | | | summary: (18) merge two known; two far left
821 821 | | | |
822 822 | o | | changeset: 17:44765d7c06e0
823 823 | |\ \ \ parent: 12:86b91144a6e9
824 824 | | | | | parent: 16:3677d192927d
825 825 | | | | | user: test
826 826 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
827 827 | | | | | summary: (17) expand
828 828 | | | | |
829 829 | | o---+ changeset: 16:3677d192927d
830 830 | | | | | parent: 0:e6eb3150255d
831 831 | | |/ / parent: 1:6db2ef61d156
832 832 | | | | user: test
833 833 | | | | date: Thu Jan 01 00:00:16 1970 +0000
834 834 | | | | summary: (16) merge two known; one immediate right, one near right
835 835 | | | |
836 836 o | | | changeset: 15:1dda3f72782d
837 837 |\ \ \ \ parent: 13:22d8966a97e3
838 838 | | | | | parent: 14:8eac370358ef
839 839 | | | | | user: test
840 840 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
841 841 | | | | | summary: (15) expand
842 842 | | | | |
843 843 | o-----+ changeset: 14:8eac370358ef
844 844 | | | | | parent: 0:e6eb3150255d
845 845 | |/ / / parent: 12:86b91144a6e9
846 846 | | | | user: test
847 847 | | | | date: Thu Jan 01 00:00:14 1970 +0000
848 848 | | | | summary: (14) merge two known; one immediate right, one far right
849 849 | | | |
850 850 o | | | changeset: 13:22d8966a97e3
851 851 |\ \ \ \ parent: 9:7010c0af0a35
852 852 | | | | | parent: 11:832d76e6bdf2
853 853 | | | | | user: test
854 854 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
855 855 | | | | | summary: (13) expand
856 856 | | | | |
857 857 +---o | | changeset: 12:86b91144a6e9
858 858 | | |/ / parent: 1:6db2ef61d156
859 859 | | | | parent: 9:7010c0af0a35
860 860 | | | | user: test
861 861 | | | | date: Thu Jan 01 00:00:12 1970 +0000
862 862 | | | | summary: (12) merge two known; one immediate right, one far left
863 863 | | | |
864 864 | o | | changeset: 11:832d76e6bdf2
865 865 | |\ \ \ parent: 6:b105a072e251
866 866 | | | | | parent: 10:74c64d036d72
867 867 | | | | | user: test
868 868 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
869 869 | | | | | summary: (11) expand
870 870 | | | | |
871 871 | | o---+ changeset: 10:74c64d036d72
872 872 | | | | | parent: 0:e6eb3150255d
873 873 | |/ / / parent: 6:b105a072e251
874 874 | | | | user: test
875 875 | | | | date: Thu Jan 01 00:00:10 1970 +0000
876 876 | | | | summary: (10) merge two known; one immediate left, one near right
877 877 | | | |
878 878 o | | | changeset: 9:7010c0af0a35
879 879 |\ \ \ \ parent: 7:b632bb1b1224
880 880 | | | | | parent: 8:7a0b11f71937
881 881 | | | | | user: test
882 882 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
883 883 | | | | | summary: (9) expand
884 884 | | | | |
885 885 | o-----+ changeset: 8:7a0b11f71937
886 886 | | | | | parent: 0:e6eb3150255d
887 887 |/ / / / parent: 7:b632bb1b1224
888 888 | | | | user: test
889 889 | | | | date: Thu Jan 01 00:00:08 1970 +0000
890 890 | | | | summary: (8) merge two known; one immediate left, one far right
891 891 | | | |
892 892 o | | | changeset: 7:b632bb1b1224
893 893 |\ \ \ \ parent: 2:3d9a33b8d1e1
894 894 | | | | | parent: 5:4409d547b708
895 895 | | | | | user: test
896 896 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
897 897 | | | | | summary: (7) expand
898 898 | | | | |
899 899 +---o | | changeset: 6:b105a072e251
900 900 | |/ / / parent: 2:3d9a33b8d1e1
901 901 | | | | parent: 5:4409d547b708
902 902 | | | | user: test
903 903 | | | | date: Thu Jan 01 00:00:06 1970 +0000
904 904 | | | | summary: (6) merge two known; one immediate left, one far left
905 905 | | | |
906 906 | o | | changeset: 5:4409d547b708
907 907 | |\ \ \ parent: 3:27eef8ed80b4
908 908 | | | | | parent: 4:26a8bac39d9f
909 909 | | | | | user: test
910 910 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
911 911 | | | | | summary: (5) expand
912 912 | | | | |
913 913 | | o | | changeset: 4:26a8bac39d9f
914 914 | |/|/ / parent: 1:6db2ef61d156
915 915 | | | | parent: 3:27eef8ed80b4
916 916 | | | | user: test
917 917 | | | | date: Thu Jan 01 00:00:04 1970 +0000
918 918 | | | | summary: (4) merge two known; one immediate left, one immediate right
919 919 | | | |
920 920 | o | | changeset: 3:27eef8ed80b4
921 921 |/ / / user: test
922 922 | | | date: Thu Jan 01 00:00:03 1970 +0000
923 923 | | | summary: (3) collapse
924 924 | | |
925 925 o | | changeset: 2:3d9a33b8d1e1
926 926 |/ / user: test
927 927 | | date: Thu Jan 01 00:00:02 1970 +0000
928 928 | | summary: (2) collapse
929 929 | |
930 930 o | changeset: 1:6db2ef61d156
931 931 |/ user: test
932 932 | date: Thu Jan 01 00:00:01 1970 +0000
933 933 | summary: (1) collapse
934 934 |
935 935 o changeset: 0:e6eb3150255d
936 936 user: test
937 937 date: Thu Jan 01 00:00:00 1970 +0000
938 938 summary: (0) root
939 939
940 940
941 941
942 942 File glog per revset (only merges):
943 943
944 944 $ hg log -G -r 'file("a")' -m
945 945 o changeset: 32:d06dffa21a31
946 946 |\ parent: 27:886ed638191b
947 947 | | parent: 31:621d83e11f67
948 948 | | user: test
949 949 | | date: Thu Jan 01 00:00:32 1970 +0000
950 950 | | summary: (32) expand
951 951 | |
952 952 o | changeset: 31:621d83e11f67
953 953 |\| parent: 21:d42a756af44d
954 954 | | parent: 30:6e11cd4b648f
955 955 | | user: test
956 956 | | date: Thu Jan 01 00:00:31 1970 +0000
957 957 | | summary: (31) expand
958 958 | |
959 959 o | changeset: 30:6e11cd4b648f
960 960 |\ \ parent: 28:44ecd0b9ae99
961 961 | | | parent: 29:cd9bb2be7593
962 962 | | | user: test
963 963 | | | date: Thu Jan 01 00:00:30 1970 +0000
964 964 | | | summary: (30) expand
965 965 | | |
966 966 o | | changeset: 28:44ecd0b9ae99
967 967 |\ \ \ parent: 1:6db2ef61d156
968 968 | | | | parent: 26:7f25b6c2f0b9
969 969 | | | | user: test
970 970 | | | | date: Thu Jan 01 00:00:28 1970 +0000
971 971 | | | | summary: (28) merge zero known
972 972 | | | |
973 973 o | | | changeset: 26:7f25b6c2f0b9
974 974 |\ \ \ \ parent: 18:1aa84d96232a
975 975 | | | | | parent: 25:91da8ed57247
976 976 | | | | | user: test
977 977 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
978 978 | | | | | summary: (26) merge one known; far right
979 979 | | | | |
980 980 | o-----+ changeset: 25:91da8ed57247
981 981 | | | | | parent: 21:d42a756af44d
982 982 | | | | | parent: 24:a9c19a3d96b7
983 983 | | | | | user: test
984 984 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
985 985 | | | | | summary: (25) merge one known; far left
986 986 | | | | |
987 987 | o | | | changeset: 24:a9c19a3d96b7
988 988 | |\ \ \ \ parent: 0:e6eb3150255d
989 989 | | | | | | parent: 23:a01cddf0766d
990 990 | | | | | | user: test
991 991 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
992 992 | | | | | | summary: (24) merge one known; immediate right
993 993 | | | | | |
994 994 | o---+ | | changeset: 23:a01cddf0766d
995 995 | | | | | | parent: 1:6db2ef61d156
996 996 | | | | | | parent: 22:e0d9cccacb5d
997 997 | | | | | | user: test
998 998 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
999 999 | | | | | | summary: (23) merge one known; immediate left
1000 1000 | | | | | |
1001 1001 | o-------+ changeset: 22:e0d9cccacb5d
1002 1002 | | | | | | parent: 18:1aa84d96232a
1003 1003 |/ / / / / parent: 21:d42a756af44d
1004 1004 | | | | | user: test
1005 1005 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
1006 1006 | | | | | summary: (22) merge two known; one far left, one far right
1007 1007 | | | | |
1008 1008 | | | | o changeset: 21:d42a756af44d
1009 1009 | | | | |\ parent: 19:31ddc2c1573b
1010 1010 | | | | | | parent: 20:d30ed6450e32
1011 1011 | | | | | | user: test
1012 1012 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
1013 1013 | | | | | | summary: (21) expand
1014 1014 | | | | | |
1015 1015 +-+-------o changeset: 20:d30ed6450e32
1016 1016 | | | | | parent: 0:e6eb3150255d
1017 1017 | | | | | parent: 18:1aa84d96232a
1018 1018 | | | | | user: test
1019 1019 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
1020 1020 | | | | | summary: (20) merge two known; two far right
1021 1021 | | | | |
1022 1022 | | | | o changeset: 19:31ddc2c1573b
1023 1023 | | | | |\ parent: 15:1dda3f72782d
1024 1024 | | | | | | parent: 17:44765d7c06e0
1025 1025 | | | | | | user: test
1026 1026 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
1027 1027 | | | | | | summary: (19) expand
1028 1028 | | | | | |
1029 1029 o---+---+ | changeset: 18:1aa84d96232a
1030 1030 | | | | | parent: 1:6db2ef61d156
1031 1031 / / / / / parent: 15:1dda3f72782d
1032 1032 | | | | | user: test
1033 1033 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
1034 1034 | | | | | summary: (18) merge two known; two far left
1035 1035 | | | | |
1036 1036 | | | | o changeset: 17:44765d7c06e0
1037 1037 | | | | |\ parent: 12:86b91144a6e9
1038 1038 | | | | | | parent: 16:3677d192927d
1039 1039 | | | | | | user: test
1040 1040 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
1041 1041 | | | | | | summary: (17) expand
1042 1042 | | | | | |
1043 1043 +-+-------o changeset: 16:3677d192927d
1044 1044 | | | | | parent: 0:e6eb3150255d
1045 1045 | | | | | parent: 1:6db2ef61d156
1046 1046 | | | | | user: test
1047 1047 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
1048 1048 | | | | | summary: (16) merge two known; one immediate right, one near right
1049 1049 | | | | |
1050 1050 | | | o | changeset: 15:1dda3f72782d
1051 1051 | | | |\ \ parent: 13:22d8966a97e3
1052 1052 | | | | | | parent: 14:8eac370358ef
1053 1053 | | | | | | user: test
1054 1054 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
1055 1055 | | | | | | summary: (15) expand
1056 1056 | | | | | |
1057 1057 +-------o | changeset: 14:8eac370358ef
1058 1058 | | | | |/ parent: 0:e6eb3150255d
1059 1059 | | | | | parent: 12:86b91144a6e9
1060 1060 | | | | | user: test
1061 1061 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
1062 1062 | | | | | summary: (14) merge two known; one immediate right, one far right
1063 1063 | | | | |
1064 1064 | | | o | changeset: 13:22d8966a97e3
1065 1065 | | | |\ \ parent: 9:7010c0af0a35
1066 1066 | | | | | | parent: 11:832d76e6bdf2
1067 1067 | | | | | | user: test
1068 1068 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
1069 1069 | | | | | | summary: (13) expand
1070 1070 | | | | | |
1071 1071 | +---+---o changeset: 12:86b91144a6e9
1072 1072 | | | | | parent: 1:6db2ef61d156
1073 1073 | | | | | parent: 9:7010c0af0a35
1074 1074 | | | | | user: test
1075 1075 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
1076 1076 | | | | | summary: (12) merge two known; one immediate right, one far left
1077 1077 | | | | |
1078 1078 | | | | o changeset: 11:832d76e6bdf2
1079 1079 | | | | |\ parent: 6:b105a072e251
1080 1080 | | | | | | parent: 10:74c64d036d72
1081 1081 | | | | | | user: test
1082 1082 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
1083 1083 | | | | | | summary: (11) expand
1084 1084 | | | | | |
1085 1085 +---------o changeset: 10:74c64d036d72
1086 1086 | | | | |/ parent: 0:e6eb3150255d
1087 1087 | | | | | parent: 6:b105a072e251
1088 1088 | | | | | user: test
1089 1089 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
1090 1090 | | | | | summary: (10) merge two known; one immediate left, one near right
1091 1091 | | | | |
1092 1092 | | | o | changeset: 9:7010c0af0a35
1093 1093 | | | |\ \ parent: 7:b632bb1b1224
1094 1094 | | | | | | parent: 8:7a0b11f71937
1095 1095 | | | | | | user: test
1096 1096 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
1097 1097 | | | | | | summary: (9) expand
1098 1098 | | | | | |
1099 1099 +-------o | changeset: 8:7a0b11f71937
1100 1100 | | | |/ / parent: 0:e6eb3150255d
1101 1101 | | | | | parent: 7:b632bb1b1224
1102 1102 | | | | | user: test
1103 1103 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
1104 1104 | | | | | summary: (8) merge two known; one immediate left, one far right
1105 1105 | | | | |
1106 1106 | | | o | changeset: 7:b632bb1b1224
1107 1107 | | | |\ \ parent: 2:3d9a33b8d1e1
1108 1108 | | | | | | parent: 5:4409d547b708
1109 1109 | | | | | | user: test
1110 1110 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
1111 1111 | | | | | | summary: (7) expand
1112 1112 | | | | | |
1113 1113 | | | +---o changeset: 6:b105a072e251
1114 1114 | | | | |/ parent: 2:3d9a33b8d1e1
1115 1115 | | | | | parent: 5:4409d547b708
1116 1116 | | | | | user: test
1117 1117 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
1118 1118 | | | | | summary: (6) merge two known; one immediate left, one far left
1119 1119 | | | | |
1120 1120 | | | o | changeset: 5:4409d547b708
1121 1121 | | | |\ \ parent: 3:27eef8ed80b4
1122 1122 | | | | | | parent: 4:26a8bac39d9f
1123 1123 | | | | | | user: test
1124 1124 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
1125 1125 | | | | | | summary: (5) expand
1126 1126 | | | | | |
1127 1127 | +---o | | changeset: 4:26a8bac39d9f
1128 1128 | | | |/ / parent: 1:6db2ef61d156
1129 1129 | | | | | parent: 3:27eef8ed80b4
1130 1130 | | | | | user: test
1131 1131 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
1132 1132 | | | | | summary: (4) merge two known; one immediate left, one immediate right
1133 1133 | | | | |
1134 1134
1135 1135
1136 1136 Empty revision range - display nothing:
1137 1137 $ hg glog -r 1..0
1138 1138
1139 1139 From outer space:
1140 1140 $ cd ..
1141 1141 $ hg glog -l1 repo
1142 1142 @ changeset: 34:fea3ac5810e0
1143 1143 | tag: tip
1144 1144 | parent: 32:d06dffa21a31
1145 1145 | user: test
1146 1146 | date: Thu Jan 01 00:00:34 1970 +0000
1147 1147 | summary: (34) head
1148 1148 |
1149 1149 $ hg glog -l1 repo/a
1150 1150 @ changeset: 34:fea3ac5810e0
1151 1151 | tag: tip
1152 1152 | parent: 32:d06dffa21a31
1153 1153 | user: test
1154 1154 | date: Thu Jan 01 00:00:34 1970 +0000
1155 1155 | summary: (34) head
1156 1156 |
1157 1157 $ hg glog -l1 repo/missing
1158 1158
1159 1159 File log with revs != cset revs:
1160 1160 $ hg init flog
1161 1161 $ cd flog
1162 1162 $ echo one >one
1163 1163 $ hg add one
1164 1164 $ hg commit -mone
1165 1165 $ echo two >two
1166 1166 $ hg add two
1167 1167 $ hg commit -mtwo
1168 1168 $ echo more >two
1169 1169 $ hg commit -mmore
1170 1170 $ hg glog two
1171 1171 @ changeset: 2:12c28321755b
1172 1172 | tag: tip
1173 1173 | user: test
1174 1174 | date: Thu Jan 01 00:00:00 1970 +0000
1175 1175 | summary: more
1176 1176 |
1177 1177 o changeset: 1:5ac72c0599bf
1178 1178 | user: test
1179 1179 | date: Thu Jan 01 00:00:00 1970 +0000
1180 1180 | summary: two
1181 1181 |
1182 1182
1183 1183 Issue1896: File log with explicit style
1184 1184 $ hg glog --style=default one
1185 1185 o changeset: 0:3d578b4a1f53
1186 1186 user: test
1187 1187 date: Thu Jan 01 00:00:00 1970 +0000
1188 1188 summary: one
1189 1189
1190 1190 Issue2395: glog --style header and footer
1191 1191 $ hg glog --style=xml one
1192 1192 <?xml version="1.0"?>
1193 1193 <log>
1194 1194 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1195 1195 <author email="test">test</author>
1196 1196 <date>1970-01-01T00:00:00+00:00</date>
1197 1197 <msg xml:space="preserve">one</msg>
1198 1198 </logentry>
1199 1199 </log>
1200 1200
1201 1201 $ cd ..
1202 1202
1203 1203 Incoming and outgoing:
1204 1204
1205 1205 $ hg clone -U -r31 repo repo2
1206 1206 adding changesets
1207 1207 adding manifests
1208 1208 adding file changes
1209 1209 added 31 changesets with 31 changes to 1 files
1210 1210 $ cd repo2
1211 1211
1212 1212 $ hg incoming --graph ../repo
1213 1213 comparing with ../repo
1214 1214 searching for changes
1215 1215 o changeset: 34:fea3ac5810e0
1216 1216 | tag: tip
1217 1217 | parent: 32:d06dffa21a31
1218 1218 | user: test
1219 1219 | date: Thu Jan 01 00:00:34 1970 +0000
1220 1220 | summary: (34) head
1221 1221 |
1222 1222 | o changeset: 33:68608f5145f9
1223 1223 | parent: 18:1aa84d96232a
1224 1224 | user: test
1225 1225 | date: Thu Jan 01 00:00:33 1970 +0000
1226 1226 | summary: (33) head
1227 1227 |
1228 1228 o changeset: 32:d06dffa21a31
1229 1229 | parent: 27:886ed638191b
1230 1230 | parent: 31:621d83e11f67
1231 1231 | user: test
1232 1232 | date: Thu Jan 01 00:00:32 1970 +0000
1233 1233 | summary: (32) expand
1234 1234 |
1235 1235 o changeset: 27:886ed638191b
1236 1236 parent: 21:d42a756af44d
1237 1237 user: test
1238 1238 date: Thu Jan 01 00:00:27 1970 +0000
1239 1239 summary: (27) collapse
1240 1240
1241 1241 $ cd ..
1242 1242
1243 1243 $ hg -R repo outgoing --graph repo2
1244 1244 comparing with repo2
1245 1245 searching for changes
1246 1246 @ changeset: 34:fea3ac5810e0
1247 1247 | tag: tip
1248 1248 | parent: 32:d06dffa21a31
1249 1249 | user: test
1250 1250 | date: Thu Jan 01 00:00:34 1970 +0000
1251 1251 | summary: (34) head
1252 1252 |
1253 1253 | o changeset: 33:68608f5145f9
1254 1254 | parent: 18:1aa84d96232a
1255 1255 | user: test
1256 1256 | date: Thu Jan 01 00:00:33 1970 +0000
1257 1257 | summary: (33) head
1258 1258 |
1259 1259 o changeset: 32:d06dffa21a31
1260 1260 | parent: 27:886ed638191b
1261 1261 | parent: 31:621d83e11f67
1262 1262 | user: test
1263 1263 | date: Thu Jan 01 00:00:32 1970 +0000
1264 1264 | summary: (32) expand
1265 1265 |
1266 1266 o changeset: 27:886ed638191b
1267 1267 parent: 21:d42a756af44d
1268 1268 user: test
1269 1269 date: Thu Jan 01 00:00:27 1970 +0000
1270 1270 summary: (27) collapse
1271 1271
1272 1272
1273 1273 File + limit with revs != cset revs:
1274 1274 $ cd repo
1275 1275 $ touch b
1276 1276 $ hg ci -Aqm0
1277 1277 $ hg glog -l2 a
1278 1278 o changeset: 34:fea3ac5810e0
1279 1279 | parent: 32:d06dffa21a31
1280 1280 | user: test
1281 1281 | date: Thu Jan 01 00:00:34 1970 +0000
1282 1282 | summary: (34) head
1283 1283 |
1284 1284 | o changeset: 33:68608f5145f9
1285 1285 | | parent: 18:1aa84d96232a
1286 1286 | | user: test
1287 1287 | | date: Thu Jan 01 00:00:33 1970 +0000
1288 1288 | | summary: (33) head
1289 1289 | |
1290 1290
1291 1291 File + limit + -ra:b, (b - a) < limit:
1292 1292 $ hg glog -l3000 -r32:tip a
1293 1293 o changeset: 34:fea3ac5810e0
1294 1294 | parent: 32:d06dffa21a31
1295 1295 | user: test
1296 1296 | date: Thu Jan 01 00:00:34 1970 +0000
1297 1297 | summary: (34) head
1298 1298 |
1299 1299 | o changeset: 33:68608f5145f9
1300 1300 | | parent: 18:1aa84d96232a
1301 1301 | | user: test
1302 1302 | | date: Thu Jan 01 00:00:33 1970 +0000
1303 1303 | | summary: (33) head
1304 1304 | |
1305 1305 o | changeset: 32:d06dffa21a31
1306 1306 |\ \ parent: 27:886ed638191b
1307 1307 | | | parent: 31:621d83e11f67
1308 1308 | | | user: test
1309 1309 | | | date: Thu Jan 01 00:00:32 1970 +0000
1310 1310 | | | summary: (32) expand
1311 1311 | | |
1312 1312
1313 1313 Point out a common and an uncommon unshown parent
1314 1314
1315 1315 $ hg glog -r 'rev(8) or rev(9)'
1316 1316 o changeset: 9:7010c0af0a35
1317 1317 |\ parent: 7:b632bb1b1224
1318 1318 | | parent: 8:7a0b11f71937
1319 1319 | | user: test
1320 1320 | | date: Thu Jan 01 00:00:09 1970 +0000
1321 1321 | | summary: (9) expand
1322 1322 | |
1323 1323 o | changeset: 8:7a0b11f71937
1324 1324 |\| parent: 0:e6eb3150255d
1325 1325 | | parent: 7:b632bb1b1224
1326 1326 | | user: test
1327 1327 | | date: Thu Jan 01 00:00:08 1970 +0000
1328 1328 | | summary: (8) merge two known; one immediate left, one far right
1329 1329 | |
1330 1330
1331 1331 File + limit + -ra:b, b < tip:
1332 1332
1333 1333 $ hg glog -l1 -r32:34 a
1334 1334 o changeset: 34:fea3ac5810e0
1335 1335 | parent: 32:d06dffa21a31
1336 1336 | user: test
1337 1337 | date: Thu Jan 01 00:00:34 1970 +0000
1338 1338 | summary: (34) head
1339 1339 |
1340 1340
1341 1341 file(File) + limit + -ra:b, b < tip:
1342 1342
1343 1343 $ hg glog -l1 -r32:34 -r 'file("a")'
1344 1344 o changeset: 34:fea3ac5810e0
1345 1345 | parent: 32:d06dffa21a31
1346 1346 | user: test
1347 1347 | date: Thu Jan 01 00:00:34 1970 +0000
1348 1348 | summary: (34) head
1349 1349 |
1350 1350
1351 1351 limit(file(File) and a::b), b < tip:
1352 1352
1353 1353 $ hg glog -r 'limit(file("a") and 32::34, 1)'
1354 1354 o changeset: 32:d06dffa21a31
1355 1355 |\ parent: 27:886ed638191b
1356 1356 | | parent: 31:621d83e11f67
1357 1357 | | user: test
1358 1358 | | date: Thu Jan 01 00:00:32 1970 +0000
1359 1359 | | summary: (32) expand
1360 1360 | |
1361 1361
1362 1362 File + limit + -ra:b, b < tip:
1363 1363
1364 1364 $ hg glog -r 'limit(file("a") and 34::32, 1)'
1365 1365
1366 1366 File + limit + -ra:b, b < tip, (b - a) < limit:
1367 1367
1368 1368 $ hg glog -l10 -r33:34 a
1369 1369 o changeset: 34:fea3ac5810e0
1370 1370 | parent: 32:d06dffa21a31
1371 1371 | user: test
1372 1372 | date: Thu Jan 01 00:00:34 1970 +0000
1373 1373 | summary: (34) head
1374 1374 |
1375 1375 | o changeset: 33:68608f5145f9
1376 1376 | | parent: 18:1aa84d96232a
1377 1377 | | user: test
1378 1378 | | date: Thu Jan 01 00:00:33 1970 +0000
1379 1379 | | summary: (33) head
1380 1380 | |
1381 1381
1382 1382 Do not crash or produce strange graphs if history is buggy
1383 1383
1384 1384 $ hg branch branch
1385 1385 marked working directory as branch branch
1386 1386 (branches are permanent and global, did you want a bookmark?)
1387 1387 $ commit 36 "buggy merge: identical parents" 35 35
1388 1388 $ hg glog -l5
1389 1389 @ changeset: 36:08a19a744424
1390 1390 | branch: branch
1391 1391 | tag: tip
1392 1392 | parent: 35:9159c3644c5e
1393 1393 | parent: 35:9159c3644c5e
1394 1394 | user: test
1395 1395 | date: Thu Jan 01 00:00:36 1970 +0000
1396 1396 | summary: (36) buggy merge: identical parents
1397 1397 |
1398 1398 o changeset: 35:9159c3644c5e
1399 1399 | user: test
1400 1400 | date: Thu Jan 01 00:00:00 1970 +0000
1401 1401 | summary: 0
1402 1402 |
1403 1403 o changeset: 34:fea3ac5810e0
1404 1404 | parent: 32:d06dffa21a31
1405 1405 | user: test
1406 1406 | date: Thu Jan 01 00:00:34 1970 +0000
1407 1407 | summary: (34) head
1408 1408 |
1409 1409 | o changeset: 33:68608f5145f9
1410 1410 | | parent: 18:1aa84d96232a
1411 1411 | | user: test
1412 1412 | | date: Thu Jan 01 00:00:33 1970 +0000
1413 1413 | | summary: (33) head
1414 1414 | |
1415 1415 o | changeset: 32:d06dffa21a31
1416 1416 |\ \ parent: 27:886ed638191b
1417 1417 | | | parent: 31:621d83e11f67
1418 1418 | | | user: test
1419 1419 | | | date: Thu Jan 01 00:00:32 1970 +0000
1420 1420 | | | summary: (32) expand
1421 1421 | | |
1422 1422
1423 1423 Test log -G options
1424 1424
1425 1425 $ testlog() {
1426 1426 > hg log -G --print-revset "$@"
1427 1427 > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
1428 1428 > | sed 's/.*nodetag/nodetag/' > log.nodes
1429 1429 > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
1430 1430 > | sed 's/.*nodetag/nodetag/' > glog.nodes
1431 > diff -u log.nodes glog.nodes
1431 > diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :
1432 1432 > }
1433 1433
1434 1434 glog always reorders nodes which explains the difference with log
1435 1435
1436 1436 $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
1437 1437 ['27', '25', '21', '34', '32', '31']
1438 1438 []
1439 1439 --- log.nodes * (glob)
1440 1440 +++ glog.nodes * (glob)
1441 1441 @@ -1,6 +1,6 @@
1442 1442 -nodetag 27
1443 1443 -nodetag 25
1444 1444 -nodetag 21
1445 1445 nodetag 34
1446 1446 nodetag 32
1447 1447 nodetag 31
1448 1448 +nodetag 27
1449 1449 +nodetag 25
1450 1450 +nodetag 21
1451 [1]
1452 1451 $ testlog -u test -u not-a-user
1453 1452 []
1454 1453 (group
1455 1454 (group
1456 1455 (or
1457 1456 (func
1458 1457 ('symbol', 'user')
1459 1458 ('string', 'test'))
1460 1459 (func
1461 1460 ('symbol', 'user')
1462 1461 ('string', 'not-a-user')))))
1463 1462 $ testlog -b not-a-branch
1464 1463 abort: unknown revision 'not-a-branch'!
1465 1464 abort: unknown revision 'not-a-branch'!
1466 1465 abort: unknown revision 'not-a-branch'!
1467 1466 $ testlog -b 35 -b 36 --only-branch branch
1468 1467 []
1469 1468 (group
1470 1469 (group
1471 1470 (or
1472 1471 (or
1473 1472 (func
1474 1473 ('symbol', 'branch')
1475 1474 ('string', 'default'))
1476 1475 (func
1477 1476 ('symbol', 'branch')
1478 1477 ('string', 'branch')))
1479 1478 (func
1480 1479 ('symbol', 'branch')
1481 1480 ('string', 'branch')))))
1482 1481 $ testlog -k expand -k merge
1483 1482 []
1484 1483 (group
1485 1484 (group
1486 1485 (or
1487 1486 (func
1488 1487 ('symbol', 'keyword')
1489 1488 ('string', 'expand'))
1490 1489 (func
1491 1490 ('symbol', 'keyword')
1492 1491 ('string', 'merge')))))
1493 1492 $ testlog --only-merges
1494 1493 []
1495 1494 (group
1496 1495 (func
1497 1496 ('symbol', 'merge')
1498 1497 None))
1499 1498 $ testlog --no-merges
1500 1499 []
1501 1500 (group
1502 1501 (not
1503 1502 (func
1504 1503 ('symbol', 'merge')
1505 1504 None)))
1506 1505 $ testlog --date '2 0 to 4 0'
1507 1506 []
1508 1507 (group
1509 1508 (func
1510 1509 ('symbol', 'date')
1511 1510 ('string', '2 0 to 4 0')))
1512 1511 $ hg log -G -d 'brace ) in a date'
1513 1512 abort: invalid date: 'brace ) in a date'
1514 1513 [255]
1515 1514 $ testlog --prune 31 --prune 32
1516 1515 []
1517 1516 (group
1518 1517 (group
1519 1518 (and
1520 1519 (not
1521 1520 (group
1522 1521 (or
1523 1522 ('string', '31')
1524 1523 (func
1525 1524 ('symbol', 'ancestors')
1526 1525 ('string', '31')))))
1527 1526 (not
1528 1527 (group
1529 1528 (or
1530 1529 ('string', '32')
1531 1530 (func
1532 1531 ('symbol', 'ancestors')
1533 1532 ('string', '32'))))))))
1534 1533
1535 1534 Dedicated repo for --follow and paths filtering. The g is crafted to
1536 1535 have 2 filelog topological heads in a linear changeset graph.
1537 1536
1538 1537 $ cd ..
1539 1538 $ hg init follow
1540 1539 $ cd follow
1541 1540 $ testlog --follow
1542 1541 []
1543 1542 []
1544 1543 $ echo a > a
1545 1544 $ echo aa > aa
1546 1545 $ echo f > f
1547 1546 $ hg ci -Am "add a" a aa f
1548 1547 $ hg cp a b
1549 1548 $ hg cp f g
1550 1549 $ hg ci -m "copy a b"
1551 1550 $ mkdir dir
1552 1551 $ hg mv b dir
1553 1552 $ echo g >> g
1554 1553 $ echo f >> f
1555 1554 $ hg ci -m "mv b dir/b"
1556 1555 $ hg mv a b
1557 1556 $ hg cp -f f g
1558 1557 $ echo a > d
1559 1558 $ hg add d
1560 1559 $ hg ci -m "mv a b; add d"
1561 1560 $ hg mv dir/b e
1562 1561 $ hg ci -m "mv dir/b e"
1563 1562 $ hg glog --template '({rev}) {desc|firstline}\n'
1564 1563 @ (4) mv dir/b e
1565 1564 |
1566 1565 o (3) mv a b; add d
1567 1566 |
1568 1567 o (2) mv b dir/b
1569 1568 |
1570 1569 o (1) copy a b
1571 1570 |
1572 1571 o (0) add a
1573 1572
1574 1573
1575 1574 $ testlog a
1576 1575 []
1577 1576 (group
1578 1577 (group
1579 1578 (func
1580 1579 ('symbol', 'filelog')
1581 1580 ('string', 'a'))))
1582 1581 $ testlog a b
1583 1582 []
1584 1583 (group
1585 1584 (group
1586 1585 (or
1587 1586 (func
1588 1587 ('symbol', 'filelog')
1589 1588 ('string', 'a'))
1590 1589 (func
1591 1590 ('symbol', 'filelog')
1592 1591 ('string', 'b')))))
1593 1592
1594 1593 Test falling back to slow path for non-existing files
1595 1594
1596 1595 $ testlog a c
1597 1596 []
1598 1597 (group
1599 1598 (func
1600 1599 ('symbol', '_matchfiles')
1601 1600 (list
1602 1601 (list
1603 1602 (list
1604 1603 ('string', 'r:')
1605 1604 ('string', 'd:relpath'))
1606 1605 ('string', 'p:a'))
1607 1606 ('string', 'p:c'))))
1608 1607
1609 1608 Test multiple --include/--exclude/paths
1610 1609
1611 1610 $ testlog --include a --include e --exclude b --exclude e a e
1612 1611 []
1613 1612 (group
1614 1613 (func
1615 1614 ('symbol', '_matchfiles')
1616 1615 (list
1617 1616 (list
1618 1617 (list
1619 1618 (list
1620 1619 (list
1621 1620 (list
1622 1621 (list
1623 1622 ('string', 'r:')
1624 1623 ('string', 'd:relpath'))
1625 1624 ('string', 'p:a'))
1626 1625 ('string', 'p:e'))
1627 1626 ('string', 'i:a'))
1628 1627 ('string', 'i:e'))
1629 1628 ('string', 'x:b'))
1630 1629 ('string', 'x:e'))))
1631 1630
1632 1631 Test glob expansion of pats
1633 1632
1634 1633 $ expandglobs=`python -c "import mercurial.util; \
1635 1634 > print mercurial.util.expandglobs and 'true' or 'false'"`
1636 1635 $ if [ $expandglobs = "true" ]; then
1637 1636 > testlog 'a*';
1638 1637 > else
1639 1638 > testlog a*;
1640 1639 > fi;
1641 1640 []
1642 1641 (group
1643 1642 (group
1644 1643 (func
1645 1644 ('symbol', 'filelog')
1646 1645 ('string', 'aa'))))
1647 1646
1648 1647 Test --follow on a directory
1649 1648
1650 1649 $ testlog -f dir
1651 1650 abort: cannot follow file not in parent revision: "dir"
1652 1651 abort: cannot follow file not in parent revision: "dir"
1653 1652 abort: cannot follow file not in parent revision: "dir"
1654 1653
1655 1654 Test --follow on file not in parent revision
1656 1655
1657 1656 $ testlog -f a
1658 1657 abort: cannot follow file not in parent revision: "a"
1659 1658 abort: cannot follow file not in parent revision: "a"
1660 1659 abort: cannot follow file not in parent revision: "a"
1661 1660
1662 1661 Test --follow and patterns
1663 1662
1664 1663 $ testlog -f 'glob:*'
1665 1664 abort: can only follow copies/renames for explicit filenames
1666 1665 abort: can only follow copies/renames for explicit filenames
1667 1666 abort: can only follow copies/renames for explicit filenames
1668 1667
1669 1668 Test --follow on a single rename
1670 1669
1671 1670 $ hg up -q 2
1672 1671 $ testlog -f a
1673 1672 []
1674 1673 (group
1675 1674 (group
1676 1675 (func
1677 1676 ('symbol', 'follow')
1678 1677 ('string', 'a'))))
1679 1678
1680 1679 Test --follow and multiple renames
1681 1680
1682 1681 $ hg up -q tip
1683 1682 $ testlog -f e
1684 1683 []
1685 1684 (group
1686 1685 (group
1687 1686 (func
1688 1687 ('symbol', 'follow')
1689 1688 ('string', 'e'))))
1690 1689
1691 1690 Test --follow and multiple filelog heads
1692 1691
1693 1692 $ hg up -q 2
1694 1693 $ testlog -f g
1695 1694 []
1696 1695 (group
1697 1696 (group
1698 1697 (func
1699 1698 ('symbol', 'follow')
1700 1699 ('string', 'g'))))
1701 1700 $ cat log.nodes
1702 1701 nodetag 2
1703 1702 nodetag 1
1704 1703 nodetag 0
1705 1704 $ hg up -q tip
1706 1705 $ testlog -f g
1707 1706 []
1708 1707 (group
1709 1708 (group
1710 1709 (func
1711 1710 ('symbol', 'follow')
1712 1711 ('string', 'g'))))
1713 1712 $ cat log.nodes
1714 1713 nodetag 3
1715 1714 nodetag 2
1716 1715 nodetag 0
1717 1716
1718 1717 Test --follow and multiple files
1719 1718
1720 1719 $ testlog -f g e
1721 1720 []
1722 1721 (group
1723 1722 (group
1724 1723 (or
1725 1724 (func
1726 1725 ('symbol', 'follow')
1727 1726 ('string', 'g'))
1728 1727 (func
1729 1728 ('symbol', 'follow')
1730 1729 ('string', 'e')))))
1731 1730 $ cat log.nodes
1732 1731 nodetag 4
1733 1732 nodetag 3
1734 1733 nodetag 2
1735 1734 nodetag 1
1736 1735 nodetag 0
1737 1736
1738 1737 Test --follow-first
1739 1738
1740 1739 $ hg up -q 3
1741 1740 $ echo ee > e
1742 1741 $ hg ci -Am "add another e" e
1743 1742 created new head
1744 1743 $ hg merge --tool internal:other 4
1745 1744 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
1746 1745 (branch merge, don't forget to commit)
1747 1746 $ echo merge > e
1748 1747 $ hg ci -m "merge 5 and 4"
1749 1748 $ testlog --follow-first
1750 1749 []
1751 1750 (group
1752 1751 (func
1753 1752 ('symbol', '_firstancestors')
1754 1753 ('symbol', '6')))
1755 1754
1756 1755 Cannot compare with log --follow-first FILE as it never worked
1757 1756
1758 1757 $ hg log -G --print-revset --follow-first e
1759 1758 []
1760 1759 (group
1761 1760 (group
1762 1761 (func
1763 1762 ('symbol', '_followfirst')
1764 1763 ('string', 'e'))))
1765 1764 $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
1766 1765 @ 6 merge 5 and 4
1767 1766 |\
1768 1767 o | 5 add another e
1769 1768 | |
1770 1769
1771 1770 Test --copies
1772 1771
1773 1772 $ hg log -G --copies --template "{rev} {desc|firstline} \
1774 1773 > copies: {file_copies_switch}\n"
1775 1774 @ 6 merge 5 and 4 copies:
1776 1775 |\
1777 1776 | o 5 add another e copies:
1778 1777 | |
1779 1778 o | 4 mv dir/b e copies: e (dir/b)
1780 1779 |/
1781 1780 o 3 mv a b; add d copies: b (a)g (f)
1782 1781 |
1783 1782 o 2 mv b dir/b copies: dir/b (b)
1784 1783 |
1785 1784 o 1 copy a b copies: b (a)g (f)
1786 1785 |
1787 1786 o 0 add a copies:
1788 1787
1789 1788 Test "set:..." and parent revision
1790 1789
1791 1790 $ hg up -q 4
1792 1791 $ testlog "set:copied()"
1793 1792 []
1794 1793 (group
1795 1794 (func
1796 1795 ('symbol', '_matchfiles')
1797 1796 (list
1798 1797 (list
1799 1798 ('string', 'r:')
1800 1799 ('string', 'd:relpath'))
1801 1800 ('string', 'p:set:copied()'))))
1802 1801 $ testlog --include "set:copied()"
1803 1802 []
1804 1803 (group
1805 1804 (func
1806 1805 ('symbol', '_matchfiles')
1807 1806 (list
1808 1807 (list
1809 1808 ('string', 'r:')
1810 1809 ('string', 'd:relpath'))
1811 1810 ('string', 'i:set:copied()'))))
1812 1811 $ testlog -r "sort(file('set:copied()'), -rev)"
1813 1812 ["sort(file('set:copied()'), -rev)"]
1814 1813 []
1815 1814
1816 1815 Test --removed
1817 1816
1818 1817 $ testlog --removed
1819 1818 []
1820 1819 []
1821 1820 $ testlog --removed a
1822 1821 []
1823 1822 (group
1824 1823 (func
1825 1824 ('symbol', '_matchfiles')
1826 1825 (list
1827 1826 (list
1828 1827 ('string', 'r:')
1829 1828 ('string', 'd:relpath'))
1830 1829 ('string', 'p:a'))))
1831 1830 $ testlog --removed --follow a
1832 1831 abort: can only follow copies/renames for explicit filenames
1833 1832 abort: can only follow copies/renames for explicit filenames
1834 1833 abort: can only follow copies/renames for explicit filenames
1835 1834
1836 1835 Test --patch and --stat with --follow and --follow-first
1837 1836
1838 1837 $ hg up -q 3
1839 1838 $ hg log -G --git --patch b
1840 1839 o changeset: 1:216d4c92cf98
1841 1840 | user: test
1842 1841 | date: Thu Jan 01 00:00:00 1970 +0000
1843 1842 | summary: copy a b
1844 1843 |
1845 1844 | diff --git a/a b/b
1846 1845 | copy from a
1847 1846 | copy to b
1848 1847 |
1849 1848
1850 1849 $ hg log -G --git --stat b
1851 1850 o changeset: 1:216d4c92cf98
1852 1851 | user: test
1853 1852 | date: Thu Jan 01 00:00:00 1970 +0000
1854 1853 | summary: copy a b
1855 1854 |
1856 1855 | a | 0
1857 1856 | 1 files changed, 0 insertions(+), 0 deletions(-)
1858 1857 |
1859 1858
1860 1859 $ hg log -G --git --patch --follow b
1861 1860 o changeset: 1:216d4c92cf98
1862 1861 | user: test
1863 1862 | date: Thu Jan 01 00:00:00 1970 +0000
1864 1863 | summary: copy a b
1865 1864 |
1866 1865 | diff --git a/a b/b
1867 1866 | copy from a
1868 1867 | copy to b
1869 1868 |
1870 1869 o changeset: 0:f8035bb17114
1871 1870 user: test
1872 1871 date: Thu Jan 01 00:00:00 1970 +0000
1873 1872 summary: add a
1874 1873
1875 1874 diff --git a/a b/a
1876 1875 new file mode 100644
1877 1876 --- /dev/null
1878 1877 +++ b/a
1879 1878 @@ -0,0 +1,1 @@
1880 1879 +a
1881 1880
1882 1881
1883 1882 $ hg log -G --git --stat --follow b
1884 1883 o changeset: 1:216d4c92cf98
1885 1884 | user: test
1886 1885 | date: Thu Jan 01 00:00:00 1970 +0000
1887 1886 | summary: copy a b
1888 1887 |
1889 1888 | a | 0
1890 1889 | 1 files changed, 0 insertions(+), 0 deletions(-)
1891 1890 |
1892 1891 o changeset: 0:f8035bb17114
1893 1892 user: test
1894 1893 date: Thu Jan 01 00:00:00 1970 +0000
1895 1894 summary: add a
1896 1895
1897 1896 a | 1 +
1898 1897 1 files changed, 1 insertions(+), 0 deletions(-)
1899 1898
1900 1899
1901 1900 $ hg up -q 6
1902 1901 $ hg log -G --git --patch --follow-first e
1903 1902 @ changeset: 6:fc281d8ff18d
1904 1903 |\ tag: tip
1905 1904 | | parent: 5:99b31f1c2782
1906 1905 | | parent: 4:17d952250a9d
1907 1906 | | user: test
1908 1907 | | date: Thu Jan 01 00:00:00 1970 +0000
1909 1908 | | summary: merge 5 and 4
1910 1909 | |
1911 1910 | | diff --git a/e b/e
1912 1911 | | --- a/e
1913 1912 | | +++ b/e
1914 1913 | | @@ -1,1 +1,1 @@
1915 1914 | | -ee
1916 1915 | | +merge
1917 1916 | |
1918 1917 o | changeset: 5:99b31f1c2782
1919 1918 | | parent: 3:5918b8d165d1
1920 1919 | | user: test
1921 1920 | | date: Thu Jan 01 00:00:00 1970 +0000
1922 1921 | | summary: add another e
1923 1922 | |
1924 1923 | | diff --git a/e b/e
1925 1924 | | new file mode 100644
1926 1925 | | --- /dev/null
1927 1926 | | +++ b/e
1928 1927 | | @@ -0,0 +1,1 @@
1929 1928 | | +ee
1930 1929 | |
1931 1930
1932 1931 Test old-style --rev
1933 1932
1934 1933 $ hg tag 'foo-bar'
1935 1934 $ testlog -r 'foo-bar'
1936 1935 ['foo-bar']
1937 1936 []
1938 1937
1939 1938 Test --follow and forward --rev
1940 1939
1941 1940 $ hg up -q 6
1942 1941 $ echo g > g
1943 1942 $ hg ci -Am 'add g' g
1944 1943 created new head
1945 1944 $ hg up -q 2
1946 1945 $ hg log -G --template "{rev} {desc|firstline}\n"
1947 1946 o 8 add g
1948 1947 |
1949 1948 | o 7 Added tag foo-bar for changeset fc281d8ff18d
1950 1949 |/
1951 1950 o 6 merge 5 and 4
1952 1951 |\
1953 1952 | o 5 add another e
1954 1953 | |
1955 1954 o | 4 mv dir/b e
1956 1955 |/
1957 1956 o 3 mv a b; add d
1958 1957 |
1959 1958 @ 2 mv b dir/b
1960 1959 |
1961 1960 o 1 copy a b
1962 1961 |
1963 1962 o 0 add a
1964 1963
1965 1964 $ testlog --follow -r6 -r8 -r5 -r7 -r4
1966 1965 ['6', '8', '5', '7', '4']
1967 1966 (group
1968 1967 (func
1969 1968 ('symbol', 'descendants')
1970 1969 ('symbol', '6')))
1971 1970 --- log.nodes * (glob)
1972 1971 +++ glog.nodes * (glob)
1973 1972 @@ -1,3 +1,3 @@
1974 1973 -nodetag 6
1975 1974 nodetag 8
1976 1975 nodetag 7
1977 1976 +nodetag 6
1978 [1]
1979 1977
1980 1978 Test --follow-first and forward --rev
1981 1979
1982 1980 $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
1983 1981 ['6', '8', '5', '7', '4']
1984 1982 (group
1985 1983 (func
1986 1984 ('symbol', '_firstdescendants')
1987 1985 ('symbol', '6')))
1988 1986 --- log.nodes * (glob)
1989 1987 +++ glog.nodes * (glob)
1990 1988 @@ -1,3 +1,3 @@
1991 1989 -nodetag 6
1992 1990 nodetag 8
1993 1991 nodetag 7
1994 1992 +nodetag 6
1995 [1]
1996 1993
1997 1994 Test --follow and backward --rev
1998 1995
1999 1996 $ testlog --follow -r6 -r5 -r7 -r8 -r4
2000 1997 ['6', '5', '7', '8', '4']
2001 1998 (group
2002 1999 (func
2003 2000 ('symbol', 'ancestors')
2004 2001 ('symbol', '6')))
2005 2002
2006 2003 Test --follow-first and backward --rev
2007 2004
2008 2005 $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
2009 2006 ['6', '5', '7', '8', '4']
2010 2007 (group
2011 2008 (func
2012 2009 ('symbol', '_firstancestors')
2013 2010 ('symbol', '6')))
2014 2011
2015 2012 Test subdir
2016 2013
2017 2014 $ hg up -q 3
2018 2015 $ cd dir
2019 2016 $ testlog .
2020 2017 []
2021 2018 (group
2022 2019 (func
2023 2020 ('symbol', '_matchfiles')
2024 2021 (list
2025 2022 (list
2026 2023 ('string', 'r:')
2027 2024 ('string', 'd:relpath'))
2028 2025 ('string', 'p:.'))))
2029 2026 $ testlog ../b
2030 2027 []
2031 2028 (group
2032 2029 (group
2033 2030 (func
2034 2031 ('symbol', 'filelog')
2035 2032 ('string', '../b'))))
2036 2033 $ testlog -f ../b
2037 2034 []
2038 2035 (group
2039 2036 (group
2040 2037 (func
2041 2038 ('symbol', 'follow')
2042 2039 ('string', 'b'))))
2043 2040 $ cd ..
2044 2041
2045 2042 Test --hidden
2046 2043
2047 2044 $ cat > $HGTMP/testhidden.py << EOF
2048 2045 > def reposetup(ui, repo):
2049 2046 > for line in repo.opener('hidden'):
2050 2047 > ctx = repo[line.strip()]
2051 2048 > repo.changelog.hiddenrevs.add(ctx.rev())
2052 2049 > EOF
2053 2050 $ echo '[extensions]' >> .hg/hgrc
2054 2051 $ echo "hidden=$HGTMP/testhidden.py" >> .hg/hgrc
2055 2052 $ hg id --debug -i -r 0 > .hg/hidden
2056 2053 $ testlog
2057 2054 []
2058 2055 []
2059 2056 $ testlog --hidden
2060 2057 []
2061 2058 []
General Comments 0
You need to be logged in to leave comments. Login now