Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.RebaseResult

455
456
457
458
459
460
461
462
463
464
465
466
      } else if (operation.equals(Operation.BEGIN)) {
        return statusHandler.handleRequest(request, response, new ServerStatus(IStatus.ERROR, HttpServletResponse.SC_BAD_REQUEST,
            "Missing commit refId.", null));
      }
      rebase.setOperation(operation);
      RebaseResult rebaseResult = rebase.call();
      result.put(GitConstants.KEY_RESULT, rebaseResult.getStatus().name());
    } catch (UnmergedPathsException e) {
      // this error should be handled by client, so return a proper status
      result.put(GitConstants.KEY_RESULT, AdditionalRebaseStatus.FAILED_UNMERGED_PATHS.name());
    } catch (WrongRepositoryStateException e) {
      // this error should be handled by client, so return a proper status
View Full Code Here
88
89
90
91
92
93
94
95
96
97
98
99
        Integer.valueOf(commits.size()))) {
      @Override
      protected IStatus run(IProgressMonitor monitor) {
        try {
          op.execute(monitor);
          RebaseResult result = op.getResult();
          if (result.getStatus() != RebaseResult.Status.OK) {
            RebaseResultDialog.show(result, repo);
          }
        } catch (CoreException e) {
          Activator.logError(
              UIText.CherryPickOperation_InternalError, e);
View Full Code Here
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
          return NLS.bind(
              UIText.MultiPullResultDialog_MergeResultMessage,
              MergeResultDialog.getStatusText(pullRes
                  .getMergeResult().getMergeStatus()));
        } else if (pullRes.getRebaseResult() != null) {
          RebaseResult res = pullRes.getRebaseResult();
          return NLS.bind(
              UIText.MultiPullResultDialog_RebaseResultMessage,
              RebaseResultDialog.getStatusText(res.getStatus()));
        } else {
          return UIText.MultiPullResultDialog_NothingUpdatedStatus;
        }
      }
      case 3:
        if (item.getValue() instanceof IStatus) {
          IStatus status = (IStatus) item.getValue();
          return status.getMessage();
        }
        PullResult res = (PullResult) item.getValue();
        if (res.isSuccessful())
          return UIText.MultiPullResultDialog_OkStatus;
        else
          return UIText.MultiPullResultDialog_FailedStatus;
      default:
        return null;
View Full Code Here
76
77
78
79
80
81
82
83
84
    return mergeResult != null
        && mergeResult.getMergeStatus() != MergeStatus.ALREADY_UP_TO_DATE;
  }

  private boolean hasRebaseResults() {
    final RebaseResult rebaseResult = result.getRebaseResult();
    return rebaseResult != null
        && rebaseResult.getStatus() != Status.UP_TO_DATE;
  }
View Full Code Here
84
85
86
87
88
89
90
91
92
93
94
95
    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);
    assertEquals(first, newTopic.getParent(0));
View Full Code Here
128
129
130
131
132
133
134
135
136
137
138
139
    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
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
    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
219
220
221
222
223
224
225
226
227
228
229
230
    // rebase topic onto master
    RebaseOperation op = new RebaseOperation(repository, repository
        .getRef(MASTER));
    op.execute(null);

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

    try {
      // let's try to start again, we should get a wrapped
      // WrongRepositoryStateException
      op = new RebaseOperation(repository, repository.getRef(MASTER));
View Full Code Here
169
170
171
172
173
174
175
176
177
178
179
180
                            localUpdate = true;
                        } else if (mergeStatus == MergeStatus.ALREADY_UP_TO_DATE) {
                            remoteUpdate = true;
                        } else if (mergeStatus == MergeStatus.ABORTED) {
                            LOGGER.debug("Cannot fast forward branch {}, attempting rebase", branch);
                            RebaseResult rebaseResult = git.rebase().setUpstream(remoteCommit).call();
                            RebaseResult.Status rebaseStatus = rebaseResult.getStatus();
                            if (rebaseStatus == RebaseResult.Status.OK) {
                                localUpdate = true;
                                remoteUpdate = true;
                            } else {
                                LOGGER.warn("Rebase on branch {} failed, restoring remote branch", branch);
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.api.RebaseResult

  • io.fabric8.git.internal.DefaultPullPushPolicy
  • org.eclipse.egit.core.test.op.RebaseOperationTest
  • org.eclipse.egit.ui.internal.commit.command.CherryPickHandler
  • org.eclipse.egit.ui.internal.pull.MultiPullResultDialog$LabelProvider
  • org.eclipse.egit.ui.internal.pull.PullResultDialog
  • org.eclipse.orion.server.git.servlets.GitCommitHandlerV1
    • 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.