tests/test-debugcomplete

merge: allow smarter tool configuration

Add [merge-tool] hgrc section with:
 <tool>.executable = name or path (<tool>)
 <tool>.args = args with $local/base/other/output ($local $base $other)
 <tool>.priority = priority (default 0)
 <tool>.binary = handles binary (False)
 <tool>.symlink = handles symlinks (False)
 <tool>.checkconflict = check for conflict markers (False)
 <tool>.premerge = try internal simplemerge (True if not binary or symlink)

Four built-in tools: internal:{merge,local,other,fail}

Add [merge-patterns] section of the form:
 <pattern> = <tool>

Priority of settings is:
 HGMERGE
 merge-patterns
 ui:merge
 merge-tools by priority
 hgmerge, if it can be found

Changes:
 unsuccessful merges leave .orig files

#!/bin/sh

echo '% Show all commands except debug commands'
hg debugcomplete

echo
echo '% Show all commands that start with "a"'
hg debugcomplete a

echo
echo '% Do not show debug commands if there are other candidates'
hg debugcomplete d

echo
echo '% Show debug commands if there are no other candidates'
hg debugcomplete debug

echo
echo '% Do not show the alias of a debug command if there are other candidates'
echo '% (this should hide rawcommit)'
hg debugcomplete r

echo
echo '% Show the alias of a debug command if there are no other candidates'
hg debugcomplete rawc

echo
echo '% Show the global options'
hg debugcomplete --options | sort

echo
echo '% Show the options for the "serve" command'
hg debugcomplete --options serve | sort

echo
echo '% Show an error if we use --options with an ambiguous abbreviation'
hg debugcomplete --options s

exit 0