Package | Description |
---|---|
org.eclipse.jgit.diff |
Comparing file contents by computing diffs.
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
org.eclipse.jgit.pgm.debug |
Modifier and Type | Class and Description |
---|---|
class |
HashedSequenceComparator<S extends Sequence>
Wrap another comparator for use with
HashedSequence . |
class |
RawTextComparator
Equivalence function for
RawText . |
class |
SubsequenceComparator<S extends Sequence>
Wrap another comparator for use with
Subsequence . |
Modifier and Type | Field and Description |
---|---|
private SequenceComparator<? super S> |
HashedSequenceComparator.cmp |
private SequenceComparator<? super S> |
SubsequenceComparator.cmp |
private SequenceComparator<? super S> |
HashedSequencePair.cmp |
Modifier and Type | Method and Description |
---|---|
<S extends Sequence> |
DiffAlgorithm.diff(SequenceComparator<? super S> cmp,
S a,
S b)
Compare two sequences and identify a list of edits between them.
|
abstract <S extends Sequence> |
DiffAlgorithm.diffNonCommon(SequenceComparator<? super S> cmp,
S a,
S b)
Compare two sequences and identify a list of edits between them.
|
<S extends Sequence> |
LowLevelDiffAlgorithm.diffNonCommon(SequenceComparator<? super S> cmp,
S a,
S b)
Compare two sequences and identify a list of edits between them.
|
private static <S extends Sequence> |
DiffAlgorithm.normalize(SequenceComparator<? super S> cmp,
EditList e,
S a,
S b)
Reorganize an
EditList for better diff consistency. |
Constructor and Description |
---|
HashedSequenceComparator(SequenceComparator<? super S> cmp) |
HashedSequencePair(SequenceComparator<? super S> cmp,
S a,
S b)
Construct a pair to provide fast hash codes.
|
SubsequenceComparator(SequenceComparator<? super S> cmp)
Construct a comparator wrapping another comparator.
|
Modifier and Type | Method and Description |
---|---|
<S extends Sequence> |
MergeAlgorithm.merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs)
Does the three way merge between a common base and two sequences.
|
Modifier and Type | Class and Description |
---|---|
private static class |
TextHashFunctions.Hash
Base class for any hashCode function to be tested.
|