diff tests/test-split.t @ 4292:caaa89adf3eb

split: add a way to abort a split from the prompt

This prompt is asking the user about the next step. Offering to abort there make
sense.

--- a/tests/test-split.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-split.t	Tue Feb 20 09:35:16 2018 +0100
@@ -79,7 +79,7 @@
   record change 2/2 to '_d'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] N
+  Done splitting? [yNq?] N
   diff --git a/_d b/_d
   new file mode 100644
   examine changes to '_d'? [Ynesfdaq?] y
@@ -201,7 +201,7 @@
   record change 2/2 to '_c'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   2 new orphan changesets
 
 Stop before splitting the commit completely creates a commit with all the
@@ -302,7 +302,7 @@
   examine changes to '_d'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   $ hg log -G -r "3f134f739075::"
   @  changeset:   16:452a26648478
   |  bookmark:    bookA
@@ -454,7 +454,7 @@
   new file mode 100644
   examine changes to 'celeste'? [Ynesfdaq?] N
   
-  Done splitting? [yN?] Y
+  Done splitting? [yNq?] Y
   diff --git a/celeste b/celeste
   new file mode 100644
   examine changes to 'celeste'? [Ynesfdaq?] Y
@@ -551,7 +551,7 @@
   new file mode 100644
   examine changes to 'SPLIT2'? [Ynesfdaq?] N
   
-  Done splitting? [yN?] N
+  Done splitting? [yNq?] N
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
   examine changes to 'SPLIT2'? [Ynesfdaq?] Y
@@ -663,7 +663,6 @@
   > ?
   > d
   > ?
-  > N
   > q
   > EOF
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -688,15 +687,12 @@
   ? - ? (display help)
   examine changes to 'SPLIT4'? [Ynesfdaq?] d
   
-  Done splitting? [yN?] ?
+  Done splitting? [yNq?] ?
   y - yes, commit all remaining changes
   n - no, continue selection
+  q - quit, abort the split
   ? - ?, display help
-  Done splitting? [yN?] N
-  diff --git a/SPLIT4 b/SPLIT4
-  new file mode 100644
-  examine changes to 'SPLIT4'? [Ynesfdaq?] q
-  
+  Done splitting? [yNq?] q
   transaction abort!
   rollback completed
   abort: user quit