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
# GNU diff is the reference for all of these results.
hgdiff() {
hg diff --nodates "$@"
}
test_added_blank_lines() {
printf '\nhello world\n\ngoodbye world\n\n' >foo
echo '>>> two diffs showing three added lines <<<'
hgdiff
hgdiff -b
echo '>>> no diffs <<<'
hgdiff -B
hgdiff -Bb
}
test_added_horizontal_space_first_on_a_line() {
printf '\t hello world\ngoodbye world\n' >foo
echo '>>> four diffs showing added space first on the first line <<<'
hgdiff
hgdiff -b
hgdiff -B
hgdiff -Bb
}
test_added_horizontal_space_last_on_a_line() {
printf 'hello world\t \ngoodbye world\n' >foo
echo '>>> two diffs showing space appended to the first line <<<'
hgdiff
hgdiff -B
echo '>>> no diffs <<<'
hgdiff -b
hgdiff -Bb
}
test_added_horizontal_space_in_the_middle_of_a_word() {
printf 'hello world\ngood bye world\n' >foo
echo '>>> four diffs showing space inserted into "goodbye" <<<'
hgdiff
hgdiff -B
hgdiff -b
hgdiff -Bb
}
test_increased_horizontal_whitespace_amount() {
printf 'hello world\ngoodbye\t\t \tworld\n' >foo
echo '>>> two diffs showing changed whitespace amount in the last line <<<'
hgdiff
hgdiff -B
echo '>>> no diffs <<<'
hgdiff -b
hgdiff -Bb
}
test_added_blank_line_with_horizontal_whitespace() {
printf 'hello world\n \t\ngoodbye world\n' >foo
echo '>>> four diffs showing added blank line w/horizontal space <<<'
hgdiff
hgdiff -B
hgdiff -b
hgdiff -Bb
}
hg init
printf 'hello world\ngoodbye world\n' >foo
hg ci -Amfoo -ufoo -d '0 0'
test_added_blank_lines
test_added_horizontal_space_first_on_a_line
test_added_horizontal_space_last_on_a_line
test_added_horizontal_space_in_the_middle_of_a_word
test_increased_horizontal_whitespace_amount
test_added_blank_line_with_horizontal_whitespace