Index: third_party/buildbot_8_4p1/README.chromium |
=================================================================== |
--- third_party/buildbot_8_4p1/README.chromium (revision 169692) |
+++ third_party/buildbot_8_4p1/README.chromium (working copy) |
@@ -591,39 +591,9 @@ |
return d |
-Add revision to changes in the waterfall. |
-diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_party/buildbo |
-index 415e781..a15dff8 100644 |
---- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
-+++ b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
-@@ -63,7 +63,8 @@ class ChangeBox(components.Adapter): |
- template = req.site.buildbot_service.templates.get_template("change_macros.html") |
- text = template.module.box_contents(url=url, |
- who=self.original.getShortAuthor(), |
-- pageTitle=self.original.comments) |
-+ pageTitle=self.original.comments, |
-+ revision=self.original.revision) |
- return Box([text], class_="Change") |
- components.registerAdapter(ChangeBox, Change, IBox) |
-diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html b/t |
-index b9b7780..9a37b47 100644 |
---- a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html |
-+++ b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html |
-@@ -67,6 +67,6 @@ |
- {% endif %} |
- {%- endmacro %} |
--{% macro box_contents(who, url, pageTitle) -%} |
--<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> |
-+{% macro box_contents(who, url, pageTitle, revision) -%} |
-+<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revision }} |
- {%- endmacro %} |
- |
- |
- |
- |
commit e6b9fad4373d6e55f7957ee8312d58cf0461d98c |
Author: Chase Phillips <cmp@google.com> |
Date: Mon Jul 25 10:46:54 2011 -0700 |
@@ -2727,3 +2697,52 @@ |
</tr> |
{% endfor %} |
+Add upstream patch 68a1a5da05e9761f1d283f23905cd9104e05e979 to enable |
M-A Ruel
2012/11/27 19:14:30
I prefer the format diff of lines 597-605 but with
|
+adding revision and project to the waterfall. |
+ |
+diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
+index 415e781..a15dff8 100644 |
+--- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
++++ b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
+@@ -63,7 +63,9 @@ class ChangeBox(components.Adapter): |
+ template = req.site.buildbot_service.templates.get_template("change_macros.html") |
+ text = template.module.box_contents(url=url, |
+ who=self.original.getShortAuthor(), |
+- pageTitle=self.original.comments) |
++ pageTitle=self.original.comments, |
++ revision=self.original.revision, |
++ project=self.original.project) |
+ return Box([text], class_="Change") |
+ components.registerAdapter(ChangeBox, Change, IBox) |
+ |
+ |
+diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html |
+index b9b7780..9a37b47 100644 |
+--- a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html |
++++ b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.html |
+@@ -67,6 +67,6 @@ |
+ {% endif %} |
+ {%- endmacro %} |
+ |
+-{% macro box_contents(who, url, pageTitle) -%} |
++{% macro box_contents(who, url, pageTitle, revision, project) -%} |
+ <a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> |
+ {%- endmacro %} |
+ |
+ |
+Add revision to the chromium waterfalls. |
+ |
+Index: buildbot/status/web/templates/change_macros.html |
+=================================================================== |
+--- buildbot/status/web/templates/change_macros.html (revision 167249) |
++++ buildbot/status/web/templates/change_macros.html (working copy) |
+@@ -67,6 +67,6 @@ |
+ {% endif %} |
+ {%- endmacro %} |
+ |
+ {% macro box_contents(who, url, pageTitle, revision) -%} |
+-<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> |
++<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revision }} |
+ {%- endmacro %} |
+ |
+ |