##// END OF EJS Templates
fix traceback in hgweb when URL doesn't end in one of the archive specs...
fix traceback in hgweb when URL doesn't end in one of the archive specs If the last n charecters of the URL doesn't match an entry in archive_specs req.form never has a key 'type'. When achive() looks up 'type' in the form dict it causes a traceback rather than printing an error message.

File last commit:

r4367:c6413f8f default
r6669:782dbbdf default
Show More
test-simplemerge-cmd
61 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-simplemerge-cmd
#!/bin/sh
cp "$TESTDIR"/../contrib/simplemerge .
echo base > base
echo local > local
cat base >> local
cp local orig
cat base > other
echo other >> other
echo '% changing local directly'
python simplemerge local base other && echo "merge succeeded"
cat local
cp orig local
echo '% printing to stdout'
python simplemerge -p local base other
echo ' local:'
cat local
echo '% conflicts'
cp base conflict-local
cp other conflict-other
echo not other >> conflict-local
echo end >> conflict-local
echo end >> conflict-other
python simplemerge -p conflict-local base conflict-other || echo "merge failed"
echo '% --no-minimal'
python simplemerge -p --no-minimal conflict-local base conflict-other
echo '% 1 label'
python simplemerge -p -L foo conflict-local base conflict-other
echo '% 2 labels'
python simplemerge -p -L foo -L bar conflict-local base conflict-other
echo '% too many labels'
python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
echo '% binary file'
python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
cat orig >> binary-local
python simplemerge -p binary-local base other
echo '% binary file --text'
python simplemerge -a -p binary-local base other
echo '% help'
python simplemerge --help
echo '% wrong number of arguments'
python simplemerge
echo '% bad option'
python simplemerge --foo -p local base other
exit 0