# HG changeset patch # User Manuel Jacob # Date 1583947706 -3600 # Node ID 143ac9ac77a3a830ddcc600abd863436d4fc0596 # Parent 871439bb55a1f20bc4ee18b660712b6cb194eb7e 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. diff -r 871439bb55a1 -r 143ac9ac77a3 hgext3rd/evolve/utility.py --- 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) diff -r 871439bb55a1 -r 143ac9ac77a3 tests/test-evolve-issue5832.t --- 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 diff -r 871439bb55a1 -r 143ac9ac77a3 tests/test-evolve-orphan-split.t --- 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 < 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 < 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 < 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 < 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 < -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 < 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 < 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