Package org.eclipse.jgit.api.RebaseCommand

Examples of org.eclipse.jgit.api.RebaseCommand.InteractiveHandler

2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
    // update files on master
    commitFile(FILE1, "blah", "master");
    RevCommit c4 = commitFile("file2", "more change", "master");

    RebaseResult res = git.rebase().setUpstream("HEAD~2")
        .runInteractively(new InteractiveHandler() {
          public void prepareSteps(List<RebaseTodoLine> steps) {
            steps.add(0, new RebaseTodoLine(
                "# Comment that should not be processed"));
          }

          public String modifyCommitMessage(String commit) {
            fail("modifyCommitMessage() was not expected to be called");
            return commit;
          }
        }).call();

    assertEquals(RebaseResult.Status.FAST_FORWARD, res.getStatus());

    RebaseResult res2 = git.rebase().setUpstream("HEAD~2")
        .runInteractively(new InteractiveHandler() {
          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              // delete RevCommit c4
              steps.get(0).setAction(Action.COMMENT);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on side").call();

    RebaseResult res = git.rebase().setUpstream("HEAD~2")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(0).setAction(Action.REWORD);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on side").call();

    RebaseResult res = git.rebase().setUpstream("HEAD~2")
        .runInteractively(new InteractiveHandler() {
          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(0).setAction(Action.EDIT);
            } catch (IllegalTodoFileModification e) {
              fail("unexpected exception: " + e);
View Full Code Here
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on master\nnew line").call();

    git.rebase().setUpstream("HEAD~3")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(1).setAction(Action.SQUASH);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on master\nnew line").call();

    git.rebase().setUpstream("HEAD~4")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(1).setAction(Action.SQUASH);
              steps.get(2).setAction(Action.SQUASH);
View Full Code Here
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on master\nnew line").call();

    git.rebase().setUpstream("HEAD~4")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(1).setAction(Action.FIXUP);
              steps.get(2).setAction(Action.SQUASH);
View Full Code Here
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
    writeTrashFile("file2", "more change");
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("update file2 on master\nnew line").call();

    git.rebase().setUpstream("HEAD~3")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(1).setAction(Action.FIXUP);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
    writeTrashFile(FILE1, "blah");
    git.add().addFilepattern(FILE1).call();
    git.commit().setMessage("updated file1 on master\n\nsome text").call();

    git.rebase().setUpstream("HEAD~2")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(1).setAction(Action.FIXUP);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("Add file2\nnew line").call();
    assertTrue(new File(db.getWorkTree(), "file2").exists());

    git.rebase().setUpstream("HEAD~1")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(0).setAction(Action.FIXUP);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
    git.add().addFilepattern("file2").call();
    git.commit().setMessage("Add file2\nnew line").call();
    assertTrue(new File(db.getWorkTree(), "file2").exists());

    git.rebase().setUpstream("HEAD~1")
        .runInteractively(new InteractiveHandler() {

          public void prepareSteps(List<RebaseTodoLine> steps) {
            try {
              steps.get(0).setAction(Action.SQUASH);
            } catch (IllegalTodoFileModification e) {
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.api.RebaseCommand.InteractiveHandler

  • org.eclipse.egit.core.op.CherryPickOperation
  • org.eclipse.egit.core.op.EditCommitOperation
  • org.eclipse.egit.core.op.RewordCommitOperation
  • org.eclipse.egit.core.op.SquashCommitsOperation
  • org.eclipse.egit.core.test.op.SquashCommitsOperationTest
  • org.eclipse.egit.ui.internal.commands.shared.RebaseCurrentRefCommand
  • org.eclipse.egit.ui.internal.commit.command.SquashHandler
  • org.eclipse.jgit.api.RebaseCommandTest
    • 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.