Examples of MergeResult

com.gitblit.utils.JGitUtils.MergeResult
org.apache.jackrabbit.jcr2spi.state.ItemState.MergeResult
org.eclipse.jgit.api.MergeResult
Encapsulates the result of a {@link MergeCommand}.
org.elasticsearch.index.mapper.DocumentMapper.MergeResult
org.rssowl.core.internal.persist.MergeResult
Contains the details of a merge operation. This can be useful to only perform persistence related operations on the objects that have changed as part of the merge. This object is not thread-safe. @see MergeCapable

Examples of org.eclipse.jgit.api.MergeResult

    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();


    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
        "[2, mode:100644, content:orig][d/1, mode:100644, stage:2, content:side][d/1, mode:100644, stage:3, content:master]",
        indexState(CONTENT));
  }

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    git.commit().setAll(true).setMessage("modified 0 on side").call();


    git.rm().addFilepattern("0").call();
    writeTrashFile("0/0", "side");
    git.add().addFilepattern("0/0").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.FAILED, mergeRes.getMergeStatus());
  }

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult


    writeTrashFile("1", "1\n2\n3side2");
    git.commit().setAll(true)
        .setMessage("modified 1 on side again").call();


    MergeResult result = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());
    result.getNewHead();
    git.checkout().setName("master").call();
    result = git.merge().setStrategy(strategy).include(sideCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());


    // we have two branches which are criss-cross merged. Try to merge the
    // tips. This should succeed with RecursiveMerge and fail with
    // ResolveMerge
    try {
      MergeResult mergeResult = git.merge().setStrategy(strategy)
          .include(git.getRepository().getRef("refs/heads/side"))
          .call();
      assertEquals(MergeStrategy.RECURSIVE, strategy);
      assertEquals(MergeResult.MergeStatus.MERGED,
          mergeResult.getMergeStatus());
      assertEquals("1master2\n2\n3side2\n", read("1"));
    } catch (JGitInternalException e) {
      assertEquals(MergeStrategy.RESOLVE, strategy);
      assertTrue(e.getCause() instanceof NoMergeBaseException);
      assertEquals(((NoMergeBaseException) e.getCause()).getReason(),

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    git.commit().setMessage("added c.txt").call();


    // Get a handle to the the file so on windows it can't be deleted.
    FileInputStream fis = new FileInputStream(new File(db.getWorkTree(),
        "b.txt"));
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    if (mergeRes.getMergeStatus().equals(MergeStatus.FAILED)) {
      // probably windows
      assertEquals(1, mergeRes.getFailingPaths().size());
      assertEquals(MergeFailureReason.COULD_NOT_DELETE, mergeRes
          .getFailingPaths().get("b.txt"));
    }
    assertEquals("[a.txt, mode:100644, content:master]"
        + "[c.txt, mode:100644, content:side]", indexState(CONTENT));
    fis.close();

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    writeTrashFile("a", "1\na(main)\n3\n");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("main").call();


    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());


    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    writeTrashFile("a", "1\na(main)\n3\n");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("main").call();


    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());


    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult


    writeTrashFile("b", "1\nb(main)\n3\n");
    git.add().addFilepattern("b").call();
    git.commit().setMessage("main").call();


    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());


    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    writeTrashFile("b", "second file content - master");
    git.add().addFilepattern("b").call();
    git.commit().setMessage("master commit").call();


    // try and merge
    MergeResult result = git.merge().include(branchCommit).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());


    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

    git.checkout().setName("topic").call();
    git.commit().setMessage("commit 1 on topic").call();
    git.commit().setMessage("commit 2 on topic").call();
    git.checkout().setName("master").call();
    git.commit().setMessage("commit on master").call();
    MergeResult mergeCall = merge(db.resolve("topic"));
    ObjectId start = mergeCall.getNewHead();
    PlotCommitList<PlotLane> commitList = createCommitList(start);


    for (int i = 0; i < commitList.size(); i++)
      plotRenderer.paintCommit(commitList.get(i), 30);

View Full Code Here

Examples of org.eclipse.jgit.api.MergeResult

  private boolean merge(HttpServletRequest request, HttpServletResponse response, Repository db, String commitToMerge, boolean squash)
      throws ServletException, JSONException {
    try {
      ObjectId objectId = db.resolve(commitToMerge);
      Git git = new Git(db);
      MergeResult mergeResult = git.merge().setSquash(squash).include(objectId).call();
      JSONObject result = new JSONObject();
      result.put(GitConstants.KEY_RESULT, mergeResult.getMergeStatus().name());
      if (mergeResult.getFailingPaths() != null && !mergeResult.getFailingPaths().isEmpty())
        result.put(GitConstants.KEY_FAILING_PATHS, mergeResult.getFailingPaths());
      OrionServlet.writeJSONResponse(request, response, result, JsonURIUnqualificationStrategy.ALL_NO_GIT);
      return true;
    } catch (CheckoutConflictException e) {
      return workaroundBug356918(request, response, e);
    } catch (IOException e) {

View Full Code Here

0 1 2 3 4 5

TOP

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.