Merge pull request #33 from netceler/master

Use MercurialTagAction.class to retrive Mercurial revision

Author: Antonio Mansilla

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java

@@ -77,7 +77,7 @@ private static List<BitbucketBuildStatusResource> createBuildStatusResources(fin
         if (scm instanceof GitSCM) {
             scmAdapter = new GitScmAdapter((GitSCM) scm, build);
         } else if (scm instanceof MercurialSCM) {
-            scmAdapter = new MercurialScmAdapter((MercurialSCM) scm);
+            scmAdapter = new MercurialScmAdapter((MercurialSCM) scm, build);
         } else if (scm instanceof MultiSCM) {
             scmAdapter = new MultiScmAdapter((MultiSCM)scm, build);
         } else {

src/main/java/org/jenkinsci/plugins/bitbucket/scm/MercurialScmAdapter.java

@@ -24,7 +24,9 @@
 
 package org.jenkinsci.plugins.bitbucket.scm;
 
+import hudson.model.Run;
 import hudson.plugins.mercurial.MercurialSCM;
+import hudson.plugins.mercurial.MercurialTagAction;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,9 +36,11 @@
 public class MercurialScmAdapter implements ScmAdapter {
 
     private final MercurialSCM hgSCM;
+    private final Run<?, ?> build;
 
-    public MercurialScmAdapter(MercurialSCM scm) {
+    public MercurialScmAdapter(MercurialSCM scm, Run<?, ?> build) {
         this.hgSCM = scm;
+        this.build = build;
     }
 
     public Map<String, URIish> getCommitRepoMap() throws Exception {
@@ -46,7 +50,8 @@ public Map<String, URIish> getCommitRepoMap() throws Exception {
         }
 
         HashMap<String, URIish> commitRepoMap = new HashMap<String, URIish>();
-        commitRepoMap.put(this.hgSCM.getRevision(), new URIish(this.hgSCM.getSource()));
+        MercurialTagAction action = build.getAction(MercurialTagAction.class);
+        commitRepoMap.put(action != null ? action.getId() : this.hgSCM.getRevision(), new URIish(this.hgSCM.getSource()));
 
         return commitRepoMap;
     }

src/main/java/org/jenkinsci/plugins/bitbucket/scm/MultiScmAdapter.java

@@ -57,7 +57,7 @@ public Map getCommitRepoMap() throws Exception {
             if (scm instanceof GitSCM) {
                 commitRepoMap.putAll(new GitScmAdapter((GitSCM) scm, this.build).getCommitRepoMap());
             } else if (scm instanceof MercurialSCM) {
-                commitRepoMap.putAll(new MercurialScmAdapter((MercurialSCM) scm).getCommitRepoMap());
+                commitRepoMap.putAll(new MercurialScmAdapter((MercurialSCM) scm, this.build).getCommitRepoMap());
             }
         }