1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
<table
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
id="proposal-summary"
tal:define="context_menu context/menu:context">
<tbody>
<tal:comment condition="nothing">
<!--
Each of the rows in this table have an id that is strictly
alphabetical (according to ASCII). This is used in the javascript
processing of the summary to determine which rows have been added,
and removed through AJAX requests.
-->
</tal:comment>
<tr id="summary-row-1-status">
<th>Status:</th>
<td id="branchmergeproposal-status-value">
<tal:merge-status define="link context_menu/edit_status;
status_name context/queue_status/name">
<a tal:condition="link/enabled"
tal:content="context/queue_status/title"
tal:attributes="href link/url;
class string:value mergestatus${status_name}">
Work in progress
</a>
<span tal:condition="not: link/enabled"
tal:content="context/queue_status/title"
tal:attributes="class string:value mergestatus${status_name}">
Work in progress
</span>
<a tal:condition="link/enabled"
tal:attributes="href link/url">
<img class="editicon" src="/@@/edit" alt="Edit status" />
</a>
</tal:merge-status>
</td>
</tr>
<tal:comment condition="nothing">
<!--
Only show the reviewed section if the state is not superseded.
Only show the reviewed revision if not rejected.
-->
</tal:comment>
<tal:not-superseded condition="not: context/queue_status/enumvalue:SUPERSEDED">
<tal:reviewed condition="context/reviewer">
<tr id="summary-row-2-reviewer">
<th>
<tal:rejected condition="context/queue_status/enumvalue:REJECTED">
Rejected by:
</tal:rejected>
<tal:approved condition="not: context/queue_status/enumvalue:REJECTED">
Approved by:
</tal:approved>
</th>
<td>
<tal:reviewer replace="structure context/reviewer/fmt:link">
Some User
</tal:reviewer>
<tal:modified replace="context/date_reviewed/fmt:displaydate" />
</td>
</tr>
<tr id="summary-row-3-approved-revision"
tal:condition="not: context/queue_status/enumvalue:REJECTED">
<th>Approved revision:</th>
<td>
<tal:not-available condition="not: context/reviewed_revision_id">
not available
</tal:not-available>
<tal:revision condition="context/reviewed_revision_id"
content="view/reviewed_revision_number">
1234
</tal:revision>
</td>
</tr>
</tal:reviewed>
</tal:not-superseded>
<tal:queued condition="context/queue_status/enumvalue:QUEUED">
<tr id="summary-row-4-queued-by">
<th>Queued by:</th>
<td tal:content="structure context/queuer/fmt:link">Some User</td>
</tr>
<tr id="summary-row-5-queued-revision">
<th>Queued revision:</th>
<td>
<tal:not-available condition="not: context/queued_revision_id">
not available
</tal:not-available>
<tal:revision condition="context/queued_revision_id"
content="view/queued_revision_number">
1234
</tal:revision>
</td>
</tr>
</tal:queued>
<tal:merged condition="context/queue_status/enumvalue:MERGED">
<tr id="summary-row-6-merge-reporter"
tal:condition="context/merge_reporter">
<th>Merge reported by:</th>
<td tal:content="structure context/merge_reporter/fmt:link">Some User</td>
</tr>
<tr id="summary-row-7-merged-revision">
<th>Merged at revision:</th>
<td>
<tal:not-available condition="not: context/merged_revno">
not available
</tal:not-available>
<tal:revision condition="context/merged_revno"
content="context/merged_revno">
1234
</tal:revision>
<a tal:define="link context_menu/update_merge_revno"
tal:condition="link/enabled"
tal:attributes="href link/url"
><img src="/@@/edit" tal:attributes="title link/text; alt link/text" />
</a>
</td>
</tr>
</tal:merged>
<tr id="summary-row-8-source-branch">
<th>Proposed branch:</th>
<td tal:content="structure context/source_branch/fmt:bzr-link">lp:~foo/bar/baz</td>
</tr>
<tr id="summary-row-9-target-branch">
<th>Merge into:</th>
<td tal:content="structure context/target_branch/fmt:bzr-link">lp:~foo/bar/baz</td>
</tr>
<tr id="summary-row-a-prerequisite-branch"
tal:condition="context/prerequisite_branch">
<th>Prerequisite:</th>
<td tal:content="structure context/prerequisite_branch/fmt:bzr-link">lp:~foo/bar/baz</td>
</tr>
<tr id="summary-row-b-diff"
tal:condition="context/preview_diff">
<th>Diff against target:</th>
<td>
<tal:diff replace="structure context/preview_diff/fmt:link"/>
<pre tal:condition="context/preview_diff/has_conflicts"
tal:content="context/preview_diff/conflicts"/>
</td>
</tr>
<tr id="summary-row-merge-instruction">
<th>To merge this branch:</th>
<td>bzr merge <span class="branch-url" tal:content="context/source_branch/bzr_identity" /></td>
</tr>
</tbody>
</table>
|