Modifier and Type	Class and Description
public static enum	MergeResult.MergeStatus The status the merge resulted in.

Modifier and Type	Field and Description
private ObjectId	base
private List<String>	checkoutConflicts
private Map<String, int[][]>	conflicts
private String	description
private Map<String, ResolveMerger.MergeFailureReason>	failingPaths
private ObjectId[]	mergedCommits
private MergeResult.MergeStatus	mergeStatus
private MergeStrategy	mergeStrategy
private ObjectId	newHead

Constructor Summary

Access	Constructor and Description
public	MergeResult(ObjectId the object the head points at after the merge newHead, ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base base, ObjectId[] all the commits which have been merged together mergedCommits, MergeResult.MergeStatus the status the merge resulted in mergeStatus, MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` mergeStrategy, Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` lowLevelResults) Constructor for MergeResult.
public	MergeResult(ObjectId the object the head points at after the merge newHead, ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base base, ObjectId[] all the commits which have been merged together mergedCommits, MergeResult.MergeStatus the status the merge resulted in mergeStatus, MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` mergeStrategy, Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` lowLevelResults, String a user friendly description of the merge result description) Constructor for MergeResult.
public	MergeResult(ObjectId the object the head points at after the merge newHead, ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base base, ObjectId[] all the commits which have been merged together mergedCommits, MergeResult.MergeStatus the status the merge resulted in mergeStatus, MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` mergeStrategy, Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` lowLevelResults, Map<String, ResolveMerger.MergeFailureReason> list of paths causing this merge to fail as returned by `org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()` failingPaths, String a user friendly description of the merge result description) Constructor for MergeResult.
public	MergeResult(List<String> the conflicting files checkoutConflicts) Creates a new result that represents a checkout conflict before the operation even started for real.

Method Summary

Modifier and Type	Method and Description
public void	addConflict(String path of the file to add a conflict for path, int[][] the conflicts to set conflictingRanges) Add a conflict
public void	addConflict(String path of the file to add a conflict for path, MergeResult<?> a `org.eclipse.jgit.merge.MergeResult` lowLevelResult) Add a conflict
public ObjectId	Returns: base the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base getBase() Get the common base
public List<String>	Returns: the list of files that caused the checkout conflict. getCheckoutConflicts() Returns a list of paths that cause a checkout conflict.
public Map<String, int[][]>	Returns: the conflicts or `null` if no conflict occurred getConflicts() Returns information about the conflicts which occurred during a `org.eclipse.jgit.api.MergeCommand`.
public Map<String, ResolveMerger.MergeFailureReason>	Returns: the list of paths causing this merge to fail or `null` if no failure occurred getFailingPaths() Returns a list of paths causing this merge to fail as returned by `org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()`
public ObjectId[]	Returns: all the commits which have been merged together getMergedCommits() Get the commits which have been merged
public MergeResult.MergeStatus	Returns: the status the merge resulted in getMergeStatus() Get the merge status
public ObjectId	Returns: the object the head points at after the merge getNewHead() Get the object the head points at after the merge
public void	setConflicts(Map<String, int[][]> the conflicts to set conflicts) Set conflicts
public String	toString() Overrides java.lang.Object.toString. Returns a string representation of the object.

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll wait wait wait

Field Detail

base	back to summary
private ObjectId base

checkoutConflicts	back to summary
private List<String> checkoutConflicts

conflicts	back to summary
private Map<String, int[][]> conflicts

description	back to summary
private String description

failingPaths	back to summary
private Map<String, ResolveMerger.MergeFailureReason> failingPaths

mergedCommits	back to summary
private ObjectId[] mergedCommits

mergeStatus	back to summary
private MergeResult.MergeStatus mergeStatus

mergeStrategy	back to summary
private MergeStrategy mergeStrategy

newHead	back to summary
private ObjectId newHead

Constructor Detail

MergeResult back to summary

MergeResult	back to summary
public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults) Constructor for MergeResult. Parameters newHead:ObjectId the object the head points at after the merge base:ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base mergedCommits:ObjectId[] all the commits which have been merged together mergeStatus:MergeResult.MergeStatus the status the merge resulted in mergeStrategy:MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` lowLevelResults:Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` Since 2.0

public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults)

Constructor for MergeResult.

Parameters

newHead:ObjectId: the object the head points at after the merge
base:ObjectId: the common base which was used to produce a content-merge. May be null if the merge-result was produced without computing a common base
mergedCommits:ObjectId[]: all the commits which have been merged together
mergeStatus:MergeResult.MergeStatus: the status the merge resulted in
mergeStrategy:MergeStrategy: the used org.eclipse.jgit.merge.MergeStrategy
lowLevelResults:Map<String, MergeResult<?>>: merge results as returned by org.eclipse.jgit.merge.ResolveMerger#getMergeResults()

Since

2.0

MergeResult back to summary

MergeResult	back to summary
public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, String description) Constructor for MergeResult. Parameters newHead:ObjectId the object the head points at after the merge base:ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base mergedCommits:ObjectId[] all the commits which have been merged together mergeStatus:MergeResult.MergeStatus the status the merge resulted in mergeStrategy:MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` lowLevelResults:Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` description:String a user friendly description of the merge result

public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, String description)

Constructor for MergeResult.

Parameters

newHead:ObjectId: the object the head points at after the merge
base:ObjectId: the common base which was used to produce a content-merge. May be null if the merge-result was produced without computing a common base
mergedCommits:ObjectId[]: all the commits which have been merged together
mergeStatus:MergeResult.MergeStatus: the status the merge resulted in
mergeStrategy:MergeStrategy: the used org.eclipse.jgit.merge.MergeStrategy
lowLevelResults:Map<String, MergeResult<?>>: merge results as returned by org.eclipse.jgit.merge.ResolveMerger#getMergeResults()
description:String: a user friendly description of the merge result

MergeResult back to summary

MergeResult	back to summary
public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, Map<String, ResolveMerger.MergeFailureReason> failingPaths, String description) Constructor for MergeResult. Parameters newHead:ObjectId the object the head points at after the merge base:ObjectId the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base mergedCommits:ObjectId[] all the commits which have been merged together mergeStatus:MergeResult.MergeStatus the status the merge resulted in mergeStrategy:MergeStrategy the used `org.eclipse.jgit.merge.MergeStrategy` lowLevelResults:Map<String, MergeResult<?>> merge results as returned by `org.eclipse.jgit.merge.ResolveMerger#getMergeResults()` failingPaths:Map<String, ResolveMerger.MergeFailureReason> list of paths causing this merge to fail as returned by `org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()` description:String a user friendly description of the merge result

Constructor for MergeResult.

Parameters

newHead:ObjectId: the object the head points at after the merge
base:ObjectId: the common base which was used to produce a content-merge. May be null if the merge-result was produced without computing a common base
mergedCommits:ObjectId[]: all the commits which have been merged together
mergeStatus:MergeResult.MergeStatus: the status the merge resulted in
mergeStrategy:MergeStrategy: the used org.eclipse.jgit.merge.MergeStrategy
lowLevelResults:Map<String, MergeResult<?>>: merge results as returned by org.eclipse.jgit.merge.ResolveMerger#getMergeResults()
failingPaths:Map<String, ResolveMerger.MergeFailureReason>: list of paths causing this merge to fail as returned by org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()
description:String: a user friendly description of the merge result

MergeResult	back to summary
public MergeResult(List<String> checkoutConflicts) Creates a new result that represents a checkout conflict before the operation even started for real. Parameters checkoutConflicts:List<String> the conflicting files

MergeResult

back to summary

public MergeResult(List<String> checkoutConflicts)

Creates a new result that represents a checkout conflict before the operation even started for real.

Parameters

checkoutConflicts:List<String>: the conflicting files

Method Detail

addConflict	back to summary
public void addConflict(String path, int[][] conflictingRanges) Add a conflict Parameters path:String path of the file to add a conflict for conflictingRanges:int[][] the conflicts to set

addConflict

back to summary

public void addConflict(String path, int[][] conflictingRanges)

Add a conflict

Parameters

path:String: path of the file to add a conflict for
conflictingRanges:int[][]: the conflicts to set

addConflict back to summary

addConflict	back to summary
public void addConflict(String path, MergeResult<?> lowLevelResult) Add a conflict Parameters path:String path of the file to add a conflict for lowLevelResult:MergeResult<?> a `org.eclipse.jgit.merge.MergeResult`

public void addConflict(String path, MergeResult<?> lowLevelResult)

Add a conflict

Parameters

path:String: path of the file to add a conflict for
lowLevelResult:MergeResult<?>: a org.eclipse.jgit.merge.MergeResult

getBase back to summary

getBase	back to summary
public ObjectId getBase() Get the common base Returns:ObjectId base the common base which was used to produce a content-merge. May be `null` if the merge-result was produced without computing a common base

public ObjectId getBase()

Get the common base

Returns:ObjectId: base the common base which was used to produce a content-merge. May be null if the merge-result was produced without computing a common base

getCheckoutConflicts	back to summary
public List<String> getCheckoutConflicts() Returns a list of paths that cause a checkout conflict. These paths prevent the operation from even starting. Returns:List<String> the list of files that caused the checkout conflict.

getCheckoutConflicts

back to summary

public List<String> getCheckoutConflicts()

Returns a list of paths that cause a checkout conflict. These paths prevent the operation from even starting.

Returns:List<String>: the list of files that caused the checkout conflict.

getConflicts back to summary

getConflicts	back to summary
public Map<String, int[][]> getConflicts() Returns information about the conflicts which occurred during a `org.eclipse.jgit.api.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 the file with path "path" contains conflicts if y < "number of merged commits": for conflict number x in this file the chunk which was copied from commit number y starts on line number z. All numberings and line numbers start with 0. if y == "number of merged commits": the first non-conflicting line after conflict number x starts at line number z Example code how to parse this data: MergeResult m=...; Map<String, int[][]> allConflicts = 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]); } } } Returns:Map<String, int[][]> the conflicts or `null` if no conflict occurred

public Map<String, int[][]> getConflicts()

Returns information about the conflicts which occurred during a org.eclipse.jgit.api.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

the file with path "path" contains conflicts
if y < "number of merged commits": for conflict number x in this file the chunk which was copied from commit number y starts on line number z. All numberings and line numbers start with 0.
if y == "number of merged commits": the first non-conflicting line after conflict number x starts at line number z

Example code how to parse this data:

MergeResult m=...;
Map<String, int[][]> allConflicts = 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]);
		}
	}
}

Returns:Map<String, int[][]>: the conflicts or null if no conflict occurred

getFailingPaths back to summary

getFailingPaths	back to summary
public Map<String, ResolveMerger.MergeFailureReason> getFailingPaths() Returns a list of paths causing this merge to fail as returned by `org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()` Returns:Map<String, ResolveMerger.MergeFailureReason> the list of paths causing this merge to fail or `null` if no failure occurred

public Map<String, ResolveMerger.MergeFailureReason> getFailingPaths()

Returns a list of paths causing this merge to fail as returned by org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()

Returns:Map<String, ResolveMerger.MergeFailureReason>: the list of paths causing this merge to fail or null if no failure occurred

getMergedCommits	back to summary
public ObjectId[] getMergedCommits() Get the commits which have been merged Returns:ObjectId[] all the commits which have been merged together

getMergedCommits

back to summary

public ObjectId[] getMergedCommits()

Get the commits which have been merged

Returns:ObjectId[]: all the commits which have been merged together

getMergeStatus	back to summary
public MergeResult.MergeStatus getMergeStatus() Get the merge status Returns:MergeResult.MergeStatus the status the merge resulted in

getMergeStatus

back to summary

public MergeResult.MergeStatus getMergeStatus()

Get the merge status

Returns:MergeResult.MergeStatus: the status the merge resulted in

getNewHead	back to summary
public ObjectId getNewHead() Get the object the head points at after the merge Returns:ObjectId the object the head points at after the merge

getNewHead

back to summary

public ObjectId getNewHead()

Get the object the head points at after the merge

Returns:ObjectId: the object the head points at after the merge

setConflicts	back to summary
public void setConflicts(Map<String, int[][]> conflicts) Set conflicts Parameters conflicts:Map<String, int[][]> the conflicts to set

setConflicts

back to summary

public void setConflicts(Map<String, int[][]> conflicts)

Set conflicts

Parameters

conflicts:Map<String, int[][]>: the conflicts to set

toString back to summary

toString	back to summary
public String toString() Overrides java.lang.Object.toString. Doc from java.lang.Object.toString. Returns a string representation of the object. Satisfying this method's contract implies a non-`null` result must be returned. Returns:String a string representation of the object Annotations @SuppressWarnings:nls @Override

public String toString()

Overrides java.lang.Object.toString.

Doc from java.lang.Object.toString.

Returns a string representation of the object. Satisfying this method's contract implies a non-null result must be returned.

Returns:String

a string representation of the object

Annotations

@SuppressWarnings:nls
@Override

org.eclipse.jgit.api back to summary

public sealed Enum MergeResult.MergeStatus

Class Inheritance

extends Enum<MergeResult.MergeStatus>

java.lang.Object
java.lang.Enum
org.eclipse.jgit.api.MergeResult.MergeStatus

The status the merge resulted in.

Field Summary

Modifier and Type	Field and Description
public static final MergeResult.MergeStatus	ABORTED Merge was aborted
public static final MergeResult.MergeStatus	ALREADY_UP_TO_DATE Already up to date, merge was a no-op
public static final MergeResult.MergeStatus	CHECKOUT_CONFLICT Status representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e. local modifications prevent checkout of files).
public static final MergeResult.MergeStatus	CONFLICTING Merge raised conflicts to be resolved
public static final MergeResult.MergeStatus	FAILED Merge failed
public static final MergeResult.MergeStatus	FAST_FORWARD Merge is a fast-forward
public static final MergeResult.MergeStatus	FAST_FORWARD_SQUASHED Merge is a fast-forward, squashed
public static final MergeResult.MergeStatus	MERGED Merged
public static final MergeResult.MergeStatus	MERGED_NOT_COMMITTED Merged, not committed
public static final MergeResult.MergeStatus	MERGED_SQUASHED Merged, squashed, not updating HEAD
public static final MergeResult.MergeStatus	MERGED_SQUASHED_NOT_COMMITTED Merged, squashed, not committed
public static final MergeResult.MergeStatus	NOT_SUPPORTED Not yet supported

Constructor Summary

Access	Constructor and Description
private	MergeStatus()

Method Summary

Modifier and Type	Method and Description
public abstract boolean	Returns: whether the status indicates a successful result isSuccessful() Whether the merge was successful
public static MergeResult.MergeStatus	valueOf(String name)
public static MergeResult.MergeStatus[]	values()

Inherited from java.lang.Enum:: clone compareTo describeConstable equals finalize getDeclaringClass hashCode name ordinal toString valueOf

Field Detail

ABORTED	back to summary
public static final MergeResult.MergeStatus ABORTED Merge was aborted Since 2.2

ABORTED

back to summary

public static final MergeResult.MergeStatus ABORTED

Merge was aborted

Since: 2.2

ALREADY_UP_TO_DATE	back to summary
public static final MergeResult.MergeStatus ALREADY_UP_TO_DATE Already up to date, merge was a no-op

CHECKOUT_CONFLICT	back to summary
public static final MergeResult.MergeStatus CHECKOUT_CONFLICT Status representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e. local modifications prevent checkout of files).

CONFLICTING	back to summary
public static final MergeResult.MergeStatus CONFLICTING Merge raised conflicts to be resolved

FAILED	back to summary
public static final MergeResult.MergeStatus FAILED Merge failed

FAST_FORWARD	back to summary
public static final MergeResult.MergeStatus FAST_FORWARD Merge is a fast-forward

FAST_FORWARD_SQUASHED	back to summary
public static final MergeResult.MergeStatus FAST_FORWARD_SQUASHED Merge is a fast-forward, squashed Since 2.0

FAST_FORWARD_SQUASHED

back to summary

public static final MergeResult.MergeStatus FAST_FORWARD_SQUASHED

Merge is a fast-forward, squashed

Since: 2.0

MERGED	back to summary
public static final MergeResult.MergeStatus MERGED Merged

MERGED_NOT_COMMITTED	back to summary
public static final MergeResult.MergeStatus MERGED_NOT_COMMITTED Merged, not committed Since 3.0

MERGED_NOT_COMMITTED

back to summary

public static final MergeResult.MergeStatus MERGED_NOT_COMMITTED

Merged, not committed

Since: 3.0

MERGED_SQUASHED	back to summary
public static final MergeResult.MergeStatus MERGED_SQUASHED Merged, squashed, not updating HEAD Since 2.0

MERGED_SQUASHED

back to summary

public static final MergeResult.MergeStatus MERGED_SQUASHED

Merged, squashed, not updating HEAD

Since: 2.0

MERGED_SQUASHED_NOT_COMMITTED	back to summary
public static final MergeResult.MergeStatus MERGED_SQUASHED_NOT_COMMITTED Merged, squashed, not committed Since 3.0

MERGED_SQUASHED_NOT_COMMITTED

back to summary

public static final MergeResult.MergeStatus MERGED_SQUASHED_NOT_COMMITTED

Merged, squashed, not committed

Since: 3.0

NOT_SUPPORTED	back to summary
public static final MergeResult.MergeStatus NOT_SUPPORTED Not yet supported

Constructor Detail

MergeStatus	back to summary
private MergeStatus()

Method Detail

isSuccessful	back to summary
public abstract boolean isSuccessful() Whether the merge was successful Returns:boolean whether the status indicates a successful result

isSuccessful

back to summary

public abstract boolean isSuccessful()

Whether the merge was successful

Returns:boolean: whether the status indicates a successful result

valueOf	back to summary
public static MergeResult.MergeStatus valueOf(String name)

values	back to summary
public static MergeResult.MergeStatus[] values()

public Class MergeResult

Nested and Inner Type Summary

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail

public sealed Enum MergeResult.MergeStatus

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail