com.google.gerrit.server.git

Class MergeOp

java.lang.Object

com.google.gerrit.server.git.MergeOp

public class MergeOp
extends java.lang.Object

Merges changes in submission order into a single branch.

Branches are reduced to the minimum number of heads needed to merge everything. This allows commits to be entered into the queue in any order (such as ancestors before descendants) and only the most recent commit on any line of development will be merged. All unmerged commits along a line of development must be in the submission queue in order to merge the tip of that line.

Conflicts are handled by discarding the entire line of development and marking it as conflicting, even if an earlier commit along that same line can be merged cleanly.

Method Summary

Modifier and Type	Method and Description
static java.util.List<com.google.gerrit.common.data.SubmitRecord>	checkSubmitRule(ChangeData cd)
void	merge(com.google.gerrit.reviewdb.server.ReviewDb db, com.google.gerrit.reviewdb.client.Change change, IdentifiedUser caller, boolean checkSubmitRules)

Methods inherited from class java.lang.Object

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

Method Detail

checkSubmitRule

public static java.util.List<com.google.gerrit.common.data.SubmitRecord> checkSubmitRule(ChangeData cd)
                                                                                  throws com.google.gerrit.extensions.restapi.ResourceConflictException,
                                                                                         com.google.gwtorm.server.OrmException

Throws:

com.google.gerrit.extensions.restapi.ResourceConflictException

com.google.gwtorm.server.OrmException

merge

public void merge(com.google.gerrit.reviewdb.server.ReviewDb db,
                  com.google.gerrit.reviewdb.client.Change change,
                  IdentifiedUser caller,
                  boolean checkSubmitRules)
           throws NoSuchChangeException,
                  com.google.gwtorm.server.OrmException,
                  com.google.gerrit.extensions.restapi.ResourceConflictException

Throws:

NoSuchChangeException

com.google.gwtorm.server.OrmException

com.google.gerrit.extensions.restapi.ResourceConflictException