This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10530

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

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc4dbbaecaad3: rewriteutil: adapt "cannot %s while merging" to work with "change branch of"
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
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 27248

mercurial/rewriteutil.py

hint = _(b"no changeset checked out") hint = _(b"no changeset checked out")
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
if any(util.safehasattr(r, 'rev') for r in revs): if any(util.safehasattr(r, 'rev') for r in revs):
repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs") repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs")
revs = (r.rev() for r in revs) revs = (r.rev() for r in revs)
if len(repo[None].parents()) > 1: 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) publicrevs = repo.revs(b'%ld and public()', revs)
if publicrevs: if publicrevs:
msg = _(b"cannot %s public changesets") % action msg = _(b"cannot %s public changesets") % action
hint = _(b"see 'hg help phases' for details") hint = _(b"see 'hg help phases' for details")
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
newunstable = disallowednewunstable(repo, revs) newunstable = disallowednewunstable(repo, revs)

tests/test-commit-amend.t

Refuse to amend during a merge: Refuse to amend during a merge:
$ hg up -q default $ hg up -q default
$ hg merge foo $ hg merge foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci --amend $ hg ci --amend
abort: cannot amend while merging abort: cannot amend changesets while merging
[20] [20]
$ hg ci -m 'merge' $ hg ci -m 'merge'
Refuse to amend if there is a merge conflict (issue5805): Refuse to amend if there is a merge conflict (issue5805):
$ hg up -q foo $ hg up -q foo
$ echo c > a $ echo c > a
$ hg up default -t :fail $ hg up default -t :fail

tests/test-uncommit.t

(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg uncommit $ hg uncommit
abort: outstanding uncommitted merge abort: outstanding uncommitted merge
(requires --allow-dirty-working-copy to uncommit) (requires --allow-dirty-working-copy to uncommit)
[20] [20]
$ hg uncommit --config experimental.uncommitondirtywdir=True $ hg uncommit --config experimental.uncommitondirtywdir=True
abort: cannot uncommit while merging abort: cannot uncommit changesets while merging
[20] [20]
$ hg status $ hg status
M a M a
$ hg commit -m 'merge a and b' $ hg commit -m 'merge a and b'
$ hg uncommit $ hg uncommit
abort: cannot uncommit merge changeset abort: cannot uncommit merge changeset