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
private static class StrategySimpleTwoWayInCore.InCoreMerger extends ThreeWayMerger
-
-
Field Summary
Fields Modifier and Type Field Description private DirCacheBuilder
builder
private DirCache
cache
private ObjectId
resultTree
private static int
T_BASE
private static int
T_OURS
private static int
T_THEIRS
private NameConflictTreeWalk
tw
-
Fields inherited from class org.eclipse.jgit.merge.Merger
db, monitor, reader, sourceCommits, sourceObjects, sourceTrees, walk
-
-
Constructor Summary
Constructors Constructor Description InCoreMerger(ObjectInserter inserter)
InCoreMerger(Repository local)
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description private void
add(int tree, int stage)
ObjectId
getResultTreeId()
Get resulting tree.private AbstractTreeIterator
getTree(int tree)
protected boolean
mergeImpl()
Execute the merge.private static boolean
nonTree(int mode)
-
Methods inherited from class org.eclipse.jgit.merge.ThreeWayMerger
getBaseCommitId, merge, mergeBase, setBase
-
Methods inherited from class org.eclipse.jgit.merge.Merger
getBaseCommit, getObjectInserter, getRepository, merge, nonNullRepo, openTree, setObjectInserter, setProgressMonitor
-
-
-
-
Field Detail
-
T_BASE
private static final int T_BASE
- See Also:
- Constant Field Values
-
T_OURS
private static final int T_OURS
- See Also:
- Constant Field Values
-
T_THEIRS
private static final int T_THEIRS
- See Also:
- Constant Field Values
-
tw
private final NameConflictTreeWalk tw
-
cache
private final DirCache cache
-
builder
private DirCacheBuilder builder
-
resultTree
private ObjectId resultTree
-
-
Constructor Detail
-
InCoreMerger
InCoreMerger(Repository local)
-
InCoreMerger
InCoreMerger(ObjectInserter inserter)
-
-
Method Detail
-
mergeImpl
protected boolean mergeImpl() throws java.io.IOException
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.java.io.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
private void add(int tree, int stage) throws java.io.IOException
- Throws:
java.io.IOException
-
getTree
private AbstractTreeIterator getTree(int tree)
-
getResultTreeId
public ObjectId getResultTreeId()
Description copied from class:Merger
Get resulting tree.- Specified by:
getResultTreeId
in classMerger
- Returns:
- resulting tree, if
Merger.merge(AnyObjectId[])
returned true.
-
-