view tests/test-simplemerge-cmd.out @ 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.

% changing local directly
merge succeeded
local
base
other
% printing to stdout
local
base
other
 local:
local
base
% conflicts
base
<<<<<<< conflict-local
not other
=======
other
>>>>>>> conflict-other
end
warning: conflicts during merge.
merge failed
% --no-minimal
base
<<<<<<< conflict-local
not other
end
=======
other
end
>>>>>>> conflict-other
warning: conflicts during merge.
% 1 label
base
<<<<<<< foo
not other
=======
other
>>>>>>> conflict-other
end
warning: conflicts during merge.
% 2 labels
base
<<<<<<< foo
not other
=======
other
>>>>>>> bar
end
warning: conflicts during merge.
% too many labels
abort: can only specify two labels.
% binary file
abort: binary-local looks like a binary file.
% binary file --text
warning: binary-local looks like a binary file.
\x00local
base
other
% help
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output
% wrong number of arguments
simplemerge: wrong number of arguments
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output
% bad option
simplemerge: option --foo not recognized
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output