Example usage for org.eclipse.jgit.merge MergeStrategy get

Introduction

In this page you can find the example usage for org.eclipse.jgit.merge MergeStrategy get.

Prototype

public static synchronized MergeStrategy get(String name) 

Source Link

Document

Locate a strategy by name.

Usage

From source file:com.google.gerrit.server.git.MergeUtil.java

License:Apache License

public static ThreeWayMerger newThreeWayMerger(Repository repo, final ObjectInserter inserter,
        String strategyName) {//from   ww  w .j  a  v a2s .  co  m
    MergeStrategy strategy = MergeStrategy.get(strategyName);
    checkArgument(strategy != null, "invalid merge strategy: %s", strategyName);
    Merger m = strategy.newMerger(repo, true);
    checkArgument(m instanceof ThreeWayMerger, "merge strategy %s does not support three-way merging",
            strategyName);
    m.setObjectInserter(new ObjectInserter.Filter() {
        @Override
        protected ObjectInserter delegate() {
            return inserter;
        }

        @Override
        public void flush() {
        }

        @Override
        public void close() {
        }
    });
    return (ThreeWayMerger) m;
}

---

From source file:org.ajoberstar.gradle.git.tasks.GitMerge.java

License:Apache License

/**
 * Attempts to get a valid {@link MergeStrategy} out of the user
 * configuration/*from w w w. jav  a  2 s.  c o  m*/
 * 
 * @return the merge strategy corresponding to the user input 
 */
private MergeStrategy getMergeStrategy() {
    String modeConfig = ObjectUtil.unpackString(getStrategy());
    if (modeConfig == null) {
        return MergeStrategy.RESOLVE;
    } else {
        try {
            return MergeStrategy.get(modeConfig.toUpperCase());
        } catch (Exception e) {
            throw new GradleException(
                    "No valid merge strategy could be " + "identified from the specified input: " + modeConfig,
                    e);
        }
    }
}

---

From source file:org.eclipse.egit.core.op.MergeOperation.java

License:Open Source License

/**
* Create a MergeOperation object/*  w w w.  j  a v a  2 s .  c o  m*/
* @param repository
* @param refName name of a commit which should be merged
* @param mergeStrategy the strategy to use for merge
*/
public MergeOperation(Repository repository, String refName, String mergeStrategy) {
    this.repository = repository;
    this.refName = refName;
    if (mergeStrategy != null)
        this.mergeStrategy = MergeStrategy.get(mergeStrategy);
}

---