Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 46364:f0982c76ef1b stable
cmdutil: add a missing byte prefix to string introduce in 976b26bdd0d8
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.
Differential Revision: https://phab.mercurial-scm.org/D9974
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Feb 2021 00:11:46 +0100 |
| parents | 012e25abc603 |
| children | 83ffc49f7e48 62c2857a174b |
comparison
equal
deleted
inserted
replaced
| 46363:dd926ce1de28 | 46364:f0982c76ef1b |
|---|---|
| 3143 | 3143 |
| 3144 if tip is not None and repo.changelog.tip() == tip: | 3144 if tip is not None and repo.changelog.tip() == tip: |
| 3145 # avoid reporting something like "committed new head" when | 3145 # avoid reporting something like "committed new head" when |
| 3146 # recommitting old changesets, and issue a helpful warning | 3146 # recommitting old changesets, and issue a helpful warning |
| 3147 # for most instances | 3147 # for most instances |
| 3148 repo.ui.warn(_("warning: commit already existed in the repository!\n")) | 3148 repo.ui.warn(_(b"warning: commit already existed in the repository!\n")) |
| 3149 elif ( | 3149 elif ( |
| 3150 not opts.get(b'amend') | 3150 not opts.get(b'amend') |
| 3151 and bheads | 3151 and bheads |
| 3152 and node not in bheads | 3152 and node not in bheads |
| 3153 and not any( | 3153 and not any( |