OLD | NEW |
---|---|
1 URL: http://buildbot.net/trac | 1 URL: http://buildbot.net/trac |
2 Version: 0.8.4p1 | 2 Version: 0.8.4p1 |
3 License: GNU General Public License (GPL) Version 2 | 3 License: GNU General Public License (GPL) Version 2 |
4 | 4 |
5 This is a forked copy of buildbot v0.8.4p1. | 5 This is a forked copy of buildbot v0.8.4p1. |
6 | 6 |
7 Make hidden steps stay hidden even if not finished, add brDoStepIf | 7 Make hidden steps stay hidden even if not finished, add brDoStepIf |
8 to support buildrunner. | 8 to support buildrunner. |
9 | 9 |
10 | 10 |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
584 + | 584 + |
585 + # Clean up the cache. | 585 + # Clean up the cache. |
586 + if debugInfo["added_blocks"]: | 586 + if debugInfo["added_blocks"]: |
587 + self.cache.trim() | 587 + self.cache.trim() |
588 + | 588 + |
589 return data | 589 return data |
590 d.addCallback(got_changes) | 590 d.addCallback(got_changes) |
591 return d | 591 return d |
592 | 592 |
593 | 593 |
594 Add revision to changes in the waterfall. | |
595 | |
596 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_p arty/buildbo | |
597 index 415e781..a15dff8 100644 | |
598 --- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | |
599 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | |
600 @@ -63,7 +63,8 @@ class ChangeBox(components.Adapter): | |
601 template = req.site.buildbot_service.templates.get_template("change_mac ros.html") | |
602 text = template.module.box_contents(url=url, | |
603 who=self.original.getShortAuthor(), | |
604 - pageTitle=self.original.comments) | |
605 + pageTitle=self.original.comments, | |
606 + revision=self.original.revision) | |
607 return Box([text], class_="Change") | |
608 components.registerAdapter(ChangeBox, Change, IBox) | |
609 | |
610 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_mac ros.html b/t | |
611 index b9b7780..9a37b47 100644 | |
612 --- a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm l | |
613 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm l | |
614 @@ -67,6 +67,6 @@ | |
615 {% endif %} | |
616 {%- endmacro %} | |
617 | |
618 -{% macro box_contents(who, url, pageTitle) -%} | |
619 -<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> | |
620 +{% macro box_contents(who, url, pageTitle, revision) -%} | |
621 +<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revisio n }} | |
622 {%- endmacro %} | |
623 | |
624 | 594 |
625 | 595 |
626 | 596 |
627 commit e6b9fad4373d6e55f7957ee8312d58cf0461d98c | 597 commit e6b9fad4373d6e55f7957ee8312d58cf0461d98c |
628 Author: Chase Phillips <cmp@google.com> | 598 Author: Chase Phillips <cmp@google.com> |
629 Date: Mon Jul 25 10:46:54 2011 -0700 | 599 Date: Mon Jul 25 10:46:54 2011 -0700 |
630 | 600 |
631 Import upstream fix: set journal mode. | 601 Import upstream fix: set journal mode. |
632 | 602 |
633 SQLite database fix from buildbot.net to increase | 603 SQLite database fix from buildbot.net to increase |
(...skipping 2086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2720 @@ -99,7 +99,7 @@ | 2690 @@ -99,7 +99,7 @@ |
2721 {% for cn in committers %} | 2691 {% for cn in committers %} |
2722 <tr> | 2692 <tr> |
2723 <td> | 2693 <td> |
2724 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> | 2694 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> |
2725 + Show Committer: <input type="text" name="committer" value="{{ cn|e }} "> | 2695 + Show Committer: <input type="text" name="committer" value="{{ cn|e }} "> |
2726 </td> | 2696 </td> |
2727 </tr> | 2697 </tr> |
2728 {% endfor %} | 2698 {% endfor %} |
2729 | 2699 |
2700 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
| |
2701 adding revision and project to the waterfall. | |
2702 | |
2703 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_p arty/buildbot_8_4p1/buildbot/status/web/changes.py | |
2704 index 415e781..a15dff8 100644 | |
2705 --- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | |
2706 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | |
2707 @@ -63,7 +63,9 @@ class ChangeBox(components.Adapter): | |
2708 template = req.site.buildbot_service.templates.get_template("change_mac ros.html") | |
2709 text = template.module.box_contents(url=url, | |
2710 who=self.original.getShortAuthor(), | |
2711 - pageTitle=self.original.comments) | |
2712 + pageTitle=self.original.comments, | |
2713 + revision=self.original.revision, | |
2714 + project=self.original.project) | |
2715 return Box([text], class_="Change") | |
2716 components.registerAdapter(ChangeBox, Change, IBox) | |
2717 | |
2718 | |
2719 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_mac ros.html b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macro s.html | |
2720 index b9b7780..9a37b47 100644 | |
2721 --- a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm l | |
2722 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm l | |
2723 @@ -67,6 +67,6 @@ | |
2724 {% endif %} | |
2725 {%- endmacro %} | |
2726 | |
2727 -{% macro box_contents(who, url, pageTitle) -%} | |
2728 +{% macro box_contents(who, url, pageTitle, revision, project) -%} | |
2729 <a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> | |
2730 {%- endmacro %} | |
2731 | |
2732 | |
2733 Add revision to the chromium waterfalls. | |
2734 | |
2735 Index: buildbot/status/web/templates/change_macros.html | |
2736 =================================================================== | |
2737 --- buildbot/status/web/templates/change_macros.html (revision 167249) | |
2738 +++ buildbot/status/web/templates/change_macros.html (working copy) | |
2739 @@ -67,6 +67,6 @@ | |
2740 {% endif %} | |
2741 {%- endmacro %} | |
2742 | |
2743 {% macro box_contents(who, url, pageTitle, revision) -%} | |
2744 -<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> | |
2745 +<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revisio n }} | |
2746 {%- endmacro %} | |
2747 | |
2748 | |
OLD | NEW |