Launchpad itself

Merge lp:~jamalta/launchpad/changesfile-509791 into lp:launchpad

  1. changesfile-509791
  2. Merge into devel
Proposed by Jamal Fanaian
Status: Merged
Approved by: Julian Edwards
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jamalta/launchpad/changesfile-509791
Merge into: lp:launchpad
Diff against target: 177 lines (+18/-18)
7 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-files.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt (+3/-3)
lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt (+3/-3)
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:~jamalta/launchpad/changesfile-509791
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+17742@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamal Fanaian (jamalta) wrote :

= Summary =

Bug #253525 explains that the word changesfile does not exist and should be changed for something that makes sense. It had originally been changed to "sources.changes" but bug #509791 explains that this term is not preferred. Changing it to the preferred term, "changes file".

== Proposed fix ==

Replace "sources.changes" with "changes file".

== Pre-implementation notes ==

Originally, Curtis Hovey had approved the change to "sources.changes" as it was already being used, when viewing your own PPA. William Grant reported that he had never seen this term before, and in bug #509791 it was recommended to replace with "changes file".

== Implementation details ==

lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt
lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt
 * Changed from sources.changes to changes file

lib/lp/soyuz/stories/ppa/xx-copy-packages.txt
lib/lp/soyuz/stories/ppa/xx-delete-packages.txt
lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt
lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt
 * Update stories that referenced pages with the above templates to read changes file instead of sources.changes

== 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

Revision history for this message
Julian Edwards (julian-edwards) wrote :

Great, much better. Thanks for getting on this so quickly! I'll land it soon.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

I'm running the test suite over this now, and it'll land as soon as that completes.

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 2010-01-15 23:28:53 +0000
3+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-01-20 14:33:21 +0000
4@@ -988,7 +988,7 @@
5 >>> print_ppa_packages(jblack_browser.contents)
6 Source Published Status Series Section Build
7 Status
8- foo - 2.0 (sources.changes) ... Published Hoary Base
9+ foo - 2.0 (changes file) ... Published Hoary Base
10
11 >>> foo_pub_id = getPPAPubIDsFor('no-priv', 'foo')[0]
12 >>> jblack_browser.getControl(
13@@ -1063,8 +1063,8 @@
14 >>> print_ppa_packages(jblack_browser.contents)
15 Source Published Status Series Section Build
16 Status
17- foo - 2.0 (sources.changes) Pending Hoary Base i386
18- foo - 1.1 (sources.changes) Pending Warty Base
19+ foo - 2.0 (changes file) Pending Hoary Base i386
20+ foo - 1.1 (changes file) Pending Warty Base
21 pmount - 0.1-1 (Newer...) Pending Hoary Editors
22 pmount - 0.1-1 Pending Warty Editors
23 pmount - 0.1-1 Pending Grumpy Editors
24@@ -1080,7 +1080,7 @@
25 >>> print_ppa_packages(jblack_browser.contents)
26 Source Published Status Series Section Build
27 Status
28- foo - 1.1 (sources.changes) ... Published Hoary Base
29+ foo - 1.1 (changes file) ... Published Hoary Base
30 iceweasel...(...) 2007-07-09 Published Breezy-autotest Editors
31
32 >>> foo_pub_id = getPPAPubIDsFor('mark', 'foo')[0]
33
34=== modified file 'lib/lp/soyuz/stories/ppa/xx-delete-packages.txt'
35--- lib/lp/soyuz/stories/ppa/xx-delete-packages.txt 2010-01-15 23:28:53 +0000
36+++ lib/lp/soyuz/stories/ppa/xx-delete-packages.txt 2010-01-20 14:33:21 +0000
37@@ -371,7 +371,7 @@
38 >>> print_ppa_packages(user_browser.contents)
39 Source Published Status Series Section Build
40 Status
41- foo - 1.0 (sources.changes) Superseded Hoary Base
42+ foo - 1.0 (changes file) Superseded Hoary Base
43
44 We don't show the publishing details for binary packages, but the
45 presence of 'Built packages' and the binary filename in the 'Files'
46@@ -401,7 +401,7 @@
47 >>> print_ppa_packages(user_browser.contents)
48 Source Published Status Series Section Build
49 Status
50- foo - 1.0 (sources.changes) Superseded Hoary Base
51+ foo - 1.0 (changes file) Superseded Hoary Base
52
53 >>> expander_url = user_browser.getLink(
54 ... id='pub%s-expander' % foo_pub_src.id).url
55@@ -440,7 +440,7 @@
56 >>> print_ppa_packages(user_browser.contents)
57 Source Published Status Series Section Build
58 Status
59- foo - 1.0 (sources.changes) Superseded Hoary Base
60+ foo - 1.0 (changes file) Superseded Hoary Base
61
62 The deletion works exactly as it does for PUBLISHED sources, both,
63 source and binaries are marked as DELETED and the corresponding
64@@ -479,7 +479,7 @@
65 >>> print_ppa_packages(user_browser.contents)
66 Source Published Status Series Section Build
67 Status
68- foo - 1.0 (sources.changes) Deleted Hoary Base
69+ foo - 1.0 (changes file) Deleted Hoary Base
70
71 >>> expander_url = user_browser.getLink(
72 ... id='pub%s-expander' % foo_pub_src.id).url
73
74=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-files.txt'
75--- lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2010-01-18 21:41:12 +0000
76+++ lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2010-01-20 14:33:21 +0000
77@@ -91,7 +91,7 @@
78 Links to files accessible via +files/ proxy in the PPA page.
79
80 >>> ppa_links = [
81- ... ('(sources.changes)',
82+ ... ('(changes file)',
83 ... another_test_source.sourcepackagerelease.upload_changesfile),
84 ... ]
85
86
87=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt'
88--- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2010-01-15 23:28:53 +0000
89+++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2010-01-20 14:33:21 +0000
90@@ -96,7 +96,7 @@
91 Source Published Status Series Section Build
92 Status
93 cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386
94- ice...(sources.changes) 2007-07-09 Published Warty Editors i386
95+ ice...(changes file) 2007-07-09 Published Warty Editors i386
96 pmount - 0.1-1 2007-07-09 Published Warty Editors
97
98 Each data row is expandable to contain some sections containing:
99@@ -289,7 +289,7 @@
100 >>> print_archive_package_rows(anon_browser.contents)
101 Source Published Status Series Section Build
102 Status
103- i...(sources.changes) 2007-07-09 Superseded Warty Editors
104+ i...(changes file) 2007-07-09 Superseded Warty Editors
105 pmount - 0.1-1 2007-07-09 Deleted Warty Editors
106
107 The 'Any Status' filter is also available, so the user can search over
108@@ -301,7 +301,7 @@
109 Source Published Status Series Section Build
110 Status
111 cdrkit - 1.0 2007-07-09 Published Breezy-a... Editors i386
112- ic...(sources.changes) 2007-07-09 Superseded Warty Editors
113+ ic...(changes file) 2007-07-09 Superseded Warty Editors
114 pmount - 0.1-1 2007-07-09 Deleted Warty Editors
115
116
117
118=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt'
119--- lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2010-01-18 17:02:54 +0000
120+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2010-01-20 14:33:21 +0000
121@@ -213,7 +213,7 @@
122 With the possibility to download the entire changesfile (if available):
123
124 >>> print extract_text(find_tag_by_id(browser.contents, 'changesfile'))
125- View sources.changes
126+ View changes file
127
128 And also download the files contained in this source, like '.orig',
129 '.diff' and the DSC:
130@@ -256,7 +256,7 @@
131 warning the user that no file is available:
132
133 >>> print extract_text(find_tag_by_id(browser.contents, 'changesfile'))
134- No sources.changes available.
135+ No changes file available.
136
137 >>> print extract_text(find_tag_by_id(browser.contents, 'files'))
138 No files available for download.
139@@ -356,7 +356,7 @@
140
141 With the possibility to download the entire changesfile (if available):
142
143- >>> print browser.getLink('View sources.changes').url
144+ >>> print browser.getLink('View changes file').url
145 http://localhost:58000/65/commercialpackage_1.0-1_source.changes
146
147 And also download the files contained in this source, like '.orig',
148
149=== modified file 'lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt'
150--- lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt 2010-01-15 23:01:36 +0000
151+++ lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt 2010-01-20 14:33:21 +0000
152@@ -50,10 +50,10 @@
153 <div id="changesfile" tal:define="changesfile context/changesfile">
154 <p tal:condition="changesfile">
155 <a tal:attributes="href changesfile/http_url">
156- View sources.changes
157+ View changes file
158 </a>
159 </p>
160- <p tal:condition="not: changesfile">No sources.changes available.</p>
161+ <p tal:condition="not: changesfile">No changes file available.</p>
162 </div>
163
164 </div>
165
166=== modified file 'lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt'
167--- lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt 2010-01-15 23:01:36 +0000
168+++ lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt 2010-01-20 14:33:21 +0000
169@@ -35,7 +35,7 @@
170 <a tal:condition="changesfile"
171 tal:attributes="href changesfile/http_url;
172 title changesfile/filename"
173- >(sources.changes)</a>
174+ >(changes file)</a>
175 </tal:view_changesfile>
176 </td>
177 <td tal:condition="context/archive/owner/isTeam"