static class StrategyOneSided.OneSide extends Merger
Modifier and Type | Field and Description |
---|---|
private int |
treeIndex |
db, monitor, reader, sourceCommits, sourceObjects, sourceTrees, walk
Modifier | Constructor and Description |
---|---|
protected |
OneSide(ObjectInserter inserter,
int index) |
protected |
OneSide(Repository local,
int index) |
Modifier and Type | Method and Description |
---|---|
ObjectId |
getBaseCommitId()
Get the ID of the commit that was used as merge base for merging
|
ObjectId |
getResultTreeId()
Get resulting tree.
|
protected boolean |
mergeImpl()
Execute the merge.
|
getBaseCommit, getObjectInserter, getRepository, merge, merge, nonNullRepo, openTree, setObjectInserter, setProgressMonitor
protected OneSide(Repository local, int index)
protected OneSide(ObjectInserter inserter, int index)
protected boolean mergeImpl() throws java.io.IOException
Merger
This method is called from Merger.merge(AnyObjectId[])
after the
Merger.sourceObjects
, Merger.sourceCommits
and Merger.sourceTrees
have been populated.
mergeImpl
in class Merger
IncorrectObjectTypeException
- one of the input objects is not a commit, but the strategy
requires it to be a commit.java.io.IOException
- one or more sources could not be read, or outputs could not
be written to the Repository.public ObjectId getResultTreeId()
Merger
getResultTreeId
in class Merger
Merger.merge(AnyObjectId[])
returned true.public ObjectId getBaseCommitId()
Merger
getBaseCommitId
in class Merger