view tests/test-archive.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

adding foo
adding bar
adding baz/bletch

% gz allowed should give 200
200 Script output follows
% tar.bz2 and zip disallowed should both give 403
403 Forbidden
403 Forbidden
% bz2 allowed should give 200
200 Script output follows
% zip and tar.gz disallowed should both give 403
403 Forbidden
403 Forbidden
% zip allowed should give 200
200 Script output follows
% tar.gz and tar.bz2 disallowed should both give 403
403 Forbidden
403 Forbidden
% invalid arch type should give 404
404 Not Found

test-archive-TIP/.hg_archival.txt
test-archive-TIP/bar
test-archive-TIP/baz/bletch
test-archive-TIP/foo
test-archive-TIP/.hg_archival.txt
test-archive-TIP/bar
test-archive-TIP/baz/bletch
test-archive-TIP/foo
Archive:  archive.zip
    testing: test-archive-TIP/.hg_archival.txt   OK
    testing: test-archive-TIP/bar   OK
    testing: test-archive-TIP/baz/bletch   OK
    testing: test-archive-TIP/foo   OK
No errors detected in compressed data of archive.zip.
test/.hg_archival.txt
test/bar
test/baz/bletch
test/foo
test/.hg_archival.txt
test/bar
test/foo
test-TIP/.hg_archival.txt
test-TIP/bar
test-TIP/baz/bletch
test-TIP/foo
True
abort: archive prefix contains illegal components
Archive:  test.zip
    testing: test/bar                 OK
    testing: test/baz/bletch          OK
    testing: test/foo                 OK
No errors detected in compressed data of test.zip.
test-TIP/.hg_archival.txt
test-TIP/bar
test-TIP/baz/bletch
test-TIP/foo
rev-0.tar created
abort: unknown archive type 'bogus'
% server errors
% empty repo
abort: no working directory: please specify a revision