Hash of merged commit (only available for merged-event) #75

Author: tomasbjerre

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Changelog of Pull Request Notifier for Stash.
 
+## 1.33
+* New variables
+ * ${PULL_REQUEST_MERGE_COMMIT} Hash of merged commit (only available for merged-event).
+
 ## 1.32
 * New variables
  * ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.

README.md

@@ -58,6 +58,7 @@ The filter text as well as the URL support variables. These are:
 * ${PULL_REQUEST_AUTHOR_ID} Example: 1
 * ${PULL_REQUEST_AUTHOR_NAME} Example: admin
 * ${PULL_REQUEST_AUTHOR_SLUG} Example: admin
+* ${PULL_REQUEST_MERGE_COMMIT} Hash of merged commit (only available for merged-event).
 * ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.
 * ${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT} Number of participants that approved the PR.
 * ${PULL_REQUEST_FROM_SSH_CLONE_URL} Example: ssh://git@localhost:7999/project_1/rep_1

src/main/java/se/bjurr/prnfs/listener/PrnfsPullRequestEventListener.java

@@ -13,6 +13,7 @@
 import static se.bjurr.prnfs.admin.AdminFormValues.TRIGGER_IF_MERGE.NOT_CONFLICTING;
 import static se.bjurr.prnfs.listener.PrnfsPullRequestAction.fromPullRequestEvent;
 import static se.bjurr.prnfs.listener.PrnfsRenderer.PrnfsVariable.PULL_REQUEST_COMMENT_TEXT;
+import static se.bjurr.prnfs.listener.PrnfsRenderer.PrnfsVariable.PULL_REQUEST_MERGE_COMMIT;
 import static se.bjurr.prnfs.listener.UrlInvoker.urlInvoker;
 import static se.bjurr.prnfs.settings.SettingsStorage.getPrnfsSettings;
 
@@ -142,7 +143,15 @@ public String get() {
        return ((PullRequestCommentAddedEvent) pullRequestEvent).getComment().getText();
       }
      });
+    } else if (pullRequestEvent instanceof PullRequestMergedEvent) {
+     variables.put(PULL_REQUEST_MERGE_COMMIT, new Supplier<String>() {
+      @Override
+      public String get() {
+       return ((PullRequestMergedEvent) pullRequestEvent).getCommit().getId();
+      }
+     });
     }
+
     PrnfsRenderer renderer = new PrnfsRenderer(pullRequestEvent.getPullRequest(), action, pullRequestEvent.getUser(),
       repositoryService, propertiesService, notification, variables);
     notify(notification, action, pullRequestEvent.getPullRequest(), variables, renderer);

src/main/java/se/bjurr/prnfs/listener/PrnfsRenderer.java

@@ -258,6 +258,13 @@ public String resolve(PullRequest pullRequest, PrnfsPullRequestAction prnfsPullR
      PrnfsNotification prnfsNotification, Map<PrnfsRenderer.PrnfsVariable, Supplier<String>> variables) {
     return getOrEmpty(variables, PULL_REQUEST_COMMENT_TEXT);
    }
+  }), PULL_REQUEST_MERGE_COMMIT(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfsPullRequestAction prnfsPullRequestAction, StashUser stashUser,
+     RepositoryService repositoryService, ApplicationPropertiesService propertiesService,
+     PrnfsNotification prnfsNotification, Map<PrnfsRenderer.PrnfsVariable, Supplier<String>> variables) {
+    return getOrEmpty(variables, PULL_REQUEST_MERGE_COMMIT);
+   }
   }), PULL_REQUEST_USER_DISPLAY_NAME(new Resolver() {
    @Override
    public String resolve(PullRequest pullRequest, PrnfsPullRequestAction prnfsPullRequestAction, StashUser stashUser,
@@ -350,7 +357,7 @@ public String resolve(PullRequest pullRequest, PrnfsPullRequestAction pullReques
     return Integer.toString(newArrayList(filter(pullRequest.getParticipants(), isApproved)).size());
    }
   });
-  ;
+
   private static final Predicate<PullRequestParticipant> isApproved = new Predicate<PullRequestParticipant>() {
    @Override
    public boolean apply(PullRequestParticipant input) {

src/main/resources/admin.vm

@@ -58,6 +58,7 @@
         <li><b>${PULL_REQUEST_AUTHOR_SLUG}</b> Example: admin</li>
         <li><b>${PULL_REQUEST_REVIEWERS_APPROVED_COUNT}</b> Number of reviewers that approved the PR.</li>
         <li><b>${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT}</b> Number of participants that approved the PR.</li>
+        <li><b>${PULL_REQUEST_MERGE_COMMIT}</b> Hash of merged commit (only available for merged-event).</li>
         <li><b>${PULL_REQUEST_FROM_SSH_CLONE_URL}</b> Example: ssh://git@localhost:7999/project_1/rep_1</li>
         <li><b>${PULL_REQUEST_FROM_HTTP_CLONE_URL}</b> Example: http://admin@localhost:7990/stash/scm/project_1/rep_1.git</li>
         <li><b>${PULL_REQUEST_FROM_HASH}</b> Example: 6053a1eaa1c009dd11092d09a72f3c41af1b59ad</li>