--- a/tests/test-evolve-abort-orphan.t Fri Jul 12 23:43:25 2019 +0530
+++ b/tests/test-evolve-abort-orphan.t Thu Jul 11 22:56:46 2019 +0530
@@ -10,6 +10,7 @@
Setup
=====
+#testcases abortcommand abortflag
$ cat >> $HGRCPATH <<EOF
> [phases]
> publish = False
@@ -19,6 +20,13 @@
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
+#if abortflag
+ $ cat >> $HGRCPATH <<EOF
+ > [alias]
+ > abort = evolve --abort
+ > EOF
+#endif
+
$ hg init abortrepo
$ cd abortrepo
$ echo ".*\.orig" > .hgignore
@@ -41,9 +49,15 @@
Testing --abort when no evolve is interrupted
=============================================
+#if abortflag
$ hg evolve --abort
abort: no interrupted evolve to abort
[255]
+#else
+ $ hg abort
+ abort: no operation in progress
+ [255]
+#endif
Testing with wrong combination of flags
=======================================
@@ -103,8 +117,13 @@
instability: orphan
summary: added d
+#if abortcommand
+when in dry-run mode
+ $ hg abort --dry-run
+ evolve in progress, will be aborted
+#endif
- $ hg evolve --abort
+ $ hg abort
evolve aborted
working directory is now at e93a9161a274
@@ -199,7 +218,7 @@
o 0:8fa14d15e168 added hgignore
() draft
- $ hg evolve --abort
+ $ hg abort
1 new orphan changesets
evolve aborted
working directory is now at 125af0ed8cae
@@ -299,7 +318,7 @@
o 0:8fa14d15e168 added hgignore
() draft
- $ hg evolve --abort
+ $ hg abort
2 new orphan changesets
evolve aborted
working directory is now at 807e8e2ca559
@@ -395,7 +414,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
$ cd ../repotwo
- $ hg evolve --abort
+ $ hg abort
warning: new changesets detected on destination branch
abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop evolve
[255]
@@ -442,7 +461,7 @@
$ hg phase -r 1c476940790a --public
- $ hg evolve --abort
+ $ hg abort
cannot clean up public changesets: 1c476940790a
abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop evolve
[255]
@@ -510,7 +529,7 @@
o 0:8fa14d15e168 added hgignore
() draft
- $ hg evolve --abort
+ $ hg abort
1 new orphan changesets
evolve aborted
working directory is now at a0086c17bfc7
@@ -543,7 +562,7 @@
(see 'hg help evolve.interrupted')
[1]
- $ hg evolve --abort
+ $ hg abort
evolve aborted
working directory is now at c1f4718020e3