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
68 lines
1.8 KiB
Cython
68 lines
1.8 KiB
Cython
# patchrmdir.py
|
|
#
|
|
# Copyright 2017 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.
|
|
|
|
"""patch rmdir
|
|
|
|
Check if a directory is empty before trying to call rmdir on it. This works
|
|
around some kernel issues.
|
|
|
|
Have no effect on Windows.
|
|
"""
|
|
|
|
IF UNAME_SYSNAME != "Windows":
|
|
from edenscm.mercurial import (
|
|
extensions,
|
|
pycompat,
|
|
)
|
|
import os
|
|
import errno
|
|
|
|
cdef extern from "dirent.h":
|
|
ctypedef struct DIR
|
|
struct dirent:
|
|
pass
|
|
|
|
DIR *opendir(const char *)
|
|
dirent *readdir(DIR *)
|
|
int closedir(DIR *)
|
|
|
|
cdef int _countdir(const char *path):
|
|
"""return min(3, the number of entries inside a directory).
|
|
return -1 if the directory cannot be opened.
|
|
"""
|
|
cdef DIR *d = opendir(path)
|
|
if d == NULL:
|
|
return -1
|
|
|
|
cdef dirent *e
|
|
cdef int n = 0
|
|
while True:
|
|
e = readdir(d)
|
|
if e == NULL:
|
|
break
|
|
else:
|
|
n += 1
|
|
if n > 2:
|
|
break
|
|
closedir(d)
|
|
return n
|
|
|
|
def _rmdir(orig, path):
|
|
n = _countdir(path)
|
|
if n >= 3:
|
|
# The number 3 is because most systems have "." and "..". For systems
|
|
# without them, we fallback to the original rmdir, the behavior should
|
|
# still be correct.
|
|
# Choose a slightly different error message other than "Directory not
|
|
# empty" so the test could notice the difference.
|
|
raise OSError(errno.ENOTEMPTY, b'Non-empty directory: %r' % path)
|
|
else:
|
|
return orig(path)
|
|
|
|
def uisetup(ui):
|
|
extensions.wrapfunction(os, b'rmdir', _rmdir)
|