JGit 7.2.0.202503040940-r · org.eclipse.jgit.notes.NoteMapMerger

Field Summary

Modifier and Type	Field and Description
private final Repository	db
private static final FanoutBucket	EMPTY_FANOUT
private static final LeafBucket	EMPTY_LEAF
private final ObjectInserter	inserter
private final MergeStrategy	nonNotesMergeStrategy
private final NoteMerger	noteMerger
private final MutableObjectId	objectIdPrefix
private final ObjectReader	reader

Constructor Summary

Access	Constructor and Description
public	NoteMapMerger(Repository Git repository db, NoteMerger note merger for merging conflicting changes on a note noteMerger, MergeStrategy merge strategy for merging non-note entries nonNotesMergeStrategy) Constructs a NoteMapMerger with custom `org.eclipse.jgit.notes.NoteMerger` and custom `org.eclipse.jgit.merge.MergeStrategy`.
public	NoteMapMerger(Repository Git repository db) Constructs a NoteMapMerger with `org.eclipse.jgit.notes.DefaultNoteMerger` as the merger for notes and the `org.eclipse.jgit.merge.MergeStrategy#RESOLVE` as the strategy for resolving conflicts on non-notes

Method Summary

Modifier and Type	Method and Description
private void	addIfNotNull(FanoutBucket b, int cell, NoteBucket child)
private static InMemoryNoteBucket	addIfNotNull(InMemoryNoteBucket result, Note note)
private FanoutBucket	asFanout(InMemoryNoteBucket bucket)
private static boolean	equals(NoteBucket a, NoteBucket b)
private static Note	get(LeafBucket b, int i)
public NoteMap	Returns: merge result as a new NoteMap merge(NoteMap base version of the note tree base, NoteMap ours version of the note tree ours, NoteMap theirs version of the note tree theirs) Performs the merge.
private InMemoryNoteBucket	Returns: merge result as an InMemoryBucket merge(int depth of the tree treeDepth, InMemoryNoteBucket base version base, InMemoryNoteBucket ours version ours, InMemoryNoteBucket theirs version theirs) This method is called only when it is known that there is some difference between base, ours and theirs.
private InMemoryNoteBucket	mergeFanoutBucket(int treeDepth, FanoutBucket base, FanoutBucket ours, FanoutBucket theirs)
private InMemoryNoteBucket	mergeLeafBucket(int treeDepth, LeafBucket bb, LeafBucket ob, LeafBucket tb)
private NonNoteEntry	mergeNonNotes(NonNoteEntry baseList, NonNoteEntry oursList, NonNoteEntry theirsList)
private static Note	min(Note b, Note o, Note t)
private static NonNoteEntry	nonNotes(InMemoryNoteBucket b)
private static LeafBucket	notNullOrEmpty(LeafBucket b)
private static boolean	sameContent(Note a, Note b)
private static boolean	sameNote(Note a, Note b)
private static Note	sameNoteOrNull(Note min, Note other)
private ObjectId	write(NonNoteEntry list)

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

Field Detail

db	back to summary
private final Repository db

EMPTY_FANOUT	back to summary
private static final FanoutBucket EMPTY_FANOUT

EMPTY_LEAF	back to summary
private static final LeafBucket EMPTY_LEAF

inserter	back to summary
private final ObjectInserter inserter

nonNotesMergeStrategy	back to summary
private final MergeStrategy nonNotesMergeStrategy

noteMerger	back to summary
private final NoteMerger noteMerger

objectIdPrefix	back to summary
private final MutableObjectId objectIdPrefix

reader	back to summary
private final ObjectReader reader

Constructor Detail

NoteMapMerger back to summary

NoteMapMerger	back to summary
public NoteMapMerger(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy) Constructs a NoteMapMerger with custom `org.eclipse.jgit.notes.NoteMerger` and custom `org.eclipse.jgit.merge.MergeStrategy`. Parameters db:Repository Git repository noteMerger:NoteMerger note merger for merging conflicting changes on a note nonNotesMergeStrategy:MergeStrategy merge strategy for merging non-note entries

public NoteMapMerger(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy)

Constructs a NoteMapMerger with custom org.eclipse.jgit.notes.NoteMerger and custom org.eclipse.jgit.merge.MergeStrategy.

Parameters

db:Repository: Git repository
noteMerger:NoteMerger: note merger for merging conflicting changes on a note
nonNotesMergeStrategy:MergeStrategy: merge strategy for merging non-note entries

NoteMapMerger back to summary

NoteMapMerger	back to summary
public NoteMapMerger(Repository db) Constructs a NoteMapMerger with `org.eclipse.jgit.notes.DefaultNoteMerger` as the merger for notes and the `org.eclipse.jgit.merge.MergeStrategy#RESOLVE` as the strategy for resolving conflicts on non-notes Parameters db:Repository Git repository

public NoteMapMerger(Repository db)

Constructs a NoteMapMerger with org.eclipse.jgit.notes.DefaultNoteMerger as the merger for notes and the org.eclipse.jgit.merge.MergeStrategy#RESOLVE as the strategy for resolving conflicts on non-notes

Parameters

db:Repository: Git repository

Method Detail

addIfNotNull	back to summary
private void addIfNotNull(FanoutBucket b, int cell, NoteBucket child) throws IOException

addIfNotNull	back to summary
private static InMemoryNoteBucket addIfNotNull(InMemoryNoteBucket result, Note note)

asFanout	back to summary
private FanoutBucket asFanout(InMemoryNoteBucket bucket)

equals	back to summary
private static boolean equals(NoteBucket a, NoteBucket b)

get	back to summary
private static Note get(LeafBucket b, int i)

merge	back to summary
public NoteMap merge(NoteMap base, NoteMap ours, NoteMap theirs) throws IOException Performs the merge. Parameters base:NoteMap base version of the note tree ours:NoteMap ours version of the note tree theirs:NoteMap theirs version of the note tree Returns:NoteMap merge result as a new NoteMap Exceptions IOException: if an IO error occurred

merge

back to summary

public NoteMap merge(NoteMap base, NoteMap ours, NoteMap theirs) throws IOException

Performs the merge.

Parameters

base:NoteMap: base version of the note tree
ours:NoteMap: ours version of the note tree
theirs:NoteMap: theirs version of the note tree

Returns:NoteMap

merge result as a new NoteMap

Exceptions

IOException:: if an IO error occurred

merge	back to summary
private InMemoryNoteBucket merge(int treeDepth, InMemoryNoteBucket base, InMemoryNoteBucket ours, InMemoryNoteBucket theirs) throws IOException This method is called only when it is known that there is some difference between base, ours and theirs. Parameters treeDepth:int depth of the tree base:InMemoryNoteBucket base version ours:InMemoryNoteBucket ours version theirs:InMemoryNoteBucket theirs version Returns:InMemoryNoteBucket merge result as an InMemoryBucket Exceptions IOException: if an IO error occurred

merge

back to summary

private InMemoryNoteBucket merge(int treeDepth, InMemoryNoteBucket base, InMemoryNoteBucket ours, InMemoryNoteBucket theirs) throws IOException

This method is called only when it is known that there is some difference between base, ours and theirs.

Parameters

treeDepth:int: depth of the tree
base:InMemoryNoteBucket: base version
ours:InMemoryNoteBucket: ours version
theirs:InMemoryNoteBucket: theirs version

Returns:InMemoryNoteBucket

merge result as an InMemoryBucket

Exceptions

IOException:: if an IO error occurred

mergeFanoutBucket	back to summary
private InMemoryNoteBucket mergeFanoutBucket(int treeDepth, FanoutBucket base, FanoutBucket ours, FanoutBucket theirs) throws IOException

mergeLeafBucket	back to summary
private InMemoryNoteBucket mergeLeafBucket(int treeDepth, LeafBucket bb, LeafBucket ob, LeafBucket tb) throws MissingObjectException, IOException

mergeNonNotes	back to summary
private NonNoteEntry mergeNonNotes(NonNoteEntry baseList, NonNoteEntry oursList, NonNoteEntry theirsList) throws IOException

min	back to summary
private static Note min(Note b, Note o, Note t)

nonNotes	back to summary
private static NonNoteEntry nonNotes(InMemoryNoteBucket b)

notNullOrEmpty	back to summary
private static LeafBucket notNullOrEmpty(LeafBucket b)

sameContent	back to summary
private static boolean sameContent(Note a, Note b)

sameNote	back to summary
private static boolean sameNote(Note a, Note b)

sameNoteOrNull	back to summary
private static Note sameNoteOrNull(Note min, Note other)

write	back to summary
private ObjectId write(NonNoteEntry list) throws IOException

public Class NoteMapMerger

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail