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
% init
% setup
% delete an empty directory
empty_dir
Removing directory empty_dir
directory
r1
% delete an untracked directory
untracked_dir/untracked_file1
untracked_dir/untracked_file2
Removing file untracked_dir/untracked_file1
Removing file untracked_dir/untracked_file2
Removing directory untracked_dir
directory
r1
% delete an untracked file
untracked_file
Removing file untracked_file
directory
r1
% delete an untracked file in a tracked directory
directory/untracked_file
Removing file directory/untracked_file
directory
r1
% delete nested directories
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
% delete nested directories from a subdir
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
% delete only part of the tree
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
directory/untracked_file
% delete ignored files
ignored
Removing file ignored
directory
r1
% abort with missing files until we support name mangling filesystems
refused to run
untracked_file still around
untracked_file
refused to run
untracked_file still around
Removing file untracked_file
directory
r1