Package | Description |
---|---|
org.eclipse.jgit.diff |
Comparing file contents by computing diffs.
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Field and Description |
---|---|
protected Edit |
MyersDiff.MiddleEdit.edit |
private Edit |
HistogramDiffIndex.lcs |
private Edit |
HistogramDiffIndex.region |
Modifier and Type | Field and Description |
---|---|
private java.util.List<Edit> |
HistogramDiff.State.queue |
Modifier and Type | Method and Description |
---|---|
Edit |
Edit.after(Edit cut)
Construct a new edit representing the region after cut.
|
Edit |
Edit.before(Edit cut)
Construct a new edit representing the region before cut.
|
(package private) Edit |
MyersDiff.MiddleEdit.calculate(int beginA,
int endA,
int beginB,
int endB) |
private static <S extends Sequence> |
DiffAlgorithm.coverEdit(S a,
S b) |
(package private) Edit |
HistogramDiffIndex.findLongestCommonSequence() |
Edit |
RawTextComparator.reduceCommonStartEnd(RawText a,
RawText b,
Edit e)
Modify the edit to remove common leading and trailing items.
|
Edit |
SequenceComparator.reduceCommonStartEnd(S a,
S b,
Edit e)
Modify the edit to remove common leading and trailing items.
|
Modifier and Type | Method and Description |
---|---|
static <S extends Sequence> |
Subsequence.a(S a,
Edit region)
Construct a subsequence around the A region/base sequence.
|
Edit |
Edit.after(Edit cut)
Construct a new edit representing the region after cut.
|
static <S extends Sequence> |
Subsequence.b(S b,
Edit region)
Construct a subsequence around the B region/base sequence.
|
Edit |
Edit.before(Edit cut)
Construct a new edit representing the region before cut.
|
private void |
MyersDiff.calculateEdits(Edit r)
Entrypoint into the algorithm this class is all about.
|
private void |
HistogramDiff.State.diff(Edit r) |
<S extends Sequence> |
HistogramDiff.diffNonCommon(EditList edits,
HashedSequenceComparator<S> cmp,
HashedSequence<S> a,
HashedSequence<S> b,
Edit region)
Compare two sequences and identify a list of edits between them.
|
abstract <S extends Sequence> |
LowLevelDiffAlgorithm.diffNonCommon(EditList edits,
HashedSequenceComparator<S> cmp,
HashedSequence<S> a,
HashedSequence<S> b,
Edit region)
Compare two sequences and identify a list of edits between them.
|
(package private) void |
HistogramDiff.State.diffRegion(Edit r) |
private void |
HistogramDiff.State.diffReplace(Edit r) |
private static boolean |
DiffFormatter.end(Edit edit,
int a,
int b) |
Edit |
RawTextComparator.reduceCommonStartEnd(RawText a,
RawText b,
Edit e)
Modify the edit to remove common leading and trailing items.
|
Edit |
SequenceComparator.reduceCommonStartEnd(S a,
S b,
Edit e)
Modify the edit to remove common leading and trailing items.
|
static EditList |
EditList.singleton(Edit edit)
Construct an edit list containing a single edit.
|
static <S extends Sequence> |
Subsequence.toBase(Edit e,
Subsequence<S> a,
Subsequence<S> b)
Adjust the Edit to reflect positions in the base sequence.
|
Modifier and Type | Method and Description |
---|---|
private boolean |
DiffFormatter.combineA(java.util.List<Edit> e,
int i) |
private boolean |
DiffFormatter.combineB(java.util.List<Edit> e,
int i) |
private int |
DiffFormatter.findCombinedEnd(java.util.List<Edit> edits,
int i) |
Constructor and Description |
---|
HistogramDiffIndex(int maxChainLength,
HashedSequenceComparator<S> cmp,
HashedSequence<S> a,
HashedSequence<S> b,
Edit r) |
MyersDiff(EditList edits,
HashedSequenceComparator<S> cmp,
HashedSequence<S> a,
HashedSequence<S> b,
Edit region) |
Modifier and Type | Field and Description |
---|---|
private static Edit |
MergeAlgorithm.END_EDIT |
Modifier and Type | Method and Description |
---|---|
private static Edit |
MergeAlgorithm.nextEdit(java.util.Iterator<Edit> it)
Helper method which returns the next Edit for an Iterator over Edits.
|
Modifier and Type | Method and Description |
---|---|
private static Edit |
MergeAlgorithm.nextEdit(java.util.Iterator<Edit> it)
Helper method which returns the next Edit for an Iterator over Edits.
|