Package org.craftercms.studio.api.v2.service.repository

Class MergeResult

java.lang.Object

org.craftercms.studio.api.v2.service.repository.MergeResult

public class MergeResult
extends Object

Holds the result of a merge from a remote repository

Since:

4.0.0

Author:

joseross

Field Summary

Fields

Modifier and Type	Field	Description
protected final long	commitsMerged	Total number of commits merged from the remote repository
protected final String	mergeCommitId	The merge commit id
protected final boolean	successful	Indicates if the pull was successful

Constructor Summary

Constructors

Constructor	Description
MergeResult(boolean successful, long commitsMerged, String mergeCommitId)

Method Summary

Modifier and Type	Method	Description
static MergeResult	failed()
static MergeResult	from(org.eclipse.jgit.api.PullResult pullResult, Collection<String> mergedCommits)
long	getCommitsMerged()
String	getMergeCommitId()
boolean	isSuccessful()
String	toString()

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait

Field Details

successful

protected final boolean successful

Indicates if the pull was successful

commitsMerged

protected final long commitsMerged

Total number of commits merged from the remote repository

mergeCommitId

protected final String mergeCommitId

The merge commit id

Constructor Details

MergeResult

public MergeResult(boolean successful,
 long commitsMerged,
 String mergeCommitId)

Method Details

isSuccessful

public boolean isSuccessful()

getCommitsMerged

public long getCommitsMerged()

getMergeCommitId

public String getMergeCommitId()

toString

public String toString()

Overrides:

toString in class Object

failed

public static MergeResult failed()

from

public static MergeResult from(org.eclipse.jgit.api.PullResult pullResult,
 Collection<String> mergedCommits)