mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +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
38 lines
918 B
Python
38 lines
918 B
Python
from __future__ import absolute_import, print_function
|
|
|
|
import os
|
|
|
|
from edenscm.mercurial import dispatch, ui as uimod
|
|
|
|
|
|
# ensure errors aren't buffered
|
|
testui = uimod.ui()
|
|
testui.pushbuffer()
|
|
testui.write(("buffered\n"))
|
|
testui.warn(("warning\n"))
|
|
testui.write_err("error\n")
|
|
print(repr(testui.popbuffer()))
|
|
|
|
# test dispatch.dispatch with the same ui object
|
|
hgrc = open(os.environ["HGRCPATH"], "w")
|
|
hgrc.write("[extensions]\n")
|
|
hgrc.write("color=\n")
|
|
hgrc.close()
|
|
|
|
ui_ = uimod.ui.load()
|
|
ui_.setconfig("ui", "formatted", "True")
|
|
|
|
# we're not interested in the output, so write that to devnull
|
|
ui_.fout = open(os.devnull, "w")
|
|
|
|
# call some arbitrary command just so we go through
|
|
# color's wrapped _runcommand twice.
|
|
def runcmd():
|
|
dispatch.dispatch(dispatch.request(["version", "-q"], ui_))
|
|
|
|
|
|
runcmd()
|
|
print("colored? %s" % (ui_._colormode is not None))
|
|
runcmd()
|
|
print("colored? %s" % (ui_._colormode is not None))
|