Package org.eclipse.orion.server.git

Examples of org.eclipse.orion.server.git.AdditionalRebaseStatus

353
354
355
356
357
358
359
360
361
362
363
      assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
      assertTrue(response.getText(), Pattern.matches("<<<<<<< Upstream, based on .*\n1master\n=======\n1a\n>>>>>>> .* first commit on a\n2\n3\n4a\n", response.getText()));

      // continue rebase without conflict resolving
      rebase = rebase(gitHeadUri, Operation.CONTINUE);
      AdditionalRebaseStatus errRebaseResult = AdditionalRebaseStatus.valueOf(rebase.getString(GitConstants.KEY_RESULT));
      assertEquals(AdditionalRebaseStatus.FAILED_UNMERGED_PATHS, errRebaseResult);

      // resolve conflict
      modifyFile(testTxt, "1amaster\n2\n3\n4a");

View Full Code Here
464
465
466
467
468
469
470
471
472
473
474
      assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
      assertTrue(response.getText(), Pattern.matches("<<<<<<< Upstream, based on .*\n1master\n=======\n1a\n>>>>>>> .* first commit on a\n2\n3\n4a\n", response.getText()));

      // continue rebase without conflict resolving - error expected
      rebase = rebase(gitHeadUri, Operation.CONTINUE);
      AdditionalRebaseStatus errRebaseResult = AdditionalRebaseStatus.valueOf(rebase.getString(GitConstants.KEY_RESULT));
      assertEquals(AdditionalRebaseStatus.FAILED_UNMERGED_PATHS, errRebaseResult);

      // continue rebase
      rebase = rebase(gitHeadUri, Operation.SKIP);
      rebaseResult = RebaseResult.Status.valueOf(rebase.getString(GitConstants.KEY_RESULT));
View Full Code Here
502
503
504
505
506
507
508
509
510
511
512
      JSONObject gitSection = project.getJSONObject(GitConstants.KEY_GIT);

      String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);

      JSONObject rebase = rebase(gitHeadUri, Operation.CONTINUE);
      AdditionalRebaseStatus errRebaseResult = AdditionalRebaseStatus.valueOf(rebase.getString(GitConstants.KEY_RESULT));
      assertEquals(AdditionalRebaseStatus.FAILED_WRONG_REPOSITORY_STATE, errRebaseResult);

      rebase = rebase(gitHeadUri, Operation.ABORT);
      errRebaseResult = AdditionalRebaseStatus.valueOf(rebase.getString(GitConstants.KEY_RESULT));
      assertEquals(AdditionalRebaseStatus.FAILED_WRONG_REPOSITORY_STATE, errRebaseResult);
View Full Code Here
TOP

Related Classes of org.eclipse.orion.server.git.AdditionalRebaseStatus

  • org.eclipse.orion.server.tests.servlets.git.GitRebaseTest
    • 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.