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
cat >> readlink.py <<EOF
import os
import sys
for f in sys.argv[1:]:
print f, '->', os.readlink(f)
EOF
hg init a
cd a
ln -s nothing dangling
hg add dangling
hg commit -m 'add symlink' -d '0 0'
hg tip -v
hg manifest --debug
echo '% rev 0:'
python ../readlink.py dangling
rm dangling
ln -s void dangling
hg commit -m 'change symlink'
echo '% rev 1:'
python ../readlink.py dangling
echo '% modifying link'
rm dangling
ln -s empty dangling
python ../readlink.py dangling
echo '% reverting to rev 0:'
hg revert -r 0 -a
python ../readlink.py dangling
echo '% backups:'
python ../readlink.py *.orig
rm *.orig
hg up -C
echo '% copies'
hg cp -v dangling dangling2
hg st -Cmard
python ../readlink.py dangling dangling2