mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +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
36 lines
938 B
Python
36 lines
938 B
Python
# dialect.py
|
|
#
|
|
# Copyright 2016 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.
|
|
|
|
"""replace terms with more widely used equivalents
|
|
|
|
With this extension enabled, some terms will be replaced by their more
|
|
well-known equivalents. Namely, "changeset" will be replaced by "commit".
|
|
"""
|
|
|
|
testedwith = "ships-with-fb-hgext"
|
|
|
|
from edenscm.mercurial import extensions, i18n
|
|
|
|
|
|
def _ugettext(orig, message):
|
|
if orig:
|
|
message = orig(message)
|
|
message = message.replace("changeset", "commit")
|
|
return message
|
|
|
|
|
|
def _ungettext(orig, singular, plural, count):
|
|
if orig:
|
|
message = orig(singular, plural, count)
|
|
message = message.replace("changeset", "commit")
|
|
return message
|
|
|
|
|
|
def uisetup(ui):
|
|
extensions.wrapfunction(i18n, "_ugettext", _ugettext)
|
|
extensions.wrapfunction(i18n, "_ungettext", _ungettext)
|