mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07: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
39 lines
995 B
Python
39 lines
995 B
Python
from __future__ import absolute_import, print_function
|
|
|
|
import os
|
|
|
|
from edenscm.mercurial import dispatch
|
|
|
|
|
|
def testdispatch(cmd):
|
|
"""Simple wrapper around dispatch.dispatch()
|
|
|
|
Prints command and result value, but does not handle quoting.
|
|
"""
|
|
print("running: %s" % (cmd,))
|
|
req = dispatch.request(cmd.split())
|
|
result = dispatch.dispatch(req)
|
|
print("result: %r" % (result,))
|
|
|
|
|
|
# create file 'foo', add and commit
|
|
f = open("foo", "wb")
|
|
f.write("foo\n")
|
|
f.close()
|
|
testdispatch("add foo")
|
|
testdispatch("commit -m commit1 -d 2000-01-01 foo")
|
|
|
|
# append to file 'foo' and commit
|
|
f = open("foo", "ab")
|
|
f.write("bar\n")
|
|
f.close()
|
|
# remove blackbox.log directory (proxy for readonly log file)
|
|
os.rmdir(".hg/blackbox.log")
|
|
# replace it with the real blackbox.log file
|
|
os.rename(".hg/blackbox.log-", ".hg/blackbox.log")
|
|
testdispatch("commit -m commit2 -d 2000-01-02 foo")
|
|
|
|
# check 88803a69b24 (fancyopts modified command table)
|
|
testdispatch("log -r 0")
|
|
testdispatch("log -r tip")
|