Package jetbrains.buildServer.vcs.impl

Class MergeManagerImpl

java.lang.Object

jetbrains.buildServer.vcs.impl.MergeManagerImpl

All Implemented Interfaces:

MergeManager

public class MergeManagerImpl
extends Object
implements MergeManager

Constructor Summary

Constructors

Constructor	Description
MergeManagerImpl(VcsContextLocator vcsContextLocator)

Method Summary

Modifier and Type	Method	Description
boolean	isSupportMerge(VcsRootInstance root)
Map<VcsRootInstance,MergeResult>	merge(SBuild build, String dstLogicalBranch, String mergeMessage, MergeOptions options)
Map<BranchMergeTask,CompositeMergeResult>	merge(SBuildType buildType, List<BranchMergeTask> mergeTasks)
void	setRepositoryStateManager(RepositoryStateManager repositoryStateManager)
void	setVcsHistory(VcsModificationHistory vcsHistory)

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeManagerImpl

public MergeManagerImpl(@NotNull
                        VcsContextLocator vcsContextLocator)

Method Detail

setRepositoryStateManager

public void setRepositoryStateManager(RepositoryStateManager repositoryStateManager)

setVcsHistory

public void setVcsHistory(@NotNull
                          VcsModificationHistory vcsHistory)

merge

@NotNull
public Map<BranchMergeTask,CompositeMergeResult> merge(@NotNull
                                                             SBuildType buildType,
                                                             @NotNull
                                                             List<BranchMergeTask> mergeTasks)
                                                      throws VcsException

Specified by:

merge in interface MergeManager

Throws:

VcsException

merge

@NotNull
public Map<VcsRootInstance,MergeResult> merge(@NotNull
                                                    SBuild build,
                                                    @NotNull
                                                    String dstLogicalBranch,
                                                    @NotNull
                                                    String mergeMessage,
                                                    @NotNull
                                                    MergeOptions options)
                                             throws VcsException

Specified by:

merge in interface MergeManager

Throws:

VcsException

isSupportMerge

public boolean isSupportMerge(@NotNull
                              VcsRootInstance root)

Specified by:

isSupportMerge in interface MergeManager