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. | 594 commit ca9f4ed52b4febcebd30ad77a8e40737f3a5ad1f |
| 595 Author: Nicolas Sylvain <nsylvain@chromium.org> |
| 596 Date: Fri Nov 23 12:24:04 2012 -0500 |
595 | 597 |
596 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_p
arty/buildbo | 598 Optionally add revision to the waterfall display of changes. |
597 index 415e781..a15dff8 100644 | 599 |
598 --- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | 600 Used in chromium's waterfalls extensively. |
599 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | 601 publicly reviewed here: https://codereview.chromium.org/7276032 |
| 602 |
| 603 Modified to not change the look by default. |
| 604 |
| 605 diff --git a/master/buildbot/status/web/changes.py b/master/buildbot/status/web/
changes.py |
| 606 index 6be37b5..0971bea 100644 |
| 607 --- a/master/buildbot/status/web/changes.py |
| 608 +++ b/master/buildbot/status/web/changes.py |
600 @@ -63,7 +63,8 @@ class ChangeBox(components.Adapter): | 609 @@ -63,7 +63,8 @@ class ChangeBox(components.Adapter): |
601 template = req.site.buildbot_service.templates.get_template("change_mac
ros.html") | 610 template = req.site.buildbot_service.templates.get_template("change_mac
ros.html") |
602 text = template.module.box_contents(url=url, | 611 text = template.module.box_contents(url=url, |
603 who=self.original.getShortAuthor(), | 612 who=self.original.getShortAuthor(), |
604 - pageTitle=self.original.comments) | 613 - pageTitle=self.original.comments) |
605 + pageTitle=self.original.comments, | 614 + pageTitle=self.original.comments, |
606 + revision=self.original.revision) | 615 + revision=self.original.revision) |
607 return Box([text], class_="Change") | 616 return Box([text], class_="Change") |
608 components.registerAdapter(ChangeBox, Change, IBox) | 617 components.registerAdapter(ChangeBox, Change, IBox) |
| 618 |
| 619 diff --git a/master/buildbot/status/web/templates/change_macros.html b/master/bu
ildbot/status/web/templates/change_macros.html |
| 620 index 9b46191..dc6a9b2 100644 |
| 621 --- a/master/buildbot/status/web/templates/change_macros.html |
| 622 +++ b/master/buildbot/status/web/templates/change_macros.html |
| 623 @@ -71,6 +71,6 @@ |
| 624 {% endif %} |
| 625 {%- endmacro %} |
| 626 |
| 627 -{% macro box_contents(who, url, pageTitle) -%} |
| 628 +{% macro box_contents(who, url, pageTitle, revision) -%} |
| 629 <a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> |
| 630 {%- endmacro %} |
609 | 631 |
610 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_mac
ros.html b/t | 632 Add revision to the chromium waterfalls. |
611 index b9b7780..9a37b47 100644 | 633 |
612 --- a/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm
l | 634 Index: buildbot/status/web/templates/change_macros.html |
613 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/templates/change_macros.htm
l | 635 =================================================================== |
| 636 --- buildbot/status/web/templates/change_macros.html» (revision 167249) |
| 637 +++ buildbot/status/web/templates/change_macros.html» (working copy) |
614 @@ -67,6 +67,6 @@ | 638 @@ -67,6 +67,6 @@ |
615 {% endif %} | 639 {% endif %} |
616 {%- endmacro %} | 640 {%- endmacro %} |
617 | 641 |
618 -{% macro box_contents(who, url, pageTitle) -%} | 642 {% macro box_contents(who, url, pageTitle, revision) -%} |
619 -<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> | 643 -<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 }} | 644 +<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revisio
n }} |
622 {%- endmacro %} | 645 {%- endmacro %} |
623 | 646 |
624 | 647 |
625 | 648 |
626 | 649 |
627 commit e6b9fad4373d6e55f7957ee8312d58cf0461d98c | 650 commit e6b9fad4373d6e55f7957ee8312d58cf0461d98c |
628 Author: Chase Phillips <cmp@google.com> | 651 Author: Chase Phillips <cmp@google.com> |
629 Date: Mon Jul 25 10:46:54 2011 -0700 | 652 Date: Mon Jul 25 10:46:54 2011 -0700 |
630 | 653 |
(...skipping 2089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2720 @@ -99,7 +99,7 @@ | 2743 @@ -99,7 +99,7 @@ |
2721 {% for cn in committers %} | 2744 {% for cn in committers %} |
2722 <tr> | 2745 <tr> |
2723 <td> | 2746 <td> |
2724 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> | 2747 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> |
2725 + Show Committer: <input type="text" name="committer" value="{{ cn|e }}
"> | 2748 + Show Committer: <input type="text" name="committer" value="{{ cn|e }}
"> |
2726 </td> | 2749 </td> |
2727 </tr> | 2750 </tr> |
2728 {% endfor %} | 2751 {% endfor %} |
2729 | 2752 |
| 2753 |
| 2754 commit 1fe8fbcf99cd98546a98d2dd6a3be1206ea590c7 |
| 2755 Author: Peter Mayo <petermayo@chromium.org> |
| 2756 Date: Fri Nov 23 12:37:00 2012 -0500 |
| 2757 |
| 2758 Optionally add project to changes in waterfall display. |
| 2759 |
| 2760 In some waterfalls it is useful to separate different change |
| 2761 sources visually. This allows an attribute to reflect that to |
| 2762 be passed though from config to template. |
| 2763 |
| 2764 Related reviews: https://codereview.chromium.org/11425002 |
| 2765 |
| 2766 diff --git a/master/buildbot/status/web/changes.py b/master/buildbot/status/web/
changes.py |
| 2767 index 0971bea..e579669 100644 |
| 2768 --- a/master/buildbot/status/web/changes.py |
| 2769 +++ b/master/buildbot/status/web/changes.py |
| 2770 @@ -64,7 +64,8 @@ class ChangeBox(components.Adapter): |
| 2771 text = template.module.box_contents(url=url, |
| 2772 who=self.original.getShortAuthor(), |
| 2773 pageTitle=self.original.comments, |
| 2774 - revision=self.original.revision) |
| 2775 + revision=self.original.revision, |
| 2776 + project=self.original.project) |
| 2777 return Box([text], class_="Change") |
| 2778 components.registerAdapter(ChangeBox, Change, IBox) |
| 2779 |
| 2780 diff --git a/master/buildbot/status/web/templates/change_macros.html b/master/bu
ildbot/status/web/templates/change_macros.html |
| 2781 index dc6a9b2..2ca01d9 100644 |
| 2782 --- a/master/buildbot/status/web/templates/change_macros.html |
| 2783 +++ b/master/buildbot/status/web/templates/change_macros.html |
| 2784 @@ -71,6 +71,6 @@ |
| 2785 {% endif %} |
| 2786 {%- endmacro %} |
| 2787 |
| 2788 -{% macro box_contents(who, url, pageTitle, revision) -%} |
| 2789 +{% macro box_contents(who, url, pageTitle, revision, project) -%} |
| 2790 <a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a> |
| 2791 {%- endmacro %} |
| 2792 |
OLD | NEW |