diff tests/test-topic-tutorial.t @ 6900:1c7dcb1db06d mercurial-6.6

test-compat: merge mercurial-6.7 into mercurial-6.6

--- a/tests/test-topic-tutorial.t	Wed Jun 26 13:45:02 2024 +0400
+++ b/tests/test-topic-tutorial.t	Thu Oct 24 17:57:13 2024 +0400
@@ -6,12 +6,12 @@
 
 .. Various setup
 
-  $ . "$TESTDIR/testlib/topic_setup.sh"
+  $ . "$TESTDIR/testlib/common.sh" #rest-ignore
   $ cat >> $HGRCPATH << EOF
-  > [experimental]
-  > evolution=all
   > [extensions]
-  > evolve=
+  > evolve =
+  > rebase =
+  > topic =
   > EOF
 
   $ hg init server
@@ -20,7 +20,7 @@
 
   $ cat >> .hg/hgrc << EOF
   > [ui]
-  > user= Shopping Master
+  > user = Shopping Master
   > EOF
 
   $ cat >> shopping << EOF
@@ -43,7 +43,7 @@
   $ cd client
   $ cat >> .hg/hgrc << EOF
   > [ui]
-  > user= Tutorial User
+  > user = Tutorial User
   > EOF
 #if docgraph-ext
   $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
@@ -100,7 +100,7 @@
   marked working directory as topic: food
 
 Much like a named branch, our topic is active but it does not contain any
-changeset yet:
+changesets yet:
 
   $ hg topics
    * food (0 changesets)
@@ -147,7 +147,7 @@
 
   $ cat >> shopping << EOF
   > Egg
-  > Suggar
+  > Sugar
   > Vinegar
   > Oil
   > EOF
@@ -157,7 +157,7 @@
   (see 'hg help topics' for more information)
 
   $ hg log --graph --rev 'topic("food")'
-  @  changeset:   1:13900241408b
+  @  changeset:   1:9e90e00c084b
   |  tag:         tip
   ~  topic:       food
      user:        test
@@ -198,14 +198,14 @@
   $ hg commit -m "adding fruits"
 
   $ hg log --graph --rev 'topic("food")'
-  @  changeset:   2:287de11b401f
+  @  changeset:   2:a25aaa6b9385
   |  tag:         tip
   |  topic:       food
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   1:13900241408b
+  o  changeset:   1:9e90e00c084b
   |  topic:       food
   ~  user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
@@ -268,14 +268,14 @@
 changeset of default without a topic:
 
   $ hg log --graph
-  o  changeset:   2:287de11b401f
+  o  changeset:   2:a25aaa6b9385
   |  tag:         tip
   |  topic:       food
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   1:13900241408b
+  o  changeset:   1:9e90e00c084b
   |  topic:       food
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -395,13 +395,13 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding clothes
   |
-  | o  changeset:   2:287de11b401f
+  | o  changeset:   2:a25aaa6b9385
   | |  topic:       food
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     adding fruits
   | |
-  | @  changeset:   1:13900241408b
+  | @  changeset:   1:9e90e00c084b
   |/   topic:       food
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -488,21 +488,21 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 1:13900241408b food "adding condiments"
+  rebasing 1:9e90e00c084b food "adding condiments"
   merging shopping
   switching to topic food
-  rebasing 2:287de11b401f food "adding fruits"
+  rebasing 2:a25aaa6b9385 food "adding fruits"
   merging shopping
 
   $ hg log --graph
-  @  changeset:   5:2d50db8b5b4c
+  @  changeset:   5:fec062fcfcfa
   |  tag:         tip
   |  topic:       food
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   4:4011b46eeb33
+  o  changeset:   4:d3a1ea2a0337
   |  topic:       food
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -580,9 +580,9 @@
 There exists a template keyword named "topic" which can be used
 
   $ hg log -GT "{rev}:{node|short} {topic}\n {desc}"
-  @  5:2d50db8b5b4c food
+  @  5:fec062fcfcfa food
   |   adding fruits
-  o  4:4011b46eeb33 food
+  o  4:d3a1ea2a0337 food
   |   adding condiments
   o  3:6104862e8b84
   |   Adding clothes
@@ -618,13 +618,13 @@
   s0^ adding fruits (base current)
 
   $ hg log --graph
-  @  changeset:   5:2d50db8b5b4c
+  @  changeset:   5:fec062fcfcfa
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   4:4011b46eeb33
+  o  changeset:   4:d3a1ea2a0337
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding condiments
@@ -713,7 +713,7 @@
 Keep working within topics
 ==========================
 
-Making sure all your new local commit are made within a topic will help you
+Making sure all your new local commits are made within a topic will help you
 organize your work. It is possible to ensure this through the Mercurial
 configuration.
 
@@ -724,10 +724,10 @@
   > topic-mode = enforce
   > EOF
 
-You can also use `hg config --edit` to update your mercurial configuration.
+You can also use `hg config --edit` to update your Mercurial configuration.
 
 
-Once enforcement is turned on. New local commit will be denied if no topic is active.
+Once enforcement is turned on, new local commits will be denied if no topic is active.
 
   $ echo sickle >> shopping
   $ hg commit -m 'Adding sickle'
@@ -764,7 +764,7 @@
   $ echo drill >> shopping
   $ hg commit -m 'Adding drill'
 
-But we are not sure we will actually go to the hardware store, so in the
+But we are not sure if we will actually go to the hardware store, so in the
 meantime, we want to extend the list with drinks. We go back to the official
 default branch and start a new topic:
 
@@ -815,7 +815,7 @@
   nothing to rebase
   [1]
 
-We simulate independant contributions to the repo with this
+We simulate independent contributions to the repo with this
 activity:
 
   $ cd ../server
@@ -832,7 +832,7 @@
   $ hg commit -m 'add a pair of shoes'
   $ cd ../client
 
-Let's discover what other people did contribute:
+Let's discover what other people have contributed:
 
   $ hg pull
   pulling from $TESTTMP/server (glob)
@@ -841,62 +841,62 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  new changesets f2d6cacc6115:fbff9bc37a43
+  new changesets bbfb218049cd:033bfcc0ecb0
   (run 'hg heads' to see heads)
 
 There are new changes! We can simply use ``hg rebase`` to update our
 changeset on top of the latest:
 
   $ hg log -G
-  o  changeset:   12:fbff9bc37a43
+  o  changeset:   12:033bfcc0ecb0
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add a pair of shoes
   |
-  o  changeset:   11:f2d6cacc6115
-  |  parent:      5:2d50db8b5b4c
+  o  changeset:   11:bbfb218049cd
+  |  parent:      5:fec062fcfcfa
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add a coat
   |
-  | o  changeset:   10:70dfa201ed73
+  | o  changeset:   10:0b8a99ba9213
   | |  topic:       drinks
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding orange juice
   | |
-  | o  changeset:   9:8dfa45bd5e0c
+  | o  changeset:   9:213e97c6cd8a
   |/   topic:       drinks
-  |    parent:      5:2d50db8b5b4c
+  |    parent:      5:fec062fcfcfa
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  | @  changeset:   8:34255b455dac
+  | @  changeset:   8:9ef4e4f40a79
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding drill
   | |
-  | o  changeset:   7:cffff85af537
+  | o  changeset:   7:c1d9846a234f
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding saw
   | |
-  | o  changeset:   6:183984ef46d1
+  | o  changeset:   6:6d6f38ff45f0
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding hammer
   |
-  o  changeset:   5:2d50db8b5b4c
+  o  changeset:   5:fec062fcfcfa
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   4:4011b46eeb33
+  o  changeset:   4:d3a1ea2a0337
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding condiments
@@ -1055,49 +1055,49 @@
 #endif
 
   $ hg rebase
-  rebasing 6:183984ef46d1 tools "Adding hammer"
+  rebasing 6:6d6f38ff45f0 tools "Adding hammer"
   merging shopping
   switching to topic tools
-  rebasing 7:cffff85af537 tools "Adding saw"
+  rebasing 7:c1d9846a234f tools "Adding saw"
   merging shopping
-  rebasing 8:34255b455dac tools "Adding drill"
+  rebasing 8:9ef4e4f40a79 tools "Adding drill"
   merging shopping
 
-But what about the other topic? You can use 'hg topics --verbose' to see
+But what about the other topic? You can use ``hg topics --verbose`` to see
 information about all the topics:
 
   $ hg topics --verbose
      drinks (on branch: default, 2 changesets, 2 behind)
    * tools  (on branch: default, 3 changesets)
 
-The "2 behind" is telling you that there are 2 new changesets over the base of the topic.
+The "2 behind" is telling you that there are 2 new changesets on top of the base of the topic.
 
 Pushing that topic would create a new head, and therefore will be prevented:
 
   $ hg push --rev drinks
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 70dfa201ed73
+  abort: push creates new remote head 0b8a99ba9213
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 
 
 Even after a rebase, pushing all active topics at the same time would publish
-them to the default branch, and then mercurial would complain about the
+them to the default branch, and then Mercurial would complain about the
 multiple *public* heads it would create on that branch:
 
   $ hg rebase -b drinks
-  rebasing 9:8dfa45bd5e0c drinks "Adding apple juice"
+  rebasing 9:213e97c6cd8a drinks "Adding apple juice"
   merging shopping
   switching to topic drinks
-  rebasing 10:70dfa201ed73 drinks "Adding orange juice"
+  rebasing 10:0b8a99ba9213 drinks "Adding orange juice"
   merging shopping
   switching to topic tools
 
   $ hg push
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 4cd7c1591a67
+  abort: push creates new remote head 56656c6d1153
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 
@@ -1113,7 +1113,7 @@
   added 2 changesets with 2 changes to 1 files
   2 new obsolescence markers
 
-The published topic has now faded out, and the other is now marked as
+The published topic has now faded out, and the other is now marked as being
 "behind":
 
   $ hg topics --verbose
@@ -1133,7 +1133,7 @@
 Navigating within your stack
 ----------------------------
 
-As we saw before `stack` displays changesets on your current topic in a clean way:
+As we saw before ``stack`` displays changesets on your current topic in a clean way:
 
   $ hg topics --verbose
    * tools (on branch: default, 3 changesets, 2 behind)
@@ -1146,9 +1146,9 @@
   s1: Adding hammer
   s0^ add a pair of shoes (base)
 
-You can navigate in your current stack with `previous` and `next`.
+You can navigate in your current stack with ``previous`` and ``next``.
 
-`previous` will bring you back to the parent of the topic head.
+``previous`` will bring you back to the parent of the topic head.
 
   $ hg previous
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1162,7 +1162,7 @@
   s1: Adding hammer
   s0^ add a pair of shoes (base)
 
-`next` will move you forward to the topic head.
+``next`` will move you forward to the topic head.
 
   $ hg next
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1176,7 +1176,7 @@
   s1: Adding hammer
   s0^ add a pair of shoes (base)
 
-You can also directly jump to a changeset within your stack with the revset `t#`.
+You can also directly jump to a changeset within your stack with the revset ``s<number>``.
 
   $ hg update s1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1209,47 +1209,47 @@
 it shows too many things:
 
   $ hg log -G -r "s0::"
-  @  changeset:   18:b7509bd417f8
+  @  changeset:   18:2c1a47a5c075
   |  tag:         tip
   |  topic:       tools
-  |  parent:      12:fbff9bc37a43
+  |  parent:      12:033bfcc0ecb0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding hammer to the shopping list
   |
-  | o  changeset:   17:4cd7c1591a67
+  | o  changeset:   17:9dc8cec494f3
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding orange juice
   | |
-  | o  changeset:   16:20759cb47ff8
-  |/   parent:      12:fbff9bc37a43
+  | o  changeset:   16:9dfd6068e8e7
+  |/   parent:      12:033bfcc0ecb0
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  | *  changeset:   15:bb1e6254f532
+  | *  changeset:   15:56656c6d1153
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     Adding drill
   | |
-  | *  changeset:   14:d4f97f32f8a1
+  | *  changeset:   14:a0ec1a6dcdce
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     Adding saw
   | |
-  | x  changeset:   13:a8ab3599d53d
+  | x  changeset:   13:dcb888ba1623
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 18:b7509bd417f8
+  |    obsolete:    reworded using amend as 18:2c1a47a5c075
   |    summary:     Adding hammer
   |
-  o  changeset:   12:fbff9bc37a43
+  o  changeset:   12:033bfcc0ecb0
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a pair of shoes
@@ -1364,14 +1364,14 @@
   s1@ Adding hammer to the shopping list (current)
   s0^ add a pair of shoes (base)
 
-It's easy to stabilize the situation, `next` has an `--evolve` option.  It will
-do the necessary relocation of `s2` and `s3` over the new `s1` without having
-to do that rebase by hand.:
+It's easy to stabilize the situation, ``next`` has an ``--evolve`` option
+(turned on by default nowadays). It will do the necessary relocation of `s2`
+and `s3` over the new `s1` without having to do that rebase by hand:
 
   $ hg next --evolve
   move:[s2] Adding saw
   atop:[s1] Adding hammer to the shopping list
-  working directory is now at d5c51ee5762a
+  working directory is now at 7537e3a3cbca
 
   $ hg stack
   ### topic: tools
@@ -1386,7 +1386,7 @@
   $ hg next --evolve
   move:[s3] Adding drill
   atop:[s2] Adding saw
-  working directory is now at bae3758e46bf
+  working directory is now at 9d65331e0dc1
 
   $ hg stack
   ### topic: tools
@@ -1396,41 +1396,41 @@
   s1: Adding hammer to the shopping list
   s0^ add a pair of shoes (base)
 
-Let's take a look at `hg log` once again:
+Let's take a look at ``hg log`` once again:
 
   $ hg log -G -r "s0::"
-  @  changeset:   20:bae3758e46bf
+  @  changeset:   20:9d65331e0dc1
   |  tag:         tip
   |  topic:       tools
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding drill
   |
-  o  changeset:   19:d5c51ee5762a
+  o  changeset:   19:7537e3a3cbca
   |  topic:       tools
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding saw
   |
-  o  changeset:   18:b7509bd417f8
+  o  changeset:   18:2c1a47a5c075
   |  topic:       tools
-  |  parent:      12:fbff9bc37a43
+  |  parent:      12:033bfcc0ecb0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding hammer to the shopping list
   |
-  | o  changeset:   17:4cd7c1591a67
+  | o  changeset:   17:9dc8cec494f3
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding orange juice
   | |
-  | o  changeset:   16:20759cb47ff8
-  |/   parent:      12:fbff9bc37a43
+  | o  changeset:   16:9dfd6068e8e7
+  |/   parent:      12:033bfcc0ecb0
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  o  changeset:   12:fbff9bc37a43
+  o  changeset:   12:033bfcc0ecb0
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a pair of shoes
@@ -1548,61 +1548,61 @@
 completely linear history so it's what we will do.
 
   $ hg log -G
-  @  changeset:   21:f936c6da9d61
+  @  changeset:   21:69ad92f8ff49
   |  tag:         tip
   |  topic:       tools
-  |  parent:      18:b7509bd417f8
+  |  parent:      18:2c1a47a5c075
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding nails
   |
-  | o  changeset:   20:bae3758e46bf
+  | o  changeset:   20:9d65331e0dc1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding drill
   | |
-  | o  changeset:   19:d5c51ee5762a
+  | o  changeset:   19:7537e3a3cbca
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding saw
   |
-  o  changeset:   18:b7509bd417f8
+  o  changeset:   18:2c1a47a5c075
   |  topic:       tools
-  |  parent:      12:fbff9bc37a43
+  |  parent:      12:033bfcc0ecb0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Adding hammer to the shopping list
   |
-  | o  changeset:   17:4cd7c1591a67
+  | o  changeset:   17:9dc8cec494f3
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Adding orange juice
   | |
-  | o  changeset:   16:20759cb47ff8
-  |/   parent:      12:fbff9bc37a43
+  | o  changeset:   16:9dfd6068e8e7
+  |/   parent:      12:033bfcc0ecb0
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Adding apple juice
   |
-  o  changeset:   12:fbff9bc37a43
+  o  changeset:   12:033bfcc0ecb0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add a pair of shoes
   |
-  o  changeset:   11:f2d6cacc6115
-  |  parent:      5:2d50db8b5b4c
+  o  changeset:   11:bbfb218049cd
+  |  parent:      5:fec062fcfcfa
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add a coat
   |
-  o  changeset:   5:2d50db8b5b4c
+  o  changeset:   5:fec062fcfcfa
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding fruits
   |
-  o  changeset:   4:4011b46eeb33
+  o  changeset:   4:d3a1ea2a0337
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     adding condiments
@@ -1777,9 +1777,9 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 19:d5c51ee5762a tools "Adding saw"
+  rebasing 19:7537e3a3cbca tools "Adding saw"
   merging shopping
-  rebasing 20:bae3758e46bf tools "Adding drill"
+  rebasing 20:9d65331e0dc1 tools "Adding drill"
   merging shopping
 
   $ hg stack
@@ -1832,7 +1832,7 @@
   8 new obsolescence markers
 
 Pushing the new topic branch to a non-publishing server did not require
---force. As long as new heads are on their own topic, Mercurial will not
+``--force``. As long as new heads are on their own topic, Mercurial will not
 complain about them.
 
 From another client, we will get them with their topic:
@@ -1847,7 +1847,7 @@
   adding file changes
   added 4 changesets with 4 changes to 1 files (+1 heads)
   8 new obsolescence markers
-  new changesets b7509bd417f8:2d084ac00115 (4 drafts)
+  new changesets 2c1a47a5c075:bbb9e269a01a (4 drafts)
   (run 'hg heads' to see heads)
 
   $ hg topics --verbose
@@ -1891,7 +1891,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 0d409663a1fd (1 drafts)
+  new changesets 71d37f5c73ed (1 drafts)
   (run 'hg update' to get a working copy)
 
   $ hg update