luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cap line matching comparisons

Browse source
This commit is contained in:
Wolfgang Illmeyer 2016-04-14 13:01:25 +02:00
parent 3929ca28fc
commit ee494b88e5
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -67,6 +67,7 @@ The HTML output accepts a Javascript object with configuration. Possible options
- `showFiles`: show a file list before the diff: `true` or `false`, default is `false` - `showFiles`: show a file list before the diff: `true` or `false`, default is `false`
- `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none` - `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none`
- `matchWordsThreshold`: similarity threshold for word matching, default is 0.25 - `matchWordsThreshold`: similarity threshold for word matching, default is 0.25
- `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is `2500`
## Diff2HtmlUI Helper ## Diff2HtmlUI Helper

5
src/line-by-line-printer.js
View file

@ -66,7 +66,10 @@
var insertType; var insertType;
var deleteType; var deleteType;
var doMatching = that.config.matching === 'lines' || that.config.matching === 'words'; var comparisons = oldLines.length * newLines.length;
var maxComparisons = that.config.matchingMaxComparisons || 2500;
var doMatching = comparisons < maxComparisons && (that.config.matching === 'lines' ||
that.config.matching === 'words');
if (doMatching) { if (doMatching) {
matches = matcher(oldLines, newLines); matches = matcher(oldLines, newLines);

6
src/side-by-side-printer.js
View file

@ -105,7 +105,11 @@
var matches; var matches;
var insertType; var insertType;
var deleteType; var deleteType;
var doMatching = that.config.matching === 'lines' || that.config.matching === 'words';
var comparisons = oldLines.length * newLines.length;
var maxComparisons = that.config.matchingMaxComparisons || 2500;
var doMatching = comparisons < maxComparisons && (that.config.matching === 'lines' ||
that.config.matching === 'words');
if (doMatching) { if (doMatching) {
matches = matcher(oldLines, newLines); matches = matcher(oldLines, newLines);