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
92 lines
1.7 KiB
Python
92 lines
1.7 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
from edenscm.mercurial import ui, util, wireproto
|
|
|
|
|
|
stringio = util.stringio
|
|
|
|
|
|
class proto(object):
|
|
def __init__(self, args):
|
|
self.args = args
|
|
|
|
def getargs(self, spec):
|
|
args = self.args
|
|
args.setdefault("*", {})
|
|
names = spec.split()
|
|
return [args[n] for n in names]
|
|
|
|
|
|
class clientpeer(wireproto.wirepeer):
|
|
def __init__(self, serverrepo):
|
|
self.serverrepo = serverrepo
|
|
|
|
@property
|
|
def ui(self):
|
|
return self.serverrepo.ui
|
|
|
|
def url(self):
|
|
return "test"
|
|
|
|
def local(self):
|
|
return None
|
|
|
|
def peer(self):
|
|
return self
|
|
|
|
def canpush(self):
|
|
return True
|
|
|
|
def close(self):
|
|
pass
|
|
|
|
def capabilities(self):
|
|
return ["batch"]
|
|
|
|
def _call(self, cmd, **args):
|
|
return wireproto.dispatch(self.serverrepo, proto(args), cmd)
|
|
|
|
def _callstream(self, cmd, **args):
|
|
return stringio(self._call(cmd, **args))
|
|
|
|
@wireproto.batchable
|
|
def greet(self, name):
|
|
f = wireproto.future()
|
|
yield {"name": mangle(name)}, f
|
|
yield unmangle(f.value)
|
|
|
|
|
|
class serverrepo(object):
|
|
def __init__(self):
|
|
self.ui = ui.ui()
|
|
|
|
def greet(self, name):
|
|
return "Hello, " + name
|
|
|
|
def filtered(self, name):
|
|
return self
|
|
|
|
|
|
def mangle(s):
|
|
return "".join(chr(ord(c) + 1) for c in s)
|
|
|
|
|
|
def unmangle(s):
|
|
return "".join(chr(ord(c) - 1) for c in s)
|
|
|
|
|
|
def greet(repo, proto, name):
|
|
return mangle(repo.greet(unmangle(name)))
|
|
|
|
|
|
wireproto.commands["greet"] = (greet, "name")
|
|
|
|
srv = serverrepo()
|
|
clt = clientpeer(srv)
|
|
|
|
print(clt.greet("Foobar"))
|
|
b = clt.iterbatch()
|
|
map(b.greet, ("Fo, =;:<o", "Bar"))
|
|
b.submit()
|
|
print([r for r in b.results()])
|