Patchwork D10530: rewriteutil: adapt "cannot %s while merging" to work with "change branch of"

login
register
mail settings
Submitter phabricator
Date April 28, 2021, 4 p.m.
Message ID <differential-rev-PHID-DREV-a35m3utzaahvvzkem2dt-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48849/
State Superseded
Headers show

Comments

phabricator - April 28, 2021, 4 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  `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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10530

AFFECTED FILES
  mercurial/rewriteutil.py
  tests/test-commit-amend.t
  tests/test-uncommit.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -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
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -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 --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -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: