MergeUtil (Gerrit Review Plugin API Documentation)

java.lang.Object
- com.google.gerrit.server.git.MergeUtil

```
public class MergeUtil
extends Object
```

Nested Class Summary

Nested Classes
Modifier and Type Class and Description

static interface MergeUtil.Factory

Nested Classes
Modifier and Type	Class and Description
`static interface`	`MergeUtil.Factory`

Method Summary

Methods
Modifier and Type	Method and Description
`boolean`	`canCherryPick(MergeSorter mergeSorter, org.eclipse.jgit.lib.Repository repo, CodeReviewCommit mergeTip, CodeReviewCommit.CodeReviewRevWalk rw, CodeReviewCommit toMerge)`
`boolean`	`canFastForward(MergeSorter mergeSorter, CodeReviewCommit mergeTip, CodeReviewCommit.CodeReviewRevWalk 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)`
`String`	`createCherryPickCommitMessage(CodeReviewCommit n)`
`String`	`createCherryPickCommitMessage(org.eclipse.jgit.revwalk.RevCommit n, ChangeControl ctl, com.google.gerrit.reviewdb.client.PatchSet.Id psId)`
`CodeReviewCommit`	`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, String commitMsg, CodeReviewCommit.CodeReviewRevWalk rw)`
`static org.eclipse.jgit.lib.ObjectInserter`	`createDryRunInserter(org.eclipse.jgit.lib.Repository db)`
`CodeReviewCommit`	`getFirstFastForward(CodeReviewCommit mergeTip, org.eclipse.jgit.revwalk.RevWalk rw, List<CodeReviewCommit> toMerge)`
`static org.eclipse.jgit.merge.ThreeWayMergeStrategy`	`getMergeStrategy(org.eclipse.jgit.lib.Config cfg)`
`boolean`	`hasMissingDependencies(MergeSorter mergeSorter, CodeReviewCommit toMerge)`
`void`	`markCleanMerges(org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.revwalk.RevFlag canMergeFlag, CodeReviewCommit mergeTip, Set<org.eclipse.jgit.revwalk.RevCommit> alreadyAccepted)`
`CodeReviewCommit`	`mergeOneCommit(org.eclipse.jgit.lib.PersonIdent author, org.eclipse.jgit.lib.PersonIdent committer, org.eclipse.jgit.lib.Repository repo, CodeReviewCommit.CodeReviewRevWalk 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)`
`String`	`mergeStrategyName()`
`static 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, String strategyName)`
`List<CodeReviewCommit>`	`reduceToMinimalMerge(MergeSorter mergeSorter, Collection<CodeReviewCommit> toSort)`
`static boolean`	`useRecursiveMerge(org.eclipse.jgit.lib.Config cfg)`
`CodeReviewCommit`	`writeMergeCommit(org.eclipse.jgit.lib.PersonIdent author, org.eclipse.jgit.lib.PersonIdent committer, CodeReviewCommit.CodeReviewRevWalk 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,
                                   List<CodeReviewCommit> toMerge)
                                     throws IntegrationException

Throws:: IntegrationException

reduceToMinimalMerge

public List<CodeReviewCommit> reduceToMinimalMerge(MergeSorter mergeSorter,
                                          Collection<CodeReviewCommit> toSort)
                                            throws IntegrationException

Throws:: IntegrationException

createCherryPickFromCommit

public CodeReviewCommit 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,
                                          String commitMsg,
                                          CodeReviewCommit.CodeReviewRevWalk rw)
                                            throws org.eclipse.jgit.errors.MissingObjectException,
                                                   org.eclipse.jgit.errors.IncorrectObjectTypeException,
                                                   IOException,
                                                   MergeIdenticalTreeException,
                                                   com.google.gerrit.extensions.restapi.MergeConflictException

Throws:: org.eclipse.jgit.errors.MissingObjectException; org.eclipse.jgit.errors.IncorrectObjectTypeException; IOException; MergeIdenticalTreeException; com.google.gerrit.extensions.restapi.MergeConflictException

createCherryPickCommitMessage

public String createCherryPickCommitMessage(org.eclipse.jgit.revwalk.RevCommit n,
                                   ChangeControl ctl,
                                   com.google.gerrit.reviewdb.client.PatchSet.Id psId)

createCherryPickCommitMessage

public String createCherryPickCommitMessage(CodeReviewCommit n)

canMerge

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

Throws:: IntegrationException

canFastForward

public boolean canFastForward(MergeSorter mergeSorter,
                     CodeReviewCommit mergeTip,
                     CodeReviewCommit.CodeReviewRevWalk rw,
                     CodeReviewCommit toMerge)
                       throws IntegrationException

Throws:: IntegrationException

canCherryPick

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

Throws:: IntegrationException

hasMissingDependencies

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

Throws:: IntegrationException

createDryRunInserter

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

mergeOneCommit

public CodeReviewCommit mergeOneCommit(org.eclipse.jgit.lib.PersonIdent author,
                              org.eclipse.jgit.lib.PersonIdent committer,
                              org.eclipse.jgit.lib.Repository repo,
                              CodeReviewCommit.CodeReviewRevWalk 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 IntegrationException

Throws:: IntegrationException

writeMergeCommit

public CodeReviewCommit writeMergeCommit(org.eclipse.jgit.lib.PersonIdent author,
                                org.eclipse.jgit.lib.PersonIdent committer,
                                CodeReviewCommit.CodeReviewRevWalk 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 IOException,
                                         org.eclipse.jgit.errors.MissingObjectException,
                                         org.eclipse.jgit.errors.IncorrectObjectTypeException

Throws:: 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 String mergeStrategyName()
```

mergeStrategyName

public static 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,
                                                      String strategyName)

commit

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

Throws:: IOException; UnsupportedEncodingException

markCleanMerges

public void markCleanMerges(org.eclipse.jgit.revwalk.RevWalk rw,
                   org.eclipse.jgit.revwalk.RevFlag canMergeFlag,
                   CodeReviewCommit mergeTip,
                   Set<org.eclipse.jgit.revwalk.RevCommit> alreadyAccepted)
                     throws IntegrationException

Throws:: IntegrationException

Class MergeUtil

Nested Class Summary

Method Summary

Methods inherited from class java.lang.Object

Method Detail

useRecursiveMerge

getMergeStrategy

getFirstFastForward

reduceToMinimalMerge

createCherryPickFromCommit

createCherryPickCommitMessage

createCherryPickCommitMessage

canMerge

canFastForward

canCherryPick

hasMissingDependencies

createDryRunInserter

mergeOneCommit

writeMergeCommit

newThreeWayMerger

mergeStrategyName

mergeStrategyName

newThreeWayMerger

commit

markCleanMerges