Add Bitbucket PR support (#88)

Author: jwulf

package.json

@@ -3,7 +3,7 @@
   "displayName": "Open in GitHub / Bitbucket / Gitlab / VisualStudio.com !",
   "description": "Jump to a source code line in Github / Bitbucket / Gitlab / VisualStudio.com !",
   "icon": "images/icon_200.png",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "publisher": "ziyasal",
   "license": "SEE LICENSE IN LICENSE.md",
   "galleryBanner": {
@@ -84,6 +84,12 @@
               "http"
           ],
           "description": "Specify the provider protocol for custom sites or Github enterprise"
+        },
+        "openInGitHub.defaultPullRequestBranch": {
+          "type": "string",
+          "default": "integration",
+          "description": "Specify the default destination branch for pull requests"
+
         }
       }
     },

src/extension.js

@@ -34,58 +34,58 @@ function getGitProviderLink(cb, fileFsPath, lines, pr) {
                     provider = null,
                     remoteName;
 
-                var branch = 'master';
-
-                // Check to see if the branch has a configured remote
-                configuredBranch = config[`branch "${branch}"`];
-
-                if (configuredBranch) {
-                    // Use the current branch's configured remote
-                    remoteName = configuredBranch.remote;
-                    rawUri = config[`remote "${remoteName}"`].url;
-                } else {
-                    const remotes = Object.keys(config).filter(k => k.startsWith('remote '));
-                    if (remotes.length > 0) {
-                        rawUri = config[remotes[0]].url;
+                gitRev.branch(repoDir, function (branchErr, branch) {
+                    // Check to see if the branch has a configured remote
+                    configuredBranch = config[`branch "${branch}"`];
+
+                    if (configuredBranch) {
+                        // Use the current branch's configured remote
+                        remoteName = configuredBranch.remote;
+                        rawUri = config[`remote "${remoteName}"`].url;
+                    } else {
+                        const remotes = Object.keys(config).filter(k => k.startsWith('remote '));
+                        if (remotes.length > 0) {
+                            rawUri = config[remotes[0]].url;
+                        }
                     }
-                }
-
-                if (!rawUri) {
-                    Window.showWarningMessage(`No remote found on branch.`);
-                    return;
-                }
-
-                try {
-                    provider = gitProvider(rawUri, sha);
-                } catch (e) {
-                    let errmsg = e.toString();
-                    Window.showWarningMessage(`Unknown Git provider. ${errmsg}`);
-                    return;
-                }
 
-                let formattedFilePath = path.relative(repoDir, fileFsPath).replace(/\\/g, '/');
-                formattedFilePath = formattedFilePath.replace(/\s{1}/g, '%20');
-
-                let subdir = repoDir !== fileFsPath ? '/' + formattedFilePath : '';
+                    if (!rawUri) {
+                        Window.showWarningMessage(`No remote found on branch.`);
+                        return;
+                    }
 
-                if (pr) {
                     try {
-                        cb(provider.prUrl(branch));
+                        provider = gitProvider(rawUri, sha);
                     } catch (e) {
-                        Window.showWarningMessage(e.toString());
+                        let errmsg = e.toString();
+                        Window.showWarningMessage(`Unknown Git provider. ${errmsg}`);
                         return;
                     }
-                } else {
-                    if (lines) {
-                        if (lines[0] == lines[1]) {
-                            cb(provider.webUrl(sha, subdir, lines[0]));
-                        } else {
-                            cb(provider.webUrl(sha, subdir, lines[0], lines[1]));
+
+                    let formattedFilePath = path.relative(repoDir, fileFsPath).replace(/\\/g, '/');
+                    formattedFilePath = formattedFilePath.replace(/\s{1}/g, '%20');
+
+                    let subdir = repoDir !== fileFsPath ? '/' + formattedFilePath : '';
+
+                    if (pr) {
+                        try {
+                            cb(provider.prUrl(branch));
+                        } catch (e) {
+                            Window.showWarningMessage(e.toString());
+                            return;
                         }
                     } else {
-                        cb(provider.webUrl(sha, subdir));
+                        if (lines) {
+                            if (lines[0] == lines[1]) {
+                                cb(provider.webUrl(sha, subdir, lines[0]));
+                            } else {
+                                cb(provider.webUrl(sha, subdir, lines[0], lines[1]));
+                            }
+                        } else {
+                            cb(provider.webUrl(sha, subdir));
+                        }
                     }
-                }
+                });
             });
         });
 }

src/gitProvider.js

@@ -55,7 +55,10 @@ class Bitbucket extends BaseProvider {
         return `${this.baseUrl}/src/${this.sha}` + (filePath ? `${filePath}` : '') + (line ? `#${fileName}-${line}` : '');
     }
     prUrl(branch) {
-        return `${this.baseUrl}/pull-requests/new?source=${branch}`;
+        const repo = this.baseUrl.replace(`${providerProtocol}://bitbucket.org/`, '')
+        return `${this.baseUrl}/pull-requests/new?source=${repo}%3A%3A${branch}&dest=${repo}%3A%3Aintegration`;
+        // looks like this:
+        // https://bitbucket.org/${org/repo}/pull-requests/new?source=${org/repo}%3A%3A${branch}&dest=${org/repo}%3A%3A${destBranch}
     }
 }
 
@@ -68,7 +71,7 @@ class GitLab extends BaseProvider {
     }
     prUrl(branch) {
         //https://docs.gitlab.com/ee/api/merge_requests.html#create-mr
-        //`${this.baseUrl}/merge-requests/new?source_branch=${branch}&target_branch=${????}&title=${????}`
+        //`${this.baseUrl}/pull-requests/new?source_branch=${branch}&target_branch=${????}&title=${????}`
         throw new Error(`Doesn't support Merge Request from URL in GitLab yet`);
     }
 }
@@ -99,6 +102,7 @@ class VisualStudio extends BaseProvider {
 const gitHubDomain = workspace.getConfiguration('openInGitHub').get('gitHubDomain', 'github.com');
 const providerType = workspace.getConfiguration('openInGitHub').get('providerType', 'unknown');
 const providerProtocol = workspace.getConfiguration('openInGitHub').get('providerProtocol', 'https');
+const defaultPrBranch = workspace.getConfiguration('openInGitHub').get('defaultPullRequestBranch', 'integration')
 
 const providers = {
     [gitHubDomain]: GitHub,