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.

     1

adding a

     2

adding b

     3

adding c

     4

adding d

     5

adding dir/bar/foo

     6

adding dir/x

     7

adding dir/y

     8

adding e

     9

% inserve

    10

? hg.pid

    11

% clean

    12

C a

    13

C b

    14

C c

    15

C d

    16

C dir/bar/foo

    17

C dir/x

    18

C dir/y

    19

C e

    20

% all

    21

? hg.pid

    22

C a

    23

C b

    24

C c

    25

C d

    26

C dir/bar/foo

    27

C dir/x

    28

C dir/y

    29

C e

    30

% path patterns

    31

M dir/x

    32

? hg.pid

    33

M dir/x

    34

M x

    35

% issue 1375

    36

adding h/h

    37

adding hg.pid

    38

removing h/h

    39

A h

    40

R h/h