From 9a0f6442d6aca106fa6b05a8c50d1cfbbd6ee950 Mon Sep 17 00:00:00 2001 From: "ap@apple.com" Date: Sun, 4 Oct 2015 17:49:08 +0000 Subject: [PATCH] Support Trac 1.0.x XML timeline link format https://bugs.webkit.org/show_bug.cgi?id=149786 Reviewed by Lucas Forschler. * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js: (Trac.prototype._convertCommitInfoElementToObject): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190550 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .../public_html/dashboard/Scripts/Trac.js | 9 ++++++++- Tools/ChangeLog | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js index 8321668..77bad79 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js @@ -90,7 +90,14 @@ Trac.prototype = { _convertCommitInfoElementToObject: function(doc, commitElement) { var link = doc.evaluate("./link", commitElement, null, XPathResult.STRING_TYPE).stringValue; - var revisionNumber = parseInt(/\d+$/.exec(link)) + + // There are multiple link formats for Trac that we support: + // https://trac.webkit.org/changeset/190497 + // http://trac.foobar.com/repository/changeset/75388/project + var linkComponents = link.split("/"); + var revisionNumber = parseInt(linkComponents.pop()); + if (!revisionNumber) + var revisionNumber = parseInt(linkComponents.pop()); function tracNSResolver(prefix) { diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 95b0d5d..7a23e29 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,5 +1,15 @@ 2015-10-04 Alexey Proskuryakov + Support Trac 1.0.x XML timeline link format + https://bugs.webkit.org/show_bug.cgi?id=149786 + + Reviewed by Lucas Forschler. + + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js: + (Trac.prototype._convertCommitInfoElementToObject): + +2015-10-04 Alexey Proskuryakov + Fix some errors on bot watcher's dashboard https://bugs.webkit.org/show_bug.cgi?id=149789 -- 1.8.3.1