Package org.eclipse.egit.core.op

Examples of org.eclipse.egit.core.op.MergeOperation.execute()

66
67
68
69
70
71
72
73
74
75
76
      op.setCommit(mergeTargetSelectionDialog.isCommit());
      Job job = new WorkspaceJob(jobname) {
        @Override
        public IStatus runInWorkspace(IProgressMonitor monitor) {
          try {
            op.execute(monitor);
          } catch (final CoreException e) {
            return e.getStatus();
          }
          return Status.OK_STATUS;
        }
View Full Code Here
54
55
56
57
58
59
60
61
62
63
64
    testRepository.branch("stable").commit().add(path.toString(), "stable")
        .create();
    touchAndSubmit("master", "master");
    MergeOperation mergeOp = new MergeOperation(
        testRepository.getRepository(), "stable");
    mergeOp.execute(null);
    MergeResult mergeResult = mergeOp.getResult();
    assertThat(mergeResult.getMergeStatus(), is(MergeStatus.CONFLICTING));
    assertThat(mergeResult.getConflicts().keySet(),
        hasItem(path.toString()));
View Full Code Here
97
98
99
100
101
102
103
104
105
106
107
    Job job = new WorkspaceJob(jobname) {

      @Override
      public IStatus runInWorkspace(IProgressMonitor monitor) {
        try {
          op.execute(monitor);
        } catch (final CoreException e) {
          return e.getStatus();
        }
        return Status.OK_STATUS;
      }
View Full Code Here
89
90
91
92
93
94
95
96
97
98
99
    Job job = new WorkspaceJob(jobname) {

      @Override
      public IStatus runInWorkspace(IProgressMonitor monitor) {
        try {
          op.execute(monitor);
        } catch (final CoreException e) {
          return e.getStatus();
        }
        return Status.OK_STATUS;
      }
View Full Code Here
65
66
67
68
69
70
71
72
73
74
75
  @Test
  public void testMergeFF() throws Exception {
    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(secondCommit));
    assertEquals(2, countCommitsInHead());
  }
View Full Code Here
77
78
79
80
81
82
83
84
85
86
87
  public void testMergeoptionsNoFF() throws Exception {
    setMergeOptions("side", FastForwardMode.NO_FF);

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertEquals(3, countCommitsInHead());
  }

  @Test
View Full Code Here
92
93
94
95
96
97
98
99
100
101
102
    RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
        "side commit 1");

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
  }

  private void setMergeOptions(String branch, FastForwardMode ffMode)
View Full Code Here
111
112
113
114
115
116
117
118
119
120
121
  public void testMergeNoFF() throws Exception {
    setMerge(FastForwardMode.NO_FF);

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertEquals(3, countCommitsInHead());
  }

  @Test
View Full Code Here
126
127
128
129
130
131
132
133
134
135
136
    RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
        "side commit 1");

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
  }

  private void setMerge(FastForwardMode ffMode) throws IOException {
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. 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.