This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11905

upgrade: byteify a few error messages
ClosedPublic

Authored by mharbison72 on Dec 13 2021, 1:11 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGcb477edeca79: upgrade: byteify a few error messages
Summary

These were flagged by pytype (which is currently disabled on this file due to
another failure).

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.

Event Timeline

mharbison72 created this revision.Dec 13 2021, 1:11 AM
Alphare accepted this revision.Dec 13 2021, 6:12 AM
This revision is now accepted and ready to land.Dec 13 2021, 6:12 AM
mharbison72 added a commit: rHGcb477edeca79: upgrade: byteify a few error messages.Dec 13 2021, 6:17 AM
Closed by commit rHGcb477edeca79: upgrade: byteify a few error messages (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (4 lines)

Diff 31442

mercurial/upgrade.py

diffrequires = current_requirements - store_requirements diffrequires = current_requirements - store_requirements
# add share-safe requirement as it will mark the share as share-safe # add share-safe requirement as it will mark the share as share-safe
diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT)
current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, diffrequires) scmutil.writerequires(hgvfs, diffrequires)
ui.warn(_(b'repository upgraded to use share-safe mode\n')) ui.warn(_(b'repository upgraded to use share-safe mode\n'))
except error.LockError as e: except error.LockError as e:
hint = _( hint = _(
"see `hg help config.format.use-share-safe` for more information" b"see `hg help config.format.use-share-safe` for more information"
) )
if mismatch_config == b'upgrade-abort': if mismatch_config == b'upgrade-abort':
raise error.Abort( raise error.Abort(
_(b'failed to upgrade share, got error: %s') _(b'failed to upgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror), % stringutil.forcebytestr(e.strerror),
hint=hint, hint=hint,
) )
elif mismatch_warn: elif mismatch_warn:
current_requirements -= removed current_requirements -= removed
current_requirements |= locked_requirements current_requirements |= locked_requirements
current_requirements |= source_requirements current_requirements |= source_requirements
current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, current_requirements) scmutil.writerequires(hgvfs, current_requirements)
ui.warn(_(b'repository downgraded to not use share-safe mode\n')) ui.warn(_(b'repository downgraded to not use share-safe mode\n'))
except error.LockError as e: except error.LockError as e:
hint = _( hint = _(
"see `hg help config.format.use-share-safe` for more information" b"see `hg help config.format.use-share-safe` for more information"
) )
# If upgrade-abort is set, abort when upgrade fails, else let the # If upgrade-abort is set, abort when upgrade fails, else let the
# process continue as `upgrade-allow` is set # process continue as `upgrade-allow` is set
if mismatch_config == b'downgrade-abort': if mismatch_config == b'downgrade-abort':
raise error.Abort( raise error.Abort(
_(b'failed to downgrade share, got error: %s') _(b'failed to downgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror), % stringutil.forcebytestr(e.strerror),
hint=hint, hint=hint,