public class MergeResult
extends java.lang.Object
MergeCommand
.Modifier and Type | Class and Description |
---|---|
static class |
MergeResult.MergeStatus
The status the merge resulted in.
|
Constructor and Description |
---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults) |
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths,
java.lang.String description) |
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description) |
Modifier and Type | Method and Description |
---|---|
void |
addConflict(java.lang.String path,
int[][] conflictingRanges) |
void |
addConflict(java.lang.String path,
MergeResult<?> lowLevelResult) |
ObjectId |
getBase() |
java.util.Map<java.lang.String,int[][]> |
getConflicts()
Returns information about the conflicts which occurred during a
MergeCommand . |
java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> |
getFailingPaths()
Returns a list of paths causing this merge to fail as returned by
ResolveMerger.getFailingPaths() |
ObjectId[] |
getMergedCommits() |
MergeResult.MergeStatus |
getMergeStatus() |
ObjectId |
getNewHead() |
void |
setConflicts(java.util.Map<java.lang.String,int[][]> conflicts) |
java.lang.String |
toString() |
public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults)
newHead
- the object the head points at after the mergebase
- the common base which was used to produce a content-merge. May
be null
if the merge-result was produced without
computing a common basemergedCommits
- all the commits which have been merged togethermergeStatus
- the status the merge resulted inmergeStrategy
- the used MergeStrategy
lowLevelResults
- merge results as returned by
ResolveMerger.getMergeResults()
public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults, java.lang.String description)
newHead
- the object the head points at after the mergebase
- the common base which was used to produce a content-merge. May
be null
if the merge-result was produced without
computing a common basemergedCommits
- all the commits which have been merged togethermergeStatus
- the status the merge resulted inmergeStrategy
- the used MergeStrategy
lowLevelResults
- merge results as returned by ResolveMerger.getMergeResults()
description
- a user friendly description of the merge resultpublic MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults, java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths, java.lang.String description)
newHead
- the object the head points at after the mergebase
- the common base which was used to produce a content-merge. May
be null
if the merge-result was produced without
computing a common basemergedCommits
- all the commits which have been merged togethermergeStatus
- the status the merge resulted inmergeStrategy
- the used MergeStrategy
lowLevelResults
- merge results as returned by
ResolveMerger.getMergeResults()
failingPaths
- list of paths causing this merge to fail as returned by
ResolveMerger.getFailingPaths()
description
- a user friendly description of the merge resultpublic ObjectId getNewHead()
public MergeResult.MergeStatus getMergeStatus()
public ObjectId[] getMergedCommits()
public ObjectId getBase()
null
if the merge-result was produced without
computing a common basepublic java.lang.String toString()
toString
in class java.lang.Object
public void setConflicts(java.util.Map<java.lang.String,int[][]> conflicts)
conflicts
- the conflicts to setpublic void addConflict(java.lang.String path, int[][] conflictingRanges)
path
- conflictingRanges
- the conflicts to setpublic void addConflict(java.lang.String path, MergeResult<?> lowLevelResult)
path
- lowLevelResult
- public java.util.Map<java.lang.String,int[][]> getConflicts()
MergeCommand
. The returned value maps the path of a conflicting
file to a two-dimensional int-array of line-numbers telling where in the
file conflict markers for which merged commit can be found.
If the returned value contains a mapping "path"->[x][y]=z then this means
Example code how to parse this data:
MergeResult m=...; MapallConflicts = m.getConflicts(); for (String path : allConflicts.keySet()) { int[][] c = allConflicts.get(path); System.out.println("Conflicts in file " + path); for (int i = 0; i < c.length; ++i) { System.out.println(" Conflict #" + i); for (int j = 0; j < (c[i].length) - 1; ++j) { if (c[i][j] >= 0) System.out.println(" Chunk for " + m.getMergedCommits()[j] + " starts on line #" + c[i][j]); } } }
null
if no conflict occurredpublic java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> getFailingPaths()
ResolveMerger.getFailingPaths()
null
if no failure occurredCopyright © 2012. All Rights Reserved.