Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
org.eclipse.jgit.notes |
Git notes processing (for commits, etc).
|
Modifier and Type | Method and Description |
---|---|
Note |
ShowNoteCommand.call() |
Note |
RemoveNoteCommand.call() |
Note |
AddNoteCommand.call() |
Modifier and Type | Method and Description |
---|---|
java.util.List<Note> |
ListNotesCommand.call() |
Modifier and Type | Field and Description |
---|---|
private Note[] |
LeafBucket.notes
All note blobs in this bucket, sorted sequentially.
|
Modifier and Type | Method and Description |
---|---|
(package private) Note |
LeafBucket.get(int index) |
private static Note |
NoteMapMerger.get(LeafBucket b,
int i) |
Note |
NoteMap.getNote(AnyObjectId id)
Lookup a note for a specific ObjectId.
|
(package private) Note |
FanoutBucket.getNote(AnyObjectId objId,
ObjectReader or) |
(package private) Note |
FanoutBucket.LazyNoteBucket.getNote(AnyObjectId objId,
ObjectReader or) |
(package private) abstract Note |
NoteBucket.getNote(AnyObjectId objId,
ObjectReader reader) |
(package private) Note |
LeafBucket.getNote(AnyObjectId objId,
ObjectReader or) |
Note |
NoteMerger.merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes.
|
Note |
DefaultNoteMerger.merge(Note base,
Note ours,
Note theirs,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes.
|
private static Note |
NoteMapMerger.min(Note b,
Note o,
Note t) |
private static Note |
NoteMapMerger.sameNoteOrNull(Note min,
Note other) |
Modifier and Type | Method and Description |
---|---|
java.util.Iterator<Note> |
NoteMap.iterator() |
(package private) java.util.Iterator<Note> |
FanoutBucket.iterator(AnyObjectId objId,
ObjectReader reader) |
(package private) java.util.Iterator<Note> |
FanoutBucket.LazyNoteBucket.iterator(AnyObjectId objId,
ObjectReader reader) |
(package private) abstract java.util.Iterator<Note> |
NoteBucket.iterator(AnyObjectId objId,
ObjectReader reader) |
(package private) java.util.Iterator<Note> |
LeafBucket.iterator(AnyObjectId objId,
ObjectReader reader) |
Modifier and Type | Method and Description |
---|---|
private static InMemoryNoteBucket |
NoteMapMerger.addIfNotNull(InMemoryNoteBucket result,
Note note) |
(package private) InMemoryNoteBucket |
FanoutBucket.append(Note note) |
(package private) abstract InMemoryNoteBucket |
InMemoryNoteBucket.append(Note note) |
(package private) InMemoryNoteBucket |
LeafBucket.append(Note note) |
Note |
NoteMerger.merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes.
|
Note |
DefaultNoteMerger.merge(Note base,
Note ours,
Note theirs,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes.
|
private static Note |
NoteMapMerger.min(Note b,
Note o,
Note t) |
private static java.lang.String |
NotesMergeConflictException.noteData(Note n) |
private static java.lang.String |
NotesMergeConflictException.noteOn(Note base,
Note ours,
Note theirs) |
private static boolean |
NoteMapMerger.sameContent(Note a,
Note b) |
private static boolean |
NoteMapMerger.sameNote(Note a,
Note b) |
private static Note |
NoteMapMerger.sameNoteOrNull(Note min,
Note other) |
Constructor and Description |
---|
NotesMergeConflictException(Note base,
Note ours,
Note theirs)
Construct a NotesMergeConflictException for the specified base, ours and
theirs note versions.
|