From 0d8a1bcbeae52070644483b4a4f817279d6dff38 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 6 Jul 2015 21:05:43 +0200 Subject: [PATCH] Always supply repository to the compare input Bug: 471293 Change-Id: I1b47862e261ee5ed03b840278e300cbc5cc3d24f Signed-off-by: Andrey Loskutov --- .../egit/ui/internal/history/command/CompareVersionsHandler.java | 3 ++- .../org/eclipse/egit/ui/internal/merge/GitCompareEditorInput.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareVersionsHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareVersionsHandler.java index d6c2003d7..fcc0e398b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareVersionsHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareVersionsHandler.java @@ -60,7 +60,8 @@ public class CompareVersionsHandler extends AbstractHistoryCommandHandler { commit2Path, repo, workBenchPage); } else if (input instanceof IResource) { GitCompareEditorInput compareInput = new GitCompareEditorInput( - commit1.name(), commit2.name(), (IResource) input); + commit1.name(), commit2.name(), repo, + (IResource) input); CompareUtils.openInCompare(workBenchPage, compareInput); } else if (input == null) { GitCompareEditorInput compareInput = new GitCompareEditorInput( diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitCompareEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitCompareEditorInput.java index be171b86e..d7b04a46b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitCompareEditorInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitCompareEditorInput.java @@ -79,12 +79,15 @@ public class GitCompareEditorInput extends CompareEditorInput { * @param baseVersion * (shown on the right side in compare); currently only commit * IDs are supported + * @param repository + * repository where resources are coming from * @param resources * as selected by the user */ public GitCompareEditorInput(String compareVersion, String baseVersion, - IResource... resources) { + Repository repository, IResource... resources) { super(new CompareConfiguration()); + this.repository = repository; this.resources = convertResourceInput(resources); this.baseVersion = baseVersion; this.compareVersion = compareVersion; -- 2.11.4.GIT