mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
#!/bin/sh
hg init
# Test issue 562: .hgignore requires newline at end
touch foo
touch bar
touch baz
cat > makeignore.py <<EOF
f = open(".hgignore", "w")
f.write("ignore\n")
f.write("foo\n")
# No EOL here
f.write("bar")
f.close()
EOF
python makeignore.py
echo % should display baz only
hg status
rm foo bar baz .hgignore makeignore.py
touch a.o
touch a.c
touch syntax
mkdir dir
touch dir/a.o
touch dir/b.o
touch dir/c.o
hg add dir/a.o
hg commit -m 0
hg add dir/b.o
echo "--" ; hg status
echo "*.o" > .hgignore
echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/'
echo ".*\.o" > .hgignore
echo "--" ; hg status
# Check it does not ignore the current directory '.'
echo "^\." > .hgignore
echo "--" ; hg status
echo "glob:**.o" > .hgignore
echo "--" ; hg status
echo "glob:*.o" > .hgignore
echo "--" ; hg status
echo "syntax: glob" > .hgignore
echo "re:.*\.o" >> .hgignore
echo "--" ; hg status
echo "syntax: invalid" > .hgignore
echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/'
echo "syntax: glob" > .hgignore
echo "*.o" >> .hgignore
echo "--" ; hg status
echo "relglob:syntax*" > .hgignore
echo "--" ; hg status
echo "relglob:*" > .hgignore
echo "--" ; hg status
cd dir
echo "--" ; hg status .