org.jenkinsci.plugins.pretestedintegration.scm.git

Class GitIntegrationStrategy

java.lang.Object

org.jenkinsci.plugins.pretestedintegration.IntegrationStrategy

org.jenkinsci.plugins.pretestedintegration.scm.git.GitIntegrationStrategy

All Implemented Interfaces:

hudson.ExtensionPoint, hudson.model.Describable<IntegrationStrategy>, IntegrationStrategyAsGitPluginExt

Direct Known Subclasses:

AccumulatedCommitStrategy, FFOnlyStrategy, SquashCommitStrategy

public abstract class GitIntegrationStrategy
extends IntegrationStrategy
implements IntegrationStrategyAsGitPluginExt

Abstract IntegrationStrategy containing common logic for Git integration strategies.

Nested Class Summary

Nested classes/interfaces inherited from interface hudson.ExtensionPoint

hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson

Constructor Summary

Constructors

Constructor and Description
GitIntegrationStrategy()

Method Summary

Modifier and Type	Method and Description
protected boolean	containsRemoteBranch(org.jenkinsci.plugins.gitclient.GitClient client, hudson.plugins.git.Branch branch) Checks whether or not we can find the given remote integrationBranch.
org.eclipse.jgit.lib.PersonIdent	getPersonIdent(String identity) Creates a PersonIdent object from a full Git identity string.
protected boolean	tryFastForward(org.eclipse.jgit.lib.ObjectId commitId, PrintStream logger, org.jenkinsci.plugins.gitclient.GitClient client) Attempts to fast-forward merge the integration integrationBranch to the ready integrationBranch.
protected boolean	tryRebase(org.eclipse.jgit.lib.ObjectId commitId, org.jenkinsci.plugins.gitclient.GitClient client, PrintStream logger, String integrationBranch) Attempts to rebase the ready integrationBranch onto the integration integrationBranch.

Methods inherited from class org.jenkinsci.plugins.pretestedintegration.IntegrationStrategy

all, getDescriptor

Methods inherited from class java.lang.Object

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

Methods inherited from interface org.jenkinsci.plugins.pretestedintegration.scm.git.IntegrationStrategyAsGitPluginExt

integrate

Constructor Detail

GitIntegrationStrategy

public GitIntegrationStrategy()

Method Detail

getPersonIdent

public org.eclipse.jgit.lib.PersonIdent getPersonIdent(String identity)

Creates a PersonIdent object from a full Git identity string.

Parameters:

identity - The Git identity string to parse. ex.: 'john Doe Joh@praqma.net 1442321765 +0200'

Returns:

A PersonIdent object representing given Git author/committer

tryRebase

protected boolean tryRebase(org.eclipse.jgit.lib.ObjectId commitId,
                            org.jenkinsci.plugins.gitclient.GitClient client,
                            PrintStream logger,
                            String integrationBranch)
                     throws IntegrationFailedException,
                            IntegrationUnknownFailureException

Attempts to rebase the ready integrationBranch onto the integration integrationBranch. Only when the ready integrationBranch consists of a single commit.

Parameters:

commitId - The sha1 from the polled integrationBranch

client - The GitClient

integrationBranch - The integrationBranch which the commitId need to be merged to

logger - The Printstream

Returns:

true if the rebase was a success, false if the integrationBranch isn't suitable for a rebase

Throws:

IntegrationFailedException - When commit counting or rebasing fails

IntegrationUnknownFailureException - An unforseen failure

tryFastForward

protected boolean tryFastForward(org.eclipse.jgit.lib.ObjectId commitId,
                                 PrintStream logger,
                                 org.jenkinsci.plugins.gitclient.GitClient client)

Attempts to fast-forward merge the integration integrationBranch to the ready integrationBranch. Only when the ready integrationBranch consists of a single commit.

Parameters:

commitId - The commit

commitCount - The amount of commits

logger - The logger for console logging

client - The GitClient

Returns:

true if the FF merge was a success, false if the integrationBranch isn't suitable for a FF merge.

containsRemoteBranch

protected boolean containsRemoteBranch(org.jenkinsci.plugins.gitclient.GitClient client,
                                       hudson.plugins.git.Branch branch)
                                throws IntegrationFailedException

Checks whether or not we can find the given remote integrationBranch.

Parameters:

client - the Git Client

branch - the integrationBranch to look for

Returns:

True if the integrationBranch was found, otherwise False.

Throws:

IntegrationFailedException - when the Git call failed unexpectedly