com.google.gerrit.server.git

Class MergeUtil

java.lang.Object

com.google.gerrit.server.git.MergeUtil

public class MergeUtil
extends java.lang.Object

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static interface	MergeUtil.Factory

Method Summary

Modifier and Type	Method and Description
boolean	canCherryPick(MergeSorter mergeSorter, org.eclipse.jgit.lib.Repository repo, CodeReviewCommit mergeTip, org.eclipse.jgit.revwalk.RevWalk rw, CodeReviewCommit toMerge)
boolean	canFastForward(MergeSorter mergeSorter, CodeReviewCommit mergeTip, org.eclipse.jgit.revwalk.RevWalk rw, CodeReviewCommit toMerge)
boolean	canMerge(MergeSorter mergeSorter, org.eclipse.jgit.lib.Repository repo, CodeReviewCommit mergeTip, CodeReviewCommit toMerge)
org.eclipse.jgit.lib.ObjectId	commit(org.eclipse.jgit.lib.ObjectInserter inserter, org.eclipse.jgit.lib.CommitBuilder mergeCommit)
org.eclipse.jgit.lib.PersonIdent	computeMergeCommitAuthor(org.eclipse.jgit.lib.PersonIdent myIdent, org.eclipse.jgit.revwalk.RevWalk rw, java.util.List<CodeReviewCommit> codeReviewCommits)
java.lang.String	createCherryPickCommitMessage(CodeReviewCommit n)
org.eclipse.jgit.revwalk.RevCommit	createCherryPickFromCommit(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.lib.ObjectInserter inserter, org.eclipse.jgit.revwalk.RevCommit mergeTip, org.eclipse.jgit.revwalk.RevCommit originalCommit, org.eclipse.jgit.lib.PersonIdent cherryPickCommitterIdent, java.lang.String commitMsg, org.eclipse.jgit.revwalk.RevWalk rw)
static org.eclipse.jgit.lib.ObjectInserter	createDryRunInserter(org.eclipse.jgit.lib.Repository db)
CodeReviewCommit	getFirstFastForward(CodeReviewCommit mergeTip, org.eclipse.jgit.revwalk.RevWalk rw, java.util.List<CodeReviewCommit> toMerge)
static org.eclipse.jgit.merge.ThreeWayMergeStrategy	getMergeStrategy(org.eclipse.jgit.lib.Config cfg)
com.google.gerrit.reviewdb.client.PatchSetApproval	getSubmitter(CodeReviewCommit c)
boolean	hasMissingDependencies(MergeSorter mergeSorter, CodeReviewCommit toMerge)
com.google.gerrit.reviewdb.client.PatchSetApproval	markCleanMerges(org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.revwalk.RevFlag canMergeFlag, CodeReviewCommit mergeTip, java.util.Set<org.eclipse.jgit.revwalk.RevCommit> alreadyAccepted)
CodeReviewCommit	mergeOneCommit(org.eclipse.jgit.lib.PersonIdent myIdent, org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.lib.ObjectInserter inserter, org.eclipse.jgit.revwalk.RevFlag canMergeFlag, com.google.gerrit.reviewdb.client.Branch.NameKey destBranch, CodeReviewCommit mergeTip, CodeReviewCommit n)
java.lang.String	mergeStrategyName()
static java.lang.String	mergeStrategyName(boolean useContentMerge, boolean useRecursiveMerge)
org.eclipse.jgit.merge.ThreeWayMerger	newThreeWayMerger(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.lib.ObjectInserter inserter)
static org.eclipse.jgit.merge.ThreeWayMerger	newThreeWayMerger(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.lib.ObjectInserter inserter, java.lang.String strategyName)
java.util.List<CodeReviewCommit>	reduceToMinimalMerge(MergeSorter mergeSorter, java.util.Collection<CodeReviewCommit> toSort)
static boolean	useRecursiveMerge(org.eclipse.jgit.lib.Config cfg)
CodeReviewCommit	writeMergeCommit(org.eclipse.jgit.lib.PersonIdent myIdent, org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.lib.ObjectInserter inserter, org.eclipse.jgit.revwalk.RevFlag canMergeFlag, com.google.gerrit.reviewdb.client.Branch.NameKey destBranch, CodeReviewCommit mergeTip, org.eclipse.jgit.lib.ObjectId treeId, CodeReviewCommit n)

Methods inherited from class java.lang.Object

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

Method Detail

useRecursiveMerge

public static boolean useRecursiveMerge(org.eclipse.jgit.lib.Config cfg)

getMergeStrategy

public static org.eclipse.jgit.merge.ThreeWayMergeStrategy getMergeStrategy(org.eclipse.jgit.lib.Config cfg)

getFirstFastForward

public CodeReviewCommit getFirstFastForward(CodeReviewCommit mergeTip,
                                            org.eclipse.jgit.revwalk.RevWalk rw,
                                            java.util.List<CodeReviewCommit> toMerge)
                                     throws MergeException

Throws:

MergeException

reduceToMinimalMerge

public java.util.List<CodeReviewCommit> reduceToMinimalMerge(MergeSorter mergeSorter,
                                                             java.util.Collection<CodeReviewCommit> toSort)
                                                      throws MergeException

Throws:

MergeException

getSubmitter

public com.google.gerrit.reviewdb.client.PatchSetApproval getSubmitter(CodeReviewCommit c)

createCherryPickFromCommit

public org.eclipse.jgit.revwalk.RevCommit createCherryPickFromCommit(org.eclipse.jgit.lib.Repository repo,
                                                                     org.eclipse.jgit.lib.ObjectInserter inserter,
                                                                     org.eclipse.jgit.revwalk.RevCommit mergeTip,
                                                                     org.eclipse.jgit.revwalk.RevCommit originalCommit,
                                                                     org.eclipse.jgit.lib.PersonIdent cherryPickCommitterIdent,
                                                                     java.lang.String commitMsg,
                                                                     org.eclipse.jgit.revwalk.RevWalk rw)
                                                              throws org.eclipse.jgit.errors.MissingObjectException,
                                                                     org.eclipse.jgit.errors.IncorrectObjectTypeException,
                                                                     java.io.IOException,
                                                                     MergeIdenticalTreeException,
                                                                     MergeConflictException

Throws:

org.eclipse.jgit.errors.MissingObjectException

org.eclipse.jgit.errors.IncorrectObjectTypeException

java.io.IOException

MergeIdenticalTreeException

MergeConflictException

createCherryPickCommitMessage

public java.lang.String createCherryPickCommitMessage(CodeReviewCommit n)

computeMergeCommitAuthor

public org.eclipse.jgit.lib.PersonIdent computeMergeCommitAuthor(org.eclipse.jgit.lib.PersonIdent myIdent,
                                                                 org.eclipse.jgit.revwalk.RevWalk rw,
                                                                 java.util.List<CodeReviewCommit> codeReviewCommits)

canMerge

public boolean canMerge(MergeSorter mergeSorter,
                        org.eclipse.jgit.lib.Repository repo,
                        CodeReviewCommit mergeTip,
                        CodeReviewCommit toMerge)
                 throws MergeException

Throws:

MergeException

canFastForward

public boolean canFastForward(MergeSorter mergeSorter,
                              CodeReviewCommit mergeTip,
                              org.eclipse.jgit.revwalk.RevWalk rw,
                              CodeReviewCommit toMerge)
                       throws MergeException

Throws:

MergeException

canCherryPick

public boolean canCherryPick(MergeSorter mergeSorter,
                             org.eclipse.jgit.lib.Repository repo,
                             CodeReviewCommit mergeTip,
                             org.eclipse.jgit.revwalk.RevWalk rw,
                             CodeReviewCommit toMerge)
                      throws MergeException

Throws:

MergeException

hasMissingDependencies

public boolean hasMissingDependencies(MergeSorter mergeSorter,
                                      CodeReviewCommit toMerge)
                               throws MergeException

Throws:

MergeException

createDryRunInserter

public static org.eclipse.jgit.lib.ObjectInserter createDryRunInserter(org.eclipse.jgit.lib.Repository db)

mergeOneCommit

public CodeReviewCommit mergeOneCommit(org.eclipse.jgit.lib.PersonIdent myIdent,
                                       org.eclipse.jgit.lib.Repository repo,
                                       org.eclipse.jgit.revwalk.RevWalk rw,
                                       org.eclipse.jgit.lib.ObjectInserter inserter,
                                       org.eclipse.jgit.revwalk.RevFlag canMergeFlag,
                                       com.google.gerrit.reviewdb.client.Branch.NameKey destBranch,
                                       CodeReviewCommit mergeTip,
                                       CodeReviewCommit n)
                                throws MergeException

Throws:

MergeException

writeMergeCommit

public CodeReviewCommit writeMergeCommit(org.eclipse.jgit.lib.PersonIdent myIdent,
                                         org.eclipse.jgit.revwalk.RevWalk rw,
                                         org.eclipse.jgit.lib.ObjectInserter inserter,
                                         org.eclipse.jgit.revwalk.RevFlag canMergeFlag,
                                         com.google.gerrit.reviewdb.client.Branch.NameKey destBranch,
                                         CodeReviewCommit mergeTip,
                                         org.eclipse.jgit.lib.ObjectId treeId,
                                         CodeReviewCommit n)
                                  throws java.io.IOException,
                                         org.eclipse.jgit.errors.MissingObjectException,
                                         org.eclipse.jgit.errors.IncorrectObjectTypeException

Throws:

java.io.IOException

org.eclipse.jgit.errors.MissingObjectException

org.eclipse.jgit.errors.IncorrectObjectTypeException

newThreeWayMerger

public org.eclipse.jgit.merge.ThreeWayMerger newThreeWayMerger(org.eclipse.jgit.lib.Repository repo,
                                                               org.eclipse.jgit.lib.ObjectInserter inserter)

mergeStrategyName

public java.lang.String mergeStrategyName()

mergeStrategyName

public static java.lang.String mergeStrategyName(boolean useContentMerge,
                                                 boolean useRecursiveMerge)

newThreeWayMerger

public static org.eclipse.jgit.merge.ThreeWayMerger newThreeWayMerger(org.eclipse.jgit.lib.Repository repo,
                                                                      org.eclipse.jgit.lib.ObjectInserter inserter,
                                                                      java.lang.String strategyName)

commit

public org.eclipse.jgit.lib.ObjectId commit(org.eclipse.jgit.lib.ObjectInserter inserter,
                                            org.eclipse.jgit.lib.CommitBuilder mergeCommit)
                                     throws java.io.IOException,
                                            java.io.UnsupportedEncodingException

Throws:

java.io.IOException

java.io.UnsupportedEncodingException

markCleanMerges

public com.google.gerrit.reviewdb.client.PatchSetApproval markCleanMerges(org.eclipse.jgit.revwalk.RevWalk rw,
                                                                          org.eclipse.jgit.revwalk.RevFlag canMergeFlag,
                                                                          CodeReviewCommit mergeTip,
                                                                          java.util.Set<org.eclipse.jgit.revwalk.RevCommit> alreadyAccepted)
                                                                   throws MergeException

Throws:

MergeException