Mercurial > bitten > bitten-test
annotate bitten/web_ui.py @ 875:a68027e2245d
Add 'Platform' name to build report for web display and notifications. Fixes #541 and #633.
author | osimons |
---|---|
date | Thu, 21 Oct 2010 08:41:16 +0000 |
parents | e695efec5b28 |
children | dfbf2f857a50 |
rev | line source |
---|---|
379 | 1 # -*- coding: utf-8 -*- |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
2 # |
408
933105ab516b
Update file headers and other stuff pointing to the old home.
cmlenz
parents:
391
diff
changeset
|
3 # Copyright (C) 2005-2007 Christopher Lenz <cmlenz@gmx.de> |
832 | 4 # Copyright (C) 2007-2010 Edgewall Software |
163 | 5 # All rights reserved. |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
6 # |
163 | 7 # This software is licensed as described in the file COPYING, which |
8 # you should have received as part of this distribution. The terms | |
408
933105ab516b
Update file headers and other stuff pointing to the old home.
cmlenz
parents:
391
diff
changeset
|
9 # are also available at http://bitten.edgewall.org/wiki/License. |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
10 |
316 | 11 """Implementation of the Bitten web interface.""" |
12 | |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
13 import posixpath |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
14 import re |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
15 import time |
250 | 16 from StringIO import StringIO |
756 | 17 from datetime import datetime |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
18 |
99
efc1eed69ba8
Make Bitten deployable in Trac as a [http://peak.telecommunity.com/DevCenter/PythonEggs Python egg].
cmlenz
parents:
98
diff
changeset
|
19 import pkg_resources |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
20 from genshi.builder import tag |
745
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
21 from trac.attachment import AttachmentModule, Attachment |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
22 from trac.core import * |
814
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
23 from trac.config import Option |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
24 from trac.mimeview.api import Context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
25 from trac.resource import Resource |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
26 from trac.timeline import ITimelineEventProvider |
321 | 27 from trac.util import escape, pretty_timedelta, format_datetime, shorten_line, \ |
723
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
28 Markup, arity |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
29 from trac.util.datefmt import to_timestamp, to_datetime, utc |
439 | 30 from trac.util.html import html |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
31 from trac.web import IRequestHandler, IRequestFilter, HTTPNotFound |
74
1d4fa4c32afa
Add template and static resources, hooked up using the new {{{ITemplateProvider}}} extension point in Trac.
cmlenz
parents:
73
diff
changeset
|
32 from trac.web.chrome import INavigationContributor, ITemplateProvider, \ |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
33 add_link, add_stylesheet, add_ctxtnav, \ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
34 prevnext_nav, add_script |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
35 from trac.versioncontrol import NoSuchChangeset |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
36 from trac.wiki import wiki_to_html, wiki_to_oneliner |
410
7930cdd83d13
More restructuring: got rid of the `trac_ext` subpackage, which makes no sense now that the master is also coupled to Trac.
cmlenz
parents:
409
diff
changeset
|
37 from bitten.api import ILogFormatter, IReportChartGenerator, IReportSummarizer |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
38 from bitten.master import BuildMaster |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
39 from bitten.model import BuildConfig, TargetPlatform, Build, BuildStep, \ |
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
40 BuildLog, Report |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
41 from bitten.queue import collect_changes |
779
d29499a4450c
Copy trac's `trac.util.presentation.to_json` method to prevent `json` module requirement, and incorporate fallback methods to support Trac 0.11 etc. See #426
dfraser
parents:
768
diff
changeset
|
42 from bitten.util import json |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
43 |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
44 _status_label = {Build.PENDING: 'pending', |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
45 Build.IN_PROGRESS: 'in progress', |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
46 Build.SUCCESS: 'completed', |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
47 Build.FAILURE: 'failed'} |
506
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
48 _status_title = {Build.PENDING: 'Pending', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
49 Build.IN_PROGRESS: 'In Progress', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
50 Build.SUCCESS: 'Success', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
51 Build.FAILURE: 'Failure'} |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
52 _step_status_label = {BuildStep.SUCCESS: 'success', |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
53 BuildStep.FAILURE: 'failed', |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
54 BuildStep.IN_PROGRESS: 'in progress'} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
55 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
56 def _get_build_data(env, req, build): |
875
a68027e2245d
Add 'Platform' name to build report for web display and notifications. Fixes #541 and #633.
osimons
parents:
874
diff
changeset
|
57 platform = TargetPlatform.fetch(env, build.platform) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
58 data = {'id': build.id, 'name': build.slave, 'rev': build.rev, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
59 'status': _status_label[build.status], |
875
a68027e2245d
Add 'Platform' name to build report for web display and notifications. Fixes #541 and #633.
osimons
parents:
874
diff
changeset
|
60 'platform': getattr(platform, 'name', 'unknown'), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
61 'cls': _status_label[build.status].replace(' ', '-'), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
62 'href': req.href.build(build.config, build.id), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
63 'chgset_href': req.href.changeset(build.rev)} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
64 if build.started: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
65 data['started'] = format_datetime(build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
66 data['started_delta'] = pretty_timedelta(build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
67 data['duration'] = pretty_timedelta(build.started) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
68 if build.stopped: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
69 data['stopped'] = format_datetime(build.stopped) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
70 data['stopped_delta'] = pretty_timedelta(build.stopped) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
71 data['duration'] = pretty_timedelta(build.stopped, build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
72 data['slave'] = { |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
73 'name': build.slave, |
250 | 74 'ipnr': build.slave_info.get(Build.IP_ADDRESS), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
75 'os_name': build.slave_info.get(Build.OS_NAME), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
76 'os_family': build.slave_info.get(Build.OS_FAMILY), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
77 'os_version': build.slave_info.get(Build.OS_VERSION), |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
78 'machine': build.slave_info.get(Build.MACHINE), |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
79 'processor': build.slave_info.get(Build.PROCESSOR) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
80 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
81 return data |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
82 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
83 def _has_permission(repos, path, perm, raise_error=False): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
84 if hasattr(repos, 'authz'): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
85 if not repos.authz.has_permission(path): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
86 if not raise_error: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
87 return False |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
88 repos.authz.assert_permission(path) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
89 else: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
90 node = repos.get_node(path) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
91 if not node.can_view(perm): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
92 if not raise_error: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
93 return False |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
94 from trac.perm import PermissionError |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
95 raise PermissionError('BROWSER_VIEW', node.resource) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
96 return True |
318 | 97 |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
98 class BittenChrome(Component): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
99 """Provides the Bitten templates and static resources.""" |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
100 |
320 | 101 implements(INavigationContributor, ITemplateProvider) |
64 | 102 |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
103 # INavigationContributor methods |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
104 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
105 def get_active_navigation_item(self, req): |
590
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
106 pass |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
107 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
108 def get_navigation_items(self, req): |
316 | 109 """Return the navigation item for access the build status overview from |
110 the Trac navigation bar.""" | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
111 if 'BUILD_VIEW' in req.perm: |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
112 status = '' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
113 if BuildMaster(self.env).quick_status: |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
114 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
115 assert repos, 'No "(default)" Repository: Add a repository ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
116 'or alias named "(default)" to Trac.' |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
117 for config in BuildConfig.select(self.env, |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
118 include_inactive=False): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
119 prev_rev = None |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
120 for platform, rev, build in collect_changes(repos, config): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
121 if rev != prev_rev: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
122 if prev_rev is not None: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
123 break |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
124 prev_rev = rev |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
125 if build: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
126 build_data = _get_build_data(self.env, req, build) |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
127 if build_data['status'] == 'failed': |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
128 status='bittenfailed' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
129 break |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
130 if build_data['status'] == 'in progress': |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
131 status='bitteninprogress' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
132 elif not status: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
133 if (build_data['status'] == 'completed'): |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
134 status='bittencompleted' |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
135 if not status: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
136 status='bittenpending' |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
137 yield ('mainnav', 'build', |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
138 tag.a('Build Status', href=req.href.build(), accesskey=5, |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
139 class_=status)) |
320 | 140 |
141 # ITemplatesProvider methods | |
142 | |
143 def get_htdocs_dirs(self): | |
144 """Return the directories containing static resources.""" | |
145 return [('bitten', pkg_resources.resource_filename(__name__, 'htdocs'))] | |
146 | |
147 def get_templates_dirs(self): | |
148 """Return the directories containing templates.""" | |
149 return [pkg_resources.resource_filename(__name__, 'templates')] | |
150 | |
151 | |
152 class BuildConfigController(Component): | |
153 """Implements the web interface for build configurations.""" | |
154 | |
590
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
155 implements(IRequestHandler, IRequestFilter, INavigationContributor) |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
156 |
814
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
157 # Configuration options |
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
158 |
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
159 chart_style = Option('bitten', 'chart_style', 'height: 220px; width: 220px;', doc= |
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
160 """Style attribute for charts. Mostly useful for setting the height and width.""") |
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
161 |
590
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
162 # INavigationContributor methods |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
163 |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
164 def get_active_navigation_item(self, req): |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
165 return 'build' |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
166 |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
167 def get_navigation_items(self, req): |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
168 return [] |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
169 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
170 # IRequestHandler methods |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
171 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
172 def match_request(self, req): |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
173 match = re.match(r'/build(?:/([\w.-]+))?/?$', req.path_info) |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
174 if match: |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
175 if match.group(1): |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
176 req.args['config'] = match.group(1) |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
177 return True |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
178 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
179 def process_request(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
180 req.perm.require('BUILD_VIEW') |
50
0d5ad32948b7
Restrict access to web interface with custom permission actions.
cmlenz
parents:
47
diff
changeset
|
181 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
182 action = req.args.get('action') |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
183 view = req.args.get('view') |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
184 config = req.args.get('config') |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
185 |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
186 if config: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
187 data = self._render_config(req, config) |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
188 elif view == 'inprogress': |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
189 data = self._render_inprogress(req) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
190 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
191 data = self._render_overview(req) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
192 |
164
a9cddfae3c09
Adapt to Trac [http://projects.edgewall.com/trac/changeset/2132 r2132].
cmlenz
parents:
163
diff
changeset
|
193 add_stylesheet(req, 'bitten/bitten.css') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
194 return 'bitten_config.html', data, None |
64 | 195 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
196 # IRequestHandler methods |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
197 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
198 def pre_process_request(self, req, handler): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
199 return handler |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
200 |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
201 def post_process_request(self, req, template, data, content_type): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
202 if template: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
203 add_stylesheet(req, 'bitten/bitten.css') |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
204 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
205 return template, data, content_type |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
206 |
64 | 207 # Internal methods |
208 | |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
209 def _render_overview(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
210 data = {'title': 'Build Status'} |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
211 show_all = False |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
212 if req.args.get('show') == 'all': |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
213 show_all = True |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
214 data['show_all'] = show_all |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
215 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
216 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
217 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
218 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
219 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
220 configs = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
221 for config in BuildConfig.select(self.env, include_inactive=show_all): |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
222 if not _has_permission(repos, config.path, req.perm): |
561
8ffe90404a8c
hide build configurations that user does not have rights to access in repository (silk) - fixes #384
dfraser
parents:
557
diff
changeset
|
223 continue |
8ffe90404a8c
hide build configurations that user does not have rights to access in repository (silk) - fixes #384
dfraser
parents:
557
diff
changeset
|
224 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
225 description = config.description |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
226 if description: |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
227 description = wiki_to_html(description, self.env, req) |
504 | 228 |
229 platforms_data = [] | |
230 for platform in TargetPlatform.select(self.env, config=config.name): | |
231 pd = { 'name': platform.name, | |
232 'id': platform.id, | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
233 'builds_pending': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
234 config=config.name, status=Build.PENDING, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
235 platform=platform.id))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
236 'builds_inprogress': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
237 config=config.name, status=Build.IN_PROGRESS, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
238 platform=platform.id))) |
504 | 239 } |
240 platforms_data.append(pd) | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
241 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
242 config_data = { |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
243 'name': config.name, 'label': config.label or config.name, |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
244 'active': config.active, 'path': config.path, |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
245 'description': description, |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
246 'builds_pending' : len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
247 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
248 status=Build.PENDING))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
249 'builds_inprogress' : len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
250 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
251 status=Build.IN_PROGRESS))), |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
252 'href': req.href.build(config.name), |
504 | 253 'builds': [], |
254 'platforms': platforms_data | |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
255 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
256 configs.append(config_data) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
257 if not config.active: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
258 continue |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
259 |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
260 prev_rev = None |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
261 for platform, rev, build in collect_changes(repos, config): |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
262 if rev != prev_rev: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
263 if prev_rev is None: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
264 chgset = repos.get_changeset(rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
265 config_data['youngest_rev'] = { |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
266 'id': rev, 'href': req.href.changeset(rev), |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
267 'display_rev': repos.normalize_rev(rev), |
320 | 268 'author': chgset.author or 'anonymous', |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
269 'date': format_datetime(chgset.date), |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
270 'message': wiki_to_oneliner( |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
271 shorten_line(chgset.message), self.env, req=req) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
272 } |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
273 else: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
274 break |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
275 prev_rev = rev |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
276 if build: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
277 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
278 build_data['platform'] = platform.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
279 config_data['builds'].append(build_data) |
256
aa942e2c7243
A bit of polishing for [265]: also show build if not yet in the queue, some layout improvements.
cmlenz
parents:
255
diff
changeset
|
280 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
281 config_data['builds'].append({ |
320 | 282 'platform': platform.name, 'status': 'pending' |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
283 }) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
284 |
746
7f698d867321
Sort the list of configurations on the configuration page.
wbell
parents:
745
diff
changeset
|
285 data['configs'] = sorted(configs, key=lambda x:x['label'].lower()) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
286 data['page_mode'] = 'overview' |
504 | 287 |
288 in_progress_builds = Build.select(self.env, status=Build.IN_PROGRESS) | |
289 pending_builds = Build.select(self.env, status=Build.PENDING) | |
290 | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
291 data['builds_pending'] = len(list(pending_builds)) |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
292 data['builds_inprogress'] = len(list(in_progress_builds)) |
504 | 293 |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
294 add_link(req, 'views', req.href.build(view='inprogress'), |
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
295 'In Progress Builds') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
296 add_ctxtnav(req, 'In Progress Builds', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
297 req.href.build(view='inprogress')) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
298 return data |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
299 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
300 def _render_inprogress(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
301 data = {'title': 'In Progress Builds', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
302 'page_mode': 'view-inprogress'} |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
303 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
304 db = self.env.get_db_cnx() |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
305 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
306 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
307 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
308 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
309 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
310 configs = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
311 for config in BuildConfig.select(self.env, include_inactive=False): |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
312 if not _has_permission(repos, config.path, req.perm): |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
313 continue |
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
314 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
315 self.log.debug(config.name) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
316 if not config.active: |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
317 continue |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
318 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
319 in_progress_builds = Build.select(self.env, config=config.name, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
320 status=Build.IN_PROGRESS, db=db) |
437
6d5ac24061dc
Fix build queue population compatiblity with Trac 0.11, where revision timestamps are `datetime` objects.
cmlenz
parents:
436
diff
changeset
|
321 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
322 current_builds = 0 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
323 builds = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
324 # sort correctly by revision. |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
325 for build in sorted(in_progress_builds, |
874
e695efec5b28
Fix revision sorting for in-progress builds using `rev_time` instead of `rev` - where `rev` would also fail when using non-Subversion repository.
osimons
parents:
834
diff
changeset
|
326 cmp=lambda x, y: int(y.rev_time) - int(x.rev_time)): |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
327 rev = build.rev |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
328 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
329 build_data['rev'] = rev |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
330 build_data['rev_href'] = req.href.changeset(rev) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
331 platform = TargetPlatform.fetch(self.env, build.platform) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
332 build_data['platform'] = platform.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
333 build_data['steps'] = [] |
437
6d5ac24061dc
Fix build queue population compatiblity with Trac 0.11, where revision timestamps are `datetime` objects.
cmlenz
parents:
436
diff
changeset
|
334 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
335 for step in BuildStep.select(self.env, build=build.id, db=db): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
336 build_data['steps'].append({ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
337 'name': step.name, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
338 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
339 'duration': to_datetime(step.stopped or int(time.time()), utc) - \ |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
340 to_datetime(step.started, utc), |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
341 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
342 'cls': _step_status_label[step.status].replace(' ', '-'), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
343 'errors': step.errors, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
344 'href': build_data['href'] + '#step_' + step.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
345 }) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
346 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
347 builds.append(build_data) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
348 current_builds += 1 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
349 |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
350 if current_builds == 0: |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
351 continue |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
352 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
353 description = config.description |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
354 if description: |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
355 description = wiki_to_html(description, self.env, req) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
356 configs.append({ |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
357 'name': config.name, 'label': config.label or config.name, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
358 'active': config.active, 'path': config.path, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
359 'description': description, |
460
32b61f031df0
Fix a couple of left-over instances of using `env.href` instead of `req.href`. Closes #186. Thanks to Markus Heberling for reporting the issue and providing a patch.
cmlenz
parents:
440
diff
changeset
|
360 'href': req.href.build(config.name), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
361 'builds': builds |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
362 }) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
363 |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
364 data['configs'] = sorted(configs, key=lambda x:x['label'].lower()) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
365 return data |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
366 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
367 def _render_config(self, req, config_name): |
250 | 368 db = self.env.get_db_cnx() |
369 | |
370 config = BuildConfig.fetch(self.env, config_name, db=db) | |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
371 if not config: |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
372 raise HTTPNotFound("Build configuration '%s' does not exist." \ |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
373 % config_name) |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
374 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
375 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
376 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
377 'named "(default)" to Trac.' |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
378 _has_permission(repos, config.path, req.perm, True) |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
379 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
380 data = {'title': 'Build Configuration "%s"' \ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
381 % config.label or config.name, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
382 'page_mode': 'view_config'} |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
383 add_link(req, 'up', req.href.build(), 'Build Status') |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
384 description = config.description |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
385 if description: |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
386 description = wiki_to_html(description, self.env, req) |
504 | 387 |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
388 pending_builds = list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
389 config=config.name, status=Build.PENDING)) |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
390 inprogress_builds = list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
391 config=config.name, status=Build.IN_PROGRESS)) |
504 | 392 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
393 data['config'] = { |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
394 'name': config.name, 'label': config.label, 'path': config.path, |
250 | 395 'min_rev': config.min_rev, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
396 'min_rev_href': req.href.changeset(config.min_rev), |
250 | 397 'max_rev': config.max_rev, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
398 'max_rev_href': req.href.changeset(config.max_rev), |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
399 'active': config.active, 'description': description, |
504 | 400 'browser_href': req.href.browser(config.path), |
401 'builds_pending' : len(pending_builds), | |
638
74237f60f8a9
0.6dev: Improving builds overview page layout, take 2. Re-closing #430.
osimons
parents:
637
diff
changeset
|
402 'builds_inprogress' : len(inprogress_builds) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
403 } |
47
083e848088ee
* Improvements to the model classes, and a couple of unit tests.
cmlenz
parents:
45
diff
changeset
|
404 |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
405 context = Context.from_request(req, config.resource) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
406 data['context'] = context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
407 data['config']['attachments'] = AttachmentModule(self.env).attachment_data(context) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
408 |
250 | 409 platforms = list(TargetPlatform.select(self.env, config=config_name, |
410 db=db)) | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
411 data['config']['platforms'] = [ |
504 | 412 { 'name': platform.name, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
413 'id': platform.id, |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
414 'builds_pending': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
415 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
416 status=Build.PENDING, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
417 platform=platform.id))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
418 'builds_inprogress': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
419 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
420 status=Build.IN_PROGRESS, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
421 platform=platform.id))) |
504 | 422 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
423 for platform in platforms |
76
ffa1ffd8c7db
* Implement basic slave selection based on configured target platforms. Closes #15.
cmlenz
parents:
74
diff
changeset
|
424 ] |
74
1d4fa4c32afa
Add template and static resources, hooked up using the new {{{ITemplateProvider}}} extension point in Trac.
cmlenz
parents:
73
diff
changeset
|
425 |
197
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
426 has_reports = False |
250 | 427 for report in Report.select(self.env, config=config.name, db=db): |
197
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
428 has_reports = True |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
429 break |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
430 |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
431 if has_reports: |
388
3ba9430a5d87
Fix for hardcoded chart generators in UI. Closes #153.
cmlenz
parents:
382
diff
changeset
|
432 chart_generators = [] |
756 | 433 report_categories = list(self._report_categories_for_config(config)) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
434 for generator in ReportChartController(self.env).generators: |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
435 for category in generator.get_supported_categories(): |
756 | 436 if category in report_categories: |
437 chart_generators.append({ | |
768 | 438 'href': req.href.build(config.name, 'chart/' + category), |
439 'category': category, | |
814
77ff2e80b69d
Make size and style of charts configurable (applying patch from #426).
hodgestar
parents:
812
diff
changeset
|
440 'style': self.config.get('bitten', 'chart_style'), |
756 | 441 }) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
442 data['config']['charts'] = chart_generators |
178
fcbe107ca755
Add some basic charts to the build status page, based on [http://www.maani.us/xml_charts/index.php XML/SWF Charts]:
cmlenz
parents:
174
diff
changeset
|
443 |
214 | 444 page = max(1, int(req.args.get('page', 1))) |
445 more = False | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
446 data['page_number'] = page |
214 | 447 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
448 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
449 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
450 'named "(default)" to Trac.' |
360
5bc81e597352
Fix incompatibility with a change to the versioncontrol layer in Trac 0.10.3
cmlenz
parents:
328
diff
changeset
|
451 |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
452 builds_per_page = 12 * len(platforms) |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
453 idx = 0 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
454 builds = {} |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
455 revisions = [] |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
456 for platform, rev, build in collect_changes(repos, config): |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
457 if idx >= page * builds_per_page: |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
458 more = True |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
459 break |
232
b6e4896dc026
Fix regression introduced in [239]: first build was being skipped on build configuration page.
cmlenz
parents:
230
diff
changeset
|
460 elif idx >= (page - 1) * builds_per_page: |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
461 if rev not in builds: |
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
462 revisions.append(rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
463 builds.setdefault(rev, {}) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
464 builds[rev].setdefault('href', req.href.changeset(rev)) |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
465 builds[rev].setdefault('display_rev', repos.normalize_rev(rev)) |
230 | 466 if build and build.status != Build.PENDING: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
467 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
468 build_data['steps'] = [] |
250 | 469 for step in BuildStep.select(self.env, build=build.id, |
470 db=db): | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
471 build_data['steps'].append({ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
472 'name': step.name, |
320 | 473 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
474 'duration': to_datetime(step.stopped or int(time.time()), utc) - \ |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
475 to_datetime(step.started, utc), |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
476 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
477 'cls': _step_status_label[step.status].replace(' ', '-'), |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
478 |
250 | 479 'errors': step.errors, |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
480 'href': build_data['href'] + '#step_' + step.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
481 }) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
482 builds[rev][platform.id] = build_data |
230 | 483 idx += 1 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
484 data['config']['builds'] = builds |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
485 data['config']['revisions'] = revisions |
214 | 486 |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
487 if page > 1: |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
488 if page == 2: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
489 prev_href = req.href.build(config.name) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
490 else: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
491 prev_href = req.href.build(config.name, page=page - 1) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
492 add_link(req, 'prev', prev_href, 'Previous Page') |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
493 if more: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
494 next_href = req.href.build(config.name, page=page + 1) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
495 add_link(req, 'next', next_href, 'Next Page') |
723
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
496 if arity(prevnext_nav) == 4: # Trac 0.12 compat, see #450 |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
497 prevnext_nav(req, 'Previous Page', 'Next Page') |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
498 else: |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
499 prevnext_nav (req, 'Page') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
500 return data |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
501 |
756 | 502 def _report_categories_for_config(self, config): |
503 """Yields the categories of reports that exist for active builds | |
504 of this configuration. | |
505 """ | |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
506 |
756 | 507 db = self.env.get_db_cnx() |
508 cursor = db.cursor() | |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
509 |
756 | 510 cursor.execute("""SELECT DISTINCT report.category as category |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
511 FROM bitten_build AS build |
756 | 512 JOIN bitten_report AS report ON (report.build=build.id) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
513 WHERE build.config=%s AND build.rev_time >= %s AND build.rev_time <= %s""", |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
514 (config.name, |
756 | 515 config.min_rev_time(self.env), |
516 config.max_rev_time(self.env))) | |
517 | |
518 for (category,) in cursor: | |
519 yield category | |
520 | |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
521 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
522 class BuildController(Component): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
523 """Renders the build page.""" |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
524 implements(INavigationContributor, IRequestHandler, ITimelineEventProvider) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
525 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
526 log_formatters = ExtensionPoint(ILogFormatter) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
527 report_summarizers = ExtensionPoint(IReportSummarizer) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
528 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
529 # INavigationContributor methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
530 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
531 def get_active_navigation_item(self, req): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
532 return 'build' |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
533 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
534 def get_navigation_items(self, req): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
535 return [] |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
536 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
537 # IRequestHandler methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
538 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
539 def match_request(self, req): |
174
79c61c26a4e1
* Changed the `IReportStore` interface to allow querying with [http://www.w3.org/XML/Query/ XQuery]. This should make it possible to efficiently query the report store for any existing metrics.
cmlenz
parents:
168
diff
changeset
|
540 match = re.match(r'/build/([\w.-]+)/(\d+)', req.path_info) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
541 if match: |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
542 if match.group(1): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
543 req.args['config'] = match.group(1) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
544 if match.group(2): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
545 req.args['id'] = match.group(2) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
546 return True |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
547 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
548 def process_request(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
549 req.perm.require('BUILD_VIEW') |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
550 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
551 db = self.env.get_db_cnx() |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
552 build_id = int(req.args.get('id')) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
553 build = Build.fetch(self.env, build_id, db=db) |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
554 if not build: |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
555 raise HTTPNotFound("Build '%s' does not exist." \ |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
556 % build_id) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
557 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
558 if req.method == 'POST': |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
559 if req.args.get('action') == 'invalidate': |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
560 self._do_invalidate(req, build, db) |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
561 req.redirect(req.href.build(build.config, build.id)) |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
562 |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
563 add_link(req, 'up', req.href.build(build.config), |
73
6d7753ea1798
Implemented basic management of target platforms. Closes #14.
cmlenz
parents:
69
diff
changeset
|
564 'Build Configuration') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
565 data = {'title': 'Build %s - %s' % (build_id, |
506
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
566 _status_title[build.status]), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
567 'page_mode': 'view_build', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
568 'build': {}} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
569 config = BuildConfig.fetch(self.env, build.config, db=db) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
570 data['build']['config'] = { |
583
f916b88926f5
0.6dev: If configuration display label is deleted, no name would show and the build UI would fold across a couple of lines. This should see to it that the configuration always has a name available.
osimons
parents:
571
diff
changeset
|
571 'name': config.label or config.name, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
572 'href': req.href.build(config.name) |
69 | 573 } |
574 | |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
575 context = Context.from_request(req, build.resource) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
576 data['context'] = context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
577 data['build']['attachments'] = AttachmentModule(self.env).attachment_data(context) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
578 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
579 formatters = [] |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
580 for formatter in self.log_formatters: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
581 formatters.append(formatter.get_formatter(req, build)) |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
582 |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
583 summarizers = {} # keyed by report type |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
584 for summarizer in self.report_summarizers: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
585 categories = summarizer.get_supported_categories() |
423
8864b3917221
Fix for Python 2.3 incompatibility in display for report summaries. Closes #164.
cmlenz
parents:
411
diff
changeset
|
586 summarizers.update(dict([(cat, summarizer) for cat in categories])) |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
587 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
588 data['build'].update(_get_build_data(self.env, req, build)) |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
589 steps = [] |
112
a38eabd4b6e1
* Store build logs in a structured way, for example to highlight messages on the error stream.
cmlenz
parents:
111
diff
changeset
|
590 for step in BuildStep.select(self.env, build=build.id, db=db): |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
591 steps.append({ |
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
592 'name': step.name, 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
593 'duration': pretty_timedelta(step.started, step.stopped or int(time.time())), |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
594 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
595 'cls': _step_status_label[step.status].replace(' ', '-'), |
245
a22ec8fce6c9
Store the reason(s) for build step failure in the database.
cmlenz
parents:
232
diff
changeset
|
596 'errors': step.errors, |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
597 'log': self._render_log(req, build, formatters, step), |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
598 'reports': self._render_reports(req, config, build, summarizers, |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
599 step) |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
600 }) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
601 data['build']['steps'] = steps |
592
4848d9b7a3e5
0.6dev: Removing 'Invalidate build' button when the build is 'pending' (and nothing further to really invalidate). See #332.
osimons
parents:
591
diff
changeset
|
602 data['build']['can_delete'] = ('BUILD_DELETE' in req.perm \ |
4848d9b7a3e5
0.6dev: Removing 'Invalidate build' button when the build is 'pending' (and nothing further to really invalidate). See #332.
osimons
parents:
591
diff
changeset
|
603 and build.status != build.PENDING) |
120
b63ed684c29c
Show the list of reports generated on the build page.
cmlenz
parents:
114
diff
changeset
|
604 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
605 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
606 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
607 'named "(default)" to Trac.' |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
608 _has_permission(repos, config.path, req.perm, True) |
250 | 609 chgset = repos.get_changeset(build.rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
610 data['build']['chgset_author'] = chgset.author |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
611 data['build']['display_rev'] = repos.normalize_rev(build.rev) |
250 | 612 |
636
21902b481ee7
0.6dev: Inline display of error and failure details in 'Test Results' summary table.
osimons
parents:
629
diff
changeset
|
613 add_script(req, 'common/js/folding.js') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
614 add_script(req, 'bitten/tabset.js') |
768 | 615 add_script(req, 'bitten/jquery.flot.js') |
164
a9cddfae3c09
Adapt to Trac [http://projects.edgewall.com/trac/changeset/2132 r2132].
cmlenz
parents:
163
diff
changeset
|
616 add_stylesheet(req, 'bitten/bitten.css') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
617 return 'bitten_build.html', data, None |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
618 |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
619 # ITimelineEventProvider methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
620 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
621 def get_timeline_filters(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
622 if 'BUILD_VIEW' in req.perm: |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
623 yield ('build', 'Builds') |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
624 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
625 def get_timeline_events(self, req, start, stop, filters): |
311 | 626 if 'build' not in filters: |
627 return | |
250 | 628 |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
629 # Attachments (will be rendered by attachment module) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
630 for event in AttachmentModule(self.env).get_timeline_events( |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
631 req, Resource('build'), start, stop): |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
632 yield event |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
633 |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
634 start = to_timestamp(start) |
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
635 stop = to_timestamp(stop) |
382
2078b20186cf
Trac 0.11 compatibility fix in timeline event provider.
cmlenz
parents:
381
diff
changeset
|
636 |
311 | 637 add_stylesheet(req, 'bitten/bitten.css') |
638 | |
639 db = self.env.get_db_cnx() | |
640 cursor = db.cursor() | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
641 cursor.execute("SELECT b.id,b.config,c.label,c.path, b.rev,p.name," |
311 | 642 "b.stopped,b.status FROM bitten_build AS b" |
643 " INNER JOIN bitten_config AS c ON (c.name=b.config) " | |
644 " INNER JOIN bitten_platform AS p ON (p.id=b.platform) " | |
645 "WHERE b.stopped>=%s AND b.stopped<=%s " | |
646 "AND b.status IN (%s, %s) ORDER BY b.stopped", | |
647 (start, stop, Build.SUCCESS, Build.FAILURE)) | |
648 | |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
649 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
650 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
651 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
652 |
311 | 653 event_kinds = {Build.SUCCESS: 'successbuild', |
654 Build.FAILURE: 'failedbuild'} | |
655 | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
656 for id_, config, label, path, rev, platform, stopped, status in cursor: |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
657 if not _has_permission(repos, path, req.perm): |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
658 continue |
311 | 659 errors = [] |
660 if status == Build.FAILURE: | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
661 for step in BuildStep.select(self.env, build=id_, |
311 | 662 status=BuildStep.FAILURE, |
663 db=db): | |
320 | 664 errors += [(step.name, error) for error |
311 | 665 in step.errors] |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
666 display_rev = repos.normalize_rev(rev) |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
667 yield (event_kinds[status], to_datetime(stopped, utc), None, |
834
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
668 (id_, config, label, display_rev, platform, status, |
70aebfc3a45f
Use `display_rev` strategy instead of just `rev` as that displays much nicer for DVCS sytems with long hash revisions numbers using Trac 0.12. No visual differences for Trac 0.11 users.
osimons
parents:
832
diff
changeset
|
669 errors)) |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
670 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
671 def render_timeline_event(self, context, field, event): |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
672 id_, config, label, rev, platform, status, errors = event[3] |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
673 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
674 if field == 'url': |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
675 return context.href.build(config, id_) |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
676 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
677 elif field == 'title': |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
678 return tag('Build of ', tag.em('%s [%s]' % (label, rev)), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
679 ' on %s %s' % (platform, _status_label[status])) |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
680 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
681 elif field == 'description': |
311 | 682 message = '' |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
683 if context.req.args.get('format') == 'rss': |
311 | 684 if errors: |
685 buf = StringIO() | |
686 prev_step = None | |
687 for step, error in errors: | |
688 if step != prev_step: | |
689 if prev_step is not None: | |
690 buf.write('</ul>') | |
321 | 691 buf.write('<p>Step %s failed:</p><ul>' \ |
692 % escape(step)) | |
311 | 693 prev_step = step |
321 | 694 buf.write('<li>%s</li>' % escape(error)) |
311 | 695 buf.write('</ul>') |
320 | 696 message = Markup(buf.getvalue()) |
311 | 697 else: |
698 if errors: | |
699 steps = [] | |
700 for step, error in errors: | |
701 if step not in steps: | |
702 steps.append(step) | |
488 | 703 steps = [Markup('<em>%s</em>') % step for step in steps] |
311 | 704 if len(steps) < 2: |
705 message = steps[0] | |
706 elif len(steps) == 2: | |
320 | 707 message = Markup(' and ').join(steps) |
311 | 708 elif len(steps) > 2: |
320 | 709 message = Markup(', ').join(steps[:-1]) + ', and ' + \ |
311 | 710 steps[-1] |
488 | 711 message = Markup('Step%s %s failed') % ( |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
712 len(steps) != 1 and 's' or '', message) |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
713 return message |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
714 |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
715 # Internal methods |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
716 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
717 def _do_invalidate(self, req, build, db): |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
718 self.log.info('Invalidating build %d', build.id) |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
719 |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
720 for step in BuildStep.select(self.env, build=build.id, db=db): |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
721 step.delete(db=db) |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
722 |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
723 build.slave = None |
762
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
724 build.started = 0 |
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
725 build.stopped = 0 |
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
726 build.last_activity = 0 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
727 build.status = Build.PENDING |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
728 build.slave_info = {} |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
729 build.update() |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
730 |
745
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
731 Attachment.delete_all(self.env, 'build', build.resource.id, db) |
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
732 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
733 db.commit() |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
734 |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
735 req.redirect(req.href.build(build.config)) |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
736 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
737 def _render_log(self, req, build, formatters, step): |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
738 items = [] |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
739 for log in BuildLog.select(self.env, build=build.id, step=step.name): |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
740 for level, message in log.messages: |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
741 for format in formatters: |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
742 message = format(step, log.generator, level, message) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
743 items.append({'level': level, 'message': message}) |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
744 return items |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
745 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
746 def _render_reports(self, req, config, build, summarizers, step): |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
747 reports = [] |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
748 for report in Report.select(self.env, build=build.id, step=step.name): |
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
749 summarizer = summarizers.get(report.category) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
750 if summarizer: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
751 tmpl, data = summarizer.render_summary(req, config, build, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
752 step, report.category) |
756 | 753 reports.append({'category': report.category, |
754 'template': tmpl, 'data': data}) | |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
755 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
756 tmpl = data = None |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
757 return reports |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
758 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
759 |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
760 class ReportChartController(Component): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
761 implements(IRequestHandler) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
762 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
763 generators = ExtensionPoint(IReportChartGenerator) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
764 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
765 # IRequestHandler methods |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
766 def match_request(self, req): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
767 match = re.match(r'/build/([\w.-]+)/chart/(\w+)', req.path_info) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
768 if match: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
769 req.args['config'] = match.group(1) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
770 req.args['category'] = match.group(2) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
771 return True |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
772 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
773 def process_request(self, req): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
774 category = req.args.get('category') |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
775 config = BuildConfig.fetch(self.env, name=req.args.get('config')) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
776 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
777 for generator in self.generators: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
778 if category in generator.get_supported_categories(): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
779 tmpl, data = generator.generate_chart_data(req, config, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
780 category) |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
781 break |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
782 else: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
783 raise TracError('Unknown report category "%s"' % category) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
784 |
779
d29499a4450c
Copy trac's `trac.util.presentation.to_json` method to prevent `json` module requirement, and incorporate fallback methods to support Trac 0.11 etc. See #426
dfraser
parents:
768
diff
changeset
|
785 data['dumps'] = json.to_json |
768 | 786 |
787 return tmpl, data, 'text/plain' | |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
788 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
789 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
790 class SourceFileLinkFormatter(Component): |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
791 """Detects references to files in the build log and renders them as links |
439 | 792 to the repository browser. |
793 """ | |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
794 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
795 implements(ILogFormatter) |
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
796 |
593
99831ab37fd3
0.6dev: Making source-linking work also for Windows-style file references (as output by Windows slaves). Thanks to Doug Patterson for updated regexp.
osimons
parents:
592
diff
changeset
|
797 _fileref_re = re.compile(r'(?P<prefix>-[A-Za-z])?(?P<path>[\w.-]+(?:[\\/][\w.-]+)+)(?P<line>:\d+)?') |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
798 |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
799 def get_formatter(self, req, build): |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
800 """Return the log message formatter function.""" |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
801 config = BuildConfig.fetch(self.env, name=build.config) |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
802 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
803 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
804 'named "(default)" to Trac.' |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
805 href = req.href.browser |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
806 cache = {} |
439 | 807 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
808 def _replace(m): |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
809 filepath = posixpath.normpath(m.group('path').replace('\\', '/')) |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
810 if not cache.get(filepath) is True: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
811 parts = filepath.split('/') |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
812 path = '' |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
813 for part in parts: |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
814 path = posixpath.join(path, part) |
439 | 815 if path not in cache: |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
816 try: |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
817 full_path = posixpath.join(config.path, path) |
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
818 full_path = posixpath.normpath(full_path) |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
819 if full_path.startswith(config.path + "/") \ |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
820 or full_path == config.path: |
528
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
821 repos.get_node(full_path, |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
822 build.rev) |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
823 cache[path] = True |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
824 else: |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
825 cache[path] = False |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
826 except TracError: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
827 cache[path] = False |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
828 if cache[path] is False: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
829 return m.group(0) |
439 | 830 link = href(config.path, filepath) |
831 if m.group('line'): | |
832 link += '#L' + m.group('line')[1:] | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
833 return Markup(tag.a(m.group(0), href=link)) |
439 | 834 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
835 def _formatter(step, type, level, message): |
439 | 836 buf = [] |
837 offset = 0 | |
838 for mo in self._fileref_re.finditer(message): | |
839 start, end = mo.span() | |
840 if start > offset: | |
841 buf.append(message[offset:start]) | |
842 buf.append(_replace(mo)) | |
843 offset = end | |
440
e660687ac89c
Follow-up fix to [486]: trailing chars in auto-linked log messages was getting removed.
cmlenz
parents:
439
diff
changeset
|
844 if offset < len(message): |
439 | 845 buf.append(message[offset:]) |
846 return Markup("").join(buf) | |
847 | |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
848 return _formatter |