Package org.eclipse.egit.core.op

Examples of org.eclipse.egit.core.op.RebaseOperation

156
157
158
159
160
161
162
163
164
165
  @Override
  protected RebaseOperation createRebaseOperation(Repository repository)
      throws ExecutionException {
    InteractiveHandler handler = interactive ? RebaseInteractiveHandler.INSTANCE
        : null;
    RebaseOperation operation = new RebaseOperation(repository, ref,
        handler);
    operation.setPreserveMerges(preserveMerges);
    return operation;
  }
View Full Code Here
29
30
31
32
33
34
35
  }

  @Override
  protected RebaseOperation createRebaseOperation(Repository repository)
      throws ExecutionException {
    return new RebaseOperation(repository, Operation.ABORT);
  }
View Full Code Here
222
223
224
225
226
227
228
229
   *
   * @param repository
   * @throws ExecutionException
   */
  public void execute(Repository repository) throws ExecutionException {
    final RebaseOperation rebase = createRebaseOperation(repository);
    execute(rebase);
  }
View Full Code Here
230
231
232
233
234
235
236
237
238
239
240
  private void handleBeginError(final Repository repository, IStatus result) {
    if (!repository.getRepositoryState().equals(RepositoryState.SAFE)) {
      Throwable t = result.getException();
      try {
        new RebaseOperation(repository, Operation.ABORT).execute(null);
        Activator.showError(t.getMessage(), t);
      } catch (CoreException e1) {
        IStatus childStatus = Activator.createErrorStatus(
            e1.getMessage(), e1);
        IStatus mStatus = new MultiStatus(Activator.getPluginId(),
View Full Code Here
28
29
30
31
32
33
34
35
        UIText.SkipRebaseCommand_CancelDialogMessage);
  }

  @Override
  public RebaseOperation createRebaseOperation(Repository repository) {
    return new RebaseOperation(repository, Operation.SKIP,
        RebaseInteractiveHandler.INSTANCE);
  }
View Full Code Here
30
31
32
33
34
35
36
37
  }

  @Override
  protected RebaseOperation createRebaseOperation(Repository repository)
      throws ExecutionException {
    return new RebaseOperation(repository, Operation.CONTINUE,
        RebaseInteractiveHandler.INSTANCE);
  }
View Full Code Here
33
34
35
36
37
38
39
40
  }

  @Override
  protected RebaseOperation createRebaseOperation(Repository repository)
      throws ExecutionException {
    return new RebaseOperation(repository, Operation.PROCESS_STEPS,
        RebaseInteractiveHandler.INSTANCE);
  }
View Full Code Here
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
    // parent of topic commit should be first master commit before rebase
    assertEquals(first, topicCommit.getParent(0));

    // rebase topic onto master
    RebaseOperation op = new RebaseOperation(
        testRepository.getRepository(), testRepository.getRepository()
            .getRef(MASTER));
    op.execute(null);

    RebaseResult res = op.getResult();
    assertEquals(RebaseResult.Status.UP_TO_DATE, res.getStatus());

    RevCommit newTopic = new RevWalk(repository).parseCommit(repository
        .resolve(TOPIC));
    assertEquals(topicCommit, newTopic);
View Full Code Here
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
    // parent of topic commit should be first master commit before rebase
    assertEquals(first, topicCommit.getParent(0));

    // rebase topic onto master
    RebaseOperation op = new RebaseOperation(
        testRepository.getRepository(), testRepository.getRepository()
            .getRef(MASTER));
    op.execute(null);

    RebaseResult res = op.getResult();
    assertEquals(RebaseResult.Status.OK, res.getStatus());

    RevCommit newTopic = new RevWalk(repository).parseCommit(repository
        .resolve(TOPIC));
    assertEquals(second, newTopic.getParent(0));
View Full Code Here
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
    // parent of topic commit should be first master commit before rebase
    assertEquals(first, topicCommit.getParent(0));

    // rebase topic onto master
    RebaseOperation op = new RebaseOperation(
        testRepository.getRepository(), testRepository.getRepository()
            .getRef(MASTER));
    op.execute(null);

    RebaseResult res = op.getResult();
    assertEquals(RebaseResult.Status.STOPPED, res.getStatus());

    // let's try to abort this here
    RebaseOperation abort = new RebaseOperation(repository, Operation.ABORT);
    abort.execute(null);
    RebaseResult abortResult = abort.getResult();
    assertEquals(Status.ABORTED, abortResult.getStatus());

    assertEquals(topicCommit, repository.resolve(Constants.HEAD));
  }
View Full Code Here
TOP

Related Classes of org.eclipse.egit.core.op.RebaseOperation

  • org.eclipse.core.resources.IWorkspaceRunnable
  • org.eclipse.core.runtime.IProgressMonitor
  • org.eclipse.core.runtime.NullProgressMonitor
  • org.eclipse.core.runtime.Status
  • org.eclipse.core.runtime.SubProgressMonitor
  • org.eclipse.egit.core.EclipseGitProgressTransformer
  • org.eclipse.egit.core.test.op.RebaseOperationTest
  • org.eclipse.egit.ui.internal.commands.shared.AbortRebaseCommand
  • org.eclipse.egit.ui.internal.commands.shared.AbstractRebaseCommandHandler
  • org.eclipse.egit.ui.internal.commands.shared.ContinueRebaseCommand
    • 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.