annotate tests/test-bdiff.py.out @ 30561:7c0c722d568d

bdiff: early pruning of common prefix before doing expensive computations

It seems quite common that files don't change completely. New lines are often
pretty much appended, and modifications will often only change a small section
of the file which on average will be in the middle.

There can thus be a big win by pruning a common prefix before starting the more
expensive search for longest common substrings.

Worst case, it will scan through a long sequence of similar bytes without
encountering a newline. Splitlines will then have to do the same again ...
twice for each side. If similar lines are found, splitlines will save the
double iteration and hashing of the lines ... plus there will be less lines to
find common substrings in.

This change might in some cases make the algorith pick shorter or less optimal
common substrings. We can't have the cake and eat it.

This make hg --time bundle --base null -r 4.0 go from 14.5 to 15 s - a 3%
increase.

On mozilla-unified:
perfbdiff -m 3041e4d59df2
! wall 0.053088 comb 0.060000 user 0.060000 sys 0.000000 (best of 100) to
! wall 0.024618 comb 0.020000 user 0.020000 sys 0.000000 (best of 116)
perfbdiff 0e9928989e9c --alldata --count 10
! wall 0.702075 comb 0.700000 user 0.700000 sys 0.000000 (best of 15) to
! wall 0.579235 comb 0.580000 user 0.580000 sys 0.000000 (best of 18)

test 'a\nc\n\n\n\n' 'a\nb\n\n\n'
test 'a\nb\nc\n' 'a\nc\n'
test '' ''
test 'a\nb\nc' 'a\nb\nc'
test 'a\nb\nc\nd\n' 'a\nd\n'
test 'a\nb\nc\nd\n' 'a\nc\ne\n'
test 'a\nb\nc\n' 'a\nc\n'
test 'a\n' 'c\na\nb\n'
test 'a\n' ''
test 'a\n' 'b\nc\n'
test 'a\n' 'c\na\n'
test '' 'adjfkjdjksdhfksj'
test '' 'ab'
test '' 'abc'
test 'a' 'a'
test 'ab' 'ab'
test 'abc' 'abc'
test 'a\n' 'a\n'
test 'a\nb' 'a\nb'
showdiff(
  'x\n\nx\n\nx\n\nx\n\nz\n',
  'x\n\nx\n\ny\n\nx\n\nx\n\nz\n'):
 'x\n\nx\n\n'
 6 6 '' -> 'y\n\n'
 'x\n\nx\n\nz\n'
showdiff(
  'x\n\nx\n\nx\n\nx\n\nz\n',
  'x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n'):
 'x\n\nx\n\n'
 6 6 '' -> 'y\n\n'
 'x\n\n'
 9 9 '' -> 'y\n\n'
 'x\n\nz\n'
showdiff(
  'a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n',
  'a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n'):
 'a\nb\nb\n'
 6 6 '' -> 'a\nb\nb\nb\nc\n.\n'
 'b\nc\n.\nd\ne\n'
 16 18 '.\n' -> ''
 'f\n'
done
done
Nice diff for a trivial change:
showdiff(
  '<0\n-\n<1\n-\n<2\n-\n<3\n-\n<4\n-\n',
  '>0\n-\n>1\n-\n>2\n-\n>3\n-\n>4\n-\n'):
 0 3 '<0\n' -> '>0\n'
 '-\n'
 5 8 '<1\n' -> '>1\n'
 '-\n'
 10 13 '<2\n' -> '>2\n'
 '-\n'
 15 18 '<3\n' -> '>3\n'
 '-\n'
 20 23 '<4\n' -> '>4\n'
 '-\n'
Diff 1 to 3 lines - preference for appending:
showdiff(
  'a\n',
  'a\na\na\n'):
 'a\n'
 2 2 '' -> 'a\na\n'
Diff 1 to 5 lines - preference for appending:
showdiff(
  'a\n',
  'a\na\na\na\na\n'):
 'a\n'
 2 2 '' -> 'a\na\na\na\n'
Diff 3 to 1 lines - preference for removing trailing lines:
showdiff(
  'a\na\na\n',
  'a\n'):
 'a\n'
 2 6 'a\na\n' -> ''
Diff 5 to 1 lines - preference for removing trailing lines:
showdiff(
  'a\na\na\na\na\n',
  'a\n'):
 'a\n'
 2 10 'a\na\na\na\n' -> ''