Changeset 217259 in webkit

Timestamp:

May 22, 2017, 5:29:47 PM (8 years ago)

Author:

jmarcell@apple.com

Message:

Do not enter Subversion-specific logic when parsing Git-based Trac data.
​https://bugs.webkit.org/show_bug.cgi?id=172433
<rdar://problem/32234188>

Reviewed by Alexey Proskuryakov.

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:

(Trac.prototype._convertCommitInfoElementToObject):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js

@@ -180 +180 @@
             title.firstChild.textContent = title.firstChild.textContent.substring(1);
 
+        // We have an overidden timeline.rss that adds git branches to the Trac timeline RSS output (rdar://problem/23853623).
+        var gitBranches = doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE).stringValue;
+
         var result = {
             revisionNumber: revisionNumber,
@@ -191 +194 @@
         };
 
-        if (result.containsBranchLocation) {
+        if (result.containsBranchLocation && !gitBranches) {
             console.assert(location[location.length - 1] !== "/");
             location = location += "/";
@@ -211 +214 @@
         }
 
-        var gitBranches = doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE).stringValue;
         if (gitBranches) {
             result.containsBranchLocation = true;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-22  Jason Marcell  <jmarcell@apple.com>
+
+        Do not enter Subversion-specific logic when parsing Git-based Trac data.
+        https://bugs.webkit.org/show_bug.cgi?id=172433
+        <rdar://problem/32234188>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
+        (Trac.prototype._convertCommitInfoElementToObject):
+
 2017-05-22  Tim Horton  <timothy_horton@apple.com>