Mercurial > evolve

changeset 6040:29bc269bcc96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: source common.sh in more tests
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 20 Sep 2021 20:28:49 +0300
parents 51249e4e9025
children 6b7ef731141b
files tests/test-amend-patch.t tests/test-evolve-abort-orphan.t tests/test-evolve-abort-phasediv.t tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-continue.t tests/test-evolve-issue5832.t tests/test-evolve-issue5881.t tests/test-evolve-noupdate.t tests/test-evolve-orphan-merge.t tests/test-evolve-orphan-split.t tests/test-evolve-stop-orphan.t tests/test-evolve-stop-phasediv.t
diffstat 12 files changed, 36 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-amend-patch.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-amend-patch.t	Mon Sep 20 20:28:49 2021 +0300
@@ -2,14 +2,16 @@
 
 Setup
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH << EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [diff]
   > git = 1
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 Reposetup
 
--- a/tests/test-evolve-abort-orphan.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-abort-orphan.t	Mon Sep 20 20:28:49 2021 +0300
@@ -10,6 +10,8 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
 #testcases abortcommand abortflag
   $ cat >> $HGRCPATH <<EOF
   > [phases]
@@ -17,8 +19,8 @@
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #if abortflag
   $ cat >> $HGRCPATH <<EOF
--- a/tests/test-evolve-abort-phasediv.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-abort-phasediv.t	Mon Sep 20 20:28:49 2021 +0300
@@ -10,6 +10,8 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
 #testcases abortcommand abortflag
   $ cat >> $HGRCPATH <<EOF
   > [phases]
@@ -17,8 +19,8 @@
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #if abortflag
   $ cat >> $HGRCPATH <<EOF
--- a/tests/test-evolve-content-divergent-interrupted.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-content-divergent-interrupted.t	Mon Sep 20 20:28:49 2021 +0300
@@ -19,6 +19,8 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
@@ -27,8 +29,8 @@
   > [experimental]
   > evolution.allowdivergence = True
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ hg init abortrepo
   $ cd abortrepo
--- a/tests/test-evolve-continue.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-continue.t	Mon Sep 20 20:28:49 2021 +0300
@@ -1,5 +1,7 @@
 Testing the continue functionality of `hg evolve`
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = True
@@ -7,8 +9,8 @@
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
   > rebase =
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #testcases inmemory ondisk
 #if inmemory
--- a/tests/test-evolve-issue5832.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-issue5832.t	Mon Sep 20 20:28:49 2021 +0300
@@ -4,14 +4,16 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ hg init issue5832
   $ cd issue5832
--- a/tests/test-evolve-issue5881.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-issue5881.t	Mon Sep 20 20:28:49 2021 +0300
@@ -7,14 +7,16 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ hg init issue5881
   $ cd issue5881
--- a/tests/test-evolve-noupdate.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-noupdate.t	Mon Sep 20 20:28:49 2021 +0300
@@ -11,12 +11,14 @@
 Setup
 -----
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #testcases inmemory ondisk
 #if inmemory
--- a/tests/test-evolve-orphan-merge.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-orphan-merge.t	Mon Sep 20 20:28:49 2021 +0300
@@ -1,14 +1,15 @@
 ** Testing resolution of orphans by `hg evolve` when merges are involved **
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = True
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
-  > rebase =
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 Repo Setup
 
--- a/tests/test-evolve-orphan-split.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-orphan-split.t	Mon Sep 20 20:28:49 2021 +0300
@@ -1,6 +1,8 @@
 ** Testing resolution of orphans by `hg evolve` where an obsolete changeset has
 multiple successors **
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = True
@@ -8,8 +10,8 @@
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
   > rebase =
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 Repo Setup
 
--- a/tests/test-evolve-stop-orphan.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-stop-orphan.t	Mon Sep 20 20:28:49 2021 +0300
@@ -9,12 +9,14 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #testcases inmemory ondisk
 #if inmemory
--- a/tests/test-evolve-stop-phasediv.t	Mon Sep 20 19:48:47 2021 +0300
+++ b/tests/test-evolve-stop-phasediv.t	Mon Sep 20 20:28:49 2021 +0300
@@ -9,12 +9,14 @@
 Setup
 =====
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #testcases inmemory ondisk
 #if inmemory