com.google.gerrit.server.git

Class MergeOp

java.lang.Object

com.google.gerrit.server.git.MergeOp

All Implemented Interfaces:

java.lang.AutoCloseable

public class MergeOp
extends java.lang.Object
implements java.lang.AutoCloseable

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.

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	MergeOp.CommitStatus

Method Summary

Modifier and Type	Method and Description
static void	checkSubmitRule(ChangeData cd)
void	close()
void	merge(com.google.gerrit.reviewdb.server.ReviewDb db, com.google.gerrit.reviewdb.client.Change change, IdentifiedUser caller, boolean checkSubmitRules, com.google.gerrit.extensions.api.changes.SubmitInput submitInput)

Methods inherited from class java.lang.Object

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

Method Detail

close

public void close()

Specified by:

close in interface java.lang.AutoCloseable

checkSubmitRule

public static void 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,
                  com.google.gerrit.extensions.api.changes.SubmitInput submitInput)
           throws com.google.gwtorm.server.OrmException,
                  com.google.gerrit.extensions.restapi.RestApiException

Throws:

com.google.gwtorm.server.OrmException

com.google.gerrit.extensions.restapi.RestApiException