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.submodule |
Git submodule support.
|
Modifier and Type | Class and Description |
---|---|
class |
HashedSequence<S extends Sequence>
Wraps a
Sequence to assign hash codes to
elements. |
class |
HashedSequenceComparator<S extends Sequence>
Wrap another comparator for use with
HashedSequence . |
class |
HashedSequencePair<S extends Sequence>
Wraps two
Sequence instances to cache their
element hash codes. |
class |
MyersDiff<S extends Sequence>
Diff algorithm, based on "An O(ND) Difference Algorithm and its Variations",
by Eugene Myers.
|
class |
SequenceComparator<S extends Sequence>
Equivalence function for a
Sequence compared by
difference algorithm. |
class |
Subsequence<S extends Sequence>
Wraps a
Sequence to have a narrower range of
elements. |
class |
SubsequenceComparator<S extends Sequence>
Wrap another comparator for use with
Subsequence . |
Modifier and Type | Class and Description |
---|---|
class |
HashedSequence<S extends Sequence>
Wraps a
Sequence to assign hash codes to
elements. |
class |
RawText
A Sequence supporting UNIX formatted text in byte[] format.
|
class |
Subsequence<S extends Sequence>
Wraps a
Sequence to have a narrower range of
elements. |
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.
|
static <S extends Sequence> |
Subsequence.b(S b,
Edit region)
Construct a subsequence around the B region/base sequence.
|
<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> |
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.
|
<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> |
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.
|
static <S extends Sequence> |
Subsequence.toBase(EditList edits,
Subsequence<S> a,
Subsequence<S> b)
Adjust the Edits to reflect positions in the base sequence.
|
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 | Class and Description |
---|---|
class |
MergeResult<S extends Sequence>
The result of merging a number of
Sequence
objects. |
Modifier and Type | Field and Description |
---|---|
protected Map<String,MergeResult<? extends Sequence>> |
ResolveMerger.mergeResults
Low-level textual merge results.
|
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 | Method and Description |
---|---|
Map<String,MergeResult<? extends Sequence>> |
ResolveMerger.getMergeResults()
Get the mergeResults
|
Modifier and Type | Class and Description |
---|---|
class |
SubmoduleConflict
Merges expect that conflicts will consist of Sequences, but that doesn't
really make sense for submodules.
|
Copyright © 2019 Eclipse JGit Project. All rights reserved.