This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9974

cmdutil: add a missing byte prefix to string introduce in 976b26bdd0d8
ClosedPublic

Authored by marmoute on Feb 9 2021, 6:11 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGf0982c76ef1b: cmdutil: add a missing byte prefix to string introduce in 976b26bdd0d8
Summary

The change is missing a the b'foo' prefix to make it a bytestring. This lead
to a traceback in some third party extension. It is unclear to me why the
Mercurial test pass without it.

Diff Detail

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

Event Timeline

marmoute created this revision.Feb 9 2021, 6:11 PM
martinvonz accepted this revision.Feb 9 2021, 8:15 PM
martinvonz added a subscriber: martinvonz.

Thanks.

It is unclear to me why the Mercurial test pass without it.

I think _() converts to bytes.

This revision is now accepted and ready to land.Feb 9 2021, 8:15 PM
mharbison72 added a subscriber: mharbison72.Feb 10 2021, 1:57 AM
In D9974#151045, @martinvonz wrote:

Thanks.

It is unclear to me why the Mercurial test pass without it.

I think _() converts to bytes.

I think that’s conditional on HGPLAIN *not* being set, which I think the test runner does set. I was having issues a few months ago because some test-check-* tests use the system installed hg and config, which loaded the keyring extension, which has similar byteification needs. I was initially puzzled why it only crashed when running tests, and that conditional turned out to be why.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 25512

mercurial/cmdutil.py

opts = {} opts = {}
ctx = repo[node] ctx = repo[node]
parents = ctx.parents() parents = ctx.parents()
if tip is not None and repo.changelog.tip() == tip: if tip is not None and repo.changelog.tip() == tip:
# avoid reporting something like "committed new head" when # avoid reporting something like "committed new head" when
# recommitting old changesets, and issue a helpful warning # recommitting old changesets, and issue a helpful warning
# for most instances # for most instances
repo.ui.warn(_("warning: commit already existed in the repository!\n")) repo.ui.warn(_(b"warning: commit already existed in the repository!\n"))
elif ( elif (
not opts.get(b'amend') not opts.get(b'amend')
and bheads and bheads
and node not in bheads and node not in bheads
and not any( and not any(
p.node() in bheads and p.branch() == branch for p in parents p.node() in bheads and p.branch() == branch for p in parents
) )
): ):