facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

merge with crew

Browse Source
This commit is contained in:
Benoit Boissinot 2008-10-18 21:11:44 +02:00
commit 5cedefbd2a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/osutil.c
View File

@ -270,10 +270,13 @@ static PyObject *_listdir(char *path, int pathlen, int keepstat, char *skip)
{
PyObject *list, *elem, *stat, *ret = NULL;
char fullpath[PATH_MAX + 10];
int kind, dfd = -1, err;
int kind, err;
struct stat st;
struct dirent *ent;
DIR *dir;
#ifdef AT_SYMLINK_NOFOLLOW
int dfd = -1;
#endif
if (pathlen >= PATH_MAX) {
PyErr_SetString(PyExc_ValueError, "path too long");

4
mercurial/util.py
View File

@ -865,7 +865,9 @@ def _statfiles_clustered(files):
# handle directory not found in Python version prior to 2.5
# Python <= 2.4 returns native Windows code 3 in errno
# Python >= 2.5 returns ENOENT and adds winerror field
if err.errno not in (3, errno.ENOENT, errno.ENOTDIR):
# EINVAL is raised if dir is not a directory.
if err.errno not in (3, errno.ENOENT, errno.EINVAL,
errno.ENOTDIR):
raise
dmap = {}
cache = dircache.setdefault(dir, dmap)