diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-09-21 13:41:47 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-09-24 19:10:09 -0700 |
| commit | b533a7293429258f34a6778a45a6c66dac55dc43 (patch) | |
| tree | c295726348f2ad42f37d175a1c052a7ee874ea47 /org.eclipse.jgit/resources | |
| parent | e7a3e590edabee731e68d5f19d8af14d7b9a83e4 (diff) | |
| download | jgit-b533a7293429258f34a6778a45a6c66dac55dc43.tar.gz jgit-b533a7293429258f34a6778a45a6c66dac55dc43.zip | |
Implement HistogramDiff
HistogramDiff is an alternative implementation of patience diff,
performing a search over all matching locations and picking the
longest common subsequence that has the lowest occurrence count.
If there are unique common elements, its behavior is identical to
that of patience diff.
Actual performance on real-world source files usually beats
MyersDiff, sometimes by a factor of 3, especially for complex
comparators that ignore whitespace.
Change-Id: I1806cd708087e36d144fb824a0e5ab7cdd579d73
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index dff68bad91..b6336283c7 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -336,6 +336,7 @@ repositoryState_rebaseWithMerge=Rebase w/merge requiredHashFunctionNotAvailable=Required hash function {0} not available. resolvingDeltas=Resolving deltas searchForReuse=Finding sources +sequenceTooLargeForDiffAlgorithm=Sequence too large for difference algorithm. serviceNotPermitted={0} not permitted shortCompressedStreamAt=Short compressed stream at {0} shortReadOfBlock=Short read of block. |