MergeUtil (Gerrit Review Plugin API Documentation)

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

```
public class MergeUtil
extends Object
```
Utility methods used during the merge process.
Note: Unless otherwise specified, the methods in this class do not flush ObjectInserters. Callers that want to read back objects before flushing should use ObjectInserter.newReader(). This is already the default behavior of BatchUpdate.

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)`
`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 String`	`createConflictMessage(List<String> conflicts)`
`static org.eclipse.jgit.revwalk.RevCommit`	`createMergeCommit(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.lib.ObjectInserter inserter, org.eclipse.jgit.revwalk.RevCommit mergeTip, org.eclipse.jgit.revwalk.RevCommit originalCommit, String mergeStrategy, org.eclipse.jgit.lib.PersonIdent committerIndent, String commitMsg, org.eclipse.jgit.revwalk.RevWalk rw)`
`static CodeReviewCommit`	`findAnyMergedInto(CodeReviewCommit.CodeReviewRevWalk rw, Iterable<CodeReviewCommit> commits, CodeReviewCommit tip)`
`Set<com.google.gerrit.reviewdb.client.Change.Id>`	`findUnmergedChanges(Set<com.google.gerrit.reviewdb.client.Change.Id> expected, CodeReviewCommit.CodeReviewRevWalk rw, org.eclipse.jgit.revwalk.RevFlag canMergeFlag, CodeReviewCommit oldTip, CodeReviewCommit mergeTip, Iterable<com.google.gerrit.reviewdb.client.Change.Id> alreadyMerged)`
`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, com.google.gerrit.reviewdb.client.Branch.NameKey destBranch, CodeReviewCommit mergeTip, CodeReviewCommit n)`
`String`	`mergeStrategyName()`
`static String`	`mergeStrategyName(boolean useContentMerge, boolean useRecursiveMerge)`
`static org.eclipse.jgit.merge.Merger`	`newMerger(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.lib.ObjectInserter inserter, String strategyName)`
`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 org.eclipse.jgit.revwalk.RevCommit`	`resolveCommit(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.revwalk.RevWalk rw, String str)`
`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, 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

createMergeCommit

public static org.eclipse.jgit.revwalk.RevCommit createMergeCommit(org.eclipse.jgit.lib.Repository repo,
                                                   org.eclipse.jgit.lib.ObjectInserter inserter,
                                                   org.eclipse.jgit.revwalk.RevCommit mergeTip,
                                                   org.eclipse.jgit.revwalk.RevCommit originalCommit,
                                                   String mergeStrategy,
                                                   org.eclipse.jgit.lib.PersonIdent committerIndent,
                                                   String commitMsg,
                                                   org.eclipse.jgit.revwalk.RevWalk rw)
                                                            throws IOException,
                                                                   MergeIdenticalTreeException,
                                                                   com.google.gerrit.extensions.restapi.MergeConflictException

Throws:: IOException; MergeIdenticalTreeException; com.google.gerrit.extensions.restapi.MergeConflictException

createConflictMessage

public static String createConflictMessage(List<String> conflicts)

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

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,
                              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,
                                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)

newMerger

public static org.eclipse.jgit.merge.Merger newMerger(org.eclipse.jgit.lib.Repository repo,
                                      org.eclipse.jgit.lib.ObjectInserter inserter,
                                      String strategyName)

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

findUnmergedChanges

public Set<com.google.gerrit.reviewdb.client.Change.Id> findUnmergedChanges(Set<com.google.gerrit.reviewdb.client.Change.Id> expected,
                                                                   CodeReviewCommit.CodeReviewRevWalk rw,
                                                                   org.eclipse.jgit.revwalk.RevFlag canMergeFlag,
                                                                   CodeReviewCommit oldTip,
                                                                   CodeReviewCommit mergeTip,
                                                                   Iterable<com.google.gerrit.reviewdb.client.Change.Id> alreadyMerged)
                                                                     throws IntegrationException

Throws:: IntegrationException

findAnyMergedInto

public static CodeReviewCommit findAnyMergedInto(CodeReviewCommit.CodeReviewRevWalk rw,
                                 Iterable<CodeReviewCommit> commits,
                                 CodeReviewCommit tip)
                                          throws IOException

Throws:: IOException

resolveCommit

public static org.eclipse.jgit.revwalk.RevCommit resolveCommit(org.eclipse.jgit.lib.Repository repo,
                                               org.eclipse.jgit.revwalk.RevWalk rw,
                                               String str)
                                                        throws com.google.gerrit.extensions.restapi.BadRequestException,
                                                               com.google.gerrit.extensions.restapi.ResourceNotFoundException,
                                                               IOException

Throws:: com.google.gerrit.extensions.restapi.BadRequestException; com.google.gerrit.extensions.restapi.ResourceNotFoundException; IOException

Class MergeUtil

Nested Class Summary

Method Summary

Methods inherited from class java.lang.Object

Method Detail

useRecursiveMerge

getMergeStrategy

getFirstFastForward

reduceToMinimalMerge

createCherryPickFromCommit

createMergeCommit

createConflictMessage

createCherryPickCommitMessage

createCherryPickCommitMessage

canMerge

canFastForward

canCherryPick

hasMissingDependencies

mergeOneCommit

writeMergeCommit

newThreeWayMerger

mergeStrategyName

mergeStrategyName

newThreeWayMerger

newMerger

markCleanMerges

findUnmergedChanges

findAnyMergedInto

resolveCommit