Examples of org.eclipse.jgit.merge.RecursiveMerger

org.eclipse.jgit.merge.RecursiveMerger
A three-way merger performing a content-merge if necessary across multiple bases using recursion This merger extends the resolve merger and does several things differently: - allow more than one merge base, up to a maximum - uses "Lists" instead of Arrays for chained types - recursively merges the merge bases together to compute a usable base @since 3.0

        return MergeStatus.ALREADY_MERGED;
      } else if (revWalk.isMergedInto(branchTip, srcTip)) {
        // fast-forward
        return MergeStatus.MERGEABLE;
      }
      RecursiveMerger merger = (RecursiveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
      boolean canMerge = merger.merge(branchTip, srcTip);
      if (canMerge) {
        return MergeStatus.MERGEABLE;
      }
    } catch (IOException e) {
      LOGGER.error("Failed to determine canMerge", e);

View Full Code Here

      RevCommit srcTip = revWalk.lookupCommit(repository.resolve(src));
      if (revWalk.isMergedInto(srcTip, branchTip)) {
        // already merged
        return new MergeResult(MergeStatus.ALREADY_MERGED, null);
      }
      RecursiveMerger merger = (RecursiveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
      boolean merged = merger.merge(branchTip, srcTip);
      if (merged) {
        // create a merge commit and a reference to track the merge commit
        ObjectId treeId = merger.getResultTreeId();
        ObjectInserter odi = repository.newObjectInserter();
        try {
          // Create a commit object
          CommitBuilder commitBuilder = new CommitBuilder();
          commitBuilder.setCommitter(committer);

View Full Code Here

        return MergeStatus.ALREADY_MERGED;
      } else if (revWalk.isMergedInto(branchTip, srcTip)) {
        // fast-forward
        return MergeStatus.MERGEABLE;
      }
      RecursiveMerger merger = (RecursiveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
      boolean canMerge = merger.merge(branchTip, srcTip);
      if (canMerge) {
        return MergeStatus.MERGEABLE;
      }
    } catch (IOException e) {
      LOGGER.error("Failed to determine canMerge", e);

View Full Code Here

      RevCommit srcTip = revWalk.lookupCommit(repository.resolve(src));
      if (revWalk.isMergedInto(srcTip, branchTip)) {
        // already merged
        return new MergeResult(MergeStatus.ALREADY_MERGED, null);
      }
      RecursiveMerger merger = (RecursiveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
      boolean merged = merger.merge(branchTip, srcTip);
      if (merged) {
        // create a merge commit and a reference to track the merge commit
        ObjectId treeId = merger.getResultTreeId();
        ObjectInserter odi = repository.newObjectInserter();
        try {
          // Create a commit object
          CommitBuilder commitBuilder = new CommitBuilder();
          commitBuilder.setCommitter(committer);

View Full Code Here

TOP

Related Classes of org.eclipse.jgit.merge.RecursiveMerger

com.gitblit.utils.JGitUtils

org.eclipse.jgit.dircache.DirCache

org.eclipse.jgit.dircache.DirCacheBuilder

org.eclipse.jgit.dircache.DirCacheEntry

org.eclipse.jgit.lib.CommitBuilder

org.eclipse.jgit.lib.ObjectId

org.eclipse.jgit.lib.ObjectInserter

org.eclipse.jgit.lib.PersonIdent

org.eclipse.jgit.revwalk.RevCommit

org.eclipse.jgit.treewalk.TreeWalk

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.