Mercurial > hg
view tests/test-impexp-branch @ 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 | 32ea809e5bd1 |
children |
line wrap: on
line source
#!/bin/sh cat >findbranch.py <<EOF import re, sys head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') for line in sys.stdin: hmatch = head_re.match(line) if not hmatch: sys.exit(1) if hmatch.group(1) == 'Branch': sys.exit(0) sys.exit(1) EOF hg init a cd a echo "Rev 1" >rev hg add rev hg commit -m "No branch." hg branch abranch echo "Rev 2" >rev hg commit -m "With branch." if hg export 0 | python ../findbranch.py; then echo "Export of default branch revision has Branch header" 1>&2 exit 1 fi if hg export 1 | python ../findbranch.py; then : # Do nothing else echo "Export of branch revision is missing Branch header" 1>&2 exit 1 fi # Make sure import still works with branch information in patches. cd .. hg init b cd b hg -R ../a export 0 | hg import - hg -R ../a export 1 | hg import - cd .. rm -rf b hg init b cd b hg -R ../a export 0 | hg import --exact - hg -R ../a export 1 | hg import --exact -