From ba1b17c9a2048d57b440c1fadf31c1fd13f61839 Mon Sep 17 00:00:00 2001
From: kyoshidajp <claddvd@gmail.com>
Date: Sun, 28 Feb 2016 11:12:52 +0900
Subject: [PATCH 1/2] Add open on Merge Request link in brower

---
 META-INF/plugin.xml                           |   6 +
 .../actions/GitLabOpenInBrowserAction.java    | 201 +---------------
 .../GitLabOpenInBrowserBaseAction.java        | 224 ++++++++++++++++++
 ...GitLabOpenInBrowserMergeRequestAction.java | 128 ++++++++++
 4 files changed, 367 insertions(+), 192 deletions(-)
 create mode 100644 src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserBaseAction.java
 create mode 100644 src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java

diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 3ba541b..687af18 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -33,6 +33,12 @@
             <add-to-group group-id="ProjectViewPopupMenu"/>
             <add-to-group group-id="EditorTabPopupMenu"/>
         </action>
+        <action id="GitLab.Open.In.BrowserMergeRequest"
+                class="ru.trylogic.idea.gitlab.integration.actions.GitLabOpenInBrowserMergeRequestAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+            <add-to-group group-id="ProjectViewPopupMenu"/>
+            <add-to-group group-id="EditorTabPopupMenu"/>
+        </action>
 
         <!--action id="GitLab.Open.Commit.In.Browser" class="ru.trylogic.idea.gitlab.integration.actions.GitLabShowCommitInBrowserFromLogAction">
             <add-to-group group-id="Git.LogContextMenu" />
diff --git a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserAction.java b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserAction.java
index a40a2d0..1513bfb 100644
--- a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserAction.java
+++ b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserAction.java
@@ -1,57 +1,20 @@
 package ru.trylogic.idea.gitlab.integration.actions;
 
-import com.intellij.ide.BrowserUtil;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.SelectionModel;
-import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.ui.popup.ListPopup;
-import com.intellij.openapi.vcs.VcsNotifier;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.GitLocalBranch;
-import git4idea.GitRemoteBranch;
-import git4idea.GitUtil;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
-import git4idea.repo.GitRepositoryManager;
-import icons.GitlabIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import ru.trylogic.idea.gitlab.integration.utils.GitlabUrlUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class GitLabOpenInBrowserAction extends DumbAwareAction {
-
-    public static final Logger LOG = Logger.getInstance("gitlab");
-
-    public static final String CANNOT_OPEN_IN_BROWSER = "Cannot open in browser";
+public class GitLabOpenInBrowserAction extends GitLabOpenInBrowserBaseAction {
 
     protected GitLabOpenInBrowserAction() {
-        super("Open on GitLab", "Open corresponding link in browser", GitlabIcons.Gitlab_icon);
-    }
-
-    static void setVisibleEnabled(AnActionEvent e, boolean visible, boolean enabled) {
-        e.getPresentation().setVisible(visible);
-        e.getPresentation().setEnabled(enabled);
-    }
-
-    static void showError(Project project, String title, String message) {
-        showError(project, title, message, null);
-    }
-
-    static void showError(Project project, String title, String message, String debugInfo) {
-        LOG.warn(title + "; " + message);
-        if (debugInfo != null) {
-            LOG.warn(debugInfo);
-        }
-        VcsNotifier.getInstance(project).notifyError(title, message);
+        super("Open on GitLab", "Open corresponding link in browser");
     }
 
     @Nullable
@@ -81,167 +44,21 @@ static String makeUrlToOpen(@Nullable Editor editor,
         return builder.toString();
     }
 
-    @Nullable
-    public static String getBranchNameOnRemote(@NotNull Project project, @NotNull GitRepository repository) {
-        GitLocalBranch currentBranch = repository.getCurrentBranch();
-        if (currentBranch == null) {
-            showError(project, CANNOT_OPEN_IN_BROWSER,
-                    "Can't open the file on GitLab when repository is on detached HEAD. Please checkout a branch.");
-            return null;
-        }
-
-        GitRemoteBranch tracked = currentBranch.findTrackedBranch(repository);
-        if (tracked == null) {
-            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't open the file on GitLab when current branch doesn't have a tracked branch.",
-                    "Current branch: " + currentBranch + ", tracked info: " + repository.getBranchTrackInfos());
-            return null;
-        }
-
-        return tracked.getNameForRemoteOperations();
-    }
-
     @Override
-    public void update(final AnActionEvent e) {
-        Project project = e.getData(PlatformDataKeys.PROJECT);
-        VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
-        if (project == null || project.isDefault() || virtualFile == null) {
-            setVisibleEnabled(e, false, false);
-            return;
-        }
-
-        final GitRepository gitRepository = GitUtil.getRepositoryManager(project).getRepositoryForFile(virtualFile);
-        if (gitRepository == null) {
-            setVisibleEnabled(e, false, false);
-            return;
-        }
-
-        ChangeListManager changeListManager = ChangeListManager.getInstance(project);
-        if (changeListManager.isUnversioned(virtualFile)) {
-            setVisibleEnabled(e, true, false);
-            return;
-        }
-
-        Change change = changeListManager.getChange(virtualFile);
-        if (change != null && change.getType() == Change.Type.NEW) {
-            setVisibleEnabled(e, true, false);
-            return;
-        }
-
-        setVisibleEnabled(e, true, true);
+    protected AnAction remoteSelectedAction(Project project, GitRepository repository, VirtualFile virtualFile, Editor editor, GitRemote remote, String rootPath, String path) {
+        return new RemoteSelectedAction(project, repository, editor, remote, rootPath, path);
     }
-
-    @Override
-    public void actionPerformed(final AnActionEvent e) {
-        final Project project = e.getData(PlatformDataKeys.PROJECT);
-        final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
-        final Editor editor = e.getData(PlatformDataKeys.EDITOR);
-        if (virtualFile == null || project == null || project.isDisposed()) {
-            return;
-        }
-
-        GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
-        final GitRepository repository = manager.getRepositoryForFile(virtualFile);
-        if (repository == null) {
-            StringBuilder details = new StringBuilder("file: " + virtualFile.getPresentableUrl() + "; Git repositories: ");
-            for (GitRepository repo : manager.getRepositories()) {
-                details.append(repo.getPresentableUrl()).append("; ");
-            }
-            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't find git repository", details.toString());
-            return;
-        }
-
-        final String rootPath = repository.getRoot().getPath();
-        final String path = virtualFile.getPath();
-
-        List<AnAction> remoteSelectedActions = new ArrayList<AnAction>();
-
-        for (GitRemote remote : repository.getRemotes()) {
-            remoteSelectedActions.add(new RemoteSelectedAction(project, repository, editor, remote, rootPath, path));
-        }
-
-        if (remoteSelectedActions.size() > 1) {
-            DefaultActionGroup remotesActionGroup = new DefaultActionGroup();
-            remotesActionGroup.addAll(remoteSelectedActions);
-            DataContext dataContext = e.getDataContext();
-            final ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
-                            "Select remote",
-                            remotesActionGroup,
-                            dataContext,
-                            JBPopupFactory.ActionSelectionAid.SPEEDSEARCH,
-                            true);
-
-            popup.showInBestPositionFor(dataContext);
-        } else if (remoteSelectedActions.size() == 1) {
-            remoteSelectedActions.get(0).actionPerformed(null);
-        } else {
-            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't find gitlab remote");
-        }
-    }
-
-
 }
 
-class RemoteSelectedAction extends AnAction {
-
-    private final Editor editor;
-
-    private final GitRemote remote;
-
-    private final String rootPath;
-
-    private final String path;
-
-    private final Project project;
-
-    private final GitRepository repository;
+class RemoteSelectedAction extends RemoteSelectedBaseAction {
 
     public RemoteSelectedAction(@NotNull Project project, @NotNull GitRepository repository, @Nullable Editor editor,
                                 @NotNull GitRemote remote, @NotNull String rootPath, @NotNull String path) {
-        super(remote.getName());
-        this.project = project;
-        this.repository = repository;
-        this.editor = editor;
-        this.remote = remote;
-        this.rootPath = rootPath;
-        this.path = path;
-    }
-
-    @Override
-    public void update(AnActionEvent e) {
-        super.update(e);
-        setEnabledInModalContext(true);
-        e.getPresentation().setEnabled(true);
+        super(project, repository, editor, remote, rootPath, path);
     }
 
     @Override
-    public void actionPerformed(@Nullable AnActionEvent unused) {
-        if (!path.startsWith(rootPath)) {
-            GitLabOpenInBrowserAction.showError(project, GitLabOpenInBrowserAction.CANNOT_OPEN_IN_BROWSER,
-                    "File is not under repository root", "Root: " + rootPath + ", file: " + path);
-            return;
-        }
-
-        String branch = GitLabOpenInBrowserAction.getBranchNameOnRemote(project, repository);
-        if (branch == null) {
-            return;
-        }
-
-        String remoteUrl = remote.getFirstUrl();
-
-        if (remoteUrl == null) {
-            GitLabOpenInBrowserAction.showError(project, GitLabOpenInBrowserAction.CANNOT_OPEN_IN_BROWSER,
-                    "Can't obtain url for remote", remote.getName());
-            return;
-        }
-
-        String relativePath = path.substring(rootPath.length());
-        String urlToOpen = GitLabOpenInBrowserAction.makeUrlToOpen(editor, relativePath, branch, remoteUrl);
-        if (urlToOpen == null) {
-            GitLabOpenInBrowserAction.showError(project, GitLabOpenInBrowserAction.CANNOT_OPEN_IN_BROWSER,
-                    "Can't create properly url", remote.getFirstUrl());
-            return;
-        }
-
-        BrowserUtil.launchBrowser(urlToOpen);
+    protected String makeUrlToOpen(String relativePath, String branch, String remoteUrl) {
+        return GitLabOpenInBrowserAction.makeUrlToOpen(editor, relativePath, branch, remoteUrl);
     }
 }
\ No newline at end of file
diff --git a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserBaseAction.java b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserBaseAction.java
new file mode 100644
index 0000000..1a1d8cd
--- /dev/null
+++ b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserBaseAction.java
@@ -0,0 +1,224 @@
+package ru.trylogic.idea.gitlab.integration.actions;
+
+import com.intellij.ide.BrowserUtil;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.DumbAwareAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.vcs.VcsNotifier;
+import com.intellij.openapi.vcs.changes.Change;
+import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vfs.VirtualFile;
+import git4idea.GitLocalBranch;
+import git4idea.GitRemoteBranch;
+import git4idea.GitUtil;
+import git4idea.repo.GitRemote;
+import git4idea.repo.GitRepository;
+import git4idea.repo.GitRepositoryManager;
+import icons.GitlabIcons;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GitLabOpenInBrowserBaseAction extends DumbAwareAction {
+
+    public static final Logger LOG = Logger.getInstance("gitlab");
+
+    public static final String CANNOT_OPEN_IN_BROWSER = "Cannot open in browser";
+
+    protected GitLabOpenInBrowserBaseAction(@Nullable String text, @Nullable String description) {
+        super(text, description, GitlabIcons.Gitlab_icon);
+    }
+
+    static void setVisibleEnabled(AnActionEvent e, boolean visible, boolean enabled) {
+        e.getPresentation().setVisible(visible);
+        e.getPresentation().setEnabled(enabled);
+    }
+
+    static void showError(Project project, String title, String message) {
+        showError(project, title, message, null);
+    }
+
+    static void showError(Project project, String title, String message, String debugInfo) {
+        LOG.warn(title + "; " + message);
+        if (debugInfo != null) {
+            LOG.warn(debugInfo);
+        }
+        VcsNotifier.getInstance(project).notifyError(title, message);
+    }
+
+    @Nullable
+    public static String getBranchNameOnRemote(@NotNull Project project, @NotNull GitRepository repository) {
+        GitLocalBranch currentBranch = repository.getCurrentBranch();
+        if (currentBranch == null) {
+            showError(project, CANNOT_OPEN_IN_BROWSER,
+                    "Can't open the file on GitLab when repository is on detached HEAD. Please checkout a branch.");
+            return null;
+        }
+
+        GitRemoteBranch tracked = currentBranch.findTrackedBranch(repository);
+        if (tracked == null) {
+            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't open the file on GitLab when current branch doesn't have a tracked branch.",
+                    "Current branch: " + currentBranch + ", tracked info: " + repository.getBranchTrackInfos());
+            return null;
+        }
+
+        return tracked.getNameForRemoteOperations();
+    }
+
+    @Override
+    public void update(final AnActionEvent e) {
+        Project project = e.getData(PlatformDataKeys.PROJECT);
+        VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+        if (project == null || project.isDefault() || virtualFile == null) {
+            setVisibleEnabled(e, false, false);
+            return;
+        }
+
+        final GitRepository gitRepository = GitUtil.getRepositoryManager(project).getRepositoryForFile(virtualFile);
+        if (gitRepository == null) {
+            setVisibleEnabled(e, false, false);
+            return;
+        }
+
+        ChangeListManager changeListManager = ChangeListManager.getInstance(project);
+        if (changeListManager.isUnversioned(virtualFile)) {
+            setVisibleEnabled(e, true, false);
+            return;
+        }
+
+        Change change = changeListManager.getChange(virtualFile);
+        if (change != null && change.getType() == Change.Type.NEW) {
+            setVisibleEnabled(e, true, false);
+            return;
+        }
+
+        setVisibleEnabled(e, true, true);
+    }
+
+    @Override
+    public void actionPerformed(final AnActionEvent e) {
+        final Project project = e.getData(PlatformDataKeys.PROJECT);
+        final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+        final Editor editor = e.getData(PlatformDataKeys.EDITOR);
+        if (virtualFile == null || project == null || project.isDisposed()) {
+            return;
+        }
+
+        GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
+        final GitRepository repository = manager.getRepositoryForFile(virtualFile);
+        if (repository == null) {
+            StringBuilder details = new StringBuilder("file: " + virtualFile.getPresentableUrl() + "; Git repositories: ");
+            for (GitRepository repo : manager.getRepositories()) {
+                details.append(repo.getPresentableUrl()).append("; ");
+            }
+            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't find git repository", details.toString());
+            return;
+        }
+
+        final String rootPath = repository.getRoot().getPath();
+        final String path = virtualFile.getPath();
+
+        List<AnAction> remoteSelectedActions = new ArrayList<AnAction>();
+
+        for (GitRemote remote : repository.getRemotes()) {
+            remoteSelectedActions.add(remoteSelectedAction(project, repository, virtualFile, editor, remote, rootPath, path));
+        }
+
+        if (remoteSelectedActions.size() > 1) {
+            DefaultActionGroup remotesActionGroup = new DefaultActionGroup();
+            remotesActionGroup.addAll(remoteSelectedActions);
+            DataContext dataContext = e.getDataContext();
+            final ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
+                    "Select remote",
+                    remotesActionGroup,
+                    dataContext,
+                    JBPopupFactory.ActionSelectionAid.SPEEDSEARCH,
+                    true);
+
+            popup.showInBestPositionFor(dataContext);
+        } else if (remoteSelectedActions.size() == 1) {
+            remoteSelectedActions.get(0).actionPerformed(null);
+        } else {
+            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't find gitlab remote");
+        }
+    }
+
+    protected AnAction remoteSelectedAction(Project project, GitRepository repository, VirtualFile virtualFile, Editor editor, GitRemote remote, String rootPath, String path) {
+        return null;
+    }
+}
+
+class RemoteSelectedBaseAction extends AnAction {
+
+    protected final Editor editor;
+
+    protected final GitRemote remote;
+
+    protected final String rootPath;
+
+    protected final String path;
+
+    protected final Project project;
+
+    protected final GitRepository repository;
+
+    public RemoteSelectedBaseAction(@NotNull Project project, @NotNull GitRepository repository, @Nullable Editor editor,
+                                    @NotNull GitRemote remote, @NotNull String rootPath, @NotNull String path) {
+        super(remote.getName());
+        this.project = project;
+        this.repository = repository;
+        this.editor = editor;
+        this.remote = remote;
+        this.rootPath = rootPath;
+        this.path = path;
+    }
+
+    @Override
+    public void update(AnActionEvent e) {
+        super.update(e);
+        setEnabledInModalContext(true);
+        e.getPresentation().setEnabled(true);
+    }
+
+    @Override
+    public void actionPerformed(@Nullable AnActionEvent e) {
+        if (!path.startsWith(rootPath)) {
+            GitLabOpenInBrowserBaseAction.showError(project, GitLabOpenInBrowserAction.CANNOT_OPEN_IN_BROWSER,
+                    "File is not under repository root", "Root: " + rootPath + ", file: " + path);
+            return;
+        }
+
+        String branch = GitLabOpenInBrowserBaseAction.getBranchNameOnRemote(project, repository);
+        if (branch == null) {
+            return;
+        }
+
+        String remoteUrl = remote.getFirstUrl();
+
+        if (remoteUrl == null) {
+            GitLabOpenInBrowserBaseAction.showError(project, GitLabOpenInBrowserBaseAction.CANNOT_OPEN_IN_BROWSER,
+                    "Can't obtain url for remote", remote.getName());
+            return;
+        }
+
+        String relativePath = path.substring(rootPath.length());
+        String urlToOpen = makeUrlToOpen(relativePath, branch, remoteUrl);
+        if (urlToOpen == null) {
+            GitLabOpenInBrowserBaseAction.showError(project, GitLabOpenInBrowserBaseAction.CANNOT_OPEN_IN_BROWSER,
+                    "Can't create properly url", remote.getFirstUrl());
+            return;
+        }
+
+        BrowserUtil.launchBrowser(urlToOpen);
+    }
+
+    protected String makeUrlToOpen(String relativePath, String branch, String remoteUrl) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java
new file mode 100644
index 0000000..a92a731
--- /dev/null
+++ b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java
@@ -0,0 +1,128 @@
+package ru.trylogic.idea.gitlab.integration.actions;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.SelectionModel;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vcs.VcsException;
+import com.intellij.openapi.vcs.annotate.FileAnnotation;
+import com.intellij.openapi.vfs.VirtualFile;
+import git4idea.GitRevisionNumber;
+import git4idea.annotate.GitAnnotationProvider;
+import git4idea.commands.Git;
+import git4idea.commands.GitCommand;
+import git4idea.commands.GitCommandResult;
+import git4idea.commands.GitLineHandler;
+import git4idea.repo.GitRemote;
+import git4idea.repo.GitRepository;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import ru.trylogic.idea.gitlab.integration.utils.GitlabUrlUtil;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GitLabOpenInBrowserMergeRequestAction extends GitLabOpenInBrowserBaseAction {
+
+    protected GitLabOpenInBrowserMergeRequestAction() {
+        super("Open on GitLab(Merge Request)", "Open corresponding Merge Request link in browser");
+    }
+
+    static String getMergeRequestId(Project project, GitRepository repository, String commitId) {
+        String mergeCommitId = getMergeCommitId(project, repository, commitId);
+        GitLineHandler handler = new GitLineHandler(project, repository.getRoot(), GitCommand.LOG);
+        handler.addParameters("-l");
+        handler.addParameters("--format=%B");
+        handler.addParameters(mergeCommitId);
+        Git git = ServiceManager.getService(project, Git.class);
+        GitCommandResult result = git.runCommand(handler);
+        Pattern p = Pattern.compile("See merge request !([0-9]*)");
+        for (String line: result.getOutput()) {
+            Matcher m = p.matcher(line);
+            if (m.find()) {
+                return m.group(1);
+            }
+        }
+
+        showError(project, CANNOT_OPEN_IN_BROWSER, "Can't open the Merge Request page on GitLab when commit id doesn't found at git-log.",
+                  "Commit id: " + commitId);
+        return null;
+    }
+
+    static String getMergeCommitId(Project project, GitRepository repository, String commitId) {
+        String branch = getBranchNameOnRemote(project, repository);
+        GitLineHandler ancestryPathHandler = new GitLineHandler(project, repository.getRoot(), GitCommand.REV_LIST);
+        ancestryPathHandler.addParameters("--ancestry-path");
+        ancestryPathHandler.addParameters(commitId + ".." + branch);
+        Git git = ServiceManager.getService(project, Git.class);
+        List<String> ancestryPathResult = git.runCommand(ancestryPathHandler).getOutput();
+
+        GitLineHandler firstParentHandler = new GitLineHandler(project, repository.getRoot(), GitCommand.REV_LIST);
+        firstParentHandler.addParameters("--first-parent");
+        firstParentHandler.addParameters(commitId + ".." + branch);
+        List<String>  firstParentResult = git.runCommand(firstParentHandler).getOutput();
+
+        ancestryPathResult.retainAll(new HashSet<String>(firstParentResult));
+        return ancestryPathResult.get(ancestryPathResult.size() - 1);
+    }
+
+    static String getCurrentLineRevisionNumber(Project project, VirtualFile virtualFile, Editor editor) {
+        GitAnnotationProvider annotationProvider = new GitAnnotationProvider(project);
+        FileAnnotation fileAnnotation = null;
+        try {
+            fileAnnotation = annotationProvider.annotate(virtualFile);
+        } catch (VcsException e1) {
+            e1.printStackTrace();
+        }
+
+        SelectionModel selectionModel = editor.getSelectionModel();
+        final int lineNumber = editor.getDocument().getLineNumber(selectionModel.getSelectionStart());
+        final GitRevisionNumber gitRev = new GitRevisionNumber(fileAnnotation.getLineRevisionNumber(lineNumber).toString());
+        return gitRev.getRev();
+    }
+
+    @Nullable
+    static String makeUrlToOpen(@NotNull Project project,
+                                @NotNull String remoteUrl,
+                                @NotNull VirtualFile virtualFile,
+                                @Nullable Editor editor,
+                                @NotNull GitRepository repository) {
+        final String commitId = getCurrentLineRevisionNumber(project, virtualFile, editor);
+        final String mergeRequestId = getMergeRequestId(project, repository, commitId);
+        if (mergeRequestId == null) {
+            return null;
+        }
+        final StringBuilder builder = new StringBuilder();
+        final String repoUrl = GitlabUrlUtil.makeRepoUrlFromRemoteUrl(remoteUrl);
+        if (repoUrl == null) {
+            return null;
+        }
+        builder.append(repoUrl).append("/merge_requests/").append(mergeRequestId);
+        return builder.toString();
+    }
+
+    @Override
+    protected AnAction remoteSelectedAction(Project project, GitRepository repository, VirtualFile virtualFile, Editor editor, GitRemote remote, String rootPath, String path) {
+        return new RemoteSelectedMergeRequestAction(project, repository, editor, remote, rootPath, path, virtualFile);
+    }
+}
+
+class RemoteSelectedMergeRequestAction extends RemoteSelectedBaseAction {
+
+    private final VirtualFile virtualFile;
+
+    public RemoteSelectedMergeRequestAction(@NotNull Project project, @NotNull GitRepository repository, @Nullable Editor editor,
+                                            @NotNull GitRemote remote, @NotNull String rootPath, @NotNull String path,
+                                            @NotNull VirtualFile virtualFile) {
+        super(project, repository, editor, remote, rootPath, path);
+        this.virtualFile = virtualFile;
+    }
+
+    @Override
+    protected String makeUrlToOpen(String relativePath, String branch, String remoteUrl) {
+        return GitLabOpenInBrowserMergeRequestAction.makeUrlToOpen(project, remoteUrl, virtualFile, editor, repository);
+    }
+}

From e4e6eeeb86f5fbc2e391900e74850d846e7c62e0 Mon Sep 17 00:00:00 2001
From: kyoshidajp <claddvd@gmail.com>
Date: Sun, 28 Feb 2016 18:49:15 +0900
Subject: [PATCH 2/2] Change printStackTrace() to showError()

---
 .../actions/GitLabOpenInBrowserMergeRequestAction.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java
index a92a731..3f83cb8 100644
--- a/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java
+++ b/src/ru/trylogic/idea/gitlab/integration/actions/GitLabOpenInBrowserMergeRequestAction.java
@@ -69,13 +69,15 @@ static String getMergeCommitId(Project project, GitRepository repository, String
         return ancestryPathResult.get(ancestryPathResult.size() - 1);
     }
 
+    @Nullable
     static String getCurrentLineRevisionNumber(Project project, VirtualFile virtualFile, Editor editor) {
         GitAnnotationProvider annotationProvider = new GitAnnotationProvider(project);
-        FileAnnotation fileAnnotation = null;
+        FileAnnotation fileAnnotation;
         try {
             fileAnnotation = annotationProvider.annotate(virtualFile);
-        } catch (VcsException e1) {
-            e1.printStackTrace();
+        } catch (VcsException e) {
+            showError(project, CANNOT_OPEN_IN_BROWSER, "Can't open the Merge Request page on GitLab due to the exception: " + e);
+            return null;
         }
 
         SelectionModel selectionModel = editor.getSelectionModel();