From c0ab924f25949e6ca731518c4f94f4a54064470c Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Sun, 6 Nov 2016 01:15:26 -0400
Subject: [PATCH] Adjust message formatters

---
 master.cfg | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/master.cfg b/master.cfg
index 6f03f0b..a9c308c 100644
--- a/master.cfg
+++ b/master.cfg
@@ -254,7 +254,7 @@ subsequent commits are made after X, by different people."""
 def MessageGDBTesters (mode, name, build, results, master_status):
     """This function is responsible for composing the message that will be
 send to the gdb-testers mailing list."""
-    git_url = "http://gdb-build.sergiodj.net/cgit"
+    res_url = "http://gdb-build.sergiodj.net/cgit"
     branch = build.getSourceStamps ()[0].branch
     cur_change = build.getSourceStamps ()[0].changes[0]
     properties = build.getProperties ()
@@ -297,13 +297,16 @@ send to the gdb-testers mailing list."""
 
     # URL to find more info about what went wrong.
     text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n"
-    for ss in ss_list:
-        commit_id = get_builder_commit_id (name, ss.revision, ss.branch)
-        if commit_id:
-            text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name, quote (ss.branch),
-                                                           commit_id)
-        else:
-            text += "\t<Error fetching commit ID for %s>\n" % ss.revision
+    text += "\t<%s/%s/%s/%s/>\n" % (res_url, name, sourcestamp.revision[:2],
+                                    sourcestamp.revision)
+
+    # for ss in ss_list:
+    #     commit_id = get_builder_commit_id (name, ss.revision, ss.branch)
+    #     if commit_id:
+    #         text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name, quote (ss.branch),
+    #                                                        commit_id)
+    #     else:
+    #         text += "\t<Error fetching commit ID for %s>\n" % ss.revision
 
     # Including the 'regressions' log.  This is the 'diff' of what
     # went wrong.
@@ -411,7 +414,7 @@ send to the gdb-testers mailing list."""
 def MessageGDBTestersTryBuild (mode, name, build, results, master_status):
     """This function is responsible for composing the message that will be
 send to the gdb-testers mailing list."""
-    git_url = "http://gdb-build.sergiodj.net/cgit"
+    res_url = "http://gdb-build.sergiodj.net/results"
     branch = build.getSourceStamps ()[0].branch
     sourcestamp = build.getSourceStamps ()[0]
     cur_change = sourcestamp.patch[1]
@@ -444,14 +447,17 @@ send to the gdb-testers mailing list."""
 
     # URL to find more info about what went wrong.
     text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n"
-    commit_id = get_builder_commit_id (name, sourcestamp.revision,
-                                       sourcestamp.branch)
-    if commit_id:
-        text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name,
-                                                       quote (sourcestamp.branch),
-                                                       commit_id)
-    else:
-        text += "\t<Error fetching commit ID for %s>\n" % sourcestamp.revision
+    text += "\t<%s/%s/%s/%s/>\n" % (res_url, name, sourcestamp.revision[:2],
+                                    sourcestamp.revision)
+
+    # commit_id = get_builder_commit_id (name, sourcestamp.revision,
+    #                                    sourcestamp.branch)
+    # if commit_id:
+    #     text += "\t<%s/%s/.git/tree/?h=%s&id=%s>\n" % (git_url, name,
+    #                                                    quote (sourcestamp.branch),
+    #                                                    commit_id)
+    # else:
+    #     text += "\t<Error fetching commit ID for %s>\n" % sourcestamp.revision
 
     # found_regressions will be True if the 'regressions' log is not
     # empty.