Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 3419:1e2f683e11e7 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Jan 2018 04:38:04 +0100
parents 3e2abd40da07 85cdce113c2c
children b21a3753255f fc2dd881297b
comparison
equal deleted inserted replaced
3381:16b4f0e32d9d 3419:1e2f683e11e7
51 51
52 Topic branches are lightweight branches which disappear when changes are 52 Topic branches are lightweight branches which disappear when changes are
53 finalized (moved to the public phase). They can help users to organize and share 53 finalized (moved to the public phase). They can help users to organize and share
54 their unfinished work. 54 their unfinished work.
55 55
56 In this tutorial, we explain how to use topics for local development. In the first part, 56 In this tutorial, we explain how to use topics for local development. In the
57 there is a central *publishing* server. Anything pushed to the central server will become public and immutable This means no unfinished work should escapes the local repository. 57 first part, there is a central *publishing* server. Anything pushed to the
58 central server will become public and immutable. This means no unfinished work
59 should escape the local repository.
58 60
59 61
60 Topic Basics 62 Topic Basics
61 ============ 63 ============
62 64
71 73
72 #if docgraph-ext 74 #if docgraph-ext
73 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 75 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
74 .. graphviz:: 76 .. graphviz::
75 77
76 strict digraph { 78 strict digraph "Mercurial graph" {
77 graph [rankdir=LR, 79 graph [rankdir=LR,
78 splines=polyline 80 splines=polyline
79 ]; 81 ];
80 node [label="\N"]; 82 node [label="\N"];
81 0 [fillcolor="#9999FF", 83 0 [fillcolor="#7F7FFF",
82 fixedsize=true, 84 fixedsize=true,
83 group=default, 85 group=default,
84 height=0.5, 86 height=1,
85 label=0, 87 label=0,
86 pin=true, 88 pin=true,
87 pos="1,0!", 89 pos="1,0!",
88 shape=circle, 90 shape=circle,
89 style=filled, 91 style=filled,
90 width=0.5]; 92 width=1];
91 } 93 }
92 #endif 94 #endif
93 95
94 We are about to make some additions to this list and would like to do them 96 We are about to make some additions to this list and would like to do them
95 within a topic. Creating a new topic is done using the ``topic`` command: 97 within a topic. Creating a new topic is done using the ``topic`` command:
121 123
122 #if docgraph-ext 124 #if docgraph-ext
123 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 125 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
124 .. graphviz:: 126 .. graphviz::
125 127
126 strict digraph { 128 strict digraph "Mercurial graph" {
127 graph [rankdir=LR, 129 graph [rankdir=LR,
128 splines=polyline 130 splines=polyline
129 ]; 131 ];
130 node [label="\N"]; 132 node [label="\N"];
131 0 [fillcolor="#9999FF", 133 0 [fillcolor="#7F7FFF",
132 fixedsize=true, 134 fixedsize=true,
133 group=default, 135 group=default,
134 height=0.5, 136 height=1,
135 label=0, 137 label=0,
136 pin=true, 138 pin=true,
137 pos="1,0!", 139 pos="1,0!",
138 shape=circle, 140 shape=circle,
139 style=filled, 141 style=filled,
140 width=0.5]; 142 width=1];
141 } 143 }
142 #endif 144 #endif
143 145
144 Our next commit will be part of the active topic: 146 Our next commit will be part of the active topic:
145 147
164 166
165 #if docgraph-ext 167 #if docgraph-ext
166 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore 168 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore
167 .. graphviz:: 169 .. graphviz::
168 170
169 strict digraph { 171 strict digraph "Mercurial graph" {
170 graph [rankdir=LR, 172 graph [rankdir=LR,
171 splines=polyline 173 splines=polyline
172 ]; 174 ];
173 node [label="\N"]; 175 node [label="\N"];
174 1 [fillcolor="#9999FF", 176 1 [fillcolor="#7F7FFF",
175 fixedsize=true, 177 fixedsize=true,
176 group=default, 178 group=default,
177 height=0.5, 179 height=1,
178 label=1, 180 label=1,
179 pin=true, 181 pin=true,
180 pos="1,1!", 182 pos="1,1!",
181 shape=pentagon, 183 shape=pentagon,
182 style=filled, 184 style=filled,
183 width=0.5]; 185 width=1];
184 } 186 }
185 #endif 187 #endif
186 188
187 And future commits will be part of that topic too: 189 And future commits will be part of that topic too:
188 190
211 213
212 #if docgraph-ext 214 #if docgraph-ext
213 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore 215 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore
214 .. graphviz:: 216 .. graphviz::
215 217
216 strict digraph { 218 strict digraph "Mercurial graph" {
217 graph [rankdir=LR, 219 graph [rankdir=LR,
218 splines=polyline 220 splines=polyline
219 ]; 221 ];
220 node [label="\N"]; 222 node [label="\N"];
221 1 [fillcolor="#9999FF", 223 1 [fillcolor="#7F7FFF",
222 fixedsize=true, 224 fixedsize=true,
223 group=default, 225 group=default,
224 height=0.5, 226 height=1,
225 label=1, 227 label=1,
226 pin=true, 228 pin=true,
227 pos="1,1!", 229 pos="1,1!",
228 shape=pentagon, 230 shape=pentagon,
229 style=filled, 231 style=filled,
230 width=0.5]; 232 width=1];
231 2 [fillcolor="#9999FF", 233 2 [fillcolor="#7F7FFF",
232 fixedsize=true, 234 fixedsize=true,
233 group=default, 235 group=default,
234 height=0.5, 236 height=1,
235 label=2, 237 label=2,
236 pin=true, 238 pin=true,
237 pos="1,2!", 239 pos="1,2!",
238 shape=pentagon, 240 shape=pentagon,
239 style=filled, 241 style=filled,
240 width=0.5]; 242 width=1];
241 1 -> 2 [arrowhead=none, 243 1 -> 2 [arrowhead=none,
242 penwidth=2.0]; 244 penwidth=2.0];
243 } 245 }
244 #endif 246 #endif
245 247
286 288
287 #if docgraph-ext 289 #if docgraph-ext
288 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 290 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
289 .. graphviz:: 291 .. graphviz::
290 292
291 strict digraph { 293 strict digraph "Mercurial graph" {
292 graph [rankdir=LR, 294 graph [rankdir=LR,
293 splines=polyline 295 splines=polyline
294 ]; 296 ];
295 node [label="\N"]; 297 node [label="\N"];
296 0 [fillcolor="#9999FF", 298 0 [fillcolor="#7F7FFF",
297 fixedsize=true, 299 fixedsize=true,
298 group=default, 300 group=default,
299 height=0.5, 301 height=1,
300 label=0, 302 label=0,
301 pin=true, 303 pin=true,
302 pos="1,0!", 304 pos="1,0!",
303 shape=circle, 305 shape=circle,
304 style=filled, 306 style=filled,
305 width=0.5]; 307 width=1];
306 1 [fillcolor="#9999FF", 308 1 [fillcolor="#7F7FFF",
307 fixedsize=true, 309 fixedsize=true,
308 group=default, 310 group=default,
309 height=0.5, 311 height=1,
310 label=1, 312 label=1,
311 pin=true, 313 pin=true,
312 pos="1,1!", 314 pos="1,1!",
313 shape=pentagon, 315 shape=pentagon,
314 style=filled, 316 style=filled,
315 width=0.5]; 317 width=1];
316 0 -> 1 [arrowhead=none, 318 0 -> 1 [arrowhead=none,
317 penwidth=2.0]; 319 penwidth=2.0];
318 2 [fillcolor="#9999FF", 320 2 [fillcolor="#7F7FFF",
319 fixedsize=true, 321 fixedsize=true,
320 group=default, 322 group=default,
321 height=0.5, 323 height=1,
322 label=2, 324 label=2,
323 pin=true, 325 pin=true,
324 pos="1,2!", 326 pos="1,2!",
325 shape=pentagon, 327 shape=pentagon,
326 style=filled, 328 style=filled,
327 width=0.5]; 329 width=1];
328 1 -> 2 [arrowhead=none, 330 1 -> 2 [arrowhead=none,
329 penwidth=2.0]; 331 penwidth=2.0];
330 } 332 }
331 #endif 333 #endif
332 And updating back to the topic reactivates it: 334 And updating back to the topic reactivates it:
409 411
410 #if docgraph-ext 412 #if docgraph-ext
411 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 413 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
412 .. graphviz:: 414 .. graphviz::
413 415
414 strict digraph { 416 strict digraph "Mercurial graph" {
415 graph [rankdir=LR, 417 graph [rankdir=LR,
416 splines=polyline 418 splines=polyline
417 ]; 419 ];
418 node [label="\N"]; 420 node [label="\N"];
419 0 [fillcolor="#9999FF", 421 0 [fillcolor="#7F7FFF",
420 fixedsize=true, 422 fixedsize=true,
421 group=default, 423 group=default,
422 height=0.5, 424 height=1,
423 label=0, 425 label=0,
424 pin=true, 426 pin=true,
425 pos="1,0!", 427 pos="1,0!",
426 shape=circle, 428 shape=circle,
427 style=filled, 429 style=filled,
428 width=0.5]; 430 width=1];
429 1 [fillcolor="#9999FF", 431 1 [fillcolor="#7F7FFF",
430 fixedsize=true, 432 fixedsize=true,
431 group=default, 433 group=default,
432 height=0.5, 434 height=1,
433 label=1, 435 label=1,
434 pin=true, 436 pin=true,
435 pos="1,1!", 437 pos="1,1!",
436 shape=pentagon, 438 shape=pentagon,
437 style=filled, 439 style=filled,
438 width=0.5]; 440 width=1];
439 0 -> 1 [arrowhead=none, 441 0 -> 1 [arrowhead=none,
440 penwidth=2.0]; 442 penwidth=2.0];
441 3 [fillcolor="#9999FF", 443 3 [fillcolor="#7F7FFF",
442 fixedsize=true, 444 fixedsize=true,
443 group=default, 445 group=default,
444 height=0.5, 446 height=1,
445 label=3, 447 label=3,
446 pin=true, 448 pin=true,
447 pos="1,3!", 449 pos="1,3!",
448 shape=circle, 450 shape=circle,
449 style=filled, 451 style=filled,
450 width=0.5]; 452 width=1];
451 0 -> 3 [arrowhead=none, 453 0 -> 3 [arrowhead=none,
452 penwidth=2.0]; 454 penwidth=2.0];
453 2 [fillcolor="#9999FF", 455 2 [fillcolor="#7F7FFF",
454 fixedsize=true, 456 fixedsize=true,
455 group=default, 457 group=default,
456 height=0.5, 458 height=1,
457 label=2, 459 label=2,
458 pin=true, 460 pin=true,
459 pos="1,2!", 461 pos="1,2!",
460 shape=pentagon, 462 shape=pentagon,
461 style=filled, 463 style=filled,
462 width=0.5]; 464 width=1];
463 1 -> 2 [arrowhead=none, 465 1 -> 2 [arrowhead=none,
464 penwidth=2.0]; 466 penwidth=2.0];
465 } 467 }
466 #endif 468 #endif
467 469
516 518
517 #if docgraph-ext 519 #if docgraph-ext
518 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 520 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
519 .. graphviz:: 521 .. graphviz::
520 522
521 strict digraph { 523 strict digraph "Mercurial graph" {
522 graph [rankdir=LR, 524 graph [rankdir=LR,
523 splines=polyline 525 splines=polyline
524 ]; 526 ];
525 node [label="\N"]; 527 node [label="\N"];
526 0 [fillcolor="#9999FF", 528 0 [fillcolor="#7F7FFF",
527 fixedsize=true, 529 fixedsize=true,
528 group=default, 530 group=default,
529 height=0.5, 531 height=1,
530 label=0, 532 label=0,
531 pin=true, 533 pin=true,
532 pos="1,0!", 534 pos="1,0!",
533 shape=circle, 535 shape=circle,
534 style=filled, 536 style=filled,
535 width=0.5]; 537 width=1];
536 3 [fillcolor="#9999FF", 538 3 [fillcolor="#7F7FFF",
537 fixedsize=true, 539 fixedsize=true,
538 group=default, 540 group=default,
539 height=0.5, 541 height=1,
540 label=3, 542 label=3,
541 pin=true, 543 pin=true,
542 pos="1,3!", 544 pos="1,3!",
543 shape=circle, 545 shape=circle,
544 style=filled, 546 style=filled,
545 width=0.5]; 547 width=1];
546 0 -> 3 [arrowhead=none, 548 0 -> 3 [arrowhead=none,
547 penwidth=2.0]; 549 penwidth=2.0];
548 4 [fillcolor="#9999FF", 550 4 [fillcolor="#7F7FFF",
549 fixedsize=true, 551 fixedsize=true,
550 group=default, 552 group=default,
551 height=0.5, 553 height=1,
552 label=4, 554 label=4,
553 pin=true, 555 pin=true,
554 pos="1,4!", 556 pos="1,4!",
555 shape=pentagon, 557 shape=pentagon,
556 style=filled, 558 style=filled,
557 width=0.5]; 559 width=1];
558 3 -> 4 [arrowhead=none, 560 3 -> 4 [arrowhead=none,
559 penwidth=2.0]; 561 penwidth=2.0];
560 5 [fillcolor="#9999FF", 562 5 [fillcolor="#7F7FFF",
561 fixedsize=true, 563 fixedsize=true,
562 group=default, 564 group=default,
563 height=0.5, 565 height=1,
564 label=5, 566 label=5,
565 pin=true, 567 pin=true,
566 pos="1,5!", 568 pos="1,5!",
567 shape=pentagon, 569 shape=pentagon,
568 style=filled, 570 style=filled,
569 width=0.5]; 571 width=1];
570 4 -> 5 [arrowhead=none, 572 4 -> 5 [arrowhead=none,
571 penwidth=2.0]; 573 penwidth=2.0];
572 } 574 }
573 #endif 575 #endif
576
577 There exists a template keyword named "topic" which can be used
578
579 $ hg log -GT "{rev}:{node|short} {topic}\n {desc}"
580 @ 5:2d50db8b5b4c food
581 | adding fruits
582 o 4:4011b46eeb33 food
583 | adding condiments
584 o 3:6104862e8b84
585 | Adding clothes
586 o 0:38da43f0a2ea
587 Shopping list
574 588
575 The topic information will disappear when we publish the changesets: 589 The topic information will disappear when we publish the changesets:
576 590
577 $ hg topics 591 $ hg topics
578 * food (2 changesets) 592 * food (2 changesets)
624 638
625 #if docgraph-ext 639 #if docgraph-ext
626 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 640 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
627 .. graphviz:: 641 .. graphviz::
628 642
629 strict digraph { 643 strict digraph "Mercurial graph" {
630 graph [rankdir=LR, 644 graph [rankdir=LR,
631 splines=polyline 645 splines=polyline
632 ]; 646 ];
633 node [label="\N"]; 647 node [label="\N"];
634 0 [fillcolor="#9999FF", 648 0 [fillcolor="#7F7FFF",
635 fixedsize=true, 649 fixedsize=true,
636 group=default, 650 group=default,
637 height=0.5, 651 height=1,
638 label=0, 652 label=0,
639 pin=true, 653 pin=true,
640 pos="1,0!", 654 pos="1,0!",
641 shape=circle, 655 shape=circle,
642 style=filled, 656 style=filled,
643 width=0.5]; 657 width=1];
644 3 [fillcolor="#9999FF", 658 3 [fillcolor="#7F7FFF",
645 fixedsize=true, 659 fixedsize=true,
646 group=default, 660 group=default,
647 height=0.5, 661 height=1,
648 label=3, 662 label=3,
649 pin=true, 663 pin=true,
650 pos="1,3!", 664 pos="1,3!",
651 shape=circle, 665 shape=circle,
652 style=filled, 666 style=filled,
653 width=0.5]; 667 width=1];
654 0 -> 3 [arrowhead=none, 668 0 -> 3 [arrowhead=none,
655 penwidth=2.0]; 669 penwidth=2.0];
656 4 [fillcolor="#9999FF", 670 4 [fillcolor="#7F7FFF",
657 fixedsize=true, 671 fixedsize=true,
658 group=default, 672 group=default,
659 height=0.5, 673 height=1,
660 label=4, 674 label=4,
661 pin=true, 675 pin=true,
662 pos="1,4!", 676 pos="1,4!",
663 shape=circle, 677 shape=circle,
664 style=filled, 678 style=filled,
665 width=0.5]; 679 width=1];
666 3 -> 4 [arrowhead=none, 680 3 -> 4 [arrowhead=none,
667 penwidth=2.0]; 681 penwidth=2.0];
668 5 [fillcolor="#9999FF", 682 5 [fillcolor="#7F7FFF",
669 fixedsize=true, 683 fixedsize=true,
670 group=default, 684 group=default,
671 height=0.5, 685 height=1,
672 label=5, 686 label=5,
673 pin=true, 687 pin=true,
674 pos="1,5!", 688 pos="1,5!",
675 shape=circle, 689 shape=circle,
676 style=filled, 690 style=filled,
677 width=0.5]; 691 width=1];
678 4 -> 5 [arrowhead=none, 692 4 -> 5 [arrowhead=none,
679 penwidth=2.0]; 693 penwidth=2.0];
680 } 694 }
681 #endif 695 #endif
682 696
693 707
694 708
695 Keep working within topics 709 Keep working within topics
696 ========================== 710 ==========================
697 711
698 Making sure all your new local commit are made within a topic will help your 712 Making sure all your new local commit are made within a topic will help you
699 organise your work. It is possible to ensure this through the Mercurial 713 organize your work. It is possible to ensure this through the Mercurial
700 configuration. 714 configuration.
701 715
702 For this tutorial, we'll add the config at the repository level: 716 For this tutorial, we'll add the config at the repository level:
703 717
704 $ cat << EOF >> .hg/hgrc 718 $ cat << EOF >> .hg/hgrc
724 738
725 739
726 Working with Multiple Topics 740 Working with Multiple Topics
727 ============================ 741 ============================
728 742
729 In the above example, topics do not bring much benefits since you only have one 743 In the above example, topics do not bring many benefits since you only have one
730 line of development. Topics start to be more useful when you have to work on 744 line of development. Topics start to be more useful when you have to work on
731 multiple features at the same time. 745 multiple features at the same time.
732 746
733 We might go shopping in a hardware store in the same go, so let's add some 747 We might go shopping in a hardware store in the same go, so let's add some
734 tools to the shopping list within a new topic: 748 tools to the shopping list within a new topic:
893 907
894 #if docgraph-ext 908 #if docgraph-ext
895 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 909 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
896 .. graphviz:: 910 .. graphviz::
897 911
898 strict digraph { 912 strict digraph "Mercurial graph" {
899 graph [rankdir=LR, 913 graph [rankdir=LR,
900 splines=polyline 914 splines=polyline
901 ]; 915 ];
902 node [label="\N"]; 916 node [label="\N"];
903 0 [fillcolor="#9999FF", 917 0 [fillcolor="#7F7FFF",
904 fixedsize=true, 918 fixedsize=true,
905 group=default, 919 group=default,
906 height=0.5, 920 height=1,
907 label=0, 921 label=0,
908 pin=true, 922 pin=true,
909 pos="1,0!", 923 pos="1,0!",
910 shape=circle, 924 shape=circle,
911 style=filled, 925 style=filled,
912 width=0.5]; 926 width=1];
913 3 [fillcolor="#9999FF", 927 3 [fillcolor="#7F7FFF",
914 fixedsize=true, 928 fixedsize=true,
915 group=default, 929 group=default,
916 height=0.5, 930 height=1,
917 label=3, 931 label=3,
918 pin=true, 932 pin=true,
919 pos="1,3!", 933 pos="1,3!",
920 shape=circle, 934 shape=circle,
921 style=filled, 935 style=filled,
922 width=0.5]; 936 width=1];
923 0 -> 3 [arrowhead=none, 937 0 -> 3 [arrowhead=none,
924 penwidth=2.0]; 938 penwidth=2.0];
925 4 [fillcolor="#9999FF", 939 4 [fillcolor="#7F7FFF",
926 fixedsize=true, 940 fixedsize=true,
927 group=default, 941 group=default,
928 height=0.5, 942 height=1,
929 label=4, 943 label=4,
930 pin=true, 944 pin=true,
931 pos="1,4!", 945 pos="1,4!",
932 shape=circle, 946 shape=circle,
933 style=filled, 947 style=filled,
934 width=0.5]; 948 width=1];
935 3 -> 4 [arrowhead=none, 949 3 -> 4 [arrowhead=none,
936 penwidth=2.0]; 950 penwidth=2.0];
937 5 [fillcolor="#9999FF", 951 5 [fillcolor="#7F7FFF",
938 fixedsize=true, 952 fixedsize=true,
939 group=default, 953 group=default,
940 height=0.5, 954 height=1,
941 label=5, 955 label=5,
942 pin=true, 956 pin=true,
943 pos="1,5!", 957 pos="1,5!",
944 shape=circle, 958 shape=circle,
945 style=filled, 959 style=filled,
946 width=0.5]; 960 width=1];
947 4 -> 5 [arrowhead=none, 961 4 -> 5 [arrowhead=none,
948 penwidth=2.0]; 962 penwidth=2.0];
949 6 [fillcolor="#9999FF", 963 6 [fillcolor="#7F7FFF",
950 fixedsize=true, 964 fixedsize=true,
951 group=default, 965 group=default,
952 height=0.5, 966 height=1,
953 label=6, 967 label=6,
954 pin=true, 968 pin=true,
955 pos="1,6!", 969 pos="1,6!",
956 shape=pentagon, 970 shape=pentagon,
957 style=filled, 971 style=filled,
958 width=0.5]; 972 width=1];
959 5 -> 6 [arrowhead=none, 973 5 -> 6 [arrowhead=none,
960 penwidth=2.0]; 974 penwidth=2.0];
961 9 [fillcolor="#9999FF", 975 9 [fillcolor="#7F7FFF",
962 fixedsize=true, 976 fixedsize=true,
963 group=default, 977 group=default,
964 height=0.5, 978 height=1,
965 label=9, 979 label=9,
966 pin=true, 980 pin=true,
967 pos="1,9!", 981 pos="1,9!",
968 shape=pentagon, 982 shape=pentagon,
969 style=filled, 983 style=filled,
970 width=0.5]; 984 width=1];
971 5 -> 9 [arrowhead=none, 985 5 -> 9 [arrowhead=none,
972 penwidth=2.0]; 986 penwidth=2.0];
973 11 [fillcolor="#9999FF", 987 11 [fillcolor="#7F7FFF",
974 fixedsize=true, 988 fixedsize=true,
975 group=default, 989 group=default,
976 height=0.5, 990 height=1,
977 label=11, 991 label=11,
978 pin=true, 992 pin=true,
979 pos="1,11!", 993 pos="1,11!",
980 shape=circle, 994 shape=circle,
981 style=filled, 995 style=filled,
982 width=0.5]; 996 width=1];
983 5 -> 11 [arrowhead=none, 997 5 -> 11 [arrowhead=none,
984 penwidth=2.0]; 998 penwidth=2.0];
985 7 [fillcolor="#9999FF", 999 7 [fillcolor="#7F7FFF",
986 fixedsize=true, 1000 fixedsize=true,
987 group=default, 1001 group=default,
988 height=0.5, 1002 height=1,
989 label=7, 1003 label=7,
990 pin=true, 1004 pin=true,
991 pos="1,7!", 1005 pos="1,7!",
992 shape=pentagon, 1006 shape=pentagon,
993 style=filled, 1007 style=filled,
994 width=0.5]; 1008 width=1];
995 6 -> 7 [arrowhead=none, 1009 6 -> 7 [arrowhead=none,
996 penwidth=2.0]; 1010 penwidth=2.0];
997 8 [fillcolor="#9999FF", 1011 8 [fillcolor="#7F7FFF",
998 fixedsize=true, 1012 fixedsize=true,
999 group=default, 1013 group=default,
1000 height=0.5, 1014 height=1,
1001 label=8, 1015 label=8,
1002 pin=true, 1016 pin=true,
1003 pos="1,8!", 1017 pos="1,8!",
1004 shape=pentagon, 1018 shape=pentagon,
1005 style=filled, 1019 style=filled,
1006 width=0.5]; 1020 width=1];
1007 7 -> 8 [arrowhead=none, 1021 7 -> 8 [arrowhead=none,
1008 penwidth=2.0]; 1022 penwidth=2.0];
1009 10 [fillcolor="#9999FF", 1023 10 [fillcolor="#7F7FFF",
1010 fixedsize=true, 1024 fixedsize=true,
1011 group=default, 1025 group=default,
1012 height=0.5, 1026 height=1,
1013 label=10, 1027 label=10,
1014 pin=true, 1028 pin=true,
1015 pos="1,10!", 1029 pos="1,10!",
1016 shape=pentagon, 1030 shape=pentagon,
1017 style=filled, 1031 style=filled,
1018 width=0.5]; 1032 width=1];
1019 9 -> 10 [arrowhead=none, 1033 9 -> 10 [arrowhead=none,
1020 penwidth=2.0]; 1034 penwidth=2.0];
1021 12 [fillcolor="#9999FF", 1035 12 [fillcolor="#7F7FFF",
1022 fixedsize=true, 1036 fixedsize=true,
1023 group=default, 1037 group=default,
1024 height=0.5, 1038 height=1,
1025 label=12, 1039 label=12,
1026 pin=true, 1040 pin=true,
1027 pos="1,12!", 1041 pos="1,12!",
1028 shape=circle, 1042 shape=circle,
1029 style=filled, 1043 style=filled,
1030 width=0.5]; 1044 width=1];
1031 11 -> 12 [arrowhead=none, 1045 11 -> 12 [arrowhead=none,
1032 penwidth=2.0]; 1046 penwidth=2.0];
1033 } 1047 }
1034 #endif 1048 #endif
1035 1049
1036 $ hg rebase 1050 $ hg rebase
1037 rebasing 6:183984ef46d1 "Adding hammer" 1051 rebasing 6:183984ef46d1 "Adding hammer"
1235 1249
1236 #if docgraph-ext 1250 #if docgraph-ext
1237 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore 1251 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1238 .. graphviz:: 1252 .. graphviz::
1239 1253
1240 strict digraph { 1254 strict digraph "Mercurial graph" {
1241 graph [rankdir=LR, 1255 graph [rankdir=LR,
1242 splines=polyline 1256 splines=polyline
1243 ]; 1257 ];
1244 node [label="\N"]; 1258 node [label="\N"];
1245 12 [fillcolor="#9999FF", 1259 12 [fillcolor="#7F7FFF",
1246 fixedsize=true, 1260 fixedsize=true,
1247 group=default, 1261 group=default,
1248 height=0.5, 1262 height=1,
1249 label=12, 1263 label=12,
1250 pin=true, 1264 pin=true,
1251 pos="1,12!", 1265 pos="1,12!",
1252 shape=circle, 1266 shape=circle,
1253 style=filled, 1267 style=filled,
1254 width=0.5]; 1268 width=1];
1255 13 [fillcolor="#DFDFFF", 1269 13 [fillcolor="#DFDFFF",
1256 fixedsize=true, 1270 fixedsize=true,
1257 group=default_alt, 1271 group=default_alt,
1258 height=0.5, 1272 height=1,
1259 label=13, 1273 label=13,
1260 pin=true, 1274 pin=true,
1261 pos="2,13!", 1275 pos="2,13!",
1262 shape=pentagon, 1276 shape=pentagon,
1263 style="dotted, filled", 1277 style="dotted, filled",
1264 width=0.5]; 1278 width=1];
1265 12 -> 13 [arrowhead=none, 1279 12 -> 13 [arrowhead=none,
1266 penwidth=2.0]; 1280 penwidth=2.0];
1267 18 [fillcolor="#9999FF", 1281 18 [fillcolor="#7F7FFF",
1268 fixedsize=true, 1282 fixedsize=true,
1269 group=default, 1283 group=default,
1270 height=0.5, 1284 height=1,
1271 label=18, 1285 label=18,
1272 pin=true, 1286 pin=true,
1273 pos="1,18!", 1287 pos="1,18!",
1274 shape=pentagon, 1288 shape=pentagon,
1275 style=filled, 1289 style=filled,
1276 width=0.5]; 1290 width=1];
1277 12 -> 18 [arrowhead=none, 1291 12 -> 18 [arrowhead=none,
1278 penwidth=2.0]; 1292 penwidth=2.0];
1279 16 [fillcolor="#9999FF", 1293 16 [fillcolor="#7F7FFF",
1280 fixedsize=true, 1294 fixedsize=true,
1281 group=default, 1295 group=default,
1282 height=0.5, 1296 height=1,
1283 label=16, 1297 label=16,
1284 pin=true, 1298 pin=true,
1285 pos="1,16!", 1299 pos="1,16!",
1286 shape=circle, 1300 shape=circle,
1287 style=filled, 1301 style=filled,
1288 width=0.5]; 1302 width=1];
1289 12 -> 16 [arrowhead=none, 1303 12 -> 16 [arrowhead=none,
1290 penwidth=2.0]; 1304 penwidth=2.0];
1291 13 -> 18 [arrowhead=none, 1305 13 -> 18 [arrowtail=none,
1292 minlen=0, 1306 dir=back,
1293 penwidth=2.0, 1307 minlen=0,
1294 style=dashed]; 1308 penwidth=2.0,
1295 14 [fillcolor="#FF4F4F", 1309 style=dashed];
1296 fixedsize=true, 1310 14 [fillcolor="#FF4F4F",
1297 group=default_alt, 1311 fixedsize=true,
1298 height=0.5, 1312 group=default_alt,
1299 label=14, 1313 height=1,
1300 pin=true, 1314 label=14,
1301 pos="2,14!", 1315 pin=true,
1302 shape=pentagon, 1316 pos="2,14!",
1303 style=filled, 1317 shape=pentagon,
1304 width=0.5]; 1318 style=filled,
1305 13 -> 14 [arrowhead=none, 1319 width=1];
1306 penwidth=2.0]; 1320 13 -> 14 [arrowhead=none,
1307 15 [fillcolor="#FF4F4F", 1321 penwidth=2.0];
1308 fixedsize=true, 1322 15 [fillcolor="#FF4F4F",
1309 group=default_alt, 1323 fixedsize=true,
1310 height=0.5, 1324 group=default_alt,
1311 label=15, 1325 height=1,
1312 pin=true, 1326 label=15,
1313 pos="2,15!", 1327 pin=true,
1314 shape=pentagon, 1328 pos="2,15!",
1315 style=filled, 1329 shape=pentagon,
1316 width=0.5]; 1330 style=filled,
1317 14 -> 15 [arrowhead=none, 1331 width=1];
1318 penwidth=2.0]; 1332 14 -> 15 [arrowhead=none,
1319 17 [fillcolor="#9999FF", 1333 penwidth=2.0];
1320 fixedsize=true, 1334 17 [fillcolor="#7F7FFF",
1321 group=default, 1335 fixedsize=true,
1322 height=0.5, 1336 group=default,
1323 label=17, 1337 height=1,
1324 pin=true, 1338 label=17,
1325 pos="1,17!", 1339 pin=true,
1326 shape=circle, 1340 pos="1,17!",
1327 style=filled, 1341 shape=circle,
1328 width=0.5]; 1342 style=filled,
1329 16 -> 17 [arrowhead=none, 1343 width=1];
1330 penwidth=2.0]; 1344 16 -> 17 [arrowhead=none,
1345 penwidth=2.0];
1331 } 1346 }
1332 #endif 1347 #endif
1333 1348
1334 Fortunately stack shows you a better visualization: 1349 Fortunately stack shows you a better visualization:
1335 1350
1415 1430
1416 #if docgraph-ext 1431 #if docgraph-ext
1417 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore 1432 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1418 .. graphviz:: 1433 .. graphviz::
1419 1434
1420 strict digraph { 1435 strict digraph "Mercurial graph" {
1421 graph [rankdir=LR, 1436 graph [rankdir=LR,
1422 splines=polyline 1437 splines=polyline
1423 ]; 1438 ];
1424 node [label="\N"]; 1439 node [label="\N"];
1425 12 [fillcolor="#9999FF", 1440 12 [fillcolor="#7F7FFF",
1426 fixedsize=true, 1441 fixedsize=true,
1427 group=default, 1442 group=default,
1428 height=0.5, 1443 height=1,
1429 label=12, 1444 label=12,
1430 pin=true, 1445 pin=true,
1431 pos="1,12!", 1446 pos="1,12!",
1432 shape=circle, 1447 shape=circle,
1433 style=filled, 1448 style=filled,
1434 width=0.5]; 1449 width=1];
1435 16 [fillcolor="#9999FF", 1450 16 [fillcolor="#7F7FFF",
1436 fixedsize=true, 1451 fixedsize=true,
1437 group=default, 1452 group=default,
1438 height=0.5, 1453 height=1,
1439 label=16, 1454 label=16,
1440 pin=true, 1455 pin=true,
1441 pos="1,16!", 1456 pos="1,16!",
1442 shape=circle, 1457 shape=circle,
1443 style=filled, 1458 style=filled,
1444 width=0.5]; 1459 width=1];
1445 12 -> 16 [arrowhead=none, 1460 12 -> 16 [arrowhead=none,
1446 penwidth=2.0]; 1461 penwidth=2.0];
1447 18 [fillcolor="#9999FF", 1462 18 [fillcolor="#7F7FFF",
1448 fixedsize=true, 1463 fixedsize=true,
1449 group=default, 1464 group=default,
1450 height=0.5, 1465 height=1,
1451 label=18, 1466 label=18,
1452 pin=true, 1467 pin=true,
1453 pos="1,18!", 1468 pos="1,18!",
1454 shape=pentagon, 1469 shape=pentagon,
1455 style=filled, 1470 style=filled,
1456 width=0.5]; 1471 width=1];
1457 12 -> 18 [arrowhead=none, 1472 12 -> 18 [arrowhead=none,
1458 penwidth=2.0]; 1473 penwidth=2.0];
1459 17 [fillcolor="#9999FF", 1474 17 [fillcolor="#7F7FFF",
1460 fixedsize=true, 1475 fixedsize=true,
1461 group=default, 1476 group=default,
1462 height=0.5, 1477 height=1,
1463 label=17, 1478 label=17,
1464 pin=true, 1479 pin=true,
1465 pos="1,17!", 1480 pos="1,17!",
1466 shape=circle, 1481 shape=circle,
1467 style=filled, 1482 style=filled,
1468 width=0.5]; 1483 width=1];
1469 16 -> 17 [arrowhead=none, 1484 16 -> 17 [arrowhead=none,
1470 penwidth=2.0]; 1485 penwidth=2.0];
1471 19 [fillcolor="#9999FF", 1486 19 [fillcolor="#7F7FFF",
1472 fixedsize=true, 1487 fixedsize=true,
1473 group=default, 1488 group=default,
1474 height=0.5, 1489 height=1,
1475 label=19, 1490 label=19,
1476 pin=true, 1491 pin=true,
1477 pos="1,19!", 1492 pos="1,19!",
1478 shape=pentagon, 1493 shape=pentagon,
1479 style=filled, 1494 style=filled,
1480 width=0.5]; 1495 width=1];
1481 18 -> 19 [arrowhead=none, 1496 18 -> 19 [arrowhead=none,
1482 penwidth=2.0]; 1497 penwidth=2.0];
1483 20 [fillcolor="#9999FF", 1498 20 [fillcolor="#7F7FFF",
1484 fixedsize=true, 1499 fixedsize=true,
1485 group=default, 1500 group=default,
1486 height=0.5, 1501 height=1,
1487 label=20, 1502 label=20,
1488 pin=true, 1503 pin=true,
1489 pos="1,20!", 1504 pos="1,20!",
1490 shape=pentagon, 1505 shape=pentagon,
1491 style=filled, 1506 style=filled,
1492 width=0.5]; 1507 width=1];
1493 19 -> 20 [arrowhead=none, 1508 19 -> 20 [arrowhead=none,
1494 penwidth=2.0]; 1509 penwidth=2.0];
1495 } 1510 }
1496 #endif 1511 #endif
1497 Multi-headed stack 1512 Multi-headed stack
1498 ------------------ 1513 ------------------
1499 1514
1597 1612
1598 #if docgraph-ext 1613 #if docgraph-ext
1599 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 1614 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
1600 .. graphviz:: 1615 .. graphviz::
1601 1616
1602 strict digraph { 1617 strict digraph "Mercurial graph" {
1603 graph [rankdir=LR, 1618 graph [rankdir=LR,
1604 splines=polyline 1619 splines=polyline
1605 ]; 1620 ];
1606 node [label="\N"]; 1621 node [label="\N"];
1607 0 [fillcolor="#9999FF", 1622 0 [fillcolor="#7F7FFF",
1608 fixedsize=true, 1623 fixedsize=true,
1609 group=default, 1624 group=default,
1610 height=0.5, 1625 height=1,
1611 label=0, 1626 label=0,
1612 pin=true, 1627 pin=true,
1613 pos="1,0!", 1628 pos="1,0!",
1614 shape=circle, 1629 shape=circle,
1615 style=filled, 1630 style=filled,
1616 width=0.5]; 1631 width=1];
1617 3 [fillcolor="#9999FF", 1632 3 [fillcolor="#7F7FFF",
1618 fixedsize=true, 1633 fixedsize=true,
1619 group=default, 1634 group=default,
1620 height=0.5, 1635 height=1,
1621 label=3, 1636 label=3,
1622 pin=true, 1637 pin=true,
1623 pos="1,3!", 1638 pos="1,3!",
1624 shape=circle, 1639 shape=circle,
1625 style=filled, 1640 style=filled,
1626 width=0.5]; 1641 width=1];
1627 0 -> 3 [arrowhead=none, 1642 0 -> 3 [arrowhead=none,
1628 penwidth=2.0]; 1643 penwidth=2.0];
1629 4 [fillcolor="#9999FF", 1644 4 [fillcolor="#7F7FFF",
1630 fixedsize=true, 1645 fixedsize=true,
1631 group=default, 1646 group=default,
1632 height=0.5, 1647 height=1,
1633 label=4, 1648 label=4,
1634 pin=true, 1649 pin=true,
1635 pos="1,4!", 1650 pos="1,4!",
1636 shape=circle, 1651 shape=circle,
1637 style=filled, 1652 style=filled,
1638 width=0.5]; 1653 width=1];
1639 3 -> 4 [arrowhead=none, 1654 3 -> 4 [arrowhead=none,
1640 penwidth=2.0]; 1655 penwidth=2.0];
1641 5 [fillcolor="#9999FF", 1656 5 [fillcolor="#7F7FFF",
1642 fixedsize=true, 1657 fixedsize=true,
1643 group=default, 1658 group=default,
1644 height=0.5, 1659 height=1,
1645 label=5, 1660 label=5,
1646 pin=true, 1661 pin=true,
1647 pos="1,5!", 1662 pos="1,5!",
1648 shape=circle, 1663 shape=circle,
1649 style=filled, 1664 style=filled,
1650 width=0.5]; 1665 width=1];
1651 4 -> 5 [arrowhead=none, 1666 4 -> 5 [arrowhead=none,
1652 penwidth=2.0]; 1667 penwidth=2.0];
1653 11 [fillcolor="#9999FF", 1668 11 [fillcolor="#7F7FFF",
1654 fixedsize=true, 1669 fixedsize=true,
1655 group=default, 1670 group=default,
1656 height=0.5, 1671 height=1,
1657 label=11, 1672 label=11,
1658 pin=true, 1673 pin=true,
1659 pos="1,11!", 1674 pos="1,11!",
1660 shape=circle, 1675 shape=circle,
1661 style=filled, 1676 style=filled,
1662 width=0.5]; 1677 width=1];
1663 5 -> 11 [arrowhead=none, 1678 5 -> 11 [arrowhead=none,
1664 penwidth=2.0]; 1679 penwidth=2.0];
1665 12 [fillcolor="#9999FF", 1680 12 [fillcolor="#7F7FFF",
1666 fixedsize=true, 1681 fixedsize=true,
1667 group=default, 1682 group=default,
1668 height=0.5, 1683 height=1,
1669 label=12, 1684 label=12,
1670 pin=true, 1685 pin=true,
1671 pos="1,12!", 1686 pos="1,12!",
1672 shape=circle, 1687 shape=circle,
1673 style=filled, 1688 style=filled,
1674 width=0.5]; 1689 width=1];
1675 11 -> 12 [arrowhead=none, 1690 11 -> 12 [arrowhead=none,
1676 penwidth=2.0]; 1691 penwidth=2.0];
1677 16 [fillcolor="#9999FF", 1692 16 [fillcolor="#7F7FFF",
1678 fixedsize=true, 1693 fixedsize=true,
1679 group=default, 1694 group=default,
1680 height=0.5, 1695 height=1,
1681 label=16, 1696 label=16,
1682 pin=true, 1697 pin=true,
1683 pos="1,16!", 1698 pos="1,16!",
1684 shape=circle, 1699 shape=circle,
1685 style=filled, 1700 style=filled,
1686 width=0.5]; 1701 width=1];
1687 12 -> 16 [arrowhead=none, 1702 12 -> 16 [arrowhead=none,
1688 penwidth=2.0]; 1703 penwidth=2.0];
1689 18 [fillcolor="#9999FF", 1704 18 [fillcolor="#7F7FFF",
1690 fixedsize=true, 1705 fixedsize=true,
1691 group=default, 1706 group=default,
1692 height=0.5, 1707 height=1,
1693 label=18, 1708 label=18,
1694 pin=true, 1709 pin=true,
1695 pos="1,18!", 1710 pos="1,18!",
1696 shape=pentagon, 1711 shape=pentagon,
1697 style=filled, 1712 style=filled,
1698 width=0.5]; 1713 width=1];
1699 12 -> 18 [arrowhead=none, 1714 12 -> 18 [arrowhead=none,
1700 penwidth=2.0]; 1715 penwidth=2.0];
1701 17 [fillcolor="#9999FF", 1716 17 [fillcolor="#7F7FFF",
1702 fixedsize=true, 1717 fixedsize=true,
1703 group=default, 1718 group=default,
1704 height=0.5, 1719 height=1,
1705 label=17, 1720 label=17,
1706 pin=true, 1721 pin=true,
1707 pos="1,17!", 1722 pos="1,17!",
1708 shape=circle, 1723 shape=circle,
1709 style=filled, 1724 style=filled,
1710 width=0.5]; 1725 width=1];
1711 16 -> 17 [arrowhead=none, 1726 16 -> 17 [arrowhead=none,
1712 penwidth=2.0]; 1727 penwidth=2.0];
1713 19 [fillcolor="#9999FF", 1728 19 [fillcolor="#7F7FFF",
1714 fixedsize=true, 1729 fixedsize=true,
1715 group=default, 1730 group=default,
1716 height=0.5, 1731 height=1,
1717 label=19, 1732 label=19,
1718 pin=true, 1733 pin=true,
1719 pos="1,19!", 1734 pos="1,19!",
1720 shape=pentagon, 1735 shape=pentagon,
1721 style=filled, 1736 style=filled,
1722 width=0.5]; 1737 width=1];
1723 18 -> 19 [arrowhead=none, 1738 18 -> 19 [arrowhead=none,
1724 penwidth=2.0]; 1739 penwidth=2.0];
1725 21 [fillcolor="#9999FF", 1740 21 [fillcolor="#7F7FFF",
1726 fixedsize=true, 1741 fixedsize=true,
1727 group=default, 1742 group=default,
1728 height=0.5, 1743 height=1,
1729 label=21, 1744 label=21,
1730 pin=true, 1745 pin=true,
1731 pos="1,21!", 1746 pos="1,21!",
1732 shape=pentagon, 1747 shape=pentagon,
1733 style=filled, 1748 style=filled,
1734 width=0.5]; 1749 width=1];
1735 18 -> 21 [arrowhead=none, 1750 18 -> 21 [arrowhead=none,
1736 penwidth=2.0]; 1751 penwidth=2.0];
1737 20 [fillcolor="#9999FF", 1752 20 [fillcolor="#7F7FFF",
1738 fixedsize=true, 1753 fixedsize=true,
1739 group=default, 1754 group=default,
1740 height=0.5, 1755 height=1,
1741 label=20, 1756 label=20,
1742 pin=true, 1757 pin=true,
1743 pos="1,20!", 1758 pos="1,20!",
1744 shape=pentagon, 1759 shape=pentagon,
1745 style=filled, 1760 style=filled,
1746 width=0.5]; 1761 width=1];
1747 19 -> 20 [arrowhead=none, 1762 19 -> 20 [arrowhead=none,
1748 penwidth=2.0]; 1763 penwidth=2.0];
1749 } 1764 }
1750 #endif 1765 #endif
1751 1766
1752 $ hg up t4 1767 $ hg up t4
1753 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1768 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1805 adding manifests 1820 adding manifests
1806 adding file changes 1821 adding file changes
1807 added 4 changesets with 4 changes to 1 files (+1 heads) 1822 added 4 changesets with 4 changes to 1 files (+1 heads)
1808 8 new obsolescence markers 1823 8 new obsolescence markers
1809 1824
1810 Pushing the new topic branch to a non publishing server did not require 1825 Pushing the new topic branch to a non-publishing server did not require
1811 --force. As long as new heads are on their own topic, Mercurial will not 1826 --force. As long as new heads are on their own topic, Mercurial will not
1812 complain about them. 1827 complain about them.
1813 1828
1814 From another client, we will get them with their topic: 1829 From another client, we will get them with their topic:
1815 1830
1853 adding changesets 1868 adding changesets
1854 adding manifests 1869 adding manifests
1855 adding file changes 1870 adding file changes
1856 added 1 changesets with 1 changes to 1 files 1871 added 1 changesets with 1 changes to 1 files
1857 1872
1858 And retrieve them on the first client: 1873 And retrieve them from the first client:
1859 1874
1860 $ cd ../client 1875 $ cd ../client
1861 1876
1862 $ hg pull ../non-publishing-server 1877 $ hg pull ../non-publishing-server
1863 pulling from ../non-publishing-server 1878 pulling from ../non-publishing-server