Merge lp:~jml/launchpad/code-to-branches into lp:launchpad/db-devel
- code-to-branches
- Merge into db-devel
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | not available | ||||
Proposed branch: | lp:~jml/launchpad/code-to-branches | ||||
Merge into: | lp:launchpad/db-devel | ||||
Diff against target: |
669 lines 35 files modified
lib/canonical/launchpad/browser/launchpad.py (+1/-1) lib/canonical/launchpad/browser/personproduct.py (+1/-1) lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt (+2/-2) lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt (+1/-1) lib/canonical/launchpad/pagetitles.py (+1/-1) lib/canonical/launchpad/webapp/__init__.py (+1/-1) lib/lp/bugs/pagetests/cve/cve-pages.txt (+3/-3) lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-activity.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-index.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-malone-homepage.txt (+1/-1) lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt (+1/-1) lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt (+2/-2) lib/lp/code/stories/branches/xx-branch-index.txt (+2/-2) lib/lp/code/stories/branches/xx-distribution-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-distroseries-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-project-branches.txt (+1/-1) lib/lp/registry/browser/distribution.py (+1/-1) lib/lp/registry/browser/person.py (+1/-1) lib/lp/registry/browser/product.py (+1/-1) lib/lp/registry/browser/productseries.py (+1/-1) lib/lp/registry/browser/project.py (+1/-1) lib/lp/registry/stories/distribution/xx-distribution-packages.txt (+3/-3) lib/lp/registry/stories/milestone/object-milestones.txt (+2/-2) lib/lp/registry/stories/product/xx-product-launchpad-usage.txt (+3/-3) lib/lp/registry/stories/team-polls/create-polls.txt (+1/-1) lib/lp/soyuz/stories/packaging/package-pages-navigation.txt (+10/-10) lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt (+3/-3) lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt (+1/-1) lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+1/-1) lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt (+1/-1) lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt (+1/-1) lib/lp/translations/stories/navigation-links/pofile.txt (+2/-2) lib/lp/translations/stories/navigation-links/pomsgset.txt (+2/-2) lib/lp/translations/stories/navigation-links/potemplate.txt (+2/-2) |
||||
To merge this branch: | bzr merge lp:~jml/launchpad/code-to-branches | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | release-critical | Approve | |
Michael Nelson (community) | code | Approve | |
Martin Albisetti (community) | ui | Approve | |
Review via email: mp+12288@code.launchpad.net |
Commit message
Change 'Code' tab to 'Branches'.
Description of the change
Jonathan Lange (jml) wrote : | # |
Martin Albisetti (beuno) wrote : | # |
Thank you kind sir.
Jonathan Lange (jml) wrote : | # |
... and all the tests pass.
Michael Nelson (michael.nelson) wrote : | # |
> This branch changes the "Code" tab to be a "Branches" tab. It also changes the
> "launchpad usage" text to say, "Uses Launchpad for Answers and Branches".
>
> None of the changes are very surprising, I think.
Hi Jonathan,
Thanks for getting this done!
I think the main issue is conflicts with other RC-mp's... for example,
my own one at:
adds a print_location call to a test. What's the best way to solve it?
I can obviously update my branch to expect 'Branches' and pre-empt the
failure - but I'd need to be sure that yours is landing at the same time...
or perhaps you merge any other of the branches on the CRB that use
print_location (maybe mine's the only one).
Anyway, I'll update CRB so that this is obvious.
--
Michael
Michael Nelson (michael.nelson) wrote : | # |
> adds a print_location call to a test. What's the best way to solve it?
> I can obviously update my branch to expect 'Branches' and pre-empt the
> failure - but I'd need to be sure that yours is landing at the same time...
> or perhaps you merge any other of the branches on the CRB that use
> print_location (maybe mine's the only one).
Actually, I'll just update my branch to use ... within the print_location.
> Anyway, I'll update CRB so that this is obvious.
>
> --
> Michael
Michael Nelson (michael.nelson) wrote : | # |
>
> Actually, I'll just update my branch to use ... within the print_location.
>
Done.
Just watch out - I'm not sure with which version of db-devel you ran ec2test, but it might be worth checking for any other occurrences of print_location that are in diffs since that rev?
Brad Crittenden (bac) : | # |
Preview Diff
1 | === modified file 'lib/canonical/launchpad/browser/launchpad.py' |
2 | --- lib/canonical/launchpad/browser/launchpad.py 2009-09-22 04:42:31 +0000 |
3 | +++ lib/canonical/launchpad/browser/launchpad.py 2009-09-24 17:43:12 +0000 |
4 | @@ -399,7 +399,7 @@ |
5 | |
6 | def branches(self): |
7 | target = '' |
8 | - text = 'Code' |
9 | + text = 'Branches' |
10 | summary = 'The Code Bazaar' |
11 | return Link(target, text, summary) |
12 | |
13 | |
14 | === modified file 'lib/canonical/launchpad/browser/personproduct.py' |
15 | --- lib/canonical/launchpad/browser/personproduct.py 2009-08-24 17:47:34 +0000 |
16 | +++ lib/canonical/launchpad/browser/personproduct.py 2009-09-24 17:43:12 +0000 |
17 | @@ -59,7 +59,7 @@ |
18 | enable_only = ['branches'] |
19 | |
20 | def branches(self): |
21 | - text = 'Code' |
22 | + text = 'Branches' |
23 | summary = ('Bazaar Branches of %s owned by %s' % |
24 | (self.context.product.displayname, |
25 | self.context.person.displayname)) |
26 | |
27 | === modified file 'lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt' |
28 | --- lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt 2009-09-18 23:46:11 +0000 |
29 | +++ lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt 2009-09-24 17:43:12 +0000 |
30 | @@ -57,7 +57,7 @@ |
31 | >>> anon_browser.open('http://code.launchpad.dev/') |
32 | >>> print_location_apps(anon_browser.contents) |
33 | * Launchpad Home - http://launchpad.dev/ |
34 | - * Code (selected) - http://code.launchpad.dev/ |
35 | + * Branches (selected) - http://code.launchpad.dev/ |
36 | * Bugs - http://bugs.launchpad.dev/ |
37 | * Blueprints - http://blueprints.launchpad.dev/ |
38 | * Translations - http://translations.launchpad.dev/ |
39 | @@ -66,7 +66,7 @@ |
40 | >>> user_browser.open('http://answers.launchpad.dev/') |
41 | >>> print_location_apps(user_browser.contents) |
42 | * Launchpad Home - http://launchpad.dev/ |
43 | - * Code - http://code.launchpad.dev/ |
44 | + * Branches - http://code.launchpad.dev/ |
45 | * Bugs - http://bugs.launchpad.dev/ |
46 | * Blueprints - http://blueprints.launchpad.dev/ |
47 | * Translations - http://translations.launchpad.dev/ |
48 | |
49 | === modified file 'lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt' |
50 | --- lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-09-22 13:10:45 +0000 |
51 | +++ lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-09-24 17:43:11 +0000 |
52 | @@ -10,7 +10,7 @@ |
53 | Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links |
54 | Tabs: |
55 | * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla |
56 | - * Code - http://code.launchpad.dev/ubuntu/warty/+source/mozilla |
57 | + * Branches - http://code.launchpad.dev/ubuntu/warty/+source/mozilla |
58 | * Bugs - http://bugs.launchpad.dev/ubuntu/warty/+source/mozilla |
59 | * Blueprints - not linked |
60 | * Translations - http://translations.launchpad.dev/ubuntu/warty/+source/mozilla |
61 | |
62 | === modified file 'lib/canonical/launchpad/pagetitles.py' |
63 | --- lib/canonical/launchpad/pagetitles.py 2009-09-23 03:36:55 +0000 |
64 | +++ lib/canonical/launchpad/pagetitles.py 2009-09-24 17:43:11 +0000 |
65 | @@ -134,7 +134,7 @@ |
66 | |
67 | bazaar_all_branches = 'All branches in the Launchpad Bazaar' |
68 | |
69 | -bazaar_index = 'Launchpad Code' |
70 | +bazaar_index = 'Launchpad Branches' |
71 | |
72 | bazaar_sync_review = ( |
73 | 'Review upstream repositories for Launchpad Bazaar syncing') |
74 | |
75 | === modified file 'lib/canonical/launchpad/webapp/__init__.py' |
76 | --- lib/canonical/launchpad/webapp/__init__.py 2009-08-27 07:05:16 +0000 |
77 | +++ lib/canonical/launchpad/webapp/__init__.py 2009-09-24 17:43:12 +0000 |
78 | @@ -124,6 +124,6 @@ |
79 | def branches(self): |
80 | # this is disabled by default, because relatively few objects have |
81 | # branch views |
82 | - text = 'Code' |
83 | + text = 'Branches' |
84 | summary = 'View related branches of code' |
85 | return Link('', text, summary=summary) |
86 | |
87 | === modified file 'lib/lp/bugs/pagetests/cve/cve-pages.txt' |
88 | --- lib/lp/bugs/pagetests/cve/cve-pages.txt 2009-06-12 16:36:02 +0000 |
89 | +++ lib/lp/bugs/pagetests/cve/cve-pages.txt 2009-09-24 17:43:12 +0000 |
90 | @@ -21,7 +21,7 @@ |
91 | Hierarchy: Launchpad |
92 | Tabs: |
93 | * Launchpad Home - http://launchpad.dev/ |
94 | - * Code - http://code.launchpad.dev/ |
95 | + * Branches - http://code.launchpad.dev/ |
96 | * Bugs (selected) - http://bugs.launchpad.dev/ |
97 | * Blueprints - http://blueprints.launchpad.dev/ |
98 | * Translations - http://translations.launchpad.dev/ |
99 | @@ -41,7 +41,7 @@ |
100 | Hierarchy: Launchpad |
101 | Tabs: |
102 | * Launchpad Home - http://launchpad.dev/ |
103 | - * Code - http://code.launchpad.dev/ |
104 | + * Branches - http://code.launchpad.dev/ |
105 | * Bugs (selected) - http://bugs.launchpad.dev/ |
106 | * Blueprints - http://blueprints.launchpad.dev/ |
107 | * Translations - http://translations.launchpad.dev/ |
108 | @@ -86,7 +86,7 @@ |
109 | Hierarchy: Launchpad |
110 | Tabs: |
111 | * Launchpad Home - http://launchpad.dev/ |
112 | - * Code - http://code.launchpad.dev/ |
113 | + * Branches - http://code.launchpad.dev/ |
114 | * Bugs (selected) - http://bugs.launchpad.dev/ |
115 | * Blueprints - http://blueprints.launchpad.dev/ |
116 | * Translations - http://translations.launchpad.dev/ |
117 | |
118 | === modified file 'lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt' |
119 | --- lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2009-09-23 14:40:53 +0000 |
120 | +++ lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2009-09-24 17:43:12 +0000 |
121 | @@ -14,7 +14,7 @@ |
122 | Hierarchy: Ubuntu > ?mozilla-firefox? package > Bugs > Bug #1... |
123 | Tabs: |
124 | * Overview - http://launchpad.dev/ubuntu/+source/mozilla-firefox |
125 | - * Code - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox |
126 | + * Branches - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox |
127 | * Bugs (selected) - http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox |
128 | * Blueprints - not linked |
129 | * Translations - not linked |
130 | |
131 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt' |
132 | --- lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2009-09-23 14:40:53 +0000 |
133 | +++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2009-09-24 17:43:12 +0000 |
134 | @@ -14,7 +14,7 @@ |
135 | Hierarchy: Debian > ?mozilla-firefox? package > Bugs > Bug #3... |
136 | Tabs: |
137 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
138 | - * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
139 | + * Branches - http://code.launchpad.dev/debian/+source/mozilla-firefox |
140 | * Bugs (selected) - http://bugs.launchpad.dev/debian/+source/mozilla-firefox |
141 | * Blueprints - not linked |
142 | * Translations - not linked |
143 | |
144 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-index.txt' |
145 | --- lib/lp/bugs/stories/bugs/xx-bug-index.txt 2009-09-20 17:17:35 +0000 |
146 | +++ lib/lp/bugs/stories/bugs/xx-bug-index.txt 2009-09-24 17:43:12 +0000 |
147 | @@ -16,7 +16,7 @@ |
148 | Hierarchy: Debian > ?mozilla-firefox? package > Bug #2 (blackhole) |
149 | Tabs: |
150 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
151 | - * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
152 | + * Branches - http://code.launchpad.dev/debian/+source/mozilla-firefox |
153 | * Bugs (selected) - http://bugs.launchpad.dev/debian/+source/mozilla-firefox |
154 | * Blueprints - not linked |
155 | * Translations - not linked |
156 | |
157 | === modified file 'lib/lp/bugs/stories/bugs/xx-malone-homepage.txt' |
158 | --- lib/lp/bugs/stories/bugs/xx-malone-homepage.txt 2009-09-04 15:06:34 +0000 |
159 | +++ lib/lp/bugs/stories/bugs/xx-malone-homepage.txt 2009-09-24 17:43:12 +0000 |
160 | @@ -8,7 +8,7 @@ |
161 | Hierarchy: None displayed |
162 | Tabs: |
163 | * Launchpad Home - http://launchpad.dev/ |
164 | - * Code - http://code.launchpad.dev/ |
165 | + * Branches - http://code.launchpad.dev/ |
166 | * Bugs (selected) - http://bugs.launchpad.dev/ |
167 | * Blueprints - http://blueprints.launchpad.dev/ |
168 | * Translations - http://translations.launchpad.dev/ |
169 | |
170 | === modified file 'lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt' |
171 | --- lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2009-09-01 16:24:52 +0000 |
172 | +++ lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2009-09-24 17:43:12 +0000 |
173 | @@ -8,7 +8,7 @@ |
174 | Hierarchy: None displayed |
175 | Tabs: |
176 | * Launchpad Home - http://launchpad.dev/ |
177 | - * Code - http://code.launchpad.dev/ |
178 | + * Branches - http://code.launchpad.dev/ |
179 | * Bugs (selected) - http://bugs.launchpad.dev/ |
180 | * Blueprints - http://blueprints.launchpad.dev/ |
181 | * Translations - http://translations.launchpad.dev/ |
182 | |
183 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt' |
184 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-09-01 16:56:20 +0000 |
185 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-09-24 17:43:12 +0000 |
186 | @@ -17,7 +17,7 @@ |
187 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
188 | Tabs: |
189 | * Launchpad Home - http://launchpad.dev/ |
190 | - * Code - http://code.launchpad.dev/ |
191 | + * Branches - http://code.launchpad.dev/ |
192 | * Bugs (selected) - http://bugs.launchpad.dev/ |
193 | * Blueprints - http://blueprints.launchpad.dev/ |
194 | * Translations - http://translations.launchpad.dev/ |
195 | @@ -73,7 +73,7 @@ |
196 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
197 | Tabs: |
198 | * Launchpad Home - http://launchpad.dev/ |
199 | - * Code - http://code.launchpad.dev/ |
200 | + * Branches - http://code.launchpad.dev/ |
201 | * Bugs (selected) - http://bugs.launchpad.dev/ |
202 | * Blueprints - http://blueprints.launchpad.dev/ |
203 | * Translations - http://translations.launchpad.dev/ |
204 | |
205 | === modified file 'lib/lp/code/stories/branches/xx-branch-index.txt' |
206 | --- lib/lp/code/stories/branches/xx-branch-index.txt 2009-09-23 14:40:53 +0000 |
207 | +++ lib/lp/code/stories/branches/xx-branch-index.txt 2009-09-24 17:43:11 +0000 |
208 | @@ -415,7 +415,7 @@ |
209 | Hierarchy: GNOME Terminal > Branches > scanned |
210 | Tabs: |
211 | * Overview - http://launchpad.dev/gnome-terminal |
212 | - * Code (selected) - http://code.launchpad.dev/gnome-terminal |
213 | + * Branches (selected) - http://code.launchpad.dev/gnome-terminal |
214 | * Bugs - http://bugs.launchpad.dev/gnome-terminal |
215 | * Blueprints - http://blueprints.launchpad.dev/gnome-terminal |
216 | * Translations - http://translations.launchpad.dev/gnome-terminal |
217 | @@ -427,7 +427,7 @@ |
218 | Hierarchy: Sample Person > Branches > junk.dev |
219 | Tabs: |
220 | * Overview - http://launchpad.dev/~name12 |
221 | - * Code (selected) - http://code.launchpad.dev/~name12 |
222 | + * Branches (selected) - http://code.launchpad.dev/~name12 |
223 | * Bugs - http://bugs.launchpad.dev/~name12 |
224 | * Blueprints - http://blueprints.launchpad.dev/~name12 |
225 | * Translations - http://translations.launchpad.dev/~name12 |
226 | |
227 | === modified file 'lib/lp/code/stories/branches/xx-distribution-branches.txt' |
228 | --- lib/lp/code/stories/branches/xx-distribution-branches.txt 2009-07-06 04:01:18 +0000 |
229 | +++ lib/lp/code/stories/branches/xx-distribution-branches.txt 2009-09-24 17:43:12 +0000 |
230 | @@ -23,7 +23,7 @@ |
231 | |
232 | >>> print_location_apps(browser.contents) |
233 | * Overview (selected) ... |
234 | - * Code - http://code.launchpad.dev/mint |
235 | + * Branches - http://code.launchpad.dev/mint |
236 | ... |
237 | |
238 | Going to this page shows us a listing ordered by most recently changed first. |
239 | |
240 | === modified file 'lib/lp/code/stories/branches/xx-distroseries-branches.txt' |
241 | --- lib/lp/code/stories/branches/xx-distroseries-branches.txt 2009-07-06 04:48:04 +0000 |
242 | +++ lib/lp/code/stories/branches/xx-distroseries-branches.txt 2009-09-24 17:43:12 +0000 |
243 | @@ -23,7 +23,7 @@ |
244 | |
245 | >>> print_location_apps(browser.contents) |
246 | * Overview (selected) ... |
247 | - * Code - http://code.launchpad.dev/mint/stable |
248 | + * Branches - http://code.launchpad.dev/mint/stable |
249 | ... |
250 | |
251 | Going to this page shows us a listing of all branches associated with that |
252 | |
253 | === modified file 'lib/lp/code/stories/branches/xx-project-branches.txt' |
254 | --- lib/lp/code/stories/branches/xx-project-branches.txt 2009-09-23 14:40:53 +0000 |
255 | +++ lib/lp/code/stories/branches/xx-project-branches.txt 2009-09-24 17:43:11 +0000 |
256 | @@ -8,7 +8,7 @@ |
257 | Projects link their branch listing page. |
258 | |
259 | >>> browser.open('http://launchpad.dev/mozilla') |
260 | - >>> browser.getLink('Code').click() |
261 | + >>> browser.getLink('Branches').click() |
262 | >>> print browser.title |
263 | Branches : the Mozilla Project |
264 | |
265 | |
266 | === modified file 'lib/lp/registry/browser/distribution.py' |
267 | --- lib/lp/registry/browser/distribution.py 2009-09-22 19:52:18 +0000 |
268 | +++ lib/lp/registry/browser/distribution.py 2009-09-24 17:43:12 +0000 |
269 | @@ -113,7 +113,7 @@ |
270 | if IProduct.providedBy(self.context): |
271 | if self.context.official_codehosting: |
272 | url = canonical_url(self.context, rootsite='code') |
273 | - uses.append(href_template % (url, 'Code')) |
274 | + uses.append(href_template % (url, 'Branches')) |
275 | if self.context.official_rosetta: |
276 | url = canonical_url(self.context, rootsite='translations') |
277 | uses.append(href_template % (url, 'Translations')) |
278 | |
279 | === modified file 'lib/lp/registry/browser/person.py' |
280 | --- lib/lp/registry/browser/person.py 2009-09-23 16:06:53 +0000 |
281 | +++ lib/lp/registry/browser/person.py 2009-09-24 17:43:12 +0000 |
282 | @@ -713,7 +713,7 @@ |
283 | return Link('', text, summary) |
284 | |
285 | def branches(self): |
286 | - text = 'Code' |
287 | + text = 'Branches' |
288 | summary = ('Bazaar Branches and revisions registered and authored ' |
289 | 'by %s' % self.context.displayname) |
290 | return Link('', text, summary) |
291 | |
292 | === modified file 'lib/lp/registry/browser/product.py' |
293 | --- lib/lp/registry/browser/product.py 2009-09-22 15:02:41 +0000 |
294 | +++ lib/lp/registry/browser/product.py 2009-09-24 17:43:11 +0000 |
295 | @@ -271,7 +271,7 @@ |
296 | return Link('', text, summary) |
297 | |
298 | def branches(self): |
299 | - text = 'Code' |
300 | + text = 'Branches' |
301 | summary = 'Branches for %s' % self.context.displayname |
302 | return Link('', text, summary) |
303 | |
304 | |
305 | === modified file 'lib/lp/registry/browser/productseries.py' |
306 | --- lib/lp/registry/browser/productseries.py 2009-09-22 19:52:18 +0000 |
307 | +++ lib/lp/registry/browser/productseries.py 2009-09-24 17:43:12 +0000 |
308 | @@ -143,7 +143,7 @@ |
309 | def branches(self): |
310 | """Return a link to view the branches related to this series.""" |
311 | # Override to go to the branches for the product. |
312 | - text = 'Code' |
313 | + text = 'Branches' |
314 | summary = 'View related branches of code' |
315 | link = canonical_url(self.context.product, rootsite='code') |
316 | return Link(link, text, summary=summary) |
317 | |
318 | === modified file 'lib/lp/registry/browser/project.py' |
319 | --- lib/lp/registry/browser/project.py 2009-09-22 15:02:41 +0000 |
320 | +++ lib/lp/registry/browser/project.py 2009-09-24 17:43:12 +0000 |
321 | @@ -134,7 +134,7 @@ |
322 | 'answers', 'translations'] |
323 | |
324 | def branches(self): |
325 | - text = 'Code' |
326 | + text = 'Branches' |
327 | return Link('', text, enabled=self.context.hasProducts()) |
328 | |
329 | def bugs(self): |
330 | |
331 | === modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt' |
332 | --- lib/lp/registry/stories/distribution/xx-distribution-packages.txt 2009-09-22 13:27:30 +0000 |
333 | +++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt 2009-09-24 17:43:12 +0000 |
334 | @@ -199,7 +199,7 @@ |
335 | Hierarchy: Ubuntu > ?iceweasel? package |
336 | Tabs: |
337 | * Overview (selected) - not linked |
338 | - * Code - http://code.launchpad.dev/ubuntu/+source/iceweasel |
339 | + * Branches - http://code.launchpad.dev/ubuntu/+source/iceweasel |
340 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/iceweasel |
341 | * Blueprints - not linked |
342 | * Translations - not linked |
343 | @@ -381,7 +381,7 @@ |
344 | Hierarchy: Ubuntu > ?foobar? package > Change log |
345 | Tabs: |
346 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/foobar |
347 | - * Code - http://code.launchpad.dev/ubuntu/+source/foobar |
348 | + * Branches - http://code.launchpad.dev/ubuntu/+source/foobar |
349 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/foobar |
350 | * Blueprints - not linked |
351 | * Translations - not linked |
352 | @@ -575,7 +575,7 @@ |
353 | Hierarchy: Ubuntu > ?alsa-utils? package > Publishing history |
354 | Tabs: |
355 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
356 | - * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
357 | + * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
358 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
359 | * Blueprints - not linked |
360 | * Translations - not linked |
361 | |
362 | === modified file 'lib/lp/registry/stories/milestone/object-milestones.txt' |
363 | --- lib/lp/registry/stories/milestone/object-milestones.txt 2009-09-19 00:09:57 +0000 |
364 | +++ lib/lp/registry/stories/milestone/object-milestones.txt 2009-09-24 17:43:11 +0000 |
365 | @@ -143,7 +143,7 @@ |
366 | Hierarchy: None displayed |
367 | Tabs: |
368 | * Overview (selected) - http://launchpad.dev/firefox |
369 | - * Code - http://code.launchpad.dev/firefox |
370 | + * Branches - http://code.launchpad.dev/firefox |
371 | * Bugs - http://bugs.launchpad.dev/firefox |
372 | * Blueprints - http://blueprints.launchpad.dev/firefox |
373 | * Translations - http://translations.launchpad.dev/firefox |
374 | @@ -161,7 +161,7 @@ |
375 | Hierarchy: None displayed |
376 | Tabs: |
377 | * Overview (selected) - http://launchpad.dev/debian |
378 | - * Code - http://code.launchpad.dev/debian |
379 | + * Branches - http://code.launchpad.dev/debian |
380 | * Bugs - http://bugs.launchpad.dev/debian |
381 | * Blueprints - http://blueprints.launchpad.dev/debian |
382 | * Translations - http://translations.launchpad.dev/debian |
383 | |
384 | === modified file 'lib/lp/registry/stories/product/xx-product-launchpad-usage.txt' |
385 | --- lib/lp/registry/stories/product/xx-product-launchpad-usage.txt 2009-08-11 12:43:24 +0000 |
386 | +++ lib/lp/registry/stories/product/xx-product-launchpad-usage.txt 2009-09-24 17:43:12 +0000 |
387 | @@ -67,7 +67,7 @@ |
388 | |
389 | >>> uses = find_tag_by_id(registrant_browser.contents, id='uses') |
390 | >>> print extract_text(uses) |
391 | - Uses Launchpad for: Answers and Code. |
392 | + Uses Launchpad for: Answers and Branches. |
393 | |
394 | >>> anon_browser.open('http://bugs.launchpad.dev/firefox') |
395 | >>> print extract_text( |
396 | @@ -87,7 +87,7 @@ |
397 | >>> registrant_browser.getControl('Change').click() |
398 | >>> uses = find_tag_by_id(registrant_browser.contents, id='uses') |
399 | >>> print extract_text(uses) |
400 | - Uses Launchpad for: Answers and Code. |
401 | + Uses Launchpad for: Answers and Branches. |
402 | |
403 | >>> anon_browser.open('http://bugs.launchpad.dev/firefox') |
404 | >>> print extract_text( |
405 | @@ -109,7 +109,7 @@ |
406 | >>> registrant_browser.getControl('Change').click() |
407 | >>> uses = find_tag_by_id(registrant_browser.contents, id='uses') |
408 | >>> print extract_text(uses) |
409 | - Uses Launchpad for: Answers, Bug Tracking, and Code. |
410 | + Uses Launchpad for: Answers, Bug Tracking, and Branches. |
411 | |
412 | |
413 | Tracking bugs by email |
414 | |
415 | === modified file 'lib/lp/registry/stories/team-polls/create-polls.txt' |
416 | --- lib/lp/registry/stories/team-polls/create-polls.txt 2009-09-18 15:24:30 +0000 |
417 | +++ lib/lp/registry/stories/team-polls/create-polls.txt 2009-09-24 17:43:12 +0000 |
418 | @@ -114,7 +114,7 @@ |
419 | Hierarchy: None displayed |
420 | Tabs: |
421 | * Overview (selected) - http://launchpad.dev/~ubuntu-team |
422 | - * Code - http://code.launchpad.dev/~ubuntu-team |
423 | + * Branches - http://code.launchpad.dev/~ubuntu-team |
424 | * Bugs - http://bugs.launchpad.dev/~ubuntu-team |
425 | * Blueprints - http://blueprints.launchpad.dev/~ubuntu-team |
426 | * Translations - http://translations.launchpad.dev/~ubuntu-team |
427 | |
428 | === modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt' |
429 | --- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2009-09-23 14:40:53 +0000 |
430 | +++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2009-09-24 17:43:11 +0000 |
431 | @@ -22,7 +22,7 @@ |
432 | Hierarchy: Ubuntu > ?alsa-utils? package |
433 | Tabs: |
434 | * Overview (selected) - not linked |
435 | - * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
436 | + * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
437 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
438 | * Blueprints - not linked |
439 | * Translations - not linked |
440 | @@ -34,7 +34,7 @@ |
441 | Hierarchy: Ubuntu > ?alsa-utils? package > Bugs |
442 | Tabs: |
443 | * Overview - http://launchpad.dev/ubuntu/+source/alsa-utils |
444 | - * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
445 | + * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
446 | * Bugs (selected) - not linked |
447 | * Blueprints - not linked |
448 | * Translations - not linked |
449 | @@ -55,7 +55,7 @@ |
450 | Hierarchy: Ubuntu > ?alsa-utils? package |
451 | Tabs: |
452 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
453 | - * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
454 | + * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
455 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
456 | * Blueprints - not linked |
457 | * Translations - not linked |
458 | @@ -77,7 +77,7 @@ |
459 | Hierarchy: Ubuntu > ?alsa-utils? package |
460 | Tabs: |
461 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
462 | - * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
463 | + * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
464 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
465 | * Blueprints - not linked |
466 | * Translations - not linked |
467 | @@ -96,7 +96,7 @@ |
468 | Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package |
469 | Tabs: |
470 | * Overview (selected) - not linked |
471 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
472 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
473 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
474 | * Blueprints - not linked |
475 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
476 | @@ -112,7 +112,7 @@ |
477 | Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package > Questions |
478 | Tabs: |
479 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils |
480 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
481 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
482 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
483 | * Blueprints - not linked |
484 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
485 | @@ -134,7 +134,7 @@ |
486 | Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package |
487 | Tabs: |
488 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils |
489 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
490 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
491 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
492 | * Blueprints - not linked |
493 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
494 | @@ -153,7 +153,7 @@ |
495 | Hierarchy: Ubuntu > 5.04 > i386 |
496 | Tabs: |
497 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
498 | - * Code - http://code.launchpad.dev/ubuntu/hoary |
499 | + * Branches - http://code.launchpad.dev/ubuntu/hoary |
500 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
501 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
502 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
503 | @@ -171,7 +171,7 @@ |
504 | Hierarchy: Ubuntu > 5.04 > i386 > pmount |
505 | Tabs: |
506 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
507 | - * Code - http://code.launchpad.dev/ubuntu/hoary |
508 | + * Branches - http://code.launchpad.dev/ubuntu/hoary |
509 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
510 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
511 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
512 | @@ -190,7 +190,7 @@ |
513 | Hierarchy: Ubuntu > 5.04 > i386 > pmount > 0.1-1 |
514 | Tabs: |
515 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
516 | - * Code - http://code.launchpad.dev/ubuntu/hoary |
517 | + * Branches - http://code.launchpad.dev/ubuntu/hoary |
518 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
519 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
520 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
521 | |
522 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt' |
523 | --- lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt 2009-09-18 01:34:06 +0000 |
524 | +++ lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt 2009-09-24 17:43:12 +0000 |
525 | @@ -51,7 +51,7 @@ |
526 | Hierarchy: Celso Providelo > PPA for Celso Providelo |
527 | Tabs: |
528 | * Overview (selected) - http://launchpad.dev/~cprov |
529 | - * Code - http://code.launchpad.dev/~cprov |
530 | + * Branches - http://code.launchpad.dev/~cprov |
531 | * Bugs - http://bugs.launchpad.dev/~cprov |
532 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
533 | * Translations - http://translations.launchpad.dev/~cprov |
534 | @@ -72,7 +72,7 @@ |
535 | Hierarchy: Celso Providelo > Default PPA |
536 | Tabs: |
537 | * Overview (selected) - http://launchpad.dev/~cprov |
538 | - * Code - http://code.launchpad.dev/~cprov |
539 | + * Branches - http://code.launchpad.dev/~cprov |
540 | * Bugs - http://bugs.launchpad.dev/~cprov |
541 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
542 | * Translations - http://translations.launchpad.dev/~cprov |
543 | @@ -117,7 +117,7 @@ |
544 | Hierarchy: Celso Providelo > Default PPA |
545 | Tabs: |
546 | * Overview (selected) - http://launchpad.dev/~cprov |
547 | - * Code - http://code.launchpad.dev/~cprov |
548 | + * Branches - http://code.launchpad.dev/~cprov |
549 | * Bugs - http://bugs.launchpad.dev/~cprov |
550 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
551 | * Translations - http://translations.launchpad.dev/~cprov |
552 | |
553 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt' |
554 | --- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2009-09-17 15:14:02 +0000 |
555 | +++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2009-09-24 17:43:12 +0000 |
556 | @@ -23,7 +23,7 @@ |
557 | Hierarchy: Celso Providelo > PPA for Celso Providelo > Packages in... |
558 | Tabs: |
559 | * Overview (selected) - http://launchpad.dev/~cprov |
560 | - * Code - http://code.launchpad.dev/~cprov |
561 | + * Branches - http://code.launchpad.dev/~cprov |
562 | * Bugs - http://bugs.launchpad.dev/~cprov |
563 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
564 | * Translations - http://translations.launchpad.dev/~cprov |
565 | |
566 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt' |
567 | --- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2009-09-22 10:05:26 +0000 |
568 | +++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2009-09-24 17:43:11 +0000 |
569 | @@ -8,7 +8,7 @@ |
570 | Hierarchy: Ubuntu > Personal Package Archives |
571 | Tabs: |
572 | * Overview (selected) - http://launchpad.dev/ubuntu |
573 | - * Code - http://code.launchpad.dev/ubuntu |
574 | + * Branches - http://code.launchpad.dev/ubuntu |
575 | * Bugs - http://bugs.launchpad.dev/ubuntu |
576 | * Blueprints - http://blueprints.launchpad.dev/ubuntu |
577 | * Translations - http://translations.launchpad.dev/ubuntu |
578 | |
579 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt' |
580 | --- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2009-09-22 13:11:13 +0000 |
581 | +++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2009-09-24 17:43:12 +0000 |
582 | @@ -48,7 +48,7 @@ |
583 | Hierarchy: ubuntutest > ?testing-dspr? package |
584 | Tabs: |
585 | * Overview (selected) - http://launchpad.dev/ubuntutest/+source/testing-dspr |
586 | - * Code - http://code.launchpad.dev/ubuntutest/+source/testing-dspr |
587 | + * Branches - http://code.launchpad.dev/ubuntutest/+source/testing-dspr |
588 | * Bugs - http://bugs.launchpad.dev/ubuntutest/+source/testing-dspr |
589 | * Blueprints - not linked |
590 | * Translations - not linked |
591 | |
592 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt' |
593 | --- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-22 11:55:32 +0000 |
594 | +++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-24 17:43:11 +0000 |
595 | @@ -8,7 +8,7 @@ |
596 | Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log |
597 | Tabs: |
598 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount |
599 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/pmount |
600 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/pmount |
601 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/pmount |
602 | * Blueprints - not linked |
603 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/pmount |
604 | |
605 | === modified file 'lib/lp/translations/stories/navigation-links/pofile.txt' |
606 | --- lib/lp/translations/stories/navigation-links/pofile.txt 2009-09-15 16:33:12 +0000 |
607 | +++ lib/lp/translations/stories/navigation-links/pofile.txt 2009-09-24 17:43:11 +0000 |
608 | @@ -15,7 +15,7 @@ |
609 | |
610 | >>> print_location_apps(admin_browser.contents) |
611 | * Overview - http://launchpad.dev/evolution/trunk |
612 | - * Code - http://code.launchpad.dev/evolution |
613 | + * Branches - http://code.launchpad.dev/evolution |
614 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
615 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
616 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
617 | @@ -33,7 +33,7 @@ |
618 | |
619 | >>> print_location_apps(admin_browser.contents) |
620 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
621 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
622 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
623 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
624 | * Blueprints - not linked |
625 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
626 | |
627 | === modified file 'lib/lp/translations/stories/navigation-links/pomsgset.txt' |
628 | --- lib/lp/translations/stories/navigation-links/pomsgset.txt 2009-07-01 20:45:39 +0000 |
629 | +++ lib/lp/translations/stories/navigation-links/pomsgset.txt 2009-09-24 17:43:11 +0000 |
630 | @@ -17,7 +17,7 @@ |
631 | |
632 | >>> print_location_apps(browser.contents) |
633 | * Overview - http://launchpad.dev/evolution/trunk |
634 | - * Code - http://code.launchpad.dev/evolution |
635 | + * Branches - http://code.launchpad.dev/evolution |
636 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
637 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
638 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
639 | @@ -39,7 +39,7 @@ |
640 | |
641 | >>> print_location_apps(browser.contents) |
642 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
643 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
644 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
645 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
646 | * Blueprints - not linked |
647 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
648 | |
649 | === modified file 'lib/lp/translations/stories/navigation-links/potemplate.txt' |
650 | --- lib/lp/translations/stories/navigation-links/potemplate.txt 2009-09-17 10:22:14 +0000 |
651 | +++ lib/lp/translations/stories/navigation-links/potemplate.txt 2009-09-24 17:43:11 +0000 |
652 | @@ -13,7 +13,7 @@ |
653 | |
654 | >>> print_location_apps(admin_browser.contents) |
655 | * Overview - http://launchpad.dev/evolution/trunk |
656 | - * Code - http://code.launchpad.dev/evolution |
657 | + * Branches - http://code.launchpad.dev/evolution |
658 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
659 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
660 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
661 | @@ -31,7 +31,7 @@ |
662 | |
663 | >>> print_location_apps(admin_browser.contents) |
664 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
665 | - * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
666 | + * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
667 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
668 | * Blueprints - not linked |
669 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
This branch changes the "Code" tab to be a "Branches" tab. It also changes the "launchpad usage" text to say, "Uses Launchpad for Answers and Branches".
None of the changes are very surprising, I think.