Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 3418:85cdce113c2c mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Jan 2018 04:35:34 +0100
parents 9f900937c198 e1f3e43a50a4
children 1e2f683e11e7 42b3ac0a5b05
comparison
equal deleted inserted replaced
3380:62f742d144da 3418:85cdce113c2c
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"
1236 1250
1237 #if docgraph-ext 1251 #if docgraph-ext
1238 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore 1252 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1239 .. graphviz:: 1253 .. graphviz::
1240 1254
1241 strict digraph { 1255 strict digraph "Mercurial graph" {
1242 graph [rankdir=LR, 1256 graph [rankdir=LR,
1243 splines=polyline 1257 splines=polyline
1244 ]; 1258 ];
1245 node [label="\N"]; 1259 node [label="\N"];
1246 12 [fillcolor="#9999FF", 1260 12 [fillcolor="#7F7FFF",
1247 fixedsize=true, 1261 fixedsize=true,
1248 group=default, 1262 group=default,
1249 height=0.5, 1263 height=1,
1250 label=12, 1264 label=12,
1251 pin=true, 1265 pin=true,
1252 pos="1,12!", 1266 pos="1,12!",
1253 shape=circle, 1267 shape=circle,
1254 style=filled, 1268 style=filled,
1255 width=0.5]; 1269 width=1];
1256 13 [fillcolor="#DFDFFF", 1270 13 [fillcolor="#DFDFFF",
1257 fixedsize=true, 1271 fixedsize=true,
1258 group=default_alt, 1272 group=default_alt,
1259 height=0.5, 1273 height=1,
1260 label=13, 1274 label=13,
1261 pin=true, 1275 pin=true,
1262 pos="2,13!", 1276 pos="2,13!",
1263 shape=pentagon, 1277 shape=pentagon,
1264 style="dotted, filled", 1278 style="dotted, filled",
1265 width=0.5]; 1279 width=1];
1266 12 -> 13 [arrowhead=none, 1280 12 -> 13 [arrowhead=none,
1267 penwidth=2.0]; 1281 penwidth=2.0];
1268 18 [fillcolor="#9999FF", 1282 18 [fillcolor="#7F7FFF",
1269 fixedsize=true, 1283 fixedsize=true,
1270 group=default, 1284 group=default,
1271 height=0.5, 1285 height=1,
1272 label=18, 1286 label=18,
1273 pin=true, 1287 pin=true,
1274 pos="1,18!", 1288 pos="1,18!",
1275 shape=pentagon, 1289 shape=pentagon,
1276 style=filled, 1290 style=filled,
1277 width=0.5]; 1291 width=1];
1278 12 -> 18 [arrowhead=none, 1292 12 -> 18 [arrowhead=none,
1279 penwidth=2.0]; 1293 penwidth=2.0];
1280 16 [fillcolor="#9999FF", 1294 16 [fillcolor="#7F7FFF",
1281 fixedsize=true, 1295 fixedsize=true,
1282 group=default, 1296 group=default,
1283 height=0.5, 1297 height=1,
1284 label=16, 1298 label=16,
1285 pin=true, 1299 pin=true,
1286 pos="1,16!", 1300 pos="1,16!",
1287 shape=circle, 1301 shape=circle,
1288 style=filled, 1302 style=filled,
1289 width=0.5]; 1303 width=1];
1290 12 -> 16 [arrowhead=none, 1304 12 -> 16 [arrowhead=none,
1291 penwidth=2.0]; 1305 penwidth=2.0];
1292 13 -> 18 [arrowhead=none, 1306 13 -> 18 [arrowtail=none,
1293 minlen=0, 1307 dir=back,
1294 penwidth=2.0, 1308 minlen=0,
1295 style=dashed]; 1309 penwidth=2.0,
1296 14 [fillcolor="#FF4F4F", 1310 style=dashed];
1297 fixedsize=true, 1311 14 [fillcolor="#FF4F4F",
1298 group=default_alt, 1312 fixedsize=true,
1299 height=0.5, 1313 group=default_alt,
1300 label=14, 1314 height=1,
1301 pin=true, 1315 label=14,
1302 pos="2,14!", 1316 pin=true,
1303 shape=pentagon, 1317 pos="2,14!",
1304 style=filled, 1318 shape=pentagon,
1305 width=0.5]; 1319 style=filled,
1306 13 -> 14 [arrowhead=none, 1320 width=1];
1307 penwidth=2.0]; 1321 13 -> 14 [arrowhead=none,
1308 15 [fillcolor="#FF4F4F", 1322 penwidth=2.0];
1309 fixedsize=true, 1323 15 [fillcolor="#FF4F4F",
1310 group=default_alt, 1324 fixedsize=true,
1311 height=0.5, 1325 group=default_alt,
1312 label=15, 1326 height=1,
1313 pin=true, 1327 label=15,
1314 pos="2,15!", 1328 pin=true,
1315 shape=pentagon, 1329 pos="2,15!",
1316 style=filled, 1330 shape=pentagon,
1317 width=0.5]; 1331 style=filled,
1318 14 -> 15 [arrowhead=none, 1332 width=1];
1319 penwidth=2.0]; 1333 14 -> 15 [arrowhead=none,
1320 17 [fillcolor="#9999FF", 1334 penwidth=2.0];
1321 fixedsize=true, 1335 17 [fillcolor="#7F7FFF",
1322 group=default, 1336 fixedsize=true,
1323 height=0.5, 1337 group=default,
1324 label=17, 1338 height=1,
1325 pin=true, 1339 label=17,
1326 pos="1,17!", 1340 pin=true,
1327 shape=circle, 1341 pos="1,17!",
1328 style=filled, 1342 shape=circle,
1329 width=0.5]; 1343 style=filled,
1330 16 -> 17 [arrowhead=none, 1344 width=1];
1331 penwidth=2.0]; 1345 16 -> 17 [arrowhead=none,
1346 penwidth=2.0];
1332 } 1347 }
1333 #endif 1348 #endif
1334 1349
1335 Fortunately stack shows you a better visualization: 1350 Fortunately stack shows you a better visualization:
1336 1351
1416 1431
1417 #if docgraph-ext 1432 #if docgraph-ext
1418 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore 1433 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1419 .. graphviz:: 1434 .. graphviz::
1420 1435
1421 strict digraph { 1436 strict digraph "Mercurial graph" {
1422 graph [rankdir=LR, 1437 graph [rankdir=LR,
1423 splines=polyline 1438 splines=polyline
1424 ]; 1439 ];
1425 node [label="\N"]; 1440 node [label="\N"];
1426 12 [fillcolor="#9999FF", 1441 12 [fillcolor="#7F7FFF",
1427 fixedsize=true, 1442 fixedsize=true,
1428 group=default, 1443 group=default,
1429 height=0.5, 1444 height=1,
1430 label=12, 1445 label=12,
1431 pin=true, 1446 pin=true,
1432 pos="1,12!", 1447 pos="1,12!",
1433 shape=circle, 1448 shape=circle,
1434 style=filled, 1449 style=filled,
1435 width=0.5]; 1450 width=1];
1436 16 [fillcolor="#9999FF", 1451 16 [fillcolor="#7F7FFF",
1437 fixedsize=true, 1452 fixedsize=true,
1438 group=default, 1453 group=default,
1439 height=0.5, 1454 height=1,
1440 label=16, 1455 label=16,
1441 pin=true, 1456 pin=true,
1442 pos="1,16!", 1457 pos="1,16!",
1443 shape=circle, 1458 shape=circle,
1444 style=filled, 1459 style=filled,
1445 width=0.5]; 1460 width=1];
1446 12 -> 16 [arrowhead=none, 1461 12 -> 16 [arrowhead=none,
1447 penwidth=2.0]; 1462 penwidth=2.0];
1448 18 [fillcolor="#9999FF", 1463 18 [fillcolor="#7F7FFF",
1449 fixedsize=true, 1464 fixedsize=true,
1450 group=default, 1465 group=default,
1451 height=0.5, 1466 height=1,
1452 label=18, 1467 label=18,
1453 pin=true, 1468 pin=true,
1454 pos="1,18!", 1469 pos="1,18!",
1455 shape=pentagon, 1470 shape=pentagon,
1456 style=filled, 1471 style=filled,
1457 width=0.5]; 1472 width=1];
1458 12 -> 18 [arrowhead=none, 1473 12 -> 18 [arrowhead=none,
1459 penwidth=2.0]; 1474 penwidth=2.0];
1460 17 [fillcolor="#9999FF", 1475 17 [fillcolor="#7F7FFF",
1461 fixedsize=true, 1476 fixedsize=true,
1462 group=default, 1477 group=default,
1463 height=0.5, 1478 height=1,
1464 label=17, 1479 label=17,
1465 pin=true, 1480 pin=true,
1466 pos="1,17!", 1481 pos="1,17!",
1467 shape=circle, 1482 shape=circle,
1468 style=filled, 1483 style=filled,
1469 width=0.5]; 1484 width=1];
1470 16 -> 17 [arrowhead=none, 1485 16 -> 17 [arrowhead=none,
1471 penwidth=2.0]; 1486 penwidth=2.0];
1472 19 [fillcolor="#9999FF", 1487 19 [fillcolor="#7F7FFF",
1473 fixedsize=true, 1488 fixedsize=true,
1474 group=default, 1489 group=default,
1475 height=0.5, 1490 height=1,
1476 label=19, 1491 label=19,
1477 pin=true, 1492 pin=true,
1478 pos="1,19!", 1493 pos="1,19!",
1479 shape=pentagon, 1494 shape=pentagon,
1480 style=filled, 1495 style=filled,
1481 width=0.5]; 1496 width=1];
1482 18 -> 19 [arrowhead=none, 1497 18 -> 19 [arrowhead=none,
1483 penwidth=2.0]; 1498 penwidth=2.0];
1484 20 [fillcolor="#9999FF", 1499 20 [fillcolor="#7F7FFF",
1485 fixedsize=true, 1500 fixedsize=true,
1486 group=default, 1501 group=default,
1487 height=0.5, 1502 height=1,
1488 label=20, 1503 label=20,
1489 pin=true, 1504 pin=true,
1490 pos="1,20!", 1505 pos="1,20!",
1491 shape=pentagon, 1506 shape=pentagon,
1492 style=filled, 1507 style=filled,
1493 width=0.5]; 1508 width=1];
1494 19 -> 20 [arrowhead=none, 1509 19 -> 20 [arrowhead=none,
1495 penwidth=2.0]; 1510 penwidth=2.0];
1496 } 1511 }
1497 #endif 1512 #endif
1498 Multi-headed stack 1513 Multi-headed stack
1499 ------------------ 1514 ------------------
1500 1515
1598 1613
1599 #if docgraph-ext 1614 #if docgraph-ext
1600 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore 1615 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
1601 .. graphviz:: 1616 .. graphviz::
1602 1617
1603 strict digraph { 1618 strict digraph "Mercurial graph" {
1604 graph [rankdir=LR, 1619 graph [rankdir=LR,
1605 splines=polyline 1620 splines=polyline
1606 ]; 1621 ];
1607 node [label="\N"]; 1622 node [label="\N"];
1608 0 [fillcolor="#9999FF", 1623 0 [fillcolor="#7F7FFF",
1609 fixedsize=true, 1624 fixedsize=true,
1610 group=default, 1625 group=default,
1611 height=0.5, 1626 height=1,
1612 label=0, 1627 label=0,
1613 pin=true, 1628 pin=true,
1614 pos="1,0!", 1629 pos="1,0!",
1615 shape=circle, 1630 shape=circle,
1616 style=filled, 1631 style=filled,
1617 width=0.5]; 1632 width=1];
1618 3 [fillcolor="#9999FF", 1633 3 [fillcolor="#7F7FFF",
1619 fixedsize=true, 1634 fixedsize=true,
1620 group=default, 1635 group=default,
1621 height=0.5, 1636 height=1,
1622 label=3, 1637 label=3,
1623 pin=true, 1638 pin=true,
1624 pos="1,3!", 1639 pos="1,3!",
1625 shape=circle, 1640 shape=circle,
1626 style=filled, 1641 style=filled,
1627 width=0.5]; 1642 width=1];
1628 0 -> 3 [arrowhead=none, 1643 0 -> 3 [arrowhead=none,
1629 penwidth=2.0]; 1644 penwidth=2.0];
1630 4 [fillcolor="#9999FF", 1645 4 [fillcolor="#7F7FFF",
1631 fixedsize=true, 1646 fixedsize=true,
1632 group=default, 1647 group=default,
1633 height=0.5, 1648 height=1,
1634 label=4, 1649 label=4,
1635 pin=true, 1650 pin=true,
1636 pos="1,4!", 1651 pos="1,4!",
1637 shape=circle, 1652 shape=circle,
1638 style=filled, 1653 style=filled,
1639 width=0.5]; 1654 width=1];
1640 3 -> 4 [arrowhead=none, 1655 3 -> 4 [arrowhead=none,
1641 penwidth=2.0]; 1656 penwidth=2.0];
1642 5 [fillcolor="#9999FF", 1657 5 [fillcolor="#7F7FFF",
1643 fixedsize=true, 1658 fixedsize=true,
1644 group=default, 1659 group=default,
1645 height=0.5, 1660 height=1,
1646 label=5, 1661 label=5,
1647 pin=true, 1662 pin=true,
1648 pos="1,5!", 1663 pos="1,5!",
1649 shape=circle, 1664 shape=circle,
1650 style=filled, 1665 style=filled,
1651 width=0.5]; 1666 width=1];
1652 4 -> 5 [arrowhead=none, 1667 4 -> 5 [arrowhead=none,
1653 penwidth=2.0]; 1668 penwidth=2.0];
1654 11 [fillcolor="#9999FF", 1669 11 [fillcolor="#7F7FFF",
1655 fixedsize=true, 1670 fixedsize=true,
1656 group=default, 1671 group=default,
1657 height=0.5, 1672 height=1,
1658 label=11, 1673 label=11,
1659 pin=true, 1674 pin=true,
1660 pos="1,11!", 1675 pos="1,11!",
1661 shape=circle, 1676 shape=circle,
1662 style=filled, 1677 style=filled,
1663 width=0.5]; 1678 width=1];
1664 5 -> 11 [arrowhead=none, 1679 5 -> 11 [arrowhead=none,
1665 penwidth=2.0]; 1680 penwidth=2.0];
1666 12 [fillcolor="#9999FF", 1681 12 [fillcolor="#7F7FFF",
1667 fixedsize=true, 1682 fixedsize=true,
1668 group=default, 1683 group=default,
1669 height=0.5, 1684 height=1,
1670 label=12, 1685 label=12,
1671 pin=true, 1686 pin=true,
1672 pos="1,12!", 1687 pos="1,12!",
1673 shape=circle, 1688 shape=circle,
1674 style=filled, 1689 style=filled,
1675 width=0.5]; 1690 width=1];
1676 11 -> 12 [arrowhead=none, 1691 11 -> 12 [arrowhead=none,
1677 penwidth=2.0]; 1692 penwidth=2.0];
1678 16 [fillcolor="#9999FF", 1693 16 [fillcolor="#7F7FFF",
1679 fixedsize=true, 1694 fixedsize=true,
1680 group=default, 1695 group=default,
1681 height=0.5, 1696 height=1,
1682 label=16, 1697 label=16,
1683 pin=true, 1698 pin=true,
1684 pos="1,16!", 1699 pos="1,16!",
1685 shape=circle, 1700 shape=circle,
1686 style=filled, 1701 style=filled,
1687 width=0.5]; 1702 width=1];
1688 12 -> 16 [arrowhead=none, 1703 12 -> 16 [arrowhead=none,
1689 penwidth=2.0]; 1704 penwidth=2.0];
1690 18 [fillcolor="#9999FF", 1705 18 [fillcolor="#7F7FFF",
1691 fixedsize=true, 1706 fixedsize=true,
1692 group=default, 1707 group=default,
1693 height=0.5, 1708 height=1,
1694 label=18, 1709 label=18,
1695 pin=true, 1710 pin=true,
1696 pos="1,18!", 1711 pos="1,18!",
1697 shape=pentagon, 1712 shape=pentagon,
1698 style=filled, 1713 style=filled,
1699 width=0.5]; 1714 width=1];
1700 12 -> 18 [arrowhead=none, 1715 12 -> 18 [arrowhead=none,
1701 penwidth=2.0]; 1716 penwidth=2.0];
1702 17 [fillcolor="#9999FF", 1717 17 [fillcolor="#7F7FFF",
1703 fixedsize=true, 1718 fixedsize=true,
1704 group=default, 1719 group=default,
1705 height=0.5, 1720 height=1,
1706 label=17, 1721 label=17,
1707 pin=true, 1722 pin=true,
1708 pos="1,17!", 1723 pos="1,17!",
1709 shape=circle, 1724 shape=circle,
1710 style=filled, 1725 style=filled,
1711 width=0.5]; 1726 width=1];
1712 16 -> 17 [arrowhead=none, 1727 16 -> 17 [arrowhead=none,
1713 penwidth=2.0]; 1728 penwidth=2.0];
1714 19 [fillcolor="#9999FF", 1729 19 [fillcolor="#7F7FFF",
1715 fixedsize=true, 1730 fixedsize=true,
1716 group=default, 1731 group=default,
1717 height=0.5, 1732 height=1,
1718 label=19, 1733 label=19,
1719 pin=true, 1734 pin=true,
1720 pos="1,19!", 1735 pos="1,19!",
1721 shape=pentagon, 1736 shape=pentagon,
1722 style=filled, 1737 style=filled,
1723 width=0.5]; 1738 width=1];
1724 18 -> 19 [arrowhead=none, 1739 18 -> 19 [arrowhead=none,
1725 penwidth=2.0]; 1740 penwidth=2.0];
1726 21 [fillcolor="#9999FF", 1741 21 [fillcolor="#7F7FFF",
1727 fixedsize=true, 1742 fixedsize=true,
1728 group=default, 1743 group=default,
1729 height=0.5, 1744 height=1,
1730 label=21, 1745 label=21,
1731 pin=true, 1746 pin=true,
1732 pos="1,21!", 1747 pos="1,21!",
1733 shape=pentagon, 1748 shape=pentagon,
1734 style=filled, 1749 style=filled,
1735 width=0.5]; 1750 width=1];
1736 18 -> 21 [arrowhead=none, 1751 18 -> 21 [arrowhead=none,
1737 penwidth=2.0]; 1752 penwidth=2.0];
1738 20 [fillcolor="#9999FF", 1753 20 [fillcolor="#7F7FFF",
1739 fixedsize=true, 1754 fixedsize=true,
1740 group=default, 1755 group=default,
1741 height=0.5, 1756 height=1,
1742 label=20, 1757 label=20,
1743 pin=true, 1758 pin=true,
1744 pos="1,20!", 1759 pos="1,20!",
1745 shape=pentagon, 1760 shape=pentagon,
1746 style=filled, 1761 style=filled,
1747 width=0.5]; 1762 width=1];
1748 19 -> 20 [arrowhead=none, 1763 19 -> 20 [arrowhead=none,
1749 penwidth=2.0]; 1764 penwidth=2.0];
1750 } 1765 }
1751 #endif 1766 #endif
1752 1767
1753 $ hg up t4 1768 $ hg up t4
1754 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1769 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1806 adding manifests 1821 adding manifests
1807 adding file changes 1822 adding file changes
1808 added 4 changesets with 4 changes to 1 files (+1 heads) 1823 added 4 changesets with 4 changes to 1 files (+1 heads)
1809 8 new obsolescence markers 1824 8 new obsolescence markers
1810 1825
1811 Pushing the new topic branch to a non publishing server did not require 1826 Pushing the new topic branch to a non-publishing server did not require
1812 --force. As long as new heads are on their own topic, Mercurial will not 1827 --force. As long as new heads are on their own topic, Mercurial will not
1813 complain about them. 1828 complain about them.
1814 1829
1815 From another client, we will get them with their topic: 1830 From another client, we will get them with their topic:
1816 1831
1854 adding changesets 1869 adding changesets
1855 adding manifests 1870 adding manifests
1856 adding file changes 1871 adding file changes
1857 added 1 changesets with 1 changes to 1 files 1872 added 1 changesets with 1 changes to 1 files
1858 1873
1859 And retrieve them on the first client: 1874 And retrieve them from the first client:
1860 1875
1861 $ cd ../client 1876 $ cd ../client
1862 1877
1863 $ hg pull ../non-publishing-server 1878 $ hg pull ../non-publishing-server
1864 pulling from ../non-publishing-server 1879 pulling from ../non-publishing-server