loggerhead

Merge lp:~jelmer/loggerhead/codespell into lp:loggerhead

  1. codespell
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Colin Watson
Approved revision: 546
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~jelmer/loggerhead/codespell
Merge into: lp:loggerhead
Diff against target: 352 lines (+41/-41)
11 files modified
HACKING.rst (+1/-1)
NEWS (+3/-3)
loggerhead/apps/error.py (+1/-1)
loggerhead/static/javascript/changelog.js (+6/-6)
loggerhead/static/javascript/custom.js (+10/-10)
loggerhead/static/javascript/diff.js (+11/-11)
loggerhead/templates/collapse-button.pt (+1/-1)
loggerhead/tests/test_corners.py (+1/-1)
loggerhead/util.py (+3/-3)
loggerhead/zptsupport.py (+1/-1)
loggerheadd (+3/-3)
To merge this branch: bzr merge lp:~jelmer/loggerhead/codespell
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+436735@code.launchpad.net

Commit message

Fix spelling errors in code

Description of the change

-------8<-------
SUMMARY:
collapsable 34
deamon 1
excercise 1
hanlder 1
informations 1
interupting 1
neccessary 1
obsure 1
overriden 1
proccess 3
recieved 1
requiered 1
witdh 1

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING.rst'
2--- HACKING.rst 2018-06-09 07:26:34 +0000
3+++ HACKING.rst 2023-02-01 23:47:36 +0000
4@@ -35,7 +35,7 @@
5 One way that Launchpad provides both high availability and performance scaling
6 is by running multiple instances of loggerhead, serving the same content. A
7 proxy is then used to load balance the requests. This also allows us to shut
8-down one instance for upgrading, without interupting service (requests are
9+down one instance for upgrading, without interrupting service (requests are
10 just routed to the other instance).
11
12 However, multiple processes poses an even greater risk that caches will
13
14=== modified file 'NEWS'
15--- NEWS 2022-09-06 15:21:30 +0000
16+++ NEWS 2023-02-01 23:47:36 +0000
17@@ -203,7 +203,7 @@
18 1.17 [20Aug2009]
19 ----------------
20
21- - Add bug links in revision informations (Alexandre Garnier, #314052)
22+ - Add bug links in revision information (Alexandre Garnier, #314052)
23
24 - Make sure that binary files aren't annotated. (Martin Albisetti,
25 #258848)
26@@ -356,7 +356,7 @@
27 1.10 [22Dec2008]
28 ----------------
29
30- - Add startup deamon script for Linux (Marius Kruger)
31+ - Add startup daemon script for Linux (Marius Kruger)
32
33 - Switch navigation from file_ids to paths. Fixes bugs #260363,
34 #269365 and #128926. (Martin Albisetti)
35@@ -394,7 +394,7 @@
36
37 - Added COPYING file and clarified copyright headers (John Arbash Meinel)
38
39- - Remove the .py extension requiered by the Debian Policy.
40+ - Remove the .py extension required by the Debian Policy.
41 (Jelmer Vernooij)
42
43 - New startup script serve-branches will serve Loggerhead without
44
45=== modified file 'loggerhead/apps/error.py'
46--- loggerhead/apps/error.py 2018-10-20 11:09:30 +0000
47+++ loggerhead/apps/error.py 2023-02-01 23:47:36 +0000
48@@ -41,7 +41,7 @@
49 raise
50
51 def handle_error(self, environ, start_response):
52- """Exception hanlder."""
53+ """Exception handler."""
54 self.log_error(environ)
55 return errapp(environ, start_response)
56
57
58=== modified file 'loggerhead/static/javascript/changelog.js'
59--- loggerhead/static/javascript/changelog.js 2020-06-04 19:43:36 +0000
60+++ loggerhead/static/javascript/changelog.js 2023-02-01 23:47:36 +0000
61@@ -3,18 +3,18 @@
62 $('.revision_log').each(
63 function(i, item)
64 {
65- var collapsable = item.collapsable;
66+ var collapsible = item.collapsible;
67 if(action == 'close')
68 {
69 $('#expand_all').css({'display': 'block'});
70 $('#collapse_all').css({'display': 'none'});
71- collapsable.close();
72+ collapsible.close();
73 }
74 else if(action == 'open')
75 {
76 $('#expand_all').css({'display': 'none'});
77 $('#collapse_all').css({'display': 'block'});
78- collapsable.open();
79+ collapsible.open();
80 }
81 });
82 }
83@@ -47,7 +47,7 @@
84 function(i, item)
85 {
86 var revid = revids[item.id.replace('log-', '')];
87- var collapsable = new Collapsable(
88+ var collapsible = new Collapsible(
89 {
90 expand_icon: $(item).find('.expand_icon'),
91 open_node: $(item).find('.long_description'),
92@@ -61,9 +61,9 @@
93 'click',
94 function(e) {
95 e.preventDefault();
96- collapsable.toggle();
97+ collapsible.toggle();
98 });
99- item.collapsable = collapsable;
100+ item.collapsible = collapsible;
101 });
102
103 });
104
105=== modified file 'loggerhead/static/javascript/custom.js'
106--- loggerhead/static/javascript/custom.js 2020-09-09 16:36:01 +0000
107+++ loggerhead/static/javascript/custom.js 2023-02-01 23:47:36 +0000
108@@ -67,7 +67,7 @@
109 setTimeout("$('#search_terms').css({'display': 'none'})", 300);
110 }
111
112-function Collapsable(config)
113+function Collapsible(config)
114 {
115 this.is_open = config.is_open;
116 this.open_node = config.open_node;
117@@ -96,7 +96,7 @@
118 return height;
119 }
120
121-Collapsable.prototype._animate = function (callback)
122+Collapsible.prototype._animate = function (callback)
123 {
124 if (this.anim) this.anim.stop();
125
126@@ -109,7 +109,7 @@
127 }.bind(this));
128 }
129
130-Collapsable.prototype._load_finished = function(data, callback)
131+Collapsible.prototype._load_finished = function(data, callback)
132 {
133 var l = data.split('\n');
134 l.splice(0, 1);
135@@ -126,7 +126,7 @@
136 this._animate(callback);
137 };
138
139-Collapsable.prototype._ensure_container = function(callback)
140+Collapsible.prototype._ensure_container = function(callback)
141 {
142 if (this.container == null) {
143 this.container = $('<div></div>');
144@@ -172,7 +172,7 @@
145 * 8. Start a new animation to show the rest of the new content.
146 */
147
148-Collapsable.prototype.open = function(callback)
149+Collapsible.prototype.open = function(callback)
150 {
151 this.expand_icon[0].src = expanded_icon_path;
152
153@@ -196,18 +196,18 @@
154
155 this._animate(callback);
156
157- var collapsable = this;
158+ var collapsible = this;
159
160 if (this.source) {
161 $.get(this.source, function(data) {
162- collapsable._load_finished(data, callback);
163+ collapsible._load_finished(data, callback);
164 });
165 return;
166 }
167
168 };
169
170-Collapsable.prototype.close = function()
171+Collapsible.prototype.close = function()
172 {
173 this._ensure_container();
174
175@@ -226,7 +226,7 @@
176 0.2, "swing", this.closeComplete.bind(this));
177 };
178
179-Collapsable.prototype.closeComplete = function () {
180+Collapsible.prototype.closeComplete = function () {
181 $(this.open_node).css({'display': 'none'});
182 if (this.close_node) {
183 $(this.close_node).css({'display': 'block'});
184@@ -236,7 +236,7 @@
185 this.is_open = false;
186 };
187
188-Collapsable.prototype.toggle = function()
189+Collapsible.prototype.toggle = function()
190 {
191 if (this.is_open)
192 {
193
194=== modified file 'loggerhead/static/javascript/diff.js'
195--- loggerhead/static/javascript/diff.js 2020-09-11 10:03:03 +0000
196+++ loggerhead/static/javascript/diff.js 2023-02-01 23:47:36 +0000
197@@ -113,18 +113,18 @@
198 diffs.each(
199 function(i, item)
200 {
201- var collapsable = item.collapsable;
202+ var collapsible = item.collapsible;
203 if(action == 'close')
204 {
205 $('#expand_all').css({'display': 'block'});
206 $('#collapse_all').css({'display': 'none'});
207- collapsable.close();
208+ collapsible.close();
209 }
210 else if(action == 'open')
211 {
212 $('#expand_all').css({'display': 'none'});
213 $('#collapse_all').css({'display': 'block'});
214- collapsable.open();
215+ collapsible.open();
216 }
217 });
218 }
219@@ -156,9 +156,9 @@
220 }
221
222 function zoom_to_diff (path) {
223- var collapsable = $('#' + path_to_id[path]).collapsable;
224- if (!collapsable.is_open) {
225- collapsable.open(
226+ var collapsible = $('#' + path_to_id[path]).collapsible;
227+ if (!collapsible.is_open) {
228+ collapsible.open(
229 function () {
230 window.location.hash = '#' + path;
231 });
232@@ -172,7 +172,7 @@
233 $('.diff').each(
234 function(i, item)
235 {
236- item.collapsable.source = global_path + '+filediff/' + link_data[item.id] + '?context=' + numlines;
237+ item.collapsible.source = global_path + '+filediff/' + link_data[item.id] + '?context=' + numlines;
238 });
239 if(original_diff_download_link == null) original_diff_download_link = $('#download_link').attr('href');
240 $('#download_link').attr('href', original_diff_download_link + '?context=' + numlines);
241@@ -206,10 +206,10 @@
242 'click',
243 function(e) {
244 e.preventDefault();
245- item.collapsable.source = global_path + '+filediff/' + link_data[item.id] + '?context=' + $('#contextLines').val();
246- collapsable.toggle();
247+ item.collapsible.source = global_path + '+filediff/' + link_data[item.id] + '?context=' + $('#contextLines').val();
248+ collapsible.toggle();
249 });
250- var collapsable = new Collapsable(
251+ var collapsible = new Collapsible(
252 {
253 expand_icon: $(item).find('.expand_diff'),
254 open_node: $(item).find('.diffinfo'),
255@@ -219,7 +219,7 @@
256 loading: $(item).find('.loading'),
257 node_process: node_process
258 });
259- item.collapsable=collapsable;
260+ item.collapsible=collapsible;
261 });
262 compute_diff_links();
263 if (window.location.hash && !specific_path) {
264
265=== modified file 'loggerhead/templates/collapse-button.pt'
266--- loggerhead/templates/collapse-button.pt 2008-06-16 10:13:40 +0000
267+++ loggerhead/templates/collapse-button.pt 2023-02-01 23:47:36 +0000
268@@ -10,7 +10,7 @@
269 class string:show-button collapse-${group}-${name}-show"
270 title="expand">
271 <img tal:attributes="src python:branch.static_url('/static/images/nav-small-right.gif')"
272- witdh="10" height="10" alt="expand"
273+ width="10" height="10" alt="expand"
274 class="collapse-triangle" />
275 </a>
276 </tal:block>
277
278=== modified file 'loggerhead/tests/test_corners.py'
279--- loggerhead/tests/test_corners.py 2018-10-20 15:28:43 +0000
280+++ loggerhead/tests/test_corners.py 2023-02-01 23:47:36 +0000
281@@ -6,7 +6,7 @@
282
283
284 class TestCornerCases(BasicTests):
285- """Tests that excercise various corner cases."""
286+ """Tests that exercise various corner cases."""
287
288 def addFileAndCommit(self, filename, commit_msg):
289 """Make a trivial commit that has 'msg' as its commit message.
290
291=== modified file 'loggerhead/util.py'
292--- loggerhead/util.py 2023-01-31 19:08:09 +0000
293+++ loggerhead/util.py 2023-02-01 23:47:36 +0000
294@@ -176,7 +176,7 @@
295
296 def hide_email(email):
297 """
298- try to obsure any email address in a bazaar committer's name.
299+ try to obscure any email address in a bazaar committer's name.
300 """
301 m = STANDARD_PATTERN.search(email)
302 if m is not None:
303@@ -258,7 +258,7 @@
304 CSS is stupid. In some cases we need to replace an empty value with
305 a non breaking space (&nbsp;). There has to be a better way of doing this.
306
307- return: the same value recieved if not empty, and a '&nbsp;' if it is.
308+ return: the same value received if not empty, and a '&nbsp;' if it is.
309 """
310 if s is None:
311 return '&nbsp;'
312@@ -562,7 +562,7 @@
313 Soon to be deprecated.
314
315
316- return a context map that may be overriden by specific values passed in,
317+ return a context map that may be overridden by specific values passed in,
318 but only contains keys from the list of valid context keys.
319
320 if 'clear' is set, only the 'remember' context value will be added, and
321
322=== modified file 'loggerhead/zptsupport.py'
323--- loggerhead/zptsupport.py 2023-01-31 19:08:09 +0000
324+++ loggerhead/zptsupport.py 2023-02-01 23:47:36 +0000
325@@ -60,7 +60,7 @@
326
327 Template files must end in ".pt" and be in legitimate packages.
328 Templates are automatically checked for changes and reloaded as
329- neccessary.
330+ necessary.
331 """
332 divider = classname.rfind(".")
333 if divider > -1:
334
335=== modified file 'loggerheadd'
336--- loggerheadd 2020-06-04 20:28:15 +0000
337+++ loggerheadd 2023-02-01 23:47:36 +0000
338@@ -46,11 +46,11 @@
339 }
340
341 loggerhead_status(){
342- proccess=`loggerhead_process`
343- #echo "$proccess"
344+ process=`loggerhead_process`
345+ #echo "$process"
346 listening=`netstat -nl |grep -e ":$PORT "`
347 #echo "$listening"
348- if [ -z "$proccess" ]; then
349+ if [ -z "$process" ]; then
350 echo "Loggerhead is *not* running."
351 else
352 echo "Loggerhead is running."

Subscribers

People subscribed via source and target branches