convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
#!/bin/sh
# GNU diff is the reference for all of these results.
hgdiff() {
echo hg diff $@
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
}
test_added_blank_line_with_other_whitespace() {
printf 'hello world\n \t\ngoodbye world \n' >foo
echo '>>> three diffs showing added blank line w/other space <<<'
hgdiff
hgdiff -B
hgdiff -b
hgdiff -Bb
}
test_whitespace_changes() {
printf 'helloworld\ngoodbye\tworld \n' >foo
echo '>>> four diffs showing changed whitespace <<<'
hgdiff
hgdiff -B
hgdiff -b
hgdiff -Bb
hgdiff -w
}
test_whitespace_changes_and_blank_lines() {
printf 'helloworld\n\n\n\ngoodbye\tworld \n' >foo
echo '>>> five diffs showing changed whitespace <<<'
hgdiff
hgdiff -B
hgdiff -b
hgdiff -Bb
hgdiff -w
hgdiff -wB
}
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
test_added_blank_line_with_other_whitespace
test_whitespace_changes
test_whitespace_changes_and_blank_lines