Mercurial > evolve

changeset 5197:143ac9ac77a3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add missing 'of' in message The message refers to the changeset that is currently evolved. Therefore the message needs an additional 'of' to be correct.
author Manuel Jacob <me@manueljacob.de>
date Wed, 11 Mar 2020 18:28:26 +0100
parents 871439bb55a1
children cbfd36046969
files hgext3rd/evolve/utility.py tests/test-evolve-issue5832.t tests/test-evolve-orphan-split.t
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/utility.py	Fri Mar 06 18:39:40 2020 +0100
+++ b/hgext3rd/evolve/utility.py	Wed Mar 11 18:28:26 2020 +0100
@@ -142,7 +142,7 @@
     roots = repo.revs(b'roots(%ld)', targetrevs)
     heads = repo.revs(b'heads(%ld)', targetrevs)
     if len(roots) > 1 or len(heads) > 1:
-        cheader = (_(b"ancestor '%s' split over multiple topological"
+        cheader = (_(b"ancestor of '%s' split over multiple topological"
                      b" branches.\nchoose an evolve destination:") %
                    evolvecand)
         selectedrev = revselectionprompt(ui, repo, list(heads), cheader)
--- a/tests/test-evolve-issue5832.t	Fri Mar 06 18:39:40 2020 +0100
+++ b/tests/test-evolve-issue5832.t	Wed Mar 11 18:28:26 2020 +0100
@@ -117,7 +117,7 @@
   move:[2] added b
   atop:[5] added a
   move:[4] merge commit
-  ancestor '7235ef625ea3' split over multiple topological branches.
+  ancestor of '7235ef625ea3' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -257,7 +257,7 @@
   move:[2] added b
   atop:[6] added a
   move:[4] merge commit
-  ancestor 'cdf2ea1b9312' split over multiple topological branches.
+  ancestor of 'cdf2ea1b9312' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -402,7 +402,7 @@
   > EOF
   move:[2] added b
   atop:[6] added a
-  ancestor 'b9b387427a53' split over multiple topological branches.
+  ancestor of 'b9b387427a53' split over multiple topological branches.
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
--- a/tests/test-evolve-orphan-split.t	Fri Mar 06 18:39:40 2020 +0100
+++ b/tests/test-evolve-orphan-split.t	Wed Mar 11 18:28:26 2020 +0100
@@ -193,7 +193,7 @@
   $ hg evolve --dry-run <<EOF
   > 1
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -206,7 +206,7 @@
   $ hg evolve --dry-run <<EOF
   > 2
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -222,7 +222,7 @@
   $ hg evolve --all <<EOF
   > foo
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -234,7 +234,7 @@
   $ hg evolve --all <<EOF
   > 4
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -246,7 +246,7 @@
   $ hg evolve --all <<EOF
   > -1
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -258,7 +258,7 @@
   $ hg evolve --all <<EOF
   > q
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c
@@ -271,7 +271,7 @@
   $ hg evolve --all <<EOF
   > 1
   > EOF
-  ancestor 'd48a30875f01' split over multiple topological branches.
+  ancestor of 'd48a30875f01' split over multiple topological branches.
   choose an evolve destination:
   1: [f2632392aefe] added a b c
   2: [7f87764e5b64] added a b c