.setReflogPrefix(REFLOG_PREFIX).setStrategy(strategy) .call(); switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult .failed(cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); return stop(commitToPick, Status.STOPPED); case OK: newHead = cherryPickResult.getNewHead();
} else { if (merger.failed()) return new CherryPickResult(merger.getFailingPaths()); e), e); return new CherryPickResult(newHead, cherryPickedRefs);
@Override protected IStatus run(IProgressMonitor monitor) { try { op.execute(monitor); CherryPickResult cherryPickResult = op.getResult(); RevCommit newHead = cherryPickResult.getNewHead(); if (newHead != null && cherryPickResult.getCherryPickedRefs().isEmpty()) showNotPerformedDialog(parent); if (newHead == null) { CherryPickStatus status = cherryPickResult.getStatus(); switch (status) { case CONFLICTING: showConflictDialog(parent); break; case FAILED: showFailure(cherryPickResult); break; case OK: break; } } } catch (CoreException e) { Activator.logError( UIText.CherryPickOperation_InternalError, e); } return Status.OK_STATUS; }
boolean rollback) throws GitAPIException, IOException { if (result.getStatus() == CherryPickResult.CherryPickStatus.CONFLICTING) { Activator.log2(LogService.LOG_WARNING, "Problem with applying the change " + commit.getName() + ":");
private void showFailure(CherryPickResult result) { IStatus details = getErrorList(result.getFailingPaths()); Activator.showErrorStatus( UIText.CherryPickHandler_CherryPickFailedMessage, details); }
boolean rollback) throws GitAPIException, IOException { if (result.getStatus() == CherryPickResult.CherryPickStatus.CONFLICTING) { Activator.log2(LogService.LOG_WARNING, "Problem with applying the change " + commit.getName() + ":");
switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult.failed( cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); newHead = commit.call(); } else newHead = cherryPickResult.getNewHead(); break;
return new CherryPickResult(merger.getFailingPaths()); e); return new CherryPickResult(newHead, cherryPickedRefs);
.setReflogPrefix(REFLOG_PREFIX).setStrategy(strategy) .call(); switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult .failed(cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); return stop(commitToPick, Status.STOPPED); case OK: newHead = cherryPickResult.getNewHead();
} else { if (merger.failed()) return new CherryPickResult(merger.getFailingPaths()); e), e); return new CherryPickResult(newHead, cherryPickedRefs);
.setReflogPrefix(REFLOG_PREFIX).setStrategy(strategy) .call(); switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult .failed(cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); return stop(commitToPick, Status.STOPPED); case OK: newHead = cherryPickResult.getNewHead();
} else { if (merger.failed()) return new CherryPickResult(merger.getFailingPaths()); e), e); return new CherryPickResult(newHead, cherryPickedRefs);
switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult.failed( cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); newHead = commit.call(); } else newHead = cherryPickResult.getNewHead(); break;
switch (cherryPickResult.getStatus()) { case FAILED: if (operation == Operation.BEGIN) return abort(RebaseResult.failed( cherryPickResult.getFailingPaths())); else return stop(commitToPick, Status.STOPPED); newHead = commit.call(); } else newHead = cherryPickResult.getNewHead(); break;