com.google.gerrit.server.git

Class MergeSuperSet

java.lang.Object

com.google.gerrit.server.git.MergeSuperSet

public class MergeSuperSet
extends Object

Calculates the minimal superset of changes required to be merged.

This includes all parents between a change and the tip of its target branch for the merging/rebasing submit strategies. For the cherry-pick strategy no additional changes are included.

If change.submitWholeTopic is enabled, also all changes of the topic and their parents are included.

Method Summary

Modifier and Type	Method and Description
ChangeSet	completeChangeSet(ReviewDb db, Change change, CurrentUser user)
static void	reloadChanges(ChangeSet cs)
MergeSuperSet	setMergeOpRepoManager(MergeOpRepoManager orm)

Methods inherited from class java.lang.Object

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

Method Detail

reloadChanges

public static void reloadChanges(ChangeSet cs)
                          throws com.google.gwtorm.server.OrmException

Throws:

com.google.gwtorm.server.OrmException

setMergeOpRepoManager

public MergeSuperSet setMergeOpRepoManager(MergeOpRepoManager orm)

completeChangeSet

public ChangeSet completeChangeSet(ReviewDb db,
                                   Change change,
                                   CurrentUser user)
                            throws IOException,
                                   com.google.gwtorm.server.OrmException

Throws:

IOException

com.google.gwtorm.server.OrmException