Merge lp://staging/~jamalta/launchpad/changesfile-253525 into lp://staging/launchpad
- changesfile-253525
- Merge into devel
Proposed by
Jamal Fanaian
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~jamalta/launchpad/changesfile-253525 | ||||
Merge into: | lp://staging/launchpad | ||||
Diff against target: |
213 lines (+26/-42) 6 files modified
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+4/-4) lib/lp/soyuz/stories/ppa/xx-delete-packages.txt (+4/-4) lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt (+3/-3) lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt (+12/-28) lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt (+2/-2) lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt (+1/-1) |
||||
To merge this branch: | bzr merge lp://staging/~jamalta/launchpad/changesfile-253525 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Henning Eggers (community) | code | Needs Fixing | |
Review via email: mp+17587@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2010-01-18.
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Jamal Fanaian (jamalta) wrote : | # |
Revision history for this message
Henning Eggers (henninge) wrote : | # |
As discussed on irc, please apply extract_text to the tests in xx-distroseries
Come back with an incremental diff for approval, please.
review:
Needs Fixing
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt' | |||
2 | --- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2009-12-11 15:57:14 +0000 | |||
3 | +++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-01-18 16:45:25 +0000 | |||
4 | @@ -988,7 +988,7 @@ | |||
5 | 988 | >>> print_ppa_packages(jblack_browser.contents) | 988 | >>> print_ppa_packages(jblack_browser.contents) |
6 | 989 | Source Published Status Series Section Build | 989 | Source Published Status Series Section Build |
7 | 990 | Status | 990 | Status |
9 | 991 | foo - 2.0 (changesfile) ... Published Hoary Base | 991 | foo - 2.0 (sources.changes) ... Published Hoary Base |
10 | 992 | 992 | ||
11 | 993 | >>> foo_pub_id = getPPAPubIDsFor('no-priv', 'foo')[0] | 993 | >>> foo_pub_id = getPPAPubIDsFor('no-priv', 'foo')[0] |
12 | 994 | >>> jblack_browser.getControl( | 994 | >>> jblack_browser.getControl( |
13 | @@ -1063,8 +1063,8 @@ | |||
14 | 1063 | >>> print_ppa_packages(jblack_browser.contents) | 1063 | >>> print_ppa_packages(jblack_browser.contents) |
15 | 1064 | Source Published Status Series Section Build | 1064 | Source Published Status Series Section Build |
16 | 1065 | Status | 1065 | Status |
19 | 1066 | foo - 2.0 (changesfile) Pending Hoary Base i386 | 1066 | foo - 2.0 (sources.changes) Pending Hoary Base i386 |
20 | 1067 | foo - 1.1 (changesfile) Pending Warty Base | 1067 | foo - 1.1 (sources.changes) Pending Warty Base |
21 | 1068 | pmount - 0.1-1 (Newer...) Pending Hoary Editors | 1068 | pmount - 0.1-1 (Newer...) Pending Hoary Editors |
22 | 1069 | pmount - 0.1-1 Pending Warty Editors | 1069 | pmount - 0.1-1 Pending Warty Editors |
23 | 1070 | pmount - 0.1-1 Pending Grumpy Editors | 1070 | pmount - 0.1-1 Pending Grumpy Editors |
24 | @@ -1080,7 +1080,7 @@ | |||
25 | 1080 | >>> print_ppa_packages(jblack_browser.contents) | 1080 | >>> print_ppa_packages(jblack_browser.contents) |
26 | 1081 | Source Published Status Series Section Build | 1081 | Source Published Status Series Section Build |
27 | 1082 | Status | 1082 | Status |
29 | 1083 | foo - 1.1 (changesfile) ... Published Hoary Base | 1083 | foo - 1.1 (sources.changes) ... Published Hoary Base |
30 | 1084 | iceweasel...(...) 2007-07-09 Published Breezy-autotest Editors | 1084 | iceweasel...(...) 2007-07-09 Published Breezy-autotest Editors |
31 | 1085 | 1085 | ||
32 | 1086 | >>> foo_pub_id = getPPAPubIDsFor('mark', 'foo')[0] | 1086 | >>> foo_pub_id = getPPAPubIDsFor('mark', 'foo')[0] |
33 | 1087 | 1087 | ||
34 | === modified file 'lib/lp/soyuz/stories/ppa/xx-delete-packages.txt' | |||
35 | --- lib/lp/soyuz/stories/ppa/xx-delete-packages.txt 2009-09-22 16:39:28 +0000 | |||
36 | +++ lib/lp/soyuz/stories/ppa/xx-delete-packages.txt 2010-01-18 16:45:25 +0000 | |||
37 | @@ -371,7 +371,7 @@ | |||
38 | 371 | >>> print_ppa_packages(user_browser.contents) | 371 | >>> print_ppa_packages(user_browser.contents) |
39 | 372 | Source Published Status Series Section Build | 372 | Source Published Status Series Section Build |
40 | 373 | Status | 373 | Status |
42 | 374 | foo - 1.0 (changesfile) Superseded Hoary Base | 374 | foo - 1.0 (sources.changes) Superseded Hoary Base |
43 | 375 | 375 | ||
44 | 376 | We don't show the publishing details for binary packages, but the | 376 | We don't show the publishing details for binary packages, but the |
45 | 377 | presence of 'Built packages' and the binary filename in the 'Files' | 377 | presence of 'Built packages' and the binary filename in the 'Files' |
46 | @@ -401,7 +401,7 @@ | |||
47 | 401 | >>> print_ppa_packages(user_browser.contents) | 401 | >>> print_ppa_packages(user_browser.contents) |
48 | 402 | Source Published Status Series Section Build | 402 | Source Published Status Series Section Build |
49 | 403 | Status | 403 | Status |
51 | 404 | foo - 1.0 (changesfile) Superseded Hoary Base | 404 | foo - 1.0 (sources.changes) Superseded Hoary Base |
52 | 405 | 405 | ||
53 | 406 | >>> expander_url = user_browser.getLink( | 406 | >>> expander_url = user_browser.getLink( |
54 | 407 | ... id='pub%s-expander' % foo_pub_src.id).url | 407 | ... id='pub%s-expander' % foo_pub_src.id).url |
55 | @@ -440,7 +440,7 @@ | |||
56 | 440 | >>> print_ppa_packages(user_browser.contents) | 440 | >>> print_ppa_packages(user_browser.contents) |
57 | 441 | Source Published Status Series Section Build | 441 | Source Published Status Series Section Build |
58 | 442 | Status | 442 | Status |
60 | 443 | foo - 1.0 (changesfile) Superseded Hoary Base | 443 | foo - 1.0 (sources.changes) Superseded Hoary Base |
61 | 444 | 444 | ||
62 | 445 | The deletion works exactly as it does for PUBLISHED sources, both, | 445 | The deletion works exactly as it does for PUBLISHED sources, both, |
63 | 446 | source and binaries are marked as DELETED and the corresponding | 446 | source and binaries are marked as DELETED and the corresponding |
64 | @@ -479,7 +479,7 @@ | |||
65 | 479 | >>> print_ppa_packages(user_browser.contents) | 479 | >>> print_ppa_packages(user_browser.contents) |
66 | 480 | Source Published Status Series Section Build | 480 | Source Published Status Series Section Build |
67 | 481 | Status | 481 | Status |
69 | 482 | foo - 1.0 (changesfile) Deleted Hoary Base | 482 | foo - 1.0 (sources.changes) Deleted Hoary Base |
70 | 483 | 483 | ||
71 | 484 | >>> expander_url = user_browser.getLink( | 484 | >>> expander_url = user_browser.getLink( |
72 | 485 | ... id='pub%s-expander' % foo_pub_src.id).url | 485 | ... id='pub%s-expander' % foo_pub_src.id).url |
73 | 486 | 486 | ||
74 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt' | |||
75 | --- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2009-12-14 13:49:03 +0000 | |||
76 | +++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2010-01-18 16:45:25 +0000 | |||
77 | @@ -96,7 +96,7 @@ | |||
78 | 96 | Source Published Status Series Section Build | 96 | Source Published Status Series Section Build |
79 | 97 | Status | 97 | Status |
80 | 98 | cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386 | 98 | cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386 |
82 | 99 | ice...(changesfile) 2007-07-09 Published Warty Editors i386 | 99 | ice...(sources.changes) 2007-07-09 Published Warty Editors i386 |
83 | 100 | pmount - 0.1-1 2007-07-09 Published Warty Editors | 100 | pmount - 0.1-1 2007-07-09 Published Warty Editors |
84 | 101 | 101 | ||
85 | 102 | Each data row is expandable to contain some sections containing: | 102 | Each data row is expandable to contain some sections containing: |
86 | @@ -289,7 +289,7 @@ | |||
87 | 289 | >>> print_archive_package_rows(anon_browser.contents) | 289 | >>> print_archive_package_rows(anon_browser.contents) |
88 | 290 | Source Published Status Series Section Build | 290 | Source Published Status Series Section Build |
89 | 291 | Status | 291 | Status |
91 | 292 | i...(changesfile) 2007-07-09 Superseded Warty Editors | 292 | i...(sources.changes) 2007-07-09 Superseded Warty Editors |
92 | 293 | pmount - 0.1-1 2007-07-09 Deleted Warty Editors | 293 | pmount - 0.1-1 2007-07-09 Deleted Warty Editors |
93 | 294 | 294 | ||
94 | 295 | The 'Any Status' filter is also available, so the user can search over | 295 | The 'Any Status' filter is also available, so the user can search over |
95 | @@ -301,7 +301,7 @@ | |||
96 | 301 | Source Published Status Series Section Build | 301 | Source Published Status Series Section Build |
97 | 302 | Status | 302 | Status |
98 | 303 | cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386 | 303 | cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386 |
100 | 304 | ic...(changesfile) 2007-07-09 Superseded Warty Editors | 304 | ic...(sources.changes) 2007-07-09 Superseded Warty Editors |
101 | 305 | pmount - 0.1-1 2007-07-09 Deleted Warty Editors | 305 | pmount - 0.1-1 2007-07-09 Deleted Warty Editors |
102 | 306 | 306 | ||
103 | 307 | 307 | ||
104 | 308 | 308 | ||
105 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt' | |||
106 | --- lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2009-11-18 02:58:23 +0000 | |||
107 | +++ lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2010-01-18 16:45:25 +0000 | |||
108 | @@ -212,14 +212,8 @@ | |||
109 | 212 | 212 | ||
110 | 213 | With the possibility to download the entire changesfile (if available): | 213 | With the possibility to download the entire changesfile (if available): |
111 | 214 | 214 | ||
120 | 215 | >>> print find_tag_by_id(browser.contents, 'changesfile') | 215 | >>> print extract_text(find_tag_by_id(browser.contents, 'changesfile')) |
121 | 216 | <div id="changesfile"> | 216 | View sources.changes |
114 | 217 | <p> | ||
115 | 218 | <a href="http://localhost:58000/52/mozilla-firefox_0.9_i386.changes"> | ||
116 | 219 | View changesfile | ||
117 | 220 | </a> | ||
118 | 221 | </p> | ||
119 | 222 | </div> | ||
122 | 223 | 217 | ||
123 | 224 | And also download the files contained in this source, like '.orig', | 218 | And also download the files contained in this source, like '.orig', |
124 | 225 | '.diff' and the DSC: | 219 | '.diff' and the DSC: |
125 | @@ -251,8 +245,8 @@ | |||
126 | 251 | ... "commercialpackage/1.0-1") | 245 | ... "commercialpackage/1.0-1") |
127 | 252 | >>> changelog = find_tag_by_id( | 246 | >>> changelog = find_tag_by_id( |
128 | 253 | ... user_browser.contents, 'commercialpackage_1.0-1') | 247 | ... user_browser.contents, 'commercialpackage_1.0-1') |
131 | 254 | >>> changelog.find('a') | 248 | >>> print extract_text(changelog.find('a')) |
132 | 255 | <a href="http://launchpad.dev/~name16" class="sprite person"> foo.bar@canonical.com</a> | 249 | foo.bar@canonical.com |
133 | 256 | 250 | ||
134 | 257 | 251 | ||
135 | 258 | Let's check how the page behaves if we no files are present: | 252 | Let's check how the page behaves if we no files are present: |
136 | @@ -264,15 +258,11 @@ | |||
137 | 264 | A string is presented in both 'changesfile' and 'files' sections, | 258 | A string is presented in both 'changesfile' and 'files' sections, |
138 | 265 | warning the user that no file is available: | 259 | warning the user that no file is available: |
139 | 266 | 260 | ||
144 | 267 | >>> print find_tag_by_id(browser.contents, 'changesfile') | 261 | >>> print extract_text(find_tag_by_id(browser.contents, 'changesfile')) |
145 | 268 | <div id="changesfile"> | 262 | No sources.changes available. |
142 | 269 | <p>No changesfile available.</p> | ||
143 | 270 | </div> | ||
146 | 271 | 263 | ||
151 | 272 | >>> print find_tag_by_id(browser.contents, 'files') | 264 | >>> print extract_text(find_tag_by_id(browser.contents, 'files')) |
152 | 273 | <div id="files"> | 265 | No files available for download. |
149 | 274 | <p>No files available for download.</p> | ||
150 | 275 | </div> | ||
153 | 276 | 266 | ||
154 | 277 | 267 | ||
155 | 278 | = DistroSeries Partner Source Package Pages = | 268 | = DistroSeries Partner Source Package Pages = |
156 | @@ -291,11 +281,8 @@ | |||
157 | 291 | This page provides its versions publications organised by pocket. | 281 | This page provides its versions publications organised by pocket. |
158 | 292 | We can see 'commercialpackage' is published once in pocket RELEASE: | 282 | We can see 'commercialpackage' is published once in pocket RELEASE: |
159 | 293 | 283 | ||
165 | 294 | >>> print find_tag_by_id(browser.contents, 'publishing_history') | 284 | >>> print browser.getLink('commercialpackage 1.0-1').url |
166 | 295 | <dl id="publishing_history"> | 285 | http://launchpad.dev/ubuntu/breezy-autotest/+source/commercialpackage/1.0-1 |
162 | 296 | ... | ||
163 | 297 | <a href="/ubuntu/breezy-autotest/+source/commercialpackage/1.0-1">commercialpackage 1.0-1</a> | ||
164 | 298 | ... | ||
167 | 299 | 286 | ||
168 | 300 | The user can also download the files for the "currentrelease" (last | 287 | The user can also download the files for the "currentrelease" (last |
169 | 301 | published version) if they are available: | 288 | published version) if they are available: |
170 | @@ -372,11 +359,8 @@ | |||
171 | 372 | 359 | ||
172 | 373 | With the possibility to download the entire changesfile (if available): | 360 | With the possibility to download the entire changesfile (if available): |
173 | 374 | 361 | ||
179 | 375 | >>> print find_tag_by_id(browser.contents, 'changesfile') | 362 | >>> print browser.getLink('View sources.changes').url |
180 | 376 | <div id="changesfile"> | 363 | http://localhost:58000/65/commercialpackage_1.0-1_source.changes |
176 | 377 | ... | ||
177 | 378 | <a href="http://localhost:58000/65/commercialpackage_1.0-1_source.changes"> | ||
178 | 379 | ... | ||
181 | 380 | 364 | ||
182 | 381 | And also download the files contained in this source, like '.orig', | 365 | And also download the files contained in this source, like '.orig', |
183 | 382 | '.diff' and the DSC: | 366 | '.diff' and the DSC: |
184 | 383 | 367 | ||
185 | === modified file 'lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt' | |||
186 | --- lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt 2009-10-27 03:23:05 +0000 | |||
187 | +++ lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt 2010-01-18 16:45:25 +0000 | |||
188 | @@ -50,10 +50,10 @@ | |||
189 | 50 | <div id="changesfile" tal:define="changesfile context/changesfile"> | 50 | <div id="changesfile" tal:define="changesfile context/changesfile"> |
190 | 51 | <p tal:condition="changesfile"> | 51 | <p tal:condition="changesfile"> |
191 | 52 | <a tal:attributes="href changesfile/http_url"> | 52 | <a tal:attributes="href changesfile/http_url"> |
193 | 53 | View changesfile | 53 | View sources.changes |
194 | 54 | </a> | 54 | </a> |
195 | 55 | </p> | 55 | </p> |
197 | 56 | <p tal:condition="not: changesfile">No changesfile available.</p> | 56 | <p tal:condition="not: changesfile">No sources.changes available.</p> |
198 | 57 | </div> | 57 | </div> |
199 | 58 | 58 | ||
200 | 59 | </div> | 59 | </div> |
201 | 60 | 60 | ||
202 | === modified file 'lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt' | |||
203 | --- lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt 2009-12-10 15:19:03 +0000 | |||
204 | +++ lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt 2010-01-18 16:45:25 +0000 | |||
205 | @@ -35,7 +35,7 @@ | |||
206 | 35 | <a tal:condition="changesfile" | 35 | <a tal:condition="changesfile" |
207 | 36 | tal:attributes="href changesfile/http_url; | 36 | tal:attributes="href changesfile/http_url; |
208 | 37 | title changesfile/filename" | 37 | title changesfile/filename" |
210 | 38 | >(changesfile)</a> | 38 | >(sources.changes)</a> |
211 | 39 | </tal:view_changesfile> | 39 | </tal:view_changesfile> |
212 | 40 | </td> | 40 | </td> |
213 | 41 | <td tal:condition="context/archive/owner/isTeam" | 41 | <td tal:condition="context/archive/owner/isTeam" |
Summary
Bug #253525 explains that the word changesfile does not exist and should be changed for something that makes sense. The PPA page was changed to read sources.changes, so the same example was followed in the other templates that still read changesfile.
Proposed fix
Replace changesfile in templates so that it reads sources.changes instead.
Pre-implementation notes
Discussed with Curtis Hovey who agreed that sources.changes was the best term to use. He also pointed out stories for soyuz that will have to be modified to work with this change.
Implementation details
lib/lp/ soyuz/templates /distroseriesso urcepackagerele ase-index. pt soyuz/templates /sourcepackagep ublishinghistor y-listing- archive- detailed. pt
lib/lp/
* Changes changesfile term in the content to sources.changes
lib/lp/ soyuz/stories/ ppa/xx- copy-packages. txt soyuz/stories/ ppa/xx- delete- packages. txt soyuz/stories/ ppa/xx- ppa-packages. txt soyuz/stories/ soyuz/xx- distroseries- sources. txt
lib/lp/
lib/lp/
lib/lp/
* Update stories that referenced pages with the above templates to read sources.changes instead of changesfile.
Tests
bin/test -vvct xx-distroseries -sources
bin/test -vvct xx-copy-packages
bin/test -vvct xx-delete-packages
bin/test -vvct xx-ppa-packages
Demo and Q/A
https:/ /launchpad. dev/~cprov/ +archive/ ppa/+packages /launchpad. dev/ubuntu/ hoary/+ source/ pmount/ 0.1-1
https:/