public abstract class AbstractBranchMergingCommand<C,T> extends AbstractGitFlowCommand<C,T>
gfConfig, git, reporter, requirementHelper
Modifier | Constructor and Description |
---|---|
protected |
AbstractBranchMergingCommand(String branchName,
org.eclipse.jgit.api.Git git,
GitFlowConfiguration gfConfig) |
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 |
isAddScmCommentSuffixOnMerge() |
boolean |
isForceDeleteBranch() |
boolean |
isKeepBranch() |
C |
setAddScmCommentSuffixOnMerge(boolean addScmCommentSuffixOnMergeToMaster) |
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
|
doFetchIfNeeded, doPushIfNeeded, enforcer, ensureLocalBranchesNotBehindRemotes, getBranchName, getCommandName, getScmMessagePrefix, getScmMessageSuffix, isAllowUntracked, isFetch, isPush, runBeforeAndGetPrefixedBranchName, runExtensionCommands, setAllowUntracked, setFetch, setPush, setScmMessagePrefix, setScmMessageSuffix
protected AbstractBranchMergingCommand(String branchName, org.eclipse.jgit.api.Git git, GitFlowConfiguration gfConfig)
protected org.eclipse.jgit.api.MergeResult doMerge(String branchToMerge, String mergeTarget, MergeProcessExtensionWrapper extension) throws LocalBranchMissingException, JGitFlowGitAPIException, JGitFlowIOException, org.eclipse.jgit.api.errors.GitAPIException, JGitFlowExtensionException
LocalBranchMissingException
JGitFlowGitAPIException
JGitFlowIOException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowExtensionException
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
LocalBranchMissingException
JGitFlowGitAPIException
JGitFlowIOException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowExtensionException
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
LocalBranchMissingException
JGitFlowGitAPIException
JGitFlowIOException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowExtensionException
protected void doTag(String branchToTag, String tagMessage, org.eclipse.jgit.api.MergeResult resultToLog, BranchMergingExtension extension) throws org.eclipse.jgit.api.errors.GitAPIException, JGitFlowGitAPIException, JGitFlowExtensionException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowGitAPIException
JGitFlowExtensionException
protected void cleanupBranchesIfNeeded(String branchToCheckout, String... branchesToDelete) throws org.eclipse.jgit.api.errors.GitAPIException, JGitFlowGitAPIException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowGitAPIException
protected void checkoutTopicBranch(String branchName, BranchMergingExtension extension) throws org.eclipse.jgit.api.errors.GitAPIException, JGitFlowExtensionException
org.eclipse.jgit.api.errors.GitAPIException
JGitFlowExtensionException
protected org.eclipse.jgit.api.MergeResult createEmptyMergeResult()
protected boolean checkMergeResults(org.eclipse.jgit.api.MergeResult... resultsToCheck)
public C setKeepBranch(boolean keepBranch)
public C setForceDeleteBranch(boolean force)
force
- true
to force, false
(default) otherwisethis
public C setMessage(String message)
message
- this
public boolean isForceDeleteBranch()
public boolean isKeepBranch()
public String getMessage()
public boolean isAddScmCommentSuffixOnMerge()
public C setAddScmCommentSuffixOnMerge(boolean addScmCommentSuffixOnMergeToMaster)
Copyright © 2017 Atlassian. All rights reserved.