mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
65 lines
2.0 KiB
Python
65 lines
2.0 KiB
Python
# hiddenerror.py
|
|
#
|
|
# Copyright 2017 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
"""configurable error messages for accessing hidden changesets
|
|
|
|
Set the following configuration options to customize the error message
|
|
seen when the user attempts to access a hidden changeset::
|
|
|
|
[hiddenerror]
|
|
message = my custom message
|
|
hint = my custom hint
|
|
|
|
The message and hint can contain an optional `{0}` which will be substituted
|
|
with the hash of the hidden changeset.
|
|
"""
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import context, error, extensions
|
|
from edenscm.mercurial.i18n import _
|
|
from edenscm.mercurial.node import short
|
|
|
|
|
|
testedwith = "ships-with-fb-hgext"
|
|
|
|
|
|
def uisetup(ui):
|
|
"""Wrap context.changectx to catch FilteredRepoLookupError."""
|
|
# Get the error messages from the user's configuration and substitute the
|
|
# hash in.
|
|
msgfmt, hintfmt = _getstrings(ui)
|
|
|
|
def _filterederror(orig, repo, rev):
|
|
# If the number is beyond the changelog, it's a short hash that
|
|
# just happened to be a number.
|
|
intrev = None
|
|
try:
|
|
intrev = int(rev)
|
|
except ValueError:
|
|
pass
|
|
if intrev is not None and intrev < len(repo):
|
|
node = repo.unfiltered()[rev].node()
|
|
shorthash = short(node)
|
|
msg = msgfmt.format(shorthash)
|
|
hint = hintfmt and hintfmt.format(shorthash)
|
|
return error.FilteredRepoLookupError(msg, hint=hint)
|
|
return orig(repo, rev)
|
|
|
|
extensions.wrapfunction(context, "_filterederror", _filterederror)
|
|
|
|
|
|
def _getstrings(ui):
|
|
"""Lood the error messages to show when the user tries to access a
|
|
hidden commit from the user's configuration file. Fall back to
|
|
default messages if nothing is configured.
|
|
"""
|
|
msg = ui.config("hiddenerror", "message")
|
|
hint = ui.config("hiddenerror", "hint")
|
|
if not msg:
|
|
msg = _("hidden changeset {0}")
|
|
return msg, hint
|