mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 17:58:27 +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
70 lines
2.0 KiB
Python
70 lines
2.0 KiB
Python
# morecolors.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.
|
|
|
|
"""make more output colorful
|
|
|
|
Currently only ui.traceback is colorized by this extension.
|
|
"""
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import os
|
|
import sys
|
|
import traceback
|
|
|
|
from edenscm.mercurial import dispatch, extensions
|
|
|
|
|
|
colortable = {"traceback.foreign": "red bold", "traceback.core": ""}
|
|
|
|
|
|
def _colorizetraceback(ui, trace):
|
|
state = "core"
|
|
result = ""
|
|
corepath = os.path.dirname(os.path.dirname(extensions.__file__))
|
|
for line in trace.splitlines(True):
|
|
if line.startswith(' File "'):
|
|
path = line[len(' File "') :]
|
|
if path.startswith(corepath):
|
|
state = "core"
|
|
else:
|
|
state = "foreign"
|
|
result += ui.label(line, "traceback.%s" % state)
|
|
return result
|
|
|
|
|
|
def _writeerr(orig, self, *args, **opts):
|
|
text = "".join(args)
|
|
if text and text.startswith("Traceback"):
|
|
text = _colorizetraceback(self, text)
|
|
return orig(self, text, **opts)
|
|
|
|
|
|
def _handlecommandexception(orig, ui):
|
|
trace = traceback.format_exc()
|
|
ui.log("commandexception", "%s\n", trace)
|
|
ui.write_err(_colorizetraceback(ui, trace))
|
|
return True # do not re-raise the exception
|
|
|
|
|
|
def uisetup(ui):
|
|
class morecolorsui(ui.__class__):
|
|
def traceback(self, exc=None, force=False):
|
|
if exc is None:
|
|
exc = sys.exc_info()
|
|
# wrap ui.write_err temporarily so we can capture the traceback and
|
|
# add colors to it.
|
|
cls = self.__class__
|
|
extensions.wrapfunction(cls, "write_err", _writeerr)
|
|
try:
|
|
return super(morecolorsui, self).traceback(exc, force)
|
|
finally:
|
|
extensions.unwrapfunction(cls, "write_err", _writeerr)
|
|
|
|
ui.__class__ = morecolorsui
|
|
extensions.wrapfunction(dispatch, "handlecommandexception", _handlecommandexception)
|