Show a rebase result dialog if cherry-picking fails.

This will show a rebase result dialog if cherry-picking a commit fails.
This is the same dialog used for regular rebasing.

Bug: 443016
Change-Id: I0a88289f74913ccb47ace8ad9d59e9214ae2314a
Signed-off-by: Maik Schreiber <blizzy@blizzy.de>

1 files changed, 14 insertions, 1 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
index aa5d363f62..1fe17b63ee 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
@@ -32,6 +32,7 @@ import org.eclipse.egit.core.internal.util.ProjectUtil;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.RebaseCommand;
 import org.eclipse.jgit.api.RebaseCommand.InteractiveHandler;
+import org.eclipse.jgit.api.RebaseResult;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.IllegalTodoFileModification;
 import org.eclipse.jgit.lib.Constants;
@@ -50,6 +51,8 @@ public class CherryPickOperation implements IEGitOperation {
 
 	private List<RevCommit> commits;
 
+	private RebaseResult result;
+
 	/**
 	 * Create cherry pick operation
 	 *
@@ -106,7 +109,8 @@ public class CherryPickOperation implements IEGitOperation {
 					ObjectId headCommitId = repo.resolve(Constants.HEAD);
 					RevCommit headCommit = new RevWalk(repo)
 							.parseCommit(headCommitId);
-					git.rebase().setUpstream(headCommit.getParent(0))
+					result = git.rebase()
+							.setUpstream(headCommit.getParent(0))
 							.runInteractively(handler)
 							.setOperation(RebaseCommand.Operation.BEGIN).call();
 				} catch (GitAPIException e) {
@@ -132,4 +136,13 @@ public class CherryPickOperation implements IEGitOperation {
 	public ISchedulingRule getSchedulingRule() {
 		return RuleUtil.getRule(repo);
 	}
+
+	/**
+	 * Returns the result of the rebase operation.
+	 *
+	 * @return the rebase result
+	 */
+	public RebaseResult getResult() {
+		return result;
+	}
 }