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 Add revision to changes in the waterfall. |
Peter Mayo
2012/11/23 17:10:16
Re: upstreaming.
Given that this is a local chang
| |
595 | 595 |
596 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_p arty/buildbo | 596 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py b/third_p arty/buildbo |
597 index 415e781..a15dff8 100644 | 597 index 415e781..a15dff8 100644 |
598 --- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py | 598 --- a/third_party/buildbot_8_4p1/buildbot/status/web/changes.py |
599 +++ b/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): | 600 @@ -63,7 +63,8 @@ class ChangeBox(components.Adapter): |
601 template = req.site.buildbot_service.templates.get_template("change_mac ros.html") | 601 template = req.site.buildbot_service.templates.get_template("change_mac ros.html") |
602 text = template.module.box_contents(url=url, | 602 text = template.module.box_contents(url=url, |
603 who=self.original.getShortAuthor(), | 603 who=self.original.getShortAuthor(), |
604 - pageTitle=self.original.comments) | 604 - pageTitle=self.original.comments) |
(...skipping 2115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2720 @@ -99,7 +99,7 @@ | 2720 @@ -99,7 +99,7 @@ |
2721 {% for cn in committers %} | 2721 {% for cn in committers %} |
2722 <tr> | 2722 <tr> |
2723 <td> | 2723 <td> |
2724 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> | 2724 - Show Committer: <input type="text" name="committer" value="{{ cn }}"> |
2725 + Show Committer: <input type="text" name="committer" value="{{ cn|e }} "> | 2725 + Show Committer: <input type="text" name="committer" value="{{ cn|e }} "> |
2726 </td> | 2726 </td> |
2727 </tr> | 2727 </tr> |
2728 {% endfor %} | 2728 {% endfor %} |
2729 | 2729 |
2730 Be able to differentiate change sources by project. | |
M-A Ruel
2012/11/27 15:03:05
Please add the commit hash upstream
| |
2731 | |
2732 Index: buildbot/status/web/templates/change_macros.html | |
2733 =================================================================== | |
2734 --- buildbot/status/web/templates/change_macros.html (revision 167249) | |
2735 +++ buildbot/status/web/templates/change_macros.html (working copy) | |
2736 @@ -67,6 +67,6 @@ | |
2737 {% endif %} | |
2738 {%- endmacro %} | |
2739 | |
2740 -{% macro box_contents(who, url, pageTitle, revision) -%} | |
2741 +{% macro box_contents(who, url, pageTitle, revision, project) -%} | |
2742 <a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a><br>r{{ revisio n }} | |
2743 {%- endmacro %} | |
2744 Index: buildbot/status/web/changes.py | |
2745 =================================================================== | |
2746 --- buildbot/status/web/changes.py (revision 167249) | |
2747 +++ buildbot/status/web/changes.py (working copy) | |
2748 @@ -64,7 +64,8 @@ | |
2749 text = template.module.box_contents(url=url, | |
2750 who=self.original.getShortAuthor(), | |
2751 pageTitle=self.original.comments, | |
2752 - revision=self.original.revision) | |
2753 + revision=self.original.revision, | |
2754 + project=self.original.project) | |
2755 return Box([text], class_="Change") | |
2756 components.registerAdapter(ChangeBox, Change, IBox) | |
2757 | |
OLD | NEW |