Package org.eclipse.jgit.merge
Class StrategyOneSided.OneSide
java.lang.Object
org.eclipse.jgit.merge.Merger
org.eclipse.jgit.merge.StrategyOneSided.OneSide
- Enclosing class:
- StrategyOneSided
-
Field Summary
FieldsFields inherited from class org.eclipse.jgit.merge.Merger
db, monitor, reader, sourceCommits, sourceObjects, sourceTrees, walk
-
Constructor Summary
ConstructorsModifierConstructorDescriptionprotected
OneSide
(ObjectInserter inserter, int index) protected
OneSide
(Repository local, int index) -
Method Summary
Modifier and TypeMethodDescriptionGet the ID of the commit that was used as merge base for mergingGet resulting tree.protected boolean
Execute the merge.Methods inherited from class org.eclipse.jgit.merge.Merger
getBaseCommit, getObjectInserter, getRepository, merge, merge, nonNullRepo, openTree, setObjectInserter, setProgressMonitor
-
Field Details
-
treeIndex
private final int treeIndex
-
-
Constructor Details
-
OneSide
-
OneSide
-
-
Method Details
-
mergeImpl
Description copied from class:Merger
Execute the merge.This method is called from
Merger.merge(AnyObjectId[])
after theMerger.sourceObjects
,Merger.sourceCommits
andMerger.sourceTrees
have been populated.- Specified by:
mergeImpl
in 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.
-
getResultTreeId
Description copied from class:Merger
Get resulting tree.- Specified by:
getResultTreeId
in classMerger
- Returns:
- resulting tree, if
Merger.merge(AnyObjectId[])
returned true.
-
getBaseCommitId
Description copied from class:Merger
Get the ID of the commit that was used as merge base for merging- Specified by:
getBaseCommitId
in classMerger
- Returns:
- the ID of the commit that was used as merge base for merging, or null if no merge base was used or it was set manually
-