org.netbeans.libs.git

Class GitCherryPickResult

java.lang.Object

org.netbeans.libs.git.GitCherryPickResult

public final class GitCherryPickResult
extends Object

Returned by a git cherry-pick command, represents its result.

Since:

1.27

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	GitCherryPickResult.CherryPickStatus The status rebase resulted in.

Method Summary

Modifier and Type	Method and Description
GitRevisionInfo[]	getCherryPickedCommits() Returns commits cherry-picked to the current branch by the last run of the cherry-pick command.
GitCherryPickResult.CherryPickStatus	getCherryPickStatus()
Collection<File>	getConflicts() If the cherry-pick started but was unable to finish because of unresolved conflicts then the method returns a collection of such files in conflict.
GitRevisionInfo	getCurrentHead()
Collection<File>	getFailures() When the command fails because of local modifications then this method returns a collections of files causing the failure.

Methods inherited from class java.lang.Object

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

Method Detail

getCherryPickStatus

public GitCherryPickResult.CherryPickStatus getCherryPickStatus()

Returns:

result of the cherry-pick command.

getCurrentHead

public GitRevisionInfo getCurrentHead()

Returns:

current HEAD commit after the cherry-pick command.

getConflicts

public Collection<File> getConflicts()

If the cherry-pick started but was unable to finish because of unresolved conflicts then the method returns a collection of such files in conflict. To complete the command you need to resolve the conflicts and continue the unfinished command.

Returns:

files in conflict

getFailures

public Collection<File> getFailures()

When the command fails because of local modifications then this method returns a collections of files causing the failure.

Returns:

files that cause the cherry-pick to fail.

getCherryPickedCommits

public GitRevisionInfo[] getCherryPickedCommits()

Returns commits cherry-picked to the current branch by the last run of the cherry-pick command.

Returns:

array of commits cherry-picked to head.