com.atlassian.jgitflow.core.command

Class AbstractBranchMergingCommand<C,T>

java.lang.Object

com.atlassian.jgitflow.core.command.AbstractGitFlowCommand<C,T>

com.atlassian.jgitflow.core.command.AbstractBranchMergingCommand<C,T>

All Implemented Interfaces:

JGitFlowCommand, Callable<T>

Direct Known Subclasses:

FeatureFinishCommand, HotfixFinishCommand, ReleaseFinishCommand

public abstract class AbstractBranchMergingCommand<C,T>
extends AbstractGitFlowCommand<C,T>

Field Summary

Fields inherited from class com.atlassian.jgitflow.core.command.AbstractGitFlowCommand

gfConfig, git, reporter, requirementHelper

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	AbstractBranchMergingCommand(String branchName, org.eclipse.jgit.api.Git git, GitFlowConfiguration gfConfig)

Method Summary

Modifier and Type	Method and Description
protected boolean	checkMergeResults(org.eclipse.jgit.api.MergeResult... resultsToCheck)
protected void	checkoutTopicBranch(String branchName, BranchMergingExtension extension)
protected void	cleanupBranchesIfNeeded(String branchToCheckout, String... branchesToDelete)
protected org.eclipse.jgit.api.MergeResult	createEmptyMergeResult()
protected org.eclipse.jgit.api.MergeResult	doMerge(String branchToMerge, String mergeTarget, MergeProcessExtensionWrapper extension)
protected org.eclipse.jgit.api.MergeResult	doMerge(String branchToMerge, String mergeTarget, MergeProcessExtensionWrapper extension, boolean squash)
protected org.eclipse.jgit.api.MergeResult	doMerge(String branchToMerge, String mergeTarget, MergeProcessExtensionWrapper extension, boolean squash, org.eclipse.jgit.api.MergeCommand.FastForwardMode ffMode)
protected void	doTag(String branchToTag, String tagMessage, org.eclipse.jgit.api.MergeResult resultToLog, BranchMergingExtension extension)
String	getMessage()
boolean	isForceDeleteBranch()
boolean	isKeepBranch()
C	setForceDeleteBranch(boolean force) Set whether to use the force flag when deleting the local feature branch
C	setKeepBranch(boolean keepBranch)
C	setMessage(String message) Set the commit message for the tag creation

Methods inherited from class com.atlassian.jgitflow.core.command.AbstractGitFlowCommand

doFetchIfNeeded, doPushIfNeeded, enforcer, ensureLocalBranchesNotBehindRemotes, getBranchName, getCommandName, getScmMessagePrefix, getScmMessageSuffix, isAllowUntracked, isFetch, isPush, runBeforeAndGetPrefixedBranchName, runExtensionCommands, setAllowUntracked, setFetch, setPush, setScmMessagePrefix, setScmMessageSuffix

Methods inherited from class java.lang.Object

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

Methods inherited from interface java.util.concurrent.Callable

call

Constructor Detail

AbstractBranchMergingCommand

protected AbstractBranchMergingCommand(String branchName,
                                       org.eclipse.jgit.api.Git git,
                                       GitFlowConfiguration gfConfig)

Method Detail

doMerge

protected org.eclipse.jgit.api.MergeResult doMerge(String branchToMerge,
                                                   String mergeTarget,
                                                   MergeProcessExtensionWrapper extension)
                                            throws LocalBranchMissingException,
                                                   JGitFlowGitAPIException,
                                                   JGitFlowIOException,
                                                   org.eclipse.jgit.api.errors.GitAPIException,
                                                   JGitFlowExtensionException

Throws:

LocalBranchMissingException

JGitFlowGitAPIException

JGitFlowIOException

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowExtensionException

doMerge

protected org.eclipse.jgit.api.MergeResult doMerge(String branchToMerge,
                                                   String mergeTarget,
                                                   MergeProcessExtensionWrapper extension,
                                                   boolean squash)
                                            throws LocalBranchMissingException,
                                                   JGitFlowGitAPIException,
                                                   JGitFlowIOException,
                                                   org.eclipse.jgit.api.errors.GitAPIException,
                                                   JGitFlowExtensionException

Throws:

LocalBranchMissingException

JGitFlowGitAPIException

JGitFlowIOException

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowExtensionException

doMerge

protected org.eclipse.jgit.api.MergeResult doMerge(String branchToMerge,
                                                   String mergeTarget,
                                                   MergeProcessExtensionWrapper extension,
                                                   boolean squash,
                                                   org.eclipse.jgit.api.MergeCommand.FastForwardMode ffMode)
                                            throws LocalBranchMissingException,
                                                   JGitFlowGitAPIException,
                                                   JGitFlowIOException,
                                                   org.eclipse.jgit.api.errors.GitAPIException,
                                                   JGitFlowExtensionException

Throws:

LocalBranchMissingException

JGitFlowGitAPIException

JGitFlowIOException

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowExtensionException

doTag

protected void doTag(String branchToTag,
                     String tagMessage,
                     org.eclipse.jgit.api.MergeResult resultToLog,
                     BranchMergingExtension extension)
              throws org.eclipse.jgit.api.errors.GitAPIException,
                     JGitFlowGitAPIException,
                     JGitFlowExtensionException

Throws:

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowGitAPIException

JGitFlowExtensionException

cleanupBranchesIfNeeded

protected void cleanupBranchesIfNeeded(String branchToCheckout,
                                       String... branchesToDelete)
                                throws org.eclipse.jgit.api.errors.GitAPIException,
                                       JGitFlowGitAPIException

Throws:

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowGitAPIException

checkoutTopicBranch

protected void checkoutTopicBranch(String branchName,
                                   BranchMergingExtension extension)
                            throws org.eclipse.jgit.api.errors.GitAPIException,
                                   JGitFlowExtensionException

Throws:

org.eclipse.jgit.api.errors.GitAPIException

JGitFlowExtensionException

createEmptyMergeResult

protected org.eclipse.jgit.api.MergeResult createEmptyMergeResult()

checkMergeResults

protected boolean checkMergeResults(org.eclipse.jgit.api.MergeResult... resultsToCheck)

setKeepBranch

public C setKeepBranch(boolean keepBranch)

setForceDeleteBranch

public C setForceDeleteBranch(boolean force)

Set whether to use the force flag when deleting the local feature branch

Parameters:

force - true to force, false(default) otherwise

Returns:

this

setMessage

public C setMessage(String message)

Set the commit message for the tag creation

Parameters:

message -

Returns:

this

isForceDeleteBranch

public boolean isForceDeleteBranch()

isKeepBranch

public boolean isKeepBranch()

getMessage

public String getMessage()