Mercurial > hg
comparison tests/test-glog.t @ 28600:0d6137891114
graphmod: allow for different styles for different edge types
Rather than draw all edges as solid lines, allow for using different styles for
different edge types. For example you could use dotted lines for edges that
do not connect to a parent, and dashed lines when connecting to a grandparent
(implying missing nodes in between).
For example, setting the following configuration:
[ui]
graphstyle.grandparent = :
graphstyle.missing = .
would result in a graph like this:
o changeset: 32:d06dffa21a31
|\ parent: 27:886ed638191b
| : parent: 31:621d83e11f67
| :
o : changeset: 31:621d83e11f67
|\: parent: 21:d42a756af44d
| : parent: 30:6e11cd4b648f
| :
o : changeset: 30:6e11cd4b648f
|\ \ parent: 28:44ecd0b9ae99
| . : parent: 29:cd9bb2be7593
| . :
o . : changeset: 28:44ecd0b9ae99
|\ \ \ parent: 1:6db2ef61d156
| . . : parent: 26:7f25b6c2f0b9
| . . :
o . . : changeset: 26:7f25b6c2f0b9
|\ \ \ \ parent: 18:1aa84d96232a
| | . . : parent: 25:91da8ed57247
| | . . :
| o-----+ changeset: 25:91da8ed57247
| | . . : parent: 21:d42a756af44d
| | . . : parent: 24:a9c19a3d96b7
| | . . :
| o . . : changeset: 24:a9c19a3d96b7
| |\ \ \ \ parent: 0:e6eb3150255d
| | . . . : parent: 23:a01cddf0766d
| | . . . :
| o---+ . : changeset: 23:a01cddf0766d
| | . . . : parent: 1:6db2ef61d156
| | . . . : parent: 22:e0d9cccacb5d
| | . . . :
| o-------+ changeset: 22:e0d9cccacb5d
| . . . . : parent: 18:1aa84d96232a
|/ / / / / parent: 21:d42a756af44d
| . . . :
| . . . o changeset: 21:d42a756af44d
| . . . |\ parent: 19:31ddc2c1573b
| . . . | | parent: 20:d30ed6450e32
| . . . | |
+-+-------o changeset: 20:d30ed6450e32
| . . . | parent: 0:e6eb3150255d
| . . . | parent: 18:1aa84d96232a
| . . . |
| . . . o changeset: 19:31ddc2c1573b
| . . . .\ parent: 15:1dda3f72782d
| . . . . | parent: 17:44765d7c06e0
| . . . . |
o---+---+ | changeset: 18:1aa84d96232a
. . . . | parent: 1:6db2ef61d156
/ / / / / parent: 15:1dda3f72782d
. . . . .
Edge styles can be altered by setting the following one-character config options::
[ui]
graphstyle.parent = |
graphstyle.grandparent = :
graphstyle.missing = .
The default configuration leaves all 3 types set to |, leaving graph styles
unaffected.
This is part of the work towards moving smartlog upstream; currently smartlog
injects extra nodes into the graph to indicate grandparent relationships (nodes
elided).
| author | Martijn Pieters <mjpieters@fb.com> |
|---|---|
| date | Sat, 19 Mar 2016 16:46:15 -0700 |
| parents | 6a4a4ca21907 |
| children | cd10171d6c71 |
comparison
equal
deleted
inserted
replaced
| 28599:0e7a929754aa | 28600:0d6137891114 |
|---|---|
| 2413 > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' | 2413 > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' |
| 2414 [branch.default|7] [log.node|7:02dbb8e276b8] | 2414 [branch.default|7] [log.node|7:02dbb8e276b8] |
| 2415 | | 2415 | |
| 2416 | 2416 |
| 2417 $ cd .. | 2417 $ cd .. |
| 2418 | |
| 2419 change graph edge styling | |
| 2420 | |
| 2421 $ cd repo | |
| 2422 $ cat << EOF >> $HGRCPATH | |
| 2423 > [ui] | |
| 2424 > graphstyle.parent = | | |
| 2425 > graphstyle.grandparent = : | |
| 2426 > graphstyle.missing = . | |
| 2427 > EOF | |
| 2428 $ hg log -G -r 'file("a")' -m | |
| 2429 @ changeset: 36:08a19a744424 | |
| 2430 : branch: branch | |
| 2431 : tag: tip | |
| 2432 : parent: 35:9159c3644c5e | |
| 2433 : parent: 35:9159c3644c5e | |
| 2434 : user: test | |
| 2435 : date: Thu Jan 01 00:00:36 1970 +0000 | |
| 2436 : summary: (36) buggy merge: identical parents | |
| 2437 : | |
| 2438 o changeset: 32:d06dffa21a31 | |
| 2439 |\ parent: 27:886ed638191b | |
| 2440 | : parent: 31:621d83e11f67 | |
| 2441 | : user: test | |
| 2442 | : date: Thu Jan 01 00:00:32 1970 +0000 | |
| 2443 | : summary: (32) expand | |
| 2444 | : | |
| 2445 o : changeset: 31:621d83e11f67 | |
| 2446 |\: parent: 21:d42a756af44d | |
| 2447 | : parent: 30:6e11cd4b648f | |
| 2448 | : user: test | |
| 2449 | : date: Thu Jan 01 00:00:31 1970 +0000 | |
| 2450 | : summary: (31) expand | |
| 2451 | : | |
| 2452 o : changeset: 30:6e11cd4b648f | |
| 2453 |\ \ parent: 28:44ecd0b9ae99 | |
| 2454 | . : parent: 29:cd9bb2be7593 | |
| 2455 | . : user: test | |
| 2456 | . : date: Thu Jan 01 00:00:30 1970 +0000 | |
| 2457 | . : summary: (30) expand | |
| 2458 | . : | |
| 2459 o . : changeset: 28:44ecd0b9ae99 | |
| 2460 |\ \ \ parent: 1:6db2ef61d156 | |
| 2461 | . . : parent: 26:7f25b6c2f0b9 | |
| 2462 | . . : user: test | |
| 2463 | . . : date: Thu Jan 01 00:00:28 1970 +0000 | |
| 2464 | . . : summary: (28) merge zero known | |
| 2465 | . . : | |
| 2466 o . . : changeset: 26:7f25b6c2f0b9 | |
| 2467 |\ \ \ \ parent: 18:1aa84d96232a | |
| 2468 | | . . : parent: 25:91da8ed57247 | |
| 2469 | | . . : user: test | |
| 2470 | | . . : date: Thu Jan 01 00:00:26 1970 +0000 | |
| 2471 | | . . : summary: (26) merge one known; far right | |
| 2472 | | . . : | |
| 2473 | o-----+ changeset: 25:91da8ed57247 | |
| 2474 | | . . : parent: 21:d42a756af44d | |
| 2475 | | . . : parent: 24:a9c19a3d96b7 | |
| 2476 | | . . : user: test | |
| 2477 | | . . : date: Thu Jan 01 00:00:25 1970 +0000 | |
| 2478 | | . . : summary: (25) merge one known; far left | |
| 2479 | | . . : | |
| 2480 | o . . : changeset: 24:a9c19a3d96b7 | |
| 2481 | |\ \ \ \ parent: 0:e6eb3150255d | |
| 2482 | | . . . : parent: 23:a01cddf0766d | |
| 2483 | | . . . : user: test | |
| 2484 | | . . . : date: Thu Jan 01 00:00:24 1970 +0000 | |
| 2485 | | . . . : summary: (24) merge one known; immediate right | |
| 2486 | | . . . : | |
| 2487 | o---+ . : changeset: 23:a01cddf0766d | |
| 2488 | | . . . : parent: 1:6db2ef61d156 | |
| 2489 | | . . . : parent: 22:e0d9cccacb5d | |
| 2490 | | . . . : user: test | |
| 2491 | | . . . : date: Thu Jan 01 00:00:23 1970 +0000 | |
| 2492 | | . . . : summary: (23) merge one known; immediate left | |
| 2493 | | . . . : | |
| 2494 | o-------+ changeset: 22:e0d9cccacb5d | |
| 2495 | . . . . : parent: 18:1aa84d96232a | |
| 2496 |/ / / / / parent: 21:d42a756af44d | |
| 2497 | . . . : user: test | |
| 2498 | . . . : date: Thu Jan 01 00:00:22 1970 +0000 | |
| 2499 | . . . : summary: (22) merge two known; one far left, one far right | |
| 2500 | . . . : | |
| 2501 | . . . o changeset: 21:d42a756af44d | |
| 2502 | . . . |\ parent: 19:31ddc2c1573b | |
| 2503 | . . . | | parent: 20:d30ed6450e32 | |
| 2504 | . . . | | user: test | |
| 2505 | . . . | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 2506 | . . . | | summary: (21) expand | |
| 2507 | . . . | | | |
| 2508 +-+-------o changeset: 20:d30ed6450e32 | |
| 2509 | . . . | parent: 0:e6eb3150255d | |
| 2510 | . . . | parent: 18:1aa84d96232a | |
| 2511 | . . . | user: test | |
| 2512 | . . . | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 2513 | . . . | summary: (20) merge two known; two far right | |
| 2514 | . . . | | |
| 2515 | . . . o changeset: 19:31ddc2c1573b | |
| 2516 | . . . |\ parent: 15:1dda3f72782d | |
| 2517 | . . . | | parent: 17:44765d7c06e0 | |
| 2518 | . . . | | user: test | |
| 2519 | . . . | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 2520 | . . . | | summary: (19) expand | |
| 2521 | . . . | | | |
| 2522 o---+---+ | changeset: 18:1aa84d96232a | |
| 2523 . . . | | parent: 1:6db2ef61d156 | |
| 2524 / / / / / parent: 15:1dda3f72782d | |
| 2525 . . . | | user: test | |
| 2526 . . . | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 2527 . . . | | summary: (18) merge two known; two far left | |
| 2528 . . . | | | |
| 2529 . . . | o changeset: 17:44765d7c06e0 | |
| 2530 . . . | |\ parent: 12:86b91144a6e9 | |
| 2531 . . . | | | parent: 16:3677d192927d | |
| 2532 . . . | | | user: test | |
| 2533 . . . | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 2534 . . . | | | summary: (17) expand | |
| 2535 . . . | | | | |
| 2536 +-+-------o changeset: 16:3677d192927d | |
| 2537 . . . | | parent: 0:e6eb3150255d | |
| 2538 . . . | | parent: 1:6db2ef61d156 | |
| 2539 . . . | | user: test | |
| 2540 . . . | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 2541 . . . | | summary: (16) merge two known; one immediate right, one near right | |
| 2542 . . . | | | |
| 2543 . . . o | changeset: 15:1dda3f72782d | |
| 2544 . . . |\ \ parent: 13:22d8966a97e3 | |
| 2545 . . . | | | parent: 14:8eac370358ef | |
| 2546 . . . | | | user: test | |
| 2547 . . . | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 2548 . . . | | | summary: (15) expand | |
| 2549 . . . | | | | |
| 2550 +-------o | changeset: 14:8eac370358ef | |
| 2551 . . . | |/ parent: 0:e6eb3150255d | |
| 2552 . . . | | parent: 12:86b91144a6e9 | |
| 2553 . . . | | user: test | |
| 2554 . . . | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 2555 . . . | | summary: (14) merge two known; one immediate right, one far right | |
| 2556 . . . | | | |
| 2557 . . . o | changeset: 13:22d8966a97e3 | |
| 2558 . . . |\ \ parent: 9:7010c0af0a35 | |
| 2559 . . . | | | parent: 11:832d76e6bdf2 | |
| 2560 . . . | | | user: test | |
| 2561 . . . | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 2562 . . . | | | summary: (13) expand | |
| 2563 . . . | | | | |
| 2564 . +---+---o changeset: 12:86b91144a6e9 | |
| 2565 . . . | | parent: 1:6db2ef61d156 | |
| 2566 . . . | | parent: 9:7010c0af0a35 | |
| 2567 . . . | | user: test | |
| 2568 . . . | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 2569 . . . | | summary: (12) merge two known; one immediate right, one far left | |
| 2570 . . . | | | |
| 2571 . . . | o changeset: 11:832d76e6bdf2 | |
| 2572 . . . | |\ parent: 6:b105a072e251 | |
| 2573 . . . | | | parent: 10:74c64d036d72 | |
| 2574 . . . | | | user: test | |
| 2575 . . . | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 2576 . . . | | | summary: (11) expand | |
| 2577 . . . | | | | |
| 2578 +---------o changeset: 10:74c64d036d72 | |
| 2579 . . . | |/ parent: 0:e6eb3150255d | |
| 2580 . . . | | parent: 6:b105a072e251 | |
| 2581 . . . | | user: test | |
| 2582 . . . | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 2583 . . . | | summary: (10) merge two known; one immediate left, one near right | |
| 2584 . . . | | | |
| 2585 . . . o | changeset: 9:7010c0af0a35 | |
| 2586 . . . |\ \ parent: 7:b632bb1b1224 | |
| 2587 . . . | | | parent: 8:7a0b11f71937 | |
| 2588 . . . | | | user: test | |
| 2589 . . . | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 2590 . . . | | | summary: (9) expand | |
| 2591 . . . | | | | |
| 2592 +-------o | changeset: 8:7a0b11f71937 | |
| 2593 . . . |/ / parent: 0:e6eb3150255d | |
| 2594 . . . | | parent: 7:b632bb1b1224 | |
| 2595 . . . | | user: test | |
| 2596 . . . | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 2597 . . . | | summary: (8) merge two known; one immediate left, one far right | |
| 2598 . . . | | | |
| 2599 . . . o | changeset: 7:b632bb1b1224 | |
| 2600 . . . |\ \ parent: 2:3d9a33b8d1e1 | |
| 2601 . . . | . | parent: 5:4409d547b708 | |
| 2602 . . . | . | user: test | |
| 2603 . . . | . | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 2604 . . . | . | summary: (7) expand | |
| 2605 . . . | . | | |
| 2606 . . . +---o changeset: 6:b105a072e251 | |
| 2607 . . . | ./ parent: 2:3d9a33b8d1e1 | |
| 2608 . . . | . parent: 5:4409d547b708 | |
| 2609 . . . | . user: test | |
| 2610 . . . | . date: Thu Jan 01 00:00:06 1970 +0000 | |
| 2611 . . . | . summary: (6) merge two known; one immediate left, one far left | |
| 2612 . . . | . | |
| 2613 . . . o . changeset: 5:4409d547b708 | |
| 2614 . . . |\ \ parent: 3:27eef8ed80b4 | |
| 2615 . . . | . . parent: 4:26a8bac39d9f | |
| 2616 . . . | . . user: test | |
| 2617 . . . | . . date: Thu Jan 01 00:00:05 1970 +0000 | |
| 2618 . . . | . . summary: (5) expand | |
| 2619 . . . | . . | |
| 2620 . +---o . . changeset: 4:26a8bac39d9f | |
| 2621 . . . ./ / parent: 1:6db2ef61d156 | |
| 2622 . . . . . parent: 3:27eef8ed80b4 | |
| 2623 . . . . . user: test | |
| 2624 . . . . . date: Thu Jan 01 00:00:04 1970 +0000 | |
| 2625 . . . . . summary: (4) merge two known; one immediate left, one immediate right | |
| 2626 . . . . . | |
| 2627 | |
| 2628 $ cd .. |