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

This is an archive of the discontinued Mercurial Phabricator instance.

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

Authored by martinvonz on Apr 28 2021, 12:00 PM.

Details

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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage