Package org.eclipse.jgit.api.MergeResult

Examples of org.eclipse.jgit.api.MergeResult.MergeStatus

390
391
392
393
394
395
396
397
398
399
400
    // assert clean
    assertStatus(new StatusResult().setModified(1), gitStatusUri);

    // merge: "git merge branch"
    JSONObject merge = merge(gitHeadUri, branch);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.FAILED, mergeResult);
    JSONObject failingPaths = merge.getJSONObject(GitConstants.KEY_FAILING_PATHS);
    assertEquals(1, failingPaths.length());
    assertEquals(MergeFailureReason.DIRTY_WORKTREE, MergeFailureReason.valueOf(failingPaths.getString("test.txt")));
  }
View Full Code Here
473
474
475
476
477
478
479
480
481
482
483
    String gitHeadUri = remoteBranch.getString(GitConstants.KEY_HEAD);

    // merge
    JSONObject merge = merge(gitHeadUri, newRefId1);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.FAST_FORWARD, mergeResult);

    request = getGetRequest(getChild(project1, "test.txt").getString(ProtocolConstants.KEY_LOCATION));
    response = webConversation.getResponse(request);
    assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
View Full Code Here
570
571
572
573
574
575
576
577
578
579
580
      Repository db1 = getRepositoryForContentLocation(cloneContentLocation);
      Git git = new Git(db1);
      git.checkout().setName(toCheckout).call();

      JSONObject merge = merge(gitHeadUri, toMerge);
      MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
      assertEquals(MergeStatus.FAST_FORWARD, mergeResult);

      request = getGetRequest(folderChildrenLocation);
      response = webConversation.getResponse(request);
      assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
View Full Code Here
49
50
51
52
53
54
55
56
    assertNotNull(gitSection);
    String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);

    // "git merge master"
    JSONObject merge = merge(gitHeadUri, Constants.MASTER, true);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.ALREADY_UP_TO_DATE, mergeResult);
  }
View Full Code Here
130
131
132
133
134
135
136
137
138
139
140
    // assert clean
    assertStatus(StatusResult.CLEAN, gitStatusUri);

    // merge: "git merge a"
    JSONObject merge = merge(gitHeadUri, "a", true);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.MERGED_SQUASHED, mergeResult);

    // assert clean
    //assertStatus(StatusResult.CLEAN, gitStatusUri);
View Full Code Here
173
174
175
176
177
178
179
180
181
182
183
    assertStatus(new StatusResult().setChanged(1), gitStatusUri);

    // "git merge master"
    JSONObject merge = merge(gitHeadUri, Constants.MASTER, true);
    MergeStatus mergeResult = MergeResult.MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, mergeResult);

    // status hasn't changed
    assertStatus(new StatusResult().setChanged(1), gitStatusUri);
  }
View Full Code Here
259
260
261
262
263
264
265
266
267
268
269
    // assert clean
    assertStatus(StatusResult.CLEAN, gitStatusUri);

    // merge: "git merge a"
    JSONObject merge = merge(gitHeadUri, "a", true);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.CONFLICTING, mergeResult);

    // check status
    assertStatus(new StatusResult().setConflictingNames("test.txt"), gitStatusUri);
View Full Code Here
328
329
330
331
332
333
334
335
336
337
338
    JSONObject masterDetails = getRemoteBranch(gitRemoteUri, 1, 0, Constants.MASTER);
    String masterLocation = masterDetails.getString(ProtocolConstants.KEY_LOCATION);
    fetch(masterLocation);
    JSONObject merge = merge(gitHeadUri, Constants.DEFAULT_REMOTE_NAME + "/" + Constants.MASTER, true);

    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.FAILED, mergeResult);
    JSONObject failingPaths = merge.getJSONObject(GitConstants.KEY_FAILING_PATHS);
    assertEquals(1, failingPaths.length());
    assertEquals(MergeFailureReason.DIRTY_WORKTREE, MergeFailureReason.valueOf(failingPaths.getString("test.txt")));
  }
View Full Code Here
390
391
392
393
394
395
396
397
398
399
400
    // assert clean
    assertStatus(new StatusResult().setModified(1), gitStatusUri);

    // merge: "git merge branch"
    JSONObject merge = merge(gitHeadUri, branch, true);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.FAILED, mergeResult);
    JSONObject failingPaths = merge.getJSONObject(GitConstants.KEY_FAILING_PATHS);
    assertEquals(1, failingPaths.length());
    assertEquals(MergeFailureReason.DIRTY_WORKTREE, MergeFailureReason.valueOf(failingPaths.getString("test.txt")));
  }
View Full Code Here
473
474
475
476
477
478
479
480
481
482
483
    String gitHeadUri = remoteBranch.getString(GitConstants.KEY_HEAD);

    // merge
    JSONObject merge = merge(gitHeadUri, newRefId1, true);
    MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
    assertEquals(MergeStatus.FAST_FORWARD_SQUASHED, mergeResult);

    request = getGetRequest(getChild(project1, "test.txt").getString(ProtocolConstants.KEY_LOCATION));
    response = webConversation.getResponse(request);
    assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.api.MergeResult.MergeStatus

  • io.fabric8.git.internal.DefaultPullPushPolicy
  • org.eclipse.egit.ui.internal.merge.MergeResultDialog
  • org.eclipse.jgit.api.MergeCommand
  • org.eclipse.orion.server.git.jobs.PullJob
  • org.eclipse.orion.server.tests.servlets.git.GitMergeSquashTest
  • org.eclipse.orion.server.tests.servlets.git.GitMergeTest
  • org.eclipse.orion.server.tests.servlets.git.GitPushTest
    • Copyright © 2018 www.massapicom. All rights reserved.
    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.