com.google.gerrit.server.patch

Class AutoMerger

java.lang.Object

com.google.gerrit.server.patch.AutoMerger

public class AutoMerger
extends java.lang.Object

Method Summary

Modifier and Type	Method and Description
static boolean	cacheAutomerge(org.eclipse.jgit.lib.Config cfg)
org.eclipse.jgit.revwalk.RevCommit	merge(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.lib.ObjectInserter ins, org.eclipse.jgit.revwalk.RevCommit merge, org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy) Perform an auto-merge of the parents of the given merge commit.

Methods inherited from class java.lang.Object

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

Method Detail

cacheAutomerge

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

merge

public org.eclipse.jgit.revwalk.RevCommit merge(org.eclipse.jgit.lib.Repository repo,
                                                org.eclipse.jgit.revwalk.RevWalk rw,
                                                org.eclipse.jgit.lib.ObjectInserter ins,
                                                org.eclipse.jgit.revwalk.RevCommit merge,
                                                org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy)
                                         throws java.io.IOException

Perform an auto-merge of the parents of the given merge commit.

Returns:

auto-merge commit or null if an auto-merge commit couldn't be created. Headers of the returned RevCommit are parsed.

Throws:

java.io.IOException