# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1619624890 25200
# Node ID c4dbbaecaad34b2818a39a9f3c8a24ea0bdbe016
# Parent  7a90fddb13b0cb2930b983d93af01078f60e1e1a
rewriteutil: adapt "cannot %s while merging" to work with "change branch of"

`rewriteutil.precheck()` creates error messages by inserting a given
verb into a sentence. The `hg branch -r` command passes in "change
branch of" as the verb. That doesn't work well with "cannot %s while
merging" (making it "cannot change branch of while merging"). Let's
insert a "changeset" there to make it work better.

Building sentences like this seems obviously bad for i18n, but fixing
that is out of scope for this series, IMO.

Differential Revision: https://phab.mercurial-scm.org/D10530

diff -r 7a90fddb13b0 -r c4dbbaecaad3 mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py	Thu Feb 11 15:11:10 2021 -0800
+++ b/mercurial/rewriteutil.py	Wed Apr 28 08:48:10 2021 -0700
@@ -44,7 +44,7 @@
         revs = (r.rev() for r in revs)
 
     if len(repo[None].parents()) > 1:
-        raise error.StateError(_(b"cannot %s while merging") % action)
+        raise error.StateError(_(b"cannot %s changesets while merging") % action)
 
     publicrevs = repo.revs(b'%ld and public()', revs)
     if publicrevs:
diff -r 7a90fddb13b0 -r c4dbbaecaad3 tests/test-commit-amend.t
--- a/tests/test-commit-amend.t	Thu Feb 11 15:11:10 2021 -0800
+++ b/tests/test-commit-amend.t	Wed Apr 28 08:48:10 2021 -0700
@@ -406,7 +406,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci --amend
-  abort: cannot amend while merging
+  abort: cannot amend changesets while merging
   [20]
   $ hg ci -m 'merge'
 
diff -r 7a90fddb13b0 -r c4dbbaecaad3 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Thu Feb 11 15:11:10 2021 -0800
+++ b/tests/test-uncommit.t	Wed Apr 28 08:48:10 2021 -0700
@@ -410,7 +410,7 @@
   [20]
 
   $ hg uncommit --config experimental.uncommitondirtywdir=True
-  abort: cannot uncommit while merging
+  abort: cannot uncommit changesets while merging
   [20]
 
   $ hg status