Mercurial > evolve

changeset 5925:e5250f24eed7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split: adjust "no more change to split" to use plural form Makes it consistent with similar messages in core.
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 17 May 2021 19:23:09 +0800
parents 16f3fb304285
children aca07ac01167
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-templates.t tests/test-prev-next.t tests/test-split.t
diffstat 7 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Mon May 17 19:22:34 2021 +0800
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon May 17 19:23:09 2021 +0800
@@ -1275,7 +1275,7 @@
                     continue
                 break # propagate the previous break
             else:
-                ui.status(_(b"no more change to split\n"))
+                ui.status(_(b"no more changes to split\n"))
                 if haschanges():
                     # XXX: Should we show a message for informing the user
                     # that we create another commit with remaining changes?
--- a/tests/test-evolve-obshistory-complex.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-evolve-obshistory-complex.t	Mon May 17 19:23:09 2021 +0800
@@ -170,7 +170,7 @@
   record this change to 'B'?
   (enter ? for help) [Ynesfdaq?] Y
   
-  no more change to split
+  no more changes to split
   $ hg split --rev "desc(fold1)" -d "0 0" << EOF
   > Y
   > Y
@@ -209,7 +209,7 @@
   record this change to 'D'?
   (enter ? for help) [Ynesfdaq?] Y
   
-  no more change to split
+  no more changes to split
   1 new orphan changesets
   $ hg split --rev "desc(fold2)" -d "0 0" << EOF
   > Y
@@ -249,7 +249,7 @@
   record this change to 'F'?
   (enter ? for help) [Ynesfdaq?] Y
   
-  no more change to split
+  no more changes to split
   1 new orphan changesets
   $ hg log -G
   @  changeset:   15:d4a000f63ee9
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Mon May 17 19:23:09 2021 +0800
@@ -134,7 +134,7 @@
   record this change to 'd'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
 
   $ hg log --hidden -G
   @  changeset:   5:c7f044602e9b
--- a/tests/test-evolve-obshistory-split.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-evolve-obshistory-split.t	Mon May 17 19:23:09 2021 +0800
@@ -71,7 +71,7 @@
   record this change to 'b'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
 
   $ sync
 
--- a/tests/test-evolve-templates.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-evolve-templates.t	Mon May 17 19:23:09 2021 +0800
@@ -327,7 +327,7 @@
   record this change to 'b'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
 
   $ hg log --hidden -G
   @  changeset:   3:f257fde29c7a
--- a/tests/test-prev-next.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-prev-next.t	Mon May 17 19:23:09 2021 +0800
@@ -564,7 +564,7 @@
   record this change to 'b'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
   1 new orphan changesets
 
   $ hg up 3 -q
--- a/tests/test-split.t	Mon May 17 19:22:34 2021 +0800
+++ b/tests/test-split.t	Mon May 17 19:23:09 2021 +0800
@@ -88,7 +88,7 @@
   record this change to '_d'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
 
   $ hg debugobsolete
   1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
@@ -562,7 +562,7 @@
   examine changes to 'SPLIT2'?
   (enter ? for help) [Ynesfdaq?] Y
   
-  no more change to split
+  no more changes to split
 
 The split changesets should be on the 'another-branch'
   $ hg log -G -l 3
@@ -875,7 +875,7 @@
   record this change to 'SPLIT3'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
 
   $ hg status --change '.~2'
   A SPLIT2
@@ -911,7 +911,7 @@
   record change 2/2 to 'SPLIT3'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
   $ hg status --change '.~1'
   A SPLIT2
   A SPLIT3
@@ -948,7 +948,7 @@
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
-  no more change to split
+  no more changes to split
   $ hg status --change '.~1'
   A SPLIT2
   $ hg status --change '.'
@@ -981,7 +981,7 @@
   adding SPLIT2
   adding SPLIT3
   adding SPLIT4
-  no more change to split
+  no more changes to split
   $ hg status --change '.'
   A SPLIT2
   A SPLIT3
@@ -994,7 +994,7 @@
   adding SPLIT2
   adding SPLIT3
   adding SPLIT4
-  no more change to split
+  no more changes to split
   $ hg status --change '.~1'
   A SPLIT2
   $ hg status --change '.'
@@ -1011,7 +1011,7 @@
   adding SPLIT2
   adding SPLIT3
   adding SPLIT4
-  no more change to split
+  no more changes to split
   $ hg status --change '.~1'
   A SPLIT2
   A SPLIT3
@@ -1029,7 +1029,7 @@
   adding SPLIT2
   adding SPLIT3
   adding SPLIT4
-  no more change to split
+  no more changes to split
   $ hg status --change '.'
   A SPLIT2
   A SPLIT3
@@ -1112,7 +1112,7 @@
   record this change to 'b'?
   (enter ? for help) [Ynesfdaq?] y
   
-  no more change to split
+  no more changes to split
   1 new orphan changesets
 
   $ hg glog -p