diff tests/test-topic-fold.t @ 5972:656edde3a8ce

tests: use common.sh for creating commits
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 03 Feb 2021 13:23:41 +0530
parents a1dad44fe3da
children caf302fb8f4d
line wrap: on
line diff
--- a/tests/test-topic-fold.t	Wed Feb 03 10:07:54 2021 +0530
+++ b/tests/test-topic-fold.t	Wed Feb 03 13:23:41 2021 +0530
@@ -1,18 +1,15 @@
 test of the fold command
 ------------------------
 
+  $ . $TESTDIR/testlib/common.sh
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = true
   > [extensions]
+  > evolve =
+  > topic =
   > EOF
-  $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
-  $ mkcommit() {
-  >    echo "$1" > "$1"
-  >    hg add "$1"
-  >    hg ci -m "add $1" $2 $3
-  > }
+
   $ logtopic() {
   >    hg log -G -T "{rev}:{node}\ntopics: {topics}" 
   > }
@@ -30,11 +27,11 @@
   (see 'hg help topics' for more information)
   $ mkcommit feature2
   $ logtopic
-  @  2:d76a6166b18c835be9a487c5e21c7d260f0a1676
+  @  2:6e0fb07fa151928b633485a01b6d815b27f5a26d
   |  topics: myfeature
-  o  1:39e7a938055e87615edf675c24a10997ff05bb06
+  o  1:95b29fc10be4e6343c8d344ad4354d6ff4098df1
   |  topics: myfeature
-  o  0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
+  o  0:ea207398892eb49e06441f10dda2a731f0450f20
      topics:
   $ hg fold --exact -r "(tip~1)::" -m "folded"
   2 changesets folded
@@ -43,14 +40,14 @@
   ### topic: myfeature
   ### target: default (branch)
   s1@ folded (current)
-  s0^ add ROOT (base)
+  s0^ ROOT (base)
   $ logtopic
-  @  3:4fd43e5bdc443dc8489edffac19bd8f93ccf1a5c
+  @  3:ba602426356f35854a83b02183d999749142443c
   |  topics: myfeature
-  o  0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
+  o  0:ea207398892eb49e06441f10dda2a731f0450f20
      topics:
   $ hg summary
-  parent: 3:4fd43e5bdc44 tip
+  parent: 3:ba602426356f tip
    folded
   branch: default:myfeature
   commit: (clean)
@@ -73,13 +70,13 @@
   active topic 'myotherfeature' grew its first changeset
   (see 'hg help topics' for more information)
   $ logtopic
-  @  5:5ded4d6d578c37f339b0716de2e46e12ece7cbde
+  @  5:85e76d22bde1cb5ce44b00fc91a88cb805c93b1b
   |  topics: myotherfeature
-  o  4:bdf6950b9b5b7c6b377c8132667c73ec86d5734f
+  o  4:6508e0bfb6a188bb94d77c107f4e969291010b42
   |  topics:
-  o  3:4fd43e5bdc443dc8489edffac19bd8f93ccf1a5c
+  o  3:ba602426356f35854a83b02183d999749142443c
   |  topics: myfeature
-  o  0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
+  o  0:ea207398892eb49e06441f10dda2a731f0450f20
      topics:
   $ hg fold --exact -r "(tip~1)::" -m "folded 2"
   active topic 'myotherfeature' is now empty
@@ -87,14 +84,14 @@
   clearing empty topic "myotherfeature"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ logtopic
-  @  6:03da8f7238e9a4d708d6b8af402c91c68f271477
+  @  6:9fa327ea84f90ba000b75b90446680c993972df0
   |  topics:
-  o  3:4fd43e5bdc443dc8489edffac19bd8f93ccf1a5c
+  o  3:ba602426356f35854a83b02183d999749142443c
   |  topics: myfeature
-  o  0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
+  o  0:ea207398892eb49e06441f10dda2a731f0450f20
      topics:
   $ hg summary
-  parent: 6:03da8f7238e9 tip
+  parent: 6:9fa327ea84f9 tip
    folded 2
   branch: default
   commit: (clean)