mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +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
47 lines
1.1 KiB
Python
Executable File
47 lines
1.1 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# Undump a dump from dumprevlog
|
|
# $ hg init
|
|
# $ undumprevlog < repo.dump
|
|
|
|
from __future__ import absolute_import, print_function
|
|
|
|
import sys
|
|
from edenscm.mercurial import (
|
|
node,
|
|
revlog,
|
|
transaction,
|
|
util,
|
|
vfs as vfsmod,
|
|
)
|
|
|
|
for fp in (sys.stdin, sys.stdout, sys.stderr):
|
|
util.setbinary(fp)
|
|
|
|
opener = vfsmod.vfs('.', False)
|
|
tr = transaction.transaction(sys.stderr.write, opener, {'store': opener},
|
|
"undump.journal")
|
|
while True:
|
|
l = sys.stdin.readline()
|
|
if not l:
|
|
break
|
|
if l.startswith("file:"):
|
|
f = l[6:-1]
|
|
r = revlog.revlog(opener, f)
|
|
print(f)
|
|
elif l.startswith("node:"):
|
|
n = node.bin(l[6:-1])
|
|
elif l.startswith("linkrev:"):
|
|
lr = int(l[9:-1])
|
|
elif l.startswith("parents:"):
|
|
p = l[9:-1].split()
|
|
p1 = node.bin(p[0])
|
|
p2 = node.bin(p[1])
|
|
elif l.startswith("length:"):
|
|
length = int(l[8:-1])
|
|
sys.stdin.readline() # start marker
|
|
d = sys.stdin.read(length)
|
|
sys.stdin.readline() # end marker
|
|
r.addrevision(d, tr, lr, p1, p2)
|
|
|
|
tr.close()
|