diff tests/test-split.t @ 4291:8f54ab5dd4e2

split: add a help entry to the final prompt We are about to add more option in this prompt. Adding a way to document then seems like a good first step.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 20 Feb 2018 09:36:55 +0100
parents 4eb3877540f1
children caaa89adf3eb
line wrap: on
line diff
--- a/tests/test-split.t	Tue Dec 04 13:33:51 2018 +0100
+++ b/tests/test-split.t	Tue Feb 20 09:36:55 2018 +0100
@@ -79,7 +79,7 @@
   record change 2/2 to '_d'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN] N
+  Done splitting? [yN?] 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? [yN?] 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? [yN?] 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? [yN?] 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? [yN?] N
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
   examine changes to 'SPLIT2'? [Ynesfdaq?] Y
@@ -651,3 +651,53 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     split10
   
+
+
+Check prompt options
+--------------------
+
+Look at the help (both record and split helps)
+
+  $ hg split -r tip << EOF
+  > Y
+  > ?
+  > d
+  > ?
+  > N
+  > q
+  > EOF
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  adding SPLIT3
+  adding SPLIT4
+  diff --git a/SPLIT3 b/SPLIT3
+  new file mode 100644
+  examine changes to 'SPLIT3'? [Ynesfdaq?] Y
+  
+  diff --git a/SPLIT4 b/SPLIT4
+  new file mode 100644
+  examine changes to 'SPLIT4'? [Ynesfdaq?] ?
+  
+  y - yes, record this change
+  n - no, skip this change
+  e - edit this change manually
+  s - skip remaining changes to this file
+  f - record remaining changes to this file
+  d - done, skip remaining changes and files
+  a - record all changes to all remaining files
+  q - quit, recording no changes
+  ? - ? (display help)
+  examine changes to 'SPLIT4'? [Ynesfdaq?] d
+  
+  Done splitting? [yN?] ?
+  y - yes, commit all remaining changes
+  n - no, continue selection
+  ? - ?, display help
+  Done splitting? [yN?] N
+  diff --git a/SPLIT4 b/SPLIT4
+  new file mode 100644
+  examine changes to 'SPLIT4'? [Ynesfdaq?] q
+  
+  transaction abort!
+  rollback completed
+  abort: user quit
+  [255]