Merge pull request waderyan#28 from dimitarnestorov/master

View button on a BitBucket repo doesn't work waderyan#26

Author: Sertion

package.json

@@ -93,6 +93,11 @@
           "minimum": 7,
           "maximum": 40
         },
+        "gitblame.isWebPathPlural": {
+          "type": "boolean",
+          "default": false,
+          "description": "BitBucket uses commits instead of commit in their web interface. Turn this on if you want the View button to work for BitBucket."
+        },
         "gitblame.logLevel": {
           "type": "array",
           "default": [

src/git/blame.ts

@@ -113,10 +113,14 @@ export class GitBlame {
         }
     }
 
-    public defaultWebPath(url: string, hash: string): string {
+    public defaultWebPath(
+        url: string,
+        hash: string,
+        isPlural: boolean,
+    ): string {
         return url.replace(
             /^(git@|https:\/\/)([^:\/]+)[:\/](.*)\.git$/,
-            `https://$2/$3/commit/${hash}`,
+            `https://$2/$3/${isPlural ? "commit" : "commits"}/${hash}`,
         );
     }
 
@@ -239,12 +243,18 @@ export class GitBlame {
             },
         );
 
+        const isWebPathPlural = Property.get(Properties.IsWebPathPlural, false);
+
         if (isWebUri(parsedUrl)) {
             return Uri.parse(parsedUrl);
         } else if (parsedUrl === "guess") {
             const origin = await this.getOriginOfActiveFile();
             if (origin) {
-                const uri = this.defaultWebPath(origin, commitInfo.hash);
+                const uri = this.defaultWebPath(
+                    origin,
+                    commitInfo.hash,
+                    isWebPathPlural,
+                );
                 return Uri.parse(uri);
             } else {
                 return;

src/util/property.ts

@@ -5,6 +5,7 @@ export enum Properties {
     IgnoreWhitespace = "ignoreWhitespace",
     InfoMessageFormat = "infoMessageFormat",
     InternalHashLength = "internalHashLength",
+    IsWebPathPlural = "isWebPathPlural",
     LogLevel = "logLevel",
     ProgressSpinner = "progressSpinner",
     StatusBarMessageFormat = "statusBarMessageFormat",
@@ -78,6 +79,9 @@ export class Property {
             internalHashLength: this.getPropertyFromConfiguration(
                 Properties.InternalHashLength,
             ),
+            isWebPathPlural: this.getPropertyFromConfiguration(
+                Properties.IsWebPathPlural,
+            ),
             logLevel: this.getPropertyFromConfiguration(
                 Properties.LogLevel,
             ),