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
40 lines
1.4 KiB
Python
40 lines
1.4 KiB
Python
import subprocess
|
|
|
|
from dulwich.client import SubprocessWrapper
|
|
from edenscm.mercurial import util
|
|
|
|
|
|
class SSHVendor(object):
|
|
"""Parent class for ui-linked Vendor classes."""
|
|
|
|
|
|
def generate_ssh_vendor(ui):
|
|
"""
|
|
Allows dulwich to use hg's ui.ssh config. The dulwich.client.get_ssh_vendor
|
|
property should point to the return value.
|
|
"""
|
|
|
|
class _Vendor(SSHVendor):
|
|
def run_command(self, host, command, username=None, port=None):
|
|
if isinstance(command, (str, bytes)):
|
|
# 0.12.x dulwich sends the raw string
|
|
command = [command]
|
|
elif len(command) > 1:
|
|
# 0.11.x dulwich sends an array of [command arg1 arg2 ...], so
|
|
# we detect that here and reformat it back to what hg-git
|
|
# expects (e.g. "command 'arg1 arg2'")
|
|
command = ["%s '%s'" % (command[0], " ".join(command[1:]))]
|
|
sshcmd = ui.config("ui", "ssh")
|
|
args = util.sshargs(sshcmd, host, username, port)
|
|
cmd = "%s %s %s" % (sshcmd, args, util.shellquote(" ".join(command)))
|
|
ui.debug("calling ssh: %s\n" % cmd)
|
|
proc = subprocess.Popen(
|
|
util.quotecommand(cmd),
|
|
shell=True,
|
|
stdin=subprocess.PIPE,
|
|
stdout=subprocess.PIPE,
|
|
)
|
|
return SubprocessWrapper(proc)
|
|
|
|
return _Vendor
|