com.google.gerrit.server.git.strategy

Class MergeIfNecessary

java.lang.Object

com.google.gerrit.server.git.strategy.SubmitStrategy

com.google.gerrit.server.git.strategy.MergeIfNecessary

public class MergeIfNecessary
extends SubmitStrategy

Field Summary

Fields inherited from class com.google.gerrit.server.git.strategy.SubmitStrategy

args

Method Summary

Modifier and Type	Method and Description
protected MergeTip	_run(CodeReviewCommit branchTip, java.util.Collection<CodeReviewCommit> toMerge)
boolean	dryRun(CodeReviewCommit mergeTip, CodeReviewCommit toMerge) Checks whether the given commit can be merged.

Methods inherited from class com.google.gerrit.server.git.strategy.SubmitStrategy

getNewCommits, getRefLogIdent, retryOnLockFailure, run, setRefLogIdent

Methods inherited from class java.lang.Object

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

Method Detail

_run

protected MergeTip _run(CodeReviewCommit branchTip,
                        java.util.Collection<CodeReviewCommit> toMerge)
                 throws MergeException

Specified by:

_run in class SubmitStrategy

Throws:

MergeException

See Also:

SubmitStrategy.run(CodeReviewCommit, Collection)

dryRun

public boolean dryRun(CodeReviewCommit mergeTip,
                      CodeReviewCommit toMerge)
               throws MergeException

Description copied from class: SubmitStrategy

Checks whether the given commit can be merged. Implementations must ensure that invoking this method modifies neither the git repository nor the Gerrit database.

Specified by:

dryRun in class SubmitStrategy

Parameters:

mergeTip - the merge tip.

toMerge - the commit that should be checked.

Returns:

true if the given commit can be merged, otherwise false

Throws:

MergeException