Package org.eclipse.jgit.merge
Class StrategySimpleTwoWayInCore.InCoreMerger
java.lang.Object
org.eclipse.jgit.merge.Merger
org.eclipse.jgit.merge.ThreeWayMerger
org.eclipse.jgit.merge.StrategySimpleTwoWayInCore.InCoreMerger
- Enclosing class:
- StrategySimpleTwoWayInCore
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate DirCacheBuilderprivate final DirCacheprivate ObjectIdprivate static final intprivate static final intprivate static final intprivate final NameConflictTreeWalkFields inherited from class org.eclipse.jgit.merge.Merger
db, monitor, reader, sourceCommits, sourceObjects, sourceTrees, walk -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprivate voidadd(int tree, int stage) Get resulting tree.private AbstractTreeIteratorgetTree(int tree) protected booleanExecute the merge.private static booleannonTree(int mode) Methods inherited from class org.eclipse.jgit.merge.ThreeWayMerger
getBaseCommitId, merge, mergeBase, setBaseMethods inherited from class org.eclipse.jgit.merge.Merger
getBaseCommit, getObjectInserter, getRepository, merge, nonNullRepo, openTree, setObjectInserter, setProgressMonitor
-
Field Details
-
T_BASE
private static final int T_BASE- See Also:
-
T_OURS
private static final int T_OURS- See Also:
-
T_THEIRS
private static final int T_THEIRS- See Also:
-
tw
-
cache
-
builder
-
resultTree
-
-
Constructor Details
-
InCoreMerger
InCoreMerger(Repository local) -
InCoreMerger
InCoreMerger(ObjectInserter inserter)
-
-
Method Details
-
mergeImpl
Description copied from class:MergerExecute the merge.This method is called from
Merger.merge(AnyObjectId[])after theMerger.sourceObjects,Merger.sourceCommitsandMerger.sourceTreeshave been populated.- Specified by:
mergeImplin classMerger- Returns:
- true if the merge was completed without conflicts; false if the merge strategy cannot handle this merge or there were conflicts preventing it from automatically resolving all paths.
- Throws:
IncorrectObjectTypeException- one of the input objects is not a commit, but the strategy requires it to be a commit.IOException- one or more sources could not be read, or outputs could not be written to the Repository.
-
nonTree
private static boolean nonTree(int mode) -
add
- Throws:
IOException
-
getTree
-
getResultTreeId
Description copied from class:MergerGet resulting tree.- Specified by:
getResultTreeIdin classMerger- Returns:
- resulting tree, if
Merger.merge(AnyObjectId[])returned true.
-