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
28 lines
669 B
Python
28 lines
669 B
Python
# Copyright 2018 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
# (c) 2017-present Facebook Inc.
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import extensions
|
|
|
|
|
|
lfsext = None
|
|
try:
|
|
lfsext = extensions.find("lfs")
|
|
except KeyError:
|
|
pass
|
|
|
|
|
|
def getlfsinfo(hgfilelog, node):
|
|
if lfsext is None:
|
|
return False, None
|
|
islfs = lfsext.wrapper._islfs(hgfilelog, node)
|
|
oid = None
|
|
if islfs:
|
|
lfspointer = lfsext.pointer.deserialize(hgfilelog.revision(node, raw=True))
|
|
oid = lfspointer.oid()
|
|
return islfs, oid
|