Mercurial > evolve

changeset 4292:caaa89adf3eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 20 Feb 2018 09:35:16 +0100
parents 8f54ab5dd4e2
children d4902d48d095
files hgext3rd/evolve/cmdrewrite.py tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory-lots-of-splits.t tests/test-evolve-obshistory-split.t tests/test-evolve-orphan-split.t tests/test-evolve-templates.t tests/test-prev-next.t tests/test-rewind.t tests/test-split.t tests/test-topic-stack-complex.t tests/test-topic-stack.t
diffstat 11 files changed, 26 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Feb 20 09:36:55 2018 +0100
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Feb 20 09:35:16 2018 +0100
@@ -1205,15 +1205,18 @@
             if haschanges():
                 nextaction = None
                 while nextaction is None:
-                    nextaction = ui.prompt('Done splitting? [yN?]', default='n')
+                    nextaction = ui.prompt('Done splitting? [yNq?]', default='n')
                     if nextaction == 'y':
                         commands.commit(ui, repo, **opts)
                         newcommits.append(repo['.'])
                         break
+                    elif nextaction == 'q':
+                        raise error.Abort(_('user quit'))
                     elif nextaction == '?':
                         nextaction = None
                         ui.write(_("y - yes, commit all remaining changes\n"))
                         ui.write(_("n - no, continue selection\n"))
+                        ui.write(_("q - quit, abort the split\n"))
                         ui.write(_("? - ?, display help\n"))
                 else:
                     continue
--- a/tests/test-evolve-obshistory-complex.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Tue Feb 20 09:35:16 2018 +0100
@@ -164,7 +164,7 @@
   examine changes to 'B'? [Ynesfdaq?] N
   
   created new head
-  Done splitting? [yN?] N
+  Done splitting? [yNq?] N
   diff --git a/B b/B
   new file mode 100644
   examine changes to 'B'? [Ynesfdaq?] Y
@@ -198,7 +198,7 @@
   examine changes 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
@@ -233,7 +233,7 @@
   examine changes to 'F'? [Ynesfdaq?] N
   
   created new head
-  Done splitting? [yN?] N
+  Done splitting? [yNq?] N
   diff --git a/F b/F
   new file mode 100644
   examine changes to 'F'? [Ynesfdaq?] Y
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Tue Feb 20 09:35:16 2018 +0100
@@ -82,7 +82,7 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] n
+  Done splitting? [yNq?] n
   diff --git a/b b/b
   new file mode 100644
   examine changes to 'b'? [Ynesfdaq?] y
@@ -99,7 +99,7 @@
   new file mode 100644
   examine changes to 'd'? [Ynesfdaq?] n
   
-  Done splitting? [yN?] n
+  Done splitting? [yNq?] n
   diff --git a/c b/c
   new file mode 100644
   examine changes to 'c'? [Ynesfdaq?] y
@@ -112,7 +112,7 @@
   new file mode 100644
   examine changes to 'd'? [Ynesfdaq?] n
   
-  Done splitting? [yN?] n
+  Done splitting? [yNq?] n
   diff --git a/d b/d
   new file mode 100644
   examine changes to 'd'? [Ynesfdaq?] y
--- a/tests/test-evolve-obshistory-split.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-evolve-obshistory-split.t	Tue Feb 20 09:35:16 2018 +0100
@@ -58,7 +58,7 @@
   examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] n
+  Done splitting? [yNq?] n
   diff --git a/b b/b
   new file mode 100644
   examine changes to 'b'? [Ynesfdaq?] y
--- a/tests/test-evolve-orphan-split.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-evolve-orphan-split.t	Tue Feb 20 09:35:16 2018 +0100
@@ -59,7 +59,7 @@
   examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   1 new orphan changesets
 
   $ hg glog
@@ -152,7 +152,7 @@
   record change 3/3 to 'c'? [Ynesfdaq?] y
   
   created new head
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   1 new orphan changesets
 
   $ hg glog
--- a/tests/test-evolve-templates.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-evolve-templates.t	Tue Feb 20 09:35:16 2018 +0100
@@ -292,7 +292,7 @@
   examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] n
+  Done splitting? [yNq?] n
   diff --git a/b b/b
   new file mode 100644
   examine changes to 'b'? [Ynesfdaq?] y
--- a/tests/test-prev-next.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-prev-next.t	Tue Feb 20 09:35:16 2018 +0100
@@ -534,7 +534,7 @@
   examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
-  Done splitting? [yN?] N
+  Done splitting? [yNq?] N
   diff --git a/b b/b
   new file mode 100644
   examine changes to 'b'? [Ynesfdaq?] y
--- a/tests/test-rewind.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-rewind.t	Tue Feb 20 09:35:16 2018 +0100
@@ -478,7 +478,7 @@
   examine changes to 'D'? [Ynesfdaq?] d
   
   created new head
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   $ hg log -G
   @  changeset:   5:9576e80d6851
   |  tag:         tip
--- 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
--- a/tests/test-topic-stack-complex.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-topic-stack-complex.t	Tue Feb 20 09:35:16 2018 +0100
@@ -80,7 +80,7 @@
   new file mode 100644
   examine changes to 'd'? [Ynesfdaq?] n
   
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
   1 new orphan changesets
 
   $ hg stack
--- a/tests/test-topic-stack.t	Tue Feb 20 09:36:55 2018 +0100
+++ b/tests/test-topic-stack.t	Tue Feb 20 09:35:16 2018 +0100
@@ -911,7 +911,7 @@
   new file mode 100644
   examine changes to 'ggg'? [Ynesfdaq?] n
   
-  Done splitting? [yN?] y
+  Done splitting? [yNq?] y
 
   $ hg --config extensions.evolve= obslog --all
   o  dde94df880e9 (21) c_G