mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +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.0 KiB
Python
40 lines
1.0 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
from edenscm.hgext.lfs import pointer
|
|
|
|
|
|
def tryparse(text):
|
|
r = {}
|
|
try:
|
|
r = pointer.deserialize(text)
|
|
print("ok")
|
|
except Exception as ex:
|
|
print(ex)
|
|
if r:
|
|
text2 = r.serialize()
|
|
if text2 != text:
|
|
print("reconstructed text differs")
|
|
return r
|
|
|
|
|
|
t = (
|
|
"version https://git-lfs.github.com/spec/v1\n"
|
|
"oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1"
|
|
"258daaa5e2ca24d17e2393\n"
|
|
"size 12345\n"
|
|
"x-foo extra-information\n"
|
|
)
|
|
|
|
tryparse("")
|
|
tryparse(t)
|
|
tryparse(t.replace("git-lfs", "unknown"))
|
|
tryparse(t.replace("v1\n", "v1\n\n"))
|
|
tryparse(t.replace("sha256", "ahs256"))
|
|
tryparse(t.replace("sha256:", ""))
|
|
tryparse(t.replace("12345", "0x12345"))
|
|
tryparse(t.replace("extra-information", "extra\0information"))
|
|
tryparse(t.replace("extra-information", "extra\ninformation"))
|
|
tryparse(t.replace("x-foo", "x_foo"))
|
|
tryparse(t.replace("oid", "blobid"))
|
|
tryparse(t.replace("size", "size-bytes").replace("oid", "object-id"))
|