Mercurial > public > mercurial-scm > hg
diff hgext/inotify/server.py @ 9116:f90bbf1ea09f
inotify: fix issue1375, add a test.
The biggest problem was the data structure, which did not allow changing
a file into a directory or vice versa. This problem is fixed by b55d44719b47.
The walk() method also had an issue in this case:
- we know 'path' as a directory. inotify server sleeps.
- 'path' is deleted
- 'path' is recreated as a file
- the server catches up here, and see the deletion. it instantiates a scan(),
which in its turn calls for walk(repo, path).
- walk() then assumes that 'path' is a directory and calls os.listdir on it,
which raises an OSError(errno.ENOTDIR)
Catch the error, and yield the file instead of the directory contents.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 13 Jul 2009 16:49:05 +0200 |
parents | b55d44719b47 |
children | a87bc6e2a907 |
line wrap: on
line diff
--- a/hgext/inotify/server.py Tue May 26 23:00:35 2009 +0900 +++ b/hgext/inotify/server.py Mon Jul 13 16:49:05 2009 +0200 @@ -89,7 +89,11 @@ yield fullpath, dirs, files except OSError, err: - if err.errno not in walk_ignored_errors: + if err.errno == errno.ENOTDIR: + # fullpath was a directory, but has since been replaced + # by a file. + yield fullpath, dirs, files + elif err.errno not in walk_ignored_errors: raise return walkit(root, root == '')