Mercurial > public > mercurial-scm > hg

comparison mercurial/rewriteutil.py @ 47019:c4dbbaecaad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 28 Apr 2021 08:48:10 -0700
parents 7a90fddb13b0
children ba6881c6a178
comparison
equal deleted inserted replaced
47018:7a90fddb13b0 47019:c4dbbaecaad3
42 if any(util.safehasattr(r, 'rev') for r in revs): 42 if any(util.safehasattr(r, 'rev') for r in revs):
43 repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs") 43 repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs")
44 revs = (r.rev() for r in revs) 44 revs = (r.rev() for r in revs)
45 45
46 if len(repo[None].parents()) > 1: 46 if len(repo[None].parents()) > 1:
47 raise error.StateError(_(b"cannot %s while merging") % action) 47 raise error.StateError(_(b"cannot %s changesets while merging") % action)
48 48
49 publicrevs = repo.revs(b'%ld and public()', revs) 49 publicrevs = repo.revs(b'%ld and public()', revs)
50 if publicrevs: 50 if publicrevs:
51 msg = _(b"cannot %s public changesets") % action 51 msg = _(b"cannot %s public changesets") % action
52 hint = _(b"see 'hg help phases' for details") 52 hint = _(b"see 'hg help phases' for details")