.getMergeStatus() == MergeResult.MergeStatus.FAILED) return abort(RebaseResult .failed(mergeResult.getFailingPaths())); return stop(commitToPick, Status.STOPPED);
/** * Show dialog for failure result * * @param shell * @param commit * @param result */ public static void show(Shell shell, RevCommit commit, MergeResult result) { String message; Map<String, MergeFailureReason> reasons = result != null ? result .getFailingPaths() : null; if (reasons != null && !reasons.isEmpty()) message = MessageFormat.format(UIText.RevertFailureDialog_Message, commit.abbreviate(7).name()); else message = MessageFormat.format( UIText.RevertFailureDialog_MessageNoFiles, commit .abbreviate(7).name()); RevertFailureDialog dialog = new RevertFailureDialog(shell, message, reasons); dialog.setShellStyle(dialog.getShellStyle() | SWT.SHEET | SWT.RESIZE); dialog.open(); }
Text pathsText = new Text(composite, SWT.READ_ONLY); pathsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); Set<Entry<String, MergeFailureReason>> failedPaths = mergeResult.getFailingPaths().entrySet(); int n = 0; for (Map.Entry<String, MergeFailureReason> e : failedPaths) {
case FAILED: for (Map.Entry<String, MergeFailureReason> entry : result .getFailingPaths().entrySet()) switch (entry.getValue()) { case DIRTY_WORKTREE:
.getMergeStatus() == MergeResult.MergeStatus.FAILED) return abort(RebaseResult .failed(mergeResult.getFailingPaths())); return stop(commitToPick, Status.STOPPED);
.getMergeStatus() == MergeResult.MergeStatus.FAILED) return abort(RebaseResult .failed(mergeResult.getFailingPaths())); return stop(commitToPick, Status.STOPPED);