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 IntegrationException

  Throws:

  IntegrationException

• reduceToMinimalMerge

  public java.util.List<CodeReviewCommit> reduceToMinimalMerge(MergeSorter mergeSorter,
                                                      java.util.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,
                                            java.lang.String commitMsg,
                                            CodeReviewCommit.CodeReviewRevWalk rw)
                                              throws org.eclipse.jgit.errors.MissingObjectException,
                                                     org.eclipse.jgit.errors.IncorrectObjectTypeException,
                                                     java.io.IOException,
                                                     MergeIdenticalTreeException,
                                                     com.google.gerrit.extensions.restapi.MergeConflictException

  Throws:

  org.eclipse.jgit.errors.MissingObjectException

  org.eclipse.jgit.errors.IncorrectObjectTypeException

  java.io.IOException

  MergeIdenticalTreeException

  com.google.gerrit.extensions.restapi.MergeConflictException

• createCherryPickCommitMessage

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

• createCherryPickCommitMessage

  public java.lang.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 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 void 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 IntegrationException

  Throws:

  IntegrationException