actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

#!/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