Ticket #1585: 1585-webui.darcs.patch

File 1585-webui.darcs.patch, 75.1 KB (added by marcusw, at 2011-11-17T21:56:28Z)

Got my darcs working; here's a patch for these changes

Line 
11 patch for repository http://tahoe-lafs.org/source/tahoe-lafs/trunk:
2
3Thu Nov 17 16:49:23 EST 2011  Marcus Wanner <marcus@wanners.net>
4  * 1585-webui.darcs.patch
5
6New patches:
7
8[1585-webui.darcs.patch
9Marcus Wanner <marcus@wanners.net>**20111117214923
10 Ignore-this: 23cf2a06c545be5f821c071d652178ee
11] {
12adddir ./src/allmydata/web/static
13move ./src/allmydata/web/d3-2.4.6.min.js ./src/allmydata/web/static/d3-2.4.6.min.js
14move ./src/allmydata/web/d3-2.4.6.time.min.js ./src/allmydata/web/static/d3-2.4.6.time.min.js
15move ./src/allmydata/web/download_status_timeline.js ./src/allmydata/web/static/download_status_timeline.js
16move ./src/allmydata/web/jquery-1.6.1.min.js ./src/allmydata/web/static/jquery-1.6.1.min.js
17move ./src/allmydata/web/tahoe.css ./src/allmydata/web/static/tahoe.css
18hunk ./src/allmydata/test/test_web.py 1279
19         return d
20 
21     def test_CSS_FILE(self):
22-        d = self.GET("/tahoe_css", followRedirect=True)
23+        d = self.GET("/tahoe.css", followRedirect=True)
24         def _check(res):
25             CSS_STYLE=re.compile('toolbar\s{.+text-align:\scenter.+toolbar-item.+display:\sinline',re.DOTALL)
26             self.failUnless(CSS_STYLE.search(res), res)
27hunk ./src/allmydata/web/check-and-repair-results.xhtml 4
28 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
29   <head>
30     <title>Tahoe-LAFS - Check Results</title>
31-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
32-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
33+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
34     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
35   </head>
36   <body>
37hunk ./src/allmydata/web/check-results.xhtml 4
38 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
39   <head>
40     <title>Tahoe-LAFS - Check Results</title>
41-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
42-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
43+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
44     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
45   </head>
46   <body>
47hunk ./src/allmydata/web/deep-check-and-repair-results.xhtml 4
48 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
49   <head>
50     <title>Tahoe-LAFS - Deep Check Results</title>
51-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
52-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
53+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
54     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55     <meta n:render="refresh" />
56   </head>
57hunk ./src/allmydata/web/deep-check-results.xhtml 4
58 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
59   <head>
60     <title>Tahoe-LAFS - Deep Check Results</title>
61-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
62-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
63+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
64     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
65     <meta n:render="refresh" />
66   </head>
67hunk ./src/allmydata/web/directory.xhtml 3
68 <html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
69   <title n:render="title"></title>
70-  <link href="/webform_css" rel="stylesheet" type="text/css"/>
71-  <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
72+  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
73   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
74 </head><body class="tahoe-directory-page">
75 
76hunk ./src/allmydata/web/download-status-timeline.xhtml 4
77 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
78   <head>
79     <title>AllMyData - Tahoe - File Download Status Timeline</title>
80-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
81-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
82+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
83     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
84     <script type="text/javascript" src="/jquery-1.6.1.min.js"></script>
85     <script type="text/javascript" src="/d3-2.4.6.min.js"></script>
86hunk ./src/allmydata/web/download-status.xhtml 4
87 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
88   <head>
89     <title>Tahoe-LAFS - File Download Status</title>
90-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
91-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
92+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
93     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
94   </head>
95   <body>
96hunk ./src/allmydata/web/helper.xhtml 4
97 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
98   <head>
99     <title>Tahoe-LAFS - Helper Status</title>
100-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
101-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
102+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
103     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
104   </head>
105   <body>
106hunk ./src/allmydata/web/info.xhtml 3
107 <html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
108   <title n:render="title"></title>
109-  <link href="/webform_css" rel="stylesheet" type="text/css"/>
110-  <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
111+  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
112   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
113 
114 </head><body>
115hunk ./src/allmydata/web/literal-check-results.xhtml 4
116 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
117   <head>
118     <title>Tahoe-LAFS - Check Results</title>
119-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
120-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
121+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
122     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
123   </head>
124   <body>
125hunk ./src/allmydata/web/manifest.xhtml 4
126 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
127   <head>
128     <title n:render="title"></title>
129-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
130+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
131     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
132     <meta n:render="refresh" />
133   </head>
134hunk ./src/allmydata/web/map-update-status.xhtml 4
135 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
136   <head>
137     <title>Tahoe-LAFS - Mutable File Servermap Update Status</title>
138-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
139-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
140+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
141     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
142   </head>
143   <body>
144hunk ./src/allmydata/web/provisioning.xhtml 4
145 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
146   <head>
147     <title>Tahoe-LAFS - Provisioning Tool</title>
148-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
149-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
150+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
151     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
152   </head>
153   <body>
154hunk ./src/allmydata/web/publish-status.xhtml 4
155 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
156   <head>
157     <title>Tahoe-LAFS - Mutable File Publish Status</title>
158-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
159-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
160+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
161     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
162   </head>
163   <body>
164hunk ./src/allmydata/web/reliability.xhtml 4
165 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
166   <head>
167     <title>Tahoe-LAFS - Reliability Tool</title>
168-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
169-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
170+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
171     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
172   </head>
173   <body>
174hunk ./src/allmydata/web/rename-form.xhtml 4
175 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
176   <head>
177     <title n:render="title"></title>
178-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
179-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
180+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
181     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
182   </head>
183 
184hunk ./src/allmydata/web/retrieve-status.xhtml 4
185 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
186   <head>
187     <title>Tahoe-LAFS - Mutable File Retrieve Status</title>
188-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
189-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
190+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
191     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
192   </head>
193   <body>
194hunk ./src/allmydata/web/root.py 1
195-import time
196+import time, os
197 
198 from twisted.internet import address
199 from twisted.web import http
200hunk ./src/allmydata/web/root.py 171
201         self.child_named = FileHandler(client)
202         self.child_status = status.Status(client.get_history())
203         self.child_statistics = status.Statistics(client.stats_provider)
204-        def f(name):
205-            return nevow_File(resource_filename('allmydata.web', name))
206-        self.putChild("download_status_timeline.js", f("download_status_timeline.js"))
207-        self.putChild("jquery-1.6.1.min.js", f("jquery-1.6.1.min.js"))
208-        self.putChild("d3-2.4.6.min.js", f("d3-2.4.6.min.js"))
209-        self.putChild("d3-2.4.6.time.min.js", f("d3-2.4.6.time.min.js"))
210+        static_dir = resource_filename("allmydata.web", "static")
211+        for filen in os.listdir(static_dir):
212+            self.putChild(filen, nevow_File(os.path.join(static_dir, filen)))
213 
214     def child_helper_status(self, ctx):
215         # the Helper isn't attached until after the Tub starts, so this child
216hunk ./src/allmydata/web/root.py 180
217         # needs to created on each request
218         return status.HelperStatus(self.client.helper)
219 
220-    child_webform_css = webform.defaultCSS
221-    child_tahoe_css = nevow_File(resource_filename('allmydata.web', 'tahoe.css'))
222-
223     child_provisioning = provisioning.ProvisioningTool()
224     if reliability.is_available():
225         child_reliability = reliability.ReliabilityTool()
226hunk ./src/allmydata/web/statistics.xhtml 4
227 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
228   <head>
229     <title>Tahoe-LAFS - Stats</title>
230-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
231-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
232+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
233     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
234   </head>
235   <body n:data="get_stats">
236hunk ./src/allmydata/web/status.xhtml 4
237 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
238   <head>
239     <title>Tahoe-LAFS - Current Uploads/Downloads</title>
240-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
241+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
242     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
243   </head>
244   <body>
245hunk ./src/allmydata/web/storage_status.xhtml 4
246 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
247   <head>
248     <title>Tahoe-LAFS - Storage Server Status</title>
249-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
250     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
251   </head>
252 <body>
253hunk ./src/allmydata/web/upload-results.xhtml 4
254 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
255   <head>
256     <title>Tahoe-LAFS - File Uploaded</title>
257-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
258-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
259+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
260     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
261   </head>
262   <body>
263hunk ./src/allmydata/web/upload-status.xhtml 4
264 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
265   <head>
266     <title>Tahoe-LAFS - File Upload Status</title>
267-    <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
268-    <link href="/webform_css" rel="stylesheet" type="text/css"/>
269+    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
270     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
271   </head>
272   <body>
273hunk ./src/allmydata/web/welcome.xhtml 3
274 <html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
275   <title>Tahoe-LAFS - Welcome</title>
276-  <link href="/webform_css" rel="stylesheet" type="text/css"/>
277-  <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
278+  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
279   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
280 </head><body>
281 
282}
283
284Context:
285
286[Remove duplicate tahoe_css links from manifest.xhtml and rename-form.xhtml
287Brian Warner <warner@lothar.com>**20111116224225
288 Ignore-this: 12024fff17964607799928928b9aadf3
289 
290 They were probably meant to be links to webform_css, but we aren't really
291 using Nevow's form-generation code anyways, so they can just be removed.
292 Thanks to 'marcusw' for the catch.
293]
294[iputil: handle openbsd5 (just like openbsd4)
295Brian Warner <warner@lothar.com>**20111115220423
296 Ignore-this: 64b28bd2fd06eb5230ea41d91540dd05
297 
298 Patch by 'sickness'. Closes #1584
299]
300[Makefile count-lines: let it work on OS-X (-l not --lines), add XXX
301Brian Warner <warner@lothar.com>**20111109184227
302 Ignore-this: 204ace1dadc9ed27543c62965b4e6757
303 
304 OS-X's simple-minded /usr/bin/wc doesn't understand --lines, but everyone
305 understands -l .
306]
307[setup.py: umask=022 for 'sdist', to avoid depending on environment
308Brian Warner <warner@lothar.com>**20111109183632
309 Ignore-this: acd5db88ba8f1972d618b14f9e5b803c
310 
311 The new tarball-building buildslave had a bogus umask set, causing the 1.9.0
312 tarballs to be non-other-user-readable (go-rwx), which is a hassle for
313 packaging. (The umask was correct on the old buildslave, but it was moved to
314 a new host shortly before the release). This should make sure tarballs are
315 correct despite the host's setting.
316 
317 Note to others: processes run under twistd get umask=077 unless you arrange
318 otherwise.
319]
320[_auto_deps.py: blacklist PyCrypto 2.4.
321david-sarah@jacaranda.org**20111105022457
322 Ignore-this: 876cb24bc71589e735f48bf449cad81e
323]
324[check-miscaptures.py: report the number of files that were not analysed due to syntax errors (and don't count them in the number of suspicious captures). refs #1555
325david-sarah@jacaranda.org**20111009050301
326 Ignore-this: 62ee03f4b8a96c292e75c097ad87d52e
327]
328[check-miscaptures.py: handle corner cases around default arguments correctly. Also make a minor optimization when there are no assigned variables to consider. refs #1555
329david-sarah@jacaranda.org**20111009045023
330 Ignore-this: f49ece515620081da1d745ae6da19d21
331]
332[check-miscaptures.py: Python doesn't really have declarations; report the topmost assignment. refs #1555
333david-sarah@jacaranda.org**20111009044800
334 Ignore-this: 4905c9dfe7726f433333e216a6760a4b
335]
336[check-miscaptures.py: handle destructuring function arguments correctly. refs #1555
337david-sarah@jacaranda.org**20111009044710
338 Ignore-this: f9de7d95e94446507a206c88d3f98a23
339]
340[check-miscaptures.py: check while loops and list comprehensions as well as for loops. Also fix a pyflakes warning. refs #1555
341david-sarah@jacaranda.org**20111009044022
342 Ignore-this: 6526e4e315ca6461b1fbc2da5568e444
343]
344[Add misc/coding_tools/check-miscaptures.py to detect incorrect captures of variables declared in a for loop, and a 'make check-miscaptures' Makefile target to run it. (It is also run by 'make code-checks'.) This is a rewritten version that reports much fewer false positives, by determining captured variables more accurately. fixes #1555
345david-sarah@jacaranda.org**20111007074121
346 Ignore-this: 51318e9678d132c374ea557ab955e79e
347]
348[Fix pyflakes warnings in misc/ directories other than misc/build_helpers. refs #1557
349david-sarah@jacaranda.org**20111007033031
350 Ignore-this: 7daf5862469732d8cabc355266622b74
351]
352[Makefile: include misc/ directories other than misc/build_helpers in SOURCES. refs #1557
353david-sarah@jacaranda.org**20111007032958
354 Ignore-this: 31376ec01401df7972e83341dc65aa05
355]
356[show-tool-versions: tolerate missing setuptools
357Brian Warner <warner@lothar.com>**20111101080010
358 Ignore-this: 72d4e440565273992beb4f010cbca699
359]
360[show-tool-versions.py: condense output, hide file-not-found exceptions
361Brian Warner <warner@lothar.com>**20111101074532
362 Ignore-this: a15381a76077ef46a74a4ac40c9ae956
363]
364[relnotes.txt: fix footnotes
365Brian Warner <warner@lothar.com>**20111101071935
366 Ignore-this: 668c1bd8618e21beed9bc6b23f048189
367]
368[Rewrite download-status-timeline visualizer ('viz') with d3.js
369Brian Warner <warner@lothar.com>**20111101061821
370 Ignore-this: 6149b027bbae52c559ef5a8167240cab
371 
372 * use d3.js v2.4.6
373 * add a "toggle misc events" button, to get hash/bitmap-checking details
374 * only draw data that's on screen, for speed
375 * add fragment-arg to fetch timeline data.json from somewhere else
376]
377[IServer refactoring: pass IServer instances around, instead of peerids
378Brian Warner <warner@lothar.com>**20111101040319
379 Ignore-this: 35e4698a0273a0311fe0ccedcc7881b5
380 
381 refs #1363
382 
383 This collapses 88 small incremental changes (each of which passes all tests)
384 into one big patch. The development process for the long path started with
385 adding some temporary scaffolding, changing one method at a time, then
386 removing the scaffolding. The individual pieces are as follows, in reverse
387 chronological order (the first patch is at the end of this comment):
388 
389  commit 9bbe4174fd0d98a6cf47a8ef96e85d9ef34b2f9a
390  Author: Brian Warner <warner@lothar.com>
391  Date:   Tue Oct 4 16:05:00 2011 -0400
392 
393      immutable/downloader/status.py: correct comment
394 
395   src/allmydata/immutable/downloader/status.py |    2 +-
396   1 files changed, 1 insertions(+), 1 deletions(-)
397 
398  commit 72146a7c7c91eac2f7c3ceb801eb7a1721376889
399  Author: Brian Warner <warner@lothar.com>
400  Date:   Tue Oct 4 15:46:20 2011 -0400
401 
402      remove temporary ServerMap._storage_broker
403 
404   src/allmydata/mutable/checker.py   |    2 +-
405   src/allmydata/mutable/filenode.py  |    2 +-
406   src/allmydata/mutable/publish.py   |    2 +-
407   src/allmydata/mutable/servermap.py |    5 ++---
408   src/allmydata/test/test_mutable.py |    8 ++++----
409   5 files changed, 9 insertions(+), 10 deletions(-)
410 
411  commit d703096b41632c47d76414b12672e076a422ff5c
412  Author: Brian Warner <warner@lothar.com>
413  Date:   Tue Oct 4 15:37:05 2011 -0400
414 
415      remove temporary storage_broker.get_server_for_id()
416 
417   src/allmydata/storage_client.py  |    3 ---
418   src/allmydata/test/no_network.py |   13 -------------
419   2 files changed, 0 insertions(+), 16 deletions(-)
420 
421  commit 620cc5d80882ef6f7decfd26af8a6c7c1ddf80d1
422  Author: Brian Warner <warner@lothar.com>
423  Date:   Tue Oct 4 12:50:06 2011 -0400
424 
425      API of Retrieve._try_to_validate_privkey(), trying to remove reader.server
426 
427   src/allmydata/mutable/retrieve.py |   10 +++++-----
428   1 files changed, 5 insertions(+), 5 deletions(-)
429 
430  commit 92f43f856f4a8b36c207d1b190ed8699b5a4ecb4
431  Author: Brian Warner <warner@lothar.com>
432  Date:   Tue Oct 4 12:48:08 2011 -0400
433 
434      API of Retrieve._validate_block(), trying to remove reader.server
435 
436   src/allmydata/mutable/retrieve.py |   14 +++++++-------
437   1 files changed, 7 insertions(+), 7 deletions(-)
438 
439  commit 572d5070761861a2190349d1ed8d85dbc25698a5
440  Author: Brian Warner <warner@lothar.com>
441  Date:   Tue Oct 4 12:36:58 2011 -0400
442 
443      API of Retrieve._mark_bad_share(), trying to remove reader.server
444 
445   src/allmydata/mutable/retrieve.py |   21 +++++++++------------
446   1 files changed, 9 insertions(+), 12 deletions(-)
447 
448  commit a793ff00c0de1e2eec7b46288fdf388c7a2bec89
449  Author: Brian Warner <warner@lothar.com>
450  Date:   Tue Oct 4 12:06:13 2011 -0400
451 
452      remove now-unused get_rref_for_serverid()
453 
454   src/allmydata/mutable/servermap.py |    3 ---
455   1 files changed, 0 insertions(+), 3 deletions(-)
456 
457  commit 1b9827cc9366bf90b93297fdd6832f2ad0480ce7
458  Author: Brian Warner <warner@lothar.com>
459  Date:   Tue Oct 4 12:03:09 2011 -0400
460 
461      Retrieve: stop adding .serverid attributes to readers
462 
463   src/allmydata/mutable/retrieve.py |    1 -
464   1 files changed, 0 insertions(+), 1 deletions(-)
465 
466  commit 5d4e9d491b19e49d2e443a1dfff2c672842c36ef
467  Author: Brian Warner <warner@lothar.com>
468  Date:   Tue Oct 4 12:03:34 2011 -0400
469 
470      return value of Retrieve(verify=True)
471 
472   src/allmydata/mutable/checker.py  |   11 ++++++-----
473   src/allmydata/mutable/retrieve.py |    3 +--
474   2 files changed, 7 insertions(+), 7 deletions(-)
475 
476  commit e9ab7978c384e1f677cb7779dc449b1044face82
477  Author: Brian Warner <warner@lothar.com>
478  Date:   Tue Oct 4 11:54:23 2011 -0400
479 
480      Retrieve._bad_shares (but not return value, used by Verifier)
481 
482   src/allmydata/mutable/retrieve.py |    7 ++++---
483   1 files changed, 4 insertions(+), 3 deletions(-)
484 
485  commit 2d91926de233ec5c881f30e36b4a30ad92ab42a9
486  Author: Brian Warner <warner@lothar.com>
487  Date:   Tue Oct 4 11:51:23 2011 -0400
488 
489      Publish: stop adding .serverid attributes to writers
490 
491   src/allmydata/mutable/publish.py |    9 ++-------
492   1 files changed, 2 insertions(+), 7 deletions(-)
493 
494  commit 47c7a0105dec7cbf4f7e0a3ce800bbb85b15df4a
495  Author: Brian Warner <warner@lothar.com>
496  Date:   Tue Oct 4 11:56:33 2011 -0400
497 
498      API of get_write_enabler()
499 
500   src/allmydata/mutable/filenode.py |    7 ++++---
501   src/allmydata/mutable/publish.py  |    4 ++--
502   src/allmydata/test/no_network.py  |    3 +++
503   3 files changed, 9 insertions(+), 5 deletions(-)
504 
505  commit 9196a5c6590fdbfd660325ea8358b345887d3db0
506  Author: Brian Warner <warner@lothar.com>
507  Date:   Tue Oct 4 11:46:24 2011 -0400
508 
509      API of get_(renewal|cancel)_secret()
510 
511   src/allmydata/mutable/filenode.py  |   14 ++++++++------
512   src/allmydata/mutable/publish.py   |    8 ++++----
513   src/allmydata/mutable/servermap.py |    5 ++---
514   3 files changed, 14 insertions(+), 13 deletions(-)
515 
516  commit de7c1552f8c163eff5b6d820b5fb3b21c1b47cb5
517  Author: Brian Warner <warner@lothar.com>
518  Date:   Tue Oct 4 11:41:52 2011 -0400
519 
520      API of CorruptShareError. Also comment out some related+unused test_web.py code
521 
522   src/allmydata/mutable/common.py    |   13 +++++--------
523   src/allmydata/mutable/retrieve.py  |   10 +++++-----
524   src/allmydata/mutable/servermap.py |    8 +++-----
525   src/allmydata/test/common.py       |   13 ++++++++-----
526   4 files changed, 21 insertions(+), 23 deletions(-)
527 
528  commit 2c1c314046b620c16f1e66d030c150d768b7d01e
529  Author: Brian Warner <warner@lothar.com>
530  Date:   Tue Oct 4 12:01:46 2011 -0400
531 
532      API of ServerMap.mark_bad_share()
533 
534   src/allmydata/mutable/publish.py   |    2 +-
535   src/allmydata/mutable/retrieve.py  |    6 +++---
536   src/allmydata/mutable/servermap.py |    6 ++----
537   src/allmydata/test/test_mutable.py |    3 +--
538   4 files changed, 7 insertions(+), 10 deletions(-)
539 
540  commit 1bed349030779fd0c378ae4e821384f953c6f6ff
541  Author: Brian Warner <warner@lothar.com>
542  Date:   Tue Oct 4 11:11:17 2011 -0400
543 
544      API+name of ServerMap.shares_on_server() : only for tests, so debug_ prefix
545 
546   src/allmydata/mutable/servermap.py |    7 ++-----
547   src/allmydata/test/test_mutable.py |    6 +++---
548   2 files changed, 5 insertions(+), 8 deletions(-)
549 
550  commit 2d32e448677d6b818692e801045d4115b29abf21
551  Author: Brian Warner <warner@lothar.com>
552  Date:   Tue Oct 4 11:07:10 2011 -0400
553 
554      API of ServerMap.all_servers_for_version()
555 
556   src/allmydata/mutable/servermap.py |    4 ++--
557   1 files changed, 2 insertions(+), 2 deletions(-)
558 
559  commit 48f3204d1889c3e7179578125c4bdef515af3d6a
560  Author: Brian Warner <warner@lothar.com>
561  Date:   Tue Oct 4 11:04:50 2011 -0400
562 
563      internals of ServerMap methods that use make_versionmap(), remove temp copy
564 
565   src/allmydata/mutable/servermap.py |   28 +++++++++----------------
566   1 files changed, 10 insertions(+), 18 deletions(-)
567 
568  commit 5c3da77b6c777a145bd5ddfaa4db849dc9495548
569  Author: Brian Warner <warner@lothar.com>
570  Date:   Tue Oct 4 11:01:28 2011 -0400
571 
572      API of ServerMap.make_versionmap()
573 
574   src/allmydata/mutable/checker.py   |    4 ++--
575   src/allmydata/mutable/retrieve.py  |    5 ++---
576   src/allmydata/mutable/servermap.py |    4 ++--
577   src/allmydata/test/test_mutable.py |    7 ++++---
578   4 files changed, 10 insertions(+), 10 deletions(-)
579 
580  commit b6882ece49afb4c507d118af2db346fa329209dc
581  Author: Brian Warner <warner@lothar.com>
582  Date:   Tue Oct 4 10:53:38 2011 -0400
583 
584      make a copy of ServerMap.make_versionmap() (_make_versionmap2) for internal use
585 
586   src/allmydata/mutable/servermap.py |   18 +++++++++++++-----
587   1 files changed, 13 insertions(+), 5 deletions(-)
588 
589  commit 963f8e63faf32b950eb1b8103cd2ff16fe8f0151
590  Author: Brian Warner <warner@lothar.com>
591  Date:   Tue Oct 4 00:45:58 2011 -0400
592 
593      API of RetrieveStatus.add_problem()
594 
595   src/allmydata/mutable/retrieve.py |    5 +++--
596   1 files changed, 3 insertions(+), 2 deletions(-)
597 
598  commit 4976d29ffae565a048851601c29013bbae2976d8
599  Author: Brian Warner <warner@lothar.com>
600  Date:   Tue Oct 4 00:45:05 2011 -0400
601 
602      API of RetrieveStatus.add_fetch_timing()
603 
604   src/allmydata/mutable/retrieve.py |    5 +++--
605   1 files changed, 3 insertions(+), 2 deletions(-)
606 
607  commit d057d3bbba72663ee148a8b916bc2d52be2e3982
608  Author: Brian Warner <warner@lothar.com>
609  Date:   Tue Oct 4 00:44:04 2011 -0400
610 
611      API of Retrieve.notify_server_corruption()
612 
613   src/allmydata/mutable/retrieve.py |    6 +++---
614   1 files changed, 3 insertions(+), 3 deletions(-)
615 
616  commit 8a2a81e46671c860610e0e96d6add1a57551f22d
617  Author: Brian Warner <warner@lothar.com>
618  Date:   Tue Oct 4 00:42:32 2011 -0400
619 
620      remove unused _outstanding_queries
621 
622   src/allmydata/mutable/retrieve.py |    1 -
623   1 files changed, 0 insertions(+), 1 deletions(-)
624 
625  commit 56d12cc9968d03ccd53764455c671122c4f391d1
626  Author: Brian Warner <warner@lothar.com>
627  Date:   Tue Oct 4 00:40:57 2011 -0400
628 
629      change Retrieve.remaining_sharemap
630 
631   src/allmydata/mutable/retrieve.py |    4 ++--
632   1 files changed, 2 insertions(+), 2 deletions(-)
633 
634  commit 4f0b7af4821f43290bfc70f2b1fc30149ad81281
635  Author: Brian Warner <warner@lothar.com>
636  Date:   Tue Oct 4 10:40:18 2011 -0400
637 
638      accessor for PublishStatus._problems
639 
640   src/allmydata/mutable/publish.py |    4 +++-
641   src/allmydata/web/status.py      |    2 +-
642   2 files changed, 4 insertions(+), 2 deletions(-)
643 
644  commit 627087cf66d0b8cc519f4d551a967a7bd9b6a741
645  Author: Brian Warner <warner@lothar.com>
646  Date:   Tue Oct 4 10:36:39 2011 -0400
647 
648      accessor for RetrieveStatus._problems
649 
650   src/allmydata/mutable/retrieve.py |    8 ++++++--
651   src/allmydata/web/status.py       |    2 +-
652   2 files changed, 7 insertions(+), 3 deletions(-)
653 
654  commit ca7dea81f03801b1c7353fc00ecba689268109cf
655  Author: Brian Warner <warner@lothar.com>
656  Date:   Tue Oct 4 00:35:32 2011 -0400
657 
658      add .server to "reader", so we can get at it later
659 
660   src/allmydata/mutable/retrieve.py |    5 +++--
661   1 files changed, 3 insertions(+), 2 deletions(-)
662 
663  commit 6ef516e24908ec195af084a7550d1921a5e983b0
664  Author: Brian Warner <warner@lothar.com>
665  Date:   Tue Oct 4 00:32:32 2011 -0400
666 
667      temporarily give Retrieve a _storage_broker, so it can map serverids to servers
668 
669   src/allmydata/mutable/checker.py   |    3 ++-
670   src/allmydata/mutable/filenode.py  |    6 ++++--
671   src/allmydata/mutable/retrieve.py  |    5 +++--
672   src/allmydata/test/test_mutable.py |    4 ++--
673   4 files changed, 11 insertions(+), 7 deletions(-)
674 
675  commit afe08e4dd3f4ff9ff7e8a2a8d28b181e3625bcc9
676  Author: Brian Warner <warner@lothar.com>
677  Date:   Tue Oct 4 00:21:51 2011 -0400
678 
679      mutable/retrieve.py: s/peer/server/
680 
681   src/allmydata/mutable/retrieve.py  |   82 +++++++++++++-------------
682   src/allmydata/test/test_mutable.py |    6 +-
683   2 files changed, 44 insertions(+), 44 deletions(-)
684 
685  commit 910afcb5d7f274880f68dd6cdb5b05f2bbc29adc
686  Author: Brian Warner <warner@lothar.com>
687  Date:   Tue Oct 4 00:16:01 2011 -0400
688 
689      web.status.PublishStatusPage: add comment, I think .problems isn't exercised
690 
691   src/allmydata/web/status.py |    2 ++
692   1 files changed, 2 insertions(+), 0 deletions(-)
693 
694  commit 311466dd8c931bbba40d590ade867704282e7f1a
695  Author: Brian Warner <warner@lothar.com>
696  Date:   Mon Oct 3 23:48:16 2011 -0400
697 
698      API of PublishStatus.add_per_server_time()
699 
700   src/allmydata/mutable/publish.py |    5 +++--
701   1 files changed, 3 insertions(+), 2 deletions(-)
702 
703  commit 2df5faa1b6cbfbaded520d2320305a62fe961118
704  Author: Brian Warner <warner@lothar.com>
705  Date:   Mon Oct 3 23:46:37 2011 -0400
706 
707      more simplifications
708 
709   src/allmydata/mutable/publish.py |    4 +---
710   1 files changed, 1 insertions(+), 3 deletions(-)
711 
712  commit 6ac4544a3da385f2aad9392f906b90192f4f919a
713  Author: Brian Warner <warner@lothar.com>
714  Date:   Mon Oct 3 23:44:08 2011 -0400
715 
716      API of ServerMap.version_on_server()
717 
718   src/allmydata/mutable/publish.py   |    2 +-
719   src/allmydata/mutable/servermap.py |    4 ++--
720   src/allmydata/test/test_mutable.py |    5 ++---
721   3 files changed, 5 insertions(+), 6 deletions(-)
722 
723  commit 3e187e322511072e4683329df6b2c6c733a66dba
724  Author: Brian Warner <warner@lothar.com>
725  Date:   Tue Oct 4 00:16:32 2011 -0400
726 
727      API of ServerMap.make_sharemap()
728 
729   src/allmydata/mutable/servermap.py |    4 ++--
730   src/allmydata/test/test_mutable.py |    7 ++++---
731   src/allmydata/web/status.py        |    4 ++--
732   3 files changed, 8 insertions(+), 7 deletions(-)
733 
734  commit 318feed8437bdd8d4943c6569d38f7b54b6313cc
735  Author: Brian Warner <warner@lothar.com>
736  Date:   Mon Oct 3 23:36:19 2011 -0400
737 
738      small cleanups
739 
740   src/allmydata/mutable/publish.py |    4 ++--
741   1 files changed, 2 insertions(+), 2 deletions(-)
742 
743  commit bd459ed5714e1db5a7163935c54b7b0b56db8349
744  Author: Brian Warner <warner@lothar.com>
745  Date:   Mon Oct 3 23:33:39 2011 -0400
746 
747      API of ServerMap.add_new_share()
748 
749   src/allmydata/mutable/publish.py   |    4 ++--
750   src/allmydata/mutable/servermap.py |    6 ++----
751   2 files changed, 4 insertions(+), 6 deletions(-)
752 
753  commit f2804fb6ed11d80088e0da8ed48e6c2922f2ffef
754  Author: Brian Warner <warner@lothar.com>
755  Date:   Mon Oct 3 23:30:26 2011 -0400
756 
757      API of ServerMap.get_bad_shares()
758 
759   src/allmydata/mutable/publish.py   |    3 +--
760   src/allmydata/mutable/servermap.py |    9 ++++-----
761   2 files changed, 5 insertions(+), 7 deletions(-)
762 
763  commit 965074a47b3ce1431cb46d9a233840afcf9105f5
764  Author: Brian Warner <warner@lothar.com>
765  Date:   Mon Oct 3 23:26:58 2011 -0400
766 
767      more small cleanups
768 
769   src/allmydata/mutable/publish.py |    6 +++---
770   1 files changed, 3 insertions(+), 3 deletions(-)
771 
772  commit 38020da34f034f8889947dd3dc05e087ffff7106
773  Author: Brian Warner <warner@lothar.com>
774  Date:   Mon Oct 3 23:18:47 2011 -0400
775 
776      change Publish.bad_share_checkstrings
777 
778   src/allmydata/mutable/publish.py |    6 +++---
779   1 files changed, 3 insertions(+), 3 deletions(-)
780 
781  commit 5efebcbd2ee0c2f299ea86f7591d856c0f265304
782  Author: Brian Warner <warner@lothar.com>
783  Date:   Mon Oct 3 23:16:31 2011 -0400
784 
785      change internals of Publish.update_goal()
786 
787   src/allmydata/mutable/publish.py |    8 +++-----
788   1 files changed, 3 insertions(+), 5 deletions(-)
789 
790  commit e91b55ff4c2a69165b71f2c7b217ac319ff4c527
791  Author: Brian Warner <warner@lothar.com>
792  Date:   Mon Oct 3 23:11:42 2011 -0400
793 
794      get rid of Publish.connections
795 
796   src/allmydata/mutable/publish.py |   27 +++++----------------------
797   1 files changed, 5 insertions(+), 22 deletions(-)
798 
799  commit 64e9a53b3229ebe2f9ebf7ed502d539311d0e037
800  Author: Brian Warner <warner@lothar.com>
801  Date:   Mon Oct 3 23:05:32 2011 -0400
802 
803      change Publish.bad_servers
804 
805   src/allmydata/mutable/publish.py |   10 +++++-----
806   1 files changed, 5 insertions(+), 5 deletions(-)
807 
808  commit b85a934bef315a06bcfe00c9c12a3627fed2b918
809  Author: Brian Warner <warner@lothar.com>
810  Date:   Mon Oct 3 23:03:07 2011 -0400
811 
812      Publish.bad_servers: fix bug, this should be a set of serverids, not writers
813 
814   src/allmydata/mutable/publish.py |    2 +-
815   1 files changed, 1 insertions(+), 1 deletions(-)
816 
817  commit 605ea15ec15ed671513819003ccd211cdb9761e0
818  Author: Brian Warner <warner@lothar.com>
819  Date:   Mon Oct 3 23:00:21 2011 -0400
820 
821      change .placed
822 
823   src/allmydata/mutable/publish.py |    6 +++---
824   1 files changed, 3 insertions(+), 3 deletions(-)
825 
826  commit f7aba37b1b345d5b6d5cb16e3b3f6f3c1afb658e
827  Author: Brian Warner <warner@lothar.com>
828  Date:   Mon Oct 3 22:59:22 2011 -0400
829 
830      temporarily stash IServer as .server on the "writer" object
831 
832   src/allmydata/mutable/publish.py |    2 ++
833   1 files changed, 2 insertions(+), 0 deletions(-)
834 
835  commit f9b551d788e7db1f187fce5ab98ab5d5fe4e1c36
836  Author: Brian Warner <warner@lothar.com>
837  Date:   Mon Oct 3 22:48:18 2011 -0400
838 
839      change Publish.goal and API of log_goal() to use IServer, not serverid
840 
841   src/allmydata/mutable/publish.py |   48 ++++++++++++++--------------
842   1 files changed, 24 insertions(+), 24 deletions(-)
843 
844  commit 75f20616558e4900b8b1f685dd99aa838de6d452
845  Author: Brian Warner <warner@lothar.com>
846  Date:   Mon Oct 3 15:27:02 2011 -0400
847 
848      API of ServerMap.get_known_shares()
849 
850   src/allmydata/mutable/publish.py   |   16 ++++++++++------
851   src/allmydata/mutable/servermap.py |    7 ++-----
852   2 files changed, 12 insertions(+), 11 deletions(-)
853 
854  commit 1c38c9d37bb08221b4418762234b1a62397b3b4b
855  Author: Brian Warner <warner@lothar.com>
856  Date:   Mon Oct 3 15:20:29 2011 -0400
857 
858      Publish.full_serverlist
859 
860   src/allmydata/mutable/publish.py |   10 +++++-----
861   1 files changed, 5 insertions(+), 5 deletions(-)
862 
863  commit b6cbd215a04b9cde31a7d92a97a7f048622b16f1
864  Author: Brian Warner <warner@lothar.com>
865  Date:   Mon Oct 3 15:12:31 2011 -0400
866 
867      API of ServerMap.all_servers()
868 
869   src/allmydata/mutable/servermap.py |   19 ++++++-------------
870   1 files changed, 6 insertions(+), 13 deletions(-)
871 
872  commit e63cd0315fae65357b1727ec6d5ff3c6e0d27c98
873  Author: Brian Warner <warner@lothar.com>
874  Date:   Mon Oct 3 15:10:18 2011 -0400
875 
876      remove ServerMap.connections, set_rref_for_serverid()
877 
878   src/allmydata/mutable/servermap.py |   11 +----------
879   1 files changed, 1 insertions(+), 10 deletions(-)
880 
881  commit 4df52db2f80eb12eefa5d57103c24893cde89553
882  Author: Brian Warner <warner@lothar.com>
883  Date:   Mon Oct 3 15:04:06 2011 -0400
884 
885      API of ServerMap.mark_server_reachable()
886 
887   src/allmydata/mutable/servermap.py |    7 ++-----
888   1 files changed, 2 insertions(+), 5 deletions(-)
889 
890  commit 69c715bde77944dc25181b3dbbeb042c816f9a1b
891  Author: Brian Warner <warner@lothar.com>
892  Date:   Mon Oct 3 15:03:21 2011 -0400
893 
894      API of ServerMap.mark_server_unreachable()
895 
896   src/allmydata/mutable/servermap.py |    9 +++------
897   1 files changed, 3 insertions(+), 6 deletions(-)
898 
899  commit 3d784d60eec1c508858e3a617e4411ffbcc3c1fa
900  Author: Brian Warner <warner@lothar.com>
901  Date:   Mon Oct 3 15:02:03 2011 -0400
902 
903      API of status.set_privkey_from()
904 
905   src/allmydata/mutable/servermap.py |    7 +++----
906   1 files changed, 3 insertions(+), 4 deletions(-)
907 
908  commit 544ed3ea29bed7e66da7fd29ca3f6f076f27a9e6
909  Author: Brian Warner <warner@lothar.com>
910  Date:   Mon Oct 3 15:01:15 2011 -0400
911 
912      API of status.add_per_server_time()
913 
914   src/allmydata/mutable/servermap.py |    7 ++++---
915   1 files changed, 4 insertions(+), 3 deletions(-)
916 
917  commit fffe5008b6320bd1e04c3c68389a2bf2ee383fa8
918  Author: Brian Warner <warner@lothar.com>
919  Date:   Mon Oct 3 14:59:02 2011 -0400
920 
921      remove unused .versionmap
922 
923   src/allmydata/mutable/servermap.py |    7 -------
924   1 files changed, 0 insertions(+), 7 deletions(-)
925 
926  commit 2816562e090d2294179db3588dafcca18de1bc2b
927  Author: Brian Warner <warner@lothar.com>
928  Date:   Mon Oct 3 14:57:51 2011 -0400
929 
930      remove serverid from all log messages. Also one unused lambda.
931 
932   src/allmydata/mutable/servermap.py |   30 +++++++++++++-------------
933   1 files changed, 15 insertions(+), 15 deletions(-)
934 
935  commit 28fa6b1a2738fa98c1f1dbd3d0e01ae98912d11f
936  Author: Brian Warner <warner@lothar.com>
937  Date:   Mon Oct 3 14:54:30 2011 -0400
938 
939      removed unused _readers
940 
941   src/allmydata/mutable/servermap.py |    3 ---
942   1 files changed, 0 insertions(+), 3 deletions(-)
943 
944  commit a8e4ed3d645ab592d1add6a1e69b6d1ebfb77817
945  Author: Brian Warner <warner@lothar.com>
946  Date:   Mon Oct 3 14:54:16 2011 -0400
947 
948      remove unused _sharemap
949 
950   src/allmydata/mutable/servermap.py |    1 -
951   1 files changed, 0 insertions(+), 1 deletions(-)
952 
953  commit 3f072e55cf1d0700f9fffe23f8f3a475725df588
954  Author: Brian Warner <warner@lothar.com>
955  Date:   Mon Oct 3 14:49:03 2011 -0400
956 
957      _must_query
958 
959   src/allmydata/mutable/servermap.py |    8 ++++----
960   1 files changed, 4 insertions(+), 4 deletions(-)
961 
962  commit c599a059b8df3f5785e4bf89fb6ecc6d8dcd708b
963  Author: Brian Warner <warner@lothar.com>
964  Date:   Mon Oct 3 14:48:05 2011 -0400
965 
966      _queries_outstanding
967 
968   src/allmydata/mutable/servermap.py |   16 +++++++---------
969   1 files changed, 7 insertions(+), 9 deletions(-)
970 
971  commit 7743759f98ac2c07926b2fdbd80bf52dfab33085
972  Author: Brian Warner <warner@lothar.com>
973  Date:   Mon Oct 3 14:46:17 2011 -0400
974 
975      _empty_servers
976 
977   src/allmydata/mutable/servermap.py |    5 ++---
978   1 files changed, 2 insertions(+), 3 deletions(-)
979 
980  commit 6bb1825916828a713a32cdf7f7411fa3ea2e1e5d
981  Author: Brian Warner <warner@lothar.com>
982  Date:   Mon Oct 3 14:45:39 2011 -0400
983 
984      _good_servers
985 
986   src/allmydata/mutable/servermap.py |    4 ++--
987   1 files changed, 2 insertions(+), 2 deletions(-)
988 
989  commit 1768fab1b51d8dd93ecabbaaabfadfa20cf6c3d4
990  Author: Brian Warner <warner@lothar.com>
991  Date:   Mon Oct 3 14:44:59 2011 -0400
992 
993      _bad_servers
994 
995   src/allmydata/mutable/servermap.py |   14 +++++++-------
996   1 files changed, 7 insertions(+), 7 deletions(-)
997 
998  commit dccbaef30f0ba714c746bf6d4a1a803c36e17b65
999  Author: Brian Warner <warner@lothar.com>
1000  Date:   Mon Oct 3 14:41:54 2011 -0400
1001 
1002      API of _try_to_set_pubkey()
1003 
1004   src/allmydata/mutable/servermap.py |    7 ++++---
1005   1 files changed, 4 insertions(+), 3 deletions(-)
1006 
1007  commit 0481ea70042ba3575f15eac7fd0780f8ece580cc
1008  Author: Brian Warner <warner@lothar.com>
1009  Date:   Mon Oct 3 14:35:02 2011 -0400
1010 
1011      API of notify_server_corruption()
1012 
1013   src/allmydata/mutable/servermap.py |    6 +++---
1014   1 files changed, 3 insertions(+), 3 deletions(-)
1015 
1016  commit bea9cba18fb3b9c11bb22f18356a263ecec7351e
1017  Author: Brian Warner <warner@lothar.com>
1018  Date:   Mon Oct 3 14:34:09 2011 -0400
1019 
1020      API of _got_signature_one_share()
1021 
1022   src/allmydata/mutable/servermap.py |    9 +++++----
1023   1 files changed, 5 insertions(+), 4 deletions(-)
1024 
1025  commit 1520123583cf78650706e114b15bb5b0ac1f4a14
1026  Author: Brian Warner <warner@lothar.com>
1027  Date:   Mon Oct 3 14:32:33 2011 -0400
1028 
1029      API of _try_to_validate_privkey()
1030 
1031   src/allmydata/mutable/servermap.py |    9 +++++----
1032   1 files changed, 5 insertions(+), 4 deletions(-)
1033 
1034  commit 938852c9c8519c7a078f58a9b1f4dd8ec8b6715e
1035  Author: Brian Warner <warner@lothar.com>
1036  Date:   Mon Oct 3 14:31:48 2011 -0400
1037 
1038      API and internals of _add_lease_failed()
1039 
1040   src/allmydata/mutable/servermap.py |    8 ++++----
1041   1 files changed, 4 insertions(+), 4 deletions(-)
1042 
1043  commit 3843dba367e3c19e176a622ab853cb51d2472ddf
1044  Author: Brian Warner <warner@lothar.com>
1045  Date:   Mon Oct 3 14:30:37 2011 -0400
1046 
1047      API of _privkey_query_failed()
1048 
1049   src/allmydata/mutable/servermap.py |    5 +++--
1050   1 files changed, 3 insertions(+), 2 deletions(-)
1051 
1052  commit 2219a710e1633cd57d0ca0786490de87b3e19ba7
1053  Author: Brian Warner <warner@lothar.com>
1054  Date:   Mon Oct 3 14:29:43 2011 -0400
1055 
1056      fix bug in call to _privkey_query_failed, unrelated to refactoring
1057 
1058   src/allmydata/mutable/servermap.py |    2 +-
1059   1 files changed, 1 insertions(+), 1 deletions(-)
1060 
1061  commit ae615bec7d0d1b269710b6902797b12f9592ad62
1062  Author: Brian Warner <warner@lothar.com>
1063  Date:   Mon Oct 3 14:27:17 2011 -0400
1064 
1065      API of _got_corrupt_share()
1066 
1067   src/allmydata/mutable/servermap.py |   17 +++++++++--------
1068   1 files changed, 9 insertions(+), 8 deletions(-)
1069 
1070  commit cb51c95a6f4e077278157a77dab060c8c1ad7a81
1071  Author: Brian Warner <warner@lothar.com>
1072  Date:   Mon Oct 3 14:23:16 2011 -0400
1073 
1074      API of _got_results()
1075 
1076   src/allmydata/mutable/servermap.py |    9 +++++----
1077   1 files changed, 5 insertions(+), 4 deletions(-)
1078 
1079  commit bac9154fe0af18f226999a58ffc2362d8cf4b802
1080  Author: Brian Warner <warner@lothar.com>
1081  Date:   Mon Oct 3 14:19:19 2011 -0400
1082 
1083      API of _query_failed()
1084 
1085   src/allmydata/mutable/servermap.py |    5 +++--
1086   1 files changed, 3 insertions(+), 2 deletions(-)
1087 
1088  commit fdc29a8ca95d4b5c503e5382b9e5d4d02141ba12
1089  Author: Brian Warner <warner@lothar.com>
1090  Date:   Mon Oct 3 14:17:20 2011 -0400
1091 
1092      API of _do_read()
1093 
1094   src/allmydata/mutable/servermap.py |    6 ++++--
1095   1 files changed, 4 insertions(+), 2 deletions(-)
1096 
1097  commit e7e9e338f28d004aa4d423d11c65f1e271ac7322
1098  Author: Brian Warner <warner@lothar.com>
1099  Date:   Mon Oct 3 14:20:21 2011 -0400
1100 
1101      API of _do_query()
1102 
1103   src/allmydata/mutable/servermap.py |   15 +++++++--------
1104   1 files changed, 7 insertions(+), 8 deletions(-)
1105 
1106  commit 330625b9dac4cdbe72a11464a893065b9aeed453
1107  Author: Brian Warner <warner@lothar.com>
1108  Date:   Mon Oct 3 14:43:05 2011 -0400
1109 
1110      next step: first batch of updates to ServermapUpdater
1111 
1112      updates:
1113       most method-local variables in update()
1114       API of _build_initial_querylist()
1115       API of _send_initial_requests()
1116       .full_serverlist
1117       .extra_servers
1118 
1119   src/allmydata/mutable/servermap.py |   39 ++++++++++++++------------
1120   1 files changed, 21 insertions(+), 18 deletions(-)
1121 
1122  commit 4aadc584fa7dcb2daa86b048c81dee0049ba26d9
1123  Author: Brian Warner <warner@lothar.com>
1124  Date:   Mon Oct 3 15:07:00 2011 -0400
1125 
1126      internal change: index _bad_shares with IServer
1127 
1128   src/allmydata/mutable/servermap.py |   20 ++++++++++----------
1129   1 files changed, 10 insertions(+), 10 deletions(-)
1130 
1131  commit 16d4e6fa82a9907dbdc92094213387c6a4164e41
1132  Author: Brian Warner <warner@lothar.com>
1133  Date:   Mon Oct 3 18:20:47 2011 +0100
1134 
1135      internal change: index _known_shares with IServer instead of serverid
1136 
1137      callers are unchanged
1138 
1139   src/allmydata/mutable/servermap.py |   42 +++++++++++++++----------
1140   1 files changed, 25 insertions(+), 17 deletions(-)
1141 
1142  commit ceeb5f4938cc814a0c75d1b8f4018aed965c2176
1143  Author: Brian Warner <warner@lothar.com>
1144  Date:   Mon Oct 3 18:11:43 2011 +0100
1145 
1146      accessors and name cleanup for servermap.Servermap.last_update_mode/time
1147 
1148   src/allmydata/mutable/filenode.py  |    6 +++---
1149   src/allmydata/mutable/publish.py   |    4 ++--
1150   src/allmydata/mutable/servermap.py |   17 +++++++++++------
1151   3 files changed, 16 insertions(+), 11 deletions(-)
1152 
1153  commit 8d3cbda82661c0a7e5c3d3b65cf7a5d5ab7e32c0
1154  Author: Brian Warner <warner@lothar.com>
1155  Date:   Mon Oct 3 18:11:14 2011 +0100
1156 
1157      accessors and name cleanup for servermap.Servermap.problems
1158 
1159   src/allmydata/mutable/servermap.py |   21 +++++++++++++--------
1160   src/allmydata/test/test_mutable.py |    6 +++---
1161   2 files changed, 16 insertions(+), 11 deletions(-)
1162 
1163  commit 348f57988f79389db0aab7672e6eaa9a6d8e3219
1164  Author: Brian Warner <warner@lothar.com>
1165  Date:   Mon Oct 3 18:10:41 2011 +0100
1166 
1167      accessors and name cleanup for servermap.Servermap.bad_shares
1168 
1169   src/allmydata/mutable/publish.py   |    2 +-
1170   src/allmydata/mutable/servermap.py |   30 ++++++++++++++-----------
1171   2 files changed, 18 insertions(+), 14 deletions(-)
1172 
1173  commit 520c9368134673cdf76c653c5e1bb91c2ab5d51e
1174  Author: Brian Warner <warner@lothar.com>
1175  Date:   Mon Oct 3 18:10:05 2011 +0100
1176 
1177      accessors and name cleanup for servermap.Servermap.servermap .
1178 
1179   src/allmydata/mutable/publish.py   |   14 +++++----
1180   src/allmydata/mutable/servermap.py |   38 ++++++++++++++-----------
1181   2 files changed, 29 insertions(+), 23 deletions(-)
1182 
1183  commit b8b8dc38287a91dbdf494426ac801d9381ce5841
1184  Author: Brian Warner <warner@lothar.com>
1185  Date:   Mon Oct 3 18:08:02 2011 +0100
1186 
1187      fix reachable_servers
1188 
1189   src/allmydata/mutable/checker.py   |    3 ++-
1190   src/allmydata/mutable/publish.py   |    4 +++-
1191   src/allmydata/mutable/servermap.py |   12 ++++++++++--
1192   3 files changed, 15 insertions(+), 4 deletions(-)
1193 
1194  commit cb0cfd1adfefad357c187aaaf690c3df68b622bc
1195  Author: Brian Warner <warner@lothar.com>
1196  Date:   Mon Oct 3 18:06:03 2011 +0100
1197 
1198      fix Servermap.unreachable_servers
1199 
1200   src/allmydata/mutable/servermap.py |   11 ++++++++---
1201   1 files changed, 8 insertions(+), 3 deletions(-)
1202 
1203  commit 2d9ea79b94bd4db674d40386fda90825785ac495
1204  Author: Brian Warner <warner@lothar.com>
1205  Date:   Mon Oct 3 18:03:48 2011 +0100
1206 
1207      give ServerMap a StorageFarmBroker, temporary
1208 
1209      this makes it possible for the ServerMap to accept bare serverids and still
1210      build data structures with IServers
1211 
1212   src/allmydata/mutable/checker.py   |    2 +-
1213   src/allmydata/mutable/filenode.py  |    2 +-
1214   src/allmydata/mutable/publish.py   |    2 +-
1215   src/allmydata/mutable/servermap.py |    5 +++--
1216   src/allmydata/test/test_mutable.py |    8 ++++----
1217   5 files changed, 10 insertions(+), 9 deletions(-)
1218 
1219  commit 718d1aeff6fded893f65397806d22ece928b0dd4
1220  Author: Brian Warner <warner@lothar.com>
1221  Date:   Mon Oct 3 13:43:30 2011 -0400
1222 
1223      add StorageFarmBroker.get_server_for_id(), temporary helper
1224 
1225      This will go away once we're passing IServers everywhere.
1226 
1227   src/allmydata/storage_client.py  |    2 ++
1228   src/allmydata/test/no_network.py |   13 +++++++++++++
1229   2 files changed, 15 insertions(+), 0 deletions(-)
1230 
1231  commit ece20231d7fda0d503704842a4aa068dfbc2e54e
1232  Author: Brian Warner <warner@lothar.com>
1233  Date:   Sun Oct 2 01:11:50 2011 +0100
1234 
1235      add proper accessors for Servermap.connections, to make refactoring easier
1236 
1237   src/allmydata/mutable/publish.py   |    6 +++---
1238   src/allmydata/mutable/retrieve.py  |   10 +++++-----
1239   src/allmydata/mutable/servermap.py |   17 +++++++++++------
1240   3 files changed, 19 insertions(+), 14 deletions(-)
1241 
1242  commit 3b943d6bf302ff702668081a612fc4fe2604cf9c
1243  Author: Brian Warner <warner@lothar.com>
1244  Date:   Fri Sep 23 10:34:30 2011 -0700
1245 
1246      mutable/servermap.py and neighbors: s/peer/server/
1247 
1248   src/allmydata/mutable/checker.py   |   22 +-
1249   src/allmydata/mutable/publish.py   |  204 +++++++-------
1250   src/allmydata/mutable/servermap.py |  402 +++++++++++++-------------
1251   src/allmydata/test/test_mutable.py |   18 +-
1252   4 files changed, 323 insertions(+), 323 deletions(-)
1253 IServer refactoring: pass IServer instances around, instead of peerids
1254 
1255 refs #1363
1256 
1257 This collapses 88 small incremental changes (each of which passes all tests)
1258 into one big patch. The development process for the long path started with
1259 adding some temporary scaffolding, changing one method at a time, then
1260 removing the scaffolding. The individual pieces are as follows, in reverse
1261 chronological order (the first patch is at the end of this comment):
1262 
1263  commit 9bbe4174fd0d98a6cf47a8ef96e85d9ef34b2f9a
1264  Author: Brian Warner <warner@lothar.com>
1265  Date:   Tue Oct 4 16:05:00 2011 -0400
1266 
1267      immutable/downloader/status.py: correct comment
1268 
1269   src/allmydata/immutable/downloader/status.py |    2 +-
1270   1 files changed, 1 insertions(+), 1 deletions(-)
1271 
1272  commit 72146a7c7c91eac2f7c3ceb801eb7a1721376889
1273  Author: Brian Warner <warner@lothar.com>
1274  Date:   Tue Oct 4 15:46:20 2011 -0400
1275 
1276      remove temporary ServerMap._storage_broker
1277 
1278   src/allmydata/mutable/checker.py   |    2 +-
1279   src/allmydata/mutable/filenode.py  |    2 +-
1280   src/allmydata/mutable/publish.py   |    2 +-
1281   src/allmydata/mutable/servermap.py |    5 ++---
1282   src/allmydata/test/test_mutable.py |    8 ++++----
1283   5 files changed, 9 insertions(+), 10 deletions(-)
1284 
1285  commit d703096b41632c47d76414b12672e076a422ff5c
1286  Author: Brian Warner <warner@lothar.com>
1287  Date:   Tue Oct 4 15:37:05 2011 -0400
1288 
1289      remove temporary storage_broker.get_server_for_id()
1290 
1291   src/allmydata/storage_client.py  |    3 ---
1292   src/allmydata/test/no_network.py |   13 -------------
1293   2 files changed, 0 insertions(+), 16 deletions(-)
1294 
1295  commit 620cc5d80882ef6f7decfd26af8a6c7c1ddf80d1
1296  Author: Brian Warner <warner@lothar.com>
1297  Date:   Tue Oct 4 12:50:06 2011 -0400
1298 
1299      API of Retrieve._try_to_validate_privkey(), trying to remove reader.server
1300 
1301   src/allmydata/mutable/retrieve.py |   10 +++++-----
1302   1 files changed, 5 insertions(+), 5 deletions(-)
1303 
1304  commit 92f43f856f4a8b36c207d1b190ed8699b5a4ecb4
1305  Author: Brian Warner <warner@lothar.com>
1306  Date:   Tue Oct 4 12:48:08 2011 -0400
1307 
1308      API of Retrieve._validate_block(), trying to remove reader.server
1309 
1310   src/allmydata/mutable/retrieve.py |   14 +++++++-------
1311   1 files changed, 7 insertions(+), 7 deletions(-)
1312 
1313  commit 572d5070761861a2190349d1ed8d85dbc25698a5
1314  Author: Brian Warner <warner@lothar.com>
1315  Date:   Tue Oct 4 12:36:58 2011 -0400
1316 
1317      API of Retrieve._mark_bad_share(), trying to remove reader.server
1318 
1319   src/allmydata/mutable/retrieve.py |   21 +++++++++------------
1320   1 files changed, 9 insertions(+), 12 deletions(-)
1321 
1322  commit a793ff00c0de1e2eec7b46288fdf388c7a2bec89
1323  Author: Brian Warner <warner@lothar.com>
1324  Date:   Tue Oct 4 12:06:13 2011 -0400
1325 
1326      remove now-unused get_rref_for_serverid()
1327 
1328   src/allmydata/mutable/servermap.py |    3 ---
1329   1 files changed, 0 insertions(+), 3 deletions(-)
1330 
1331  commit 1b9827cc9366bf90b93297fdd6832f2ad0480ce7
1332  Author: Brian Warner <warner@lothar.com>
1333  Date:   Tue Oct 4 12:03:09 2011 -0400
1334 
1335      Retrieve: stop adding .serverid attributes to readers
1336 
1337   src/allmydata/mutable/retrieve.py |    1 -
1338   1 files changed, 0 insertions(+), 1 deletions(-)
1339 
1340  commit 5d4e9d491b19e49d2e443a1dfff2c672842c36ef
1341  Author: Brian Warner <warner@lothar.com>
1342  Date:   Tue Oct 4 12:03:34 2011 -0400
1343 
1344      return value of Retrieve(verify=True)
1345 
1346   src/allmydata/mutable/checker.py  |   11 ++++++-----
1347   src/allmydata/mutable/retrieve.py |    3 +--
1348   2 files changed, 7 insertions(+), 7 deletions(-)
1349 
1350  commit e9ab7978c384e1f677cb7779dc449b1044face82
1351  Author: Brian Warner <warner@lothar.com>
1352  Date:   Tue Oct 4 11:54:23 2011 -0400
1353 
1354      Retrieve._bad_shares (but not return value, used by Verifier)
1355 
1356   src/allmydata/mutable/retrieve.py |    7 ++++---
1357   1 files changed, 4 insertions(+), 3 deletions(-)
1358 
1359  commit 2d91926de233ec5c881f30e36b4a30ad92ab42a9
1360  Author: Brian Warner <warner@lothar.com>
1361  Date:   Tue Oct 4 11:51:23 2011 -0400
1362 
1363      Publish: stop adding .serverid attributes to writers
1364 
1365   src/allmydata/mutable/publish.py |    9 ++-------
1366   1 files changed, 2 insertions(+), 7 deletions(-)
1367 
1368  commit 47c7a0105dec7cbf4f7e0a3ce800bbb85b15df4a
1369  Author: Brian Warner <warner@lothar.com>
1370  Date:   Tue Oct 4 11:56:33 2011 -0400
1371 
1372      API of get_write_enabler()
1373 
1374   src/allmydata/mutable/filenode.py |    7 ++++---
1375   src/allmydata/mutable/publish.py  |    4 ++--
1376   src/allmydata/test/no_network.py  |    3 +++
1377   3 files changed, 9 insertions(+), 5 deletions(-)
1378 
1379  commit 9196a5c6590fdbfd660325ea8358b345887d3db0
1380  Author: Brian Warner <warner@lothar.com>
1381  Date:   Tue Oct 4 11:46:24 2011 -0400
1382 
1383      API of get_(renewal|cancel)_secret()
1384 
1385   src/allmydata/mutable/filenode.py  |   14 ++++++++------
1386   src/allmydata/mutable/publish.py   |    8 ++++----
1387   src/allmydata/mutable/servermap.py |    5 ++---
1388   3 files changed, 14 insertions(+), 13 deletions(-)
1389 
1390  commit de7c1552f8c163eff5b6d820b5fb3b21c1b47cb5
1391  Author: Brian Warner <warner@lothar.com>
1392  Date:   Tue Oct 4 11:41:52 2011 -0400
1393 
1394      API of CorruptShareError. Also comment out some related+unused test_web.py code
1395 
1396   src/allmydata/mutable/common.py    |   13 +++++--------
1397   src/allmydata/mutable/retrieve.py  |   10 +++++-----
1398   src/allmydata/mutable/servermap.py |    8 +++-----
1399   src/allmydata/test/common.py       |   13 ++++++++-----
1400   4 files changed, 21 insertions(+), 23 deletions(-)
1401 
1402  commit 2c1c314046b620c16f1e66d030c150d768b7d01e
1403  Author: Brian Warner <warner@lothar.com>
1404  Date:   Tue Oct 4 12:01:46 2011 -0400
1405 
1406      API of ServerMap.mark_bad_share()
1407 
1408   src/allmydata/mutable/publish.py   |    2 +-
1409   src/allmydata/mutable/retrieve.py  |    6 +++---
1410   src/allmydata/mutable/servermap.py |    6 ++----
1411   src/allmydata/test/test_mutable.py |    3 +--
1412   4 files changed, 7 insertions(+), 10 deletions(-)
1413 
1414  commit 1bed349030779fd0c378ae4e821384f953c6f6ff
1415  Author: Brian Warner <warner@lothar.com>
1416  Date:   Tue Oct 4 11:11:17 2011 -0400
1417 
1418      API+name of ServerMap.shares_on_server() : only for tests, so debug_ prefix
1419 
1420   src/allmydata/mutable/servermap.py |    7 ++-----
1421   src/allmydata/test/test_mutable.py |    6 +++---
1422   2 files changed, 5 insertions(+), 8 deletions(-)
1423 
1424  commit 2d32e448677d6b818692e801045d4115b29abf21
1425  Author: Brian Warner <warner@lothar.com>
1426  Date:   Tue Oct 4 11:07:10 2011 -0400
1427 
1428      API of ServerMap.all_servers_for_version()
1429 
1430   src/allmydata/mutable/servermap.py |    4 ++--
1431   1 files changed, 2 insertions(+), 2 deletions(-)
1432 
1433  commit 48f3204d1889c3e7179578125c4bdef515af3d6a
1434  Author: Brian Warner <warner@lothar.com>
1435  Date:   Tue Oct 4 11:04:50 2011 -0400
1436 
1437      internals of ServerMap methods that use make_versionmap(), remove temp copy
1438 
1439   src/allmydata/mutable/servermap.py |   28 +++++++++----------------
1440   1 files changed, 10 insertions(+), 18 deletions(-)
1441 
1442  commit 5c3da77b6c777a145bd5ddfaa4db849dc9495548
1443  Author: Brian Warner <warner@lothar.com>
1444  Date:   Tue Oct 4 11:01:28 2011 -0400
1445 
1446      API of ServerMap.make_versionmap()
1447 
1448   src/allmydata/mutable/checker.py   |    4 ++--
1449   src/allmydata/mutable/retrieve.py  |    5 ++---
1450   src/allmydata/mutable/servermap.py |    4 ++--
1451   src/allmydata/test/test_mutable.py |    7 ++++---
1452   4 files changed, 10 insertions(+), 10 deletions(-)
1453 
1454  commit b6882ece49afb4c507d118af2db346fa329209dc
1455  Author: Brian Warner <warner@lothar.com>
1456  Date:   Tue Oct 4 10:53:38 2011 -0400
1457 
1458      make a copy of ServerMap.make_versionmap() (_make_versionmap2) for internal use
1459 
1460   src/allmydata/mutable/servermap.py |   18 +++++++++++++-----
1461   1 files changed, 13 insertions(+), 5 deletions(-)
1462 
1463  commit 963f8e63faf32b950eb1b8103cd2ff16fe8f0151
1464  Author: Brian Warner <warner@lothar.com>
1465  Date:   Tue Oct 4 00:45:58 2011 -0400
1466 
1467      API of RetrieveStatus.add_problem()
1468 
1469   src/allmydata/mutable/retrieve.py |    5 +++--
1470   1 files changed, 3 insertions(+), 2 deletions(-)
1471 
1472  commit 4976d29ffae565a048851601c29013bbae2976d8
1473  Author: Brian Warner <warner@lothar.com>
1474  Date:   Tue Oct 4 00:45:05 2011 -0400
1475 
1476      API of RetrieveStatus.add_fetch_timing()
1477 
1478   src/allmydata/mutable/retrieve.py |    5 +++--
1479   1 files changed, 3 insertions(+), 2 deletions(-)
1480 
1481  commit d057d3bbba72663ee148a8b916bc2d52be2e3982
1482  Author: Brian Warner <warner@lothar.com>
1483  Date:   Tue Oct 4 00:44:04 2011 -0400
1484 
1485      API of Retrieve.notify_server_corruption()
1486 
1487   src/allmydata/mutable/retrieve.py |    6 +++---
1488   1 files changed, 3 insertions(+), 3 deletions(-)
1489 
1490  commit 8a2a81e46671c860610e0e96d6add1a57551f22d
1491  Author: Brian Warner <warner@lothar.com>
1492  Date:   Tue Oct 4 00:42:32 2011 -0400
1493 
1494      remove unused _outstanding_queries
1495 
1496   src/allmydata/mutable/retrieve.py |    1 -
1497   1 files changed, 0 insertions(+), 1 deletions(-)
1498 
1499  commit 56d12cc9968d03ccd53764455c671122c4f391d1
1500  Author: Brian Warner <warner@lothar.com>
1501  Date:   Tue Oct 4 00:40:57 2011 -0400
1502 
1503      change Retrieve.remaining_sharemap
1504 
1505   src/allmydata/mutable/retrieve.py |    4 ++--
1506   1 files changed, 2 insertions(+), 2 deletions(-)
1507 
1508  commit 4f0b7af4821f43290bfc70f2b1fc30149ad81281
1509  Author: Brian Warner <warner@lothar.com>
1510  Date:   Tue Oct 4 10:40:18 2011 -0400
1511 
1512      accessor for PublishStatus._problems
1513 
1514   src/allmydata/mutable/publish.py |    4 +++-
1515   src/allmydata/web/status.py      |    2 +-
1516   2 files changed, 4 insertions(+), 2 deletions(-)
1517 
1518  commit 627087cf66d0b8cc519f4d551a967a7bd9b6a741
1519  Author: Brian Warner <warner@lothar.com>
1520  Date:   Tue Oct 4 10:36:39 2011 -0400
1521 
1522      accessor for RetrieveStatus._problems
1523 
1524   src/allmydata/mutable/retrieve.py |    8 ++++++--
1525   src/allmydata/web/status.py       |    2 +-
1526   2 files changed, 7 insertions(+), 3 deletions(-)
1527 
1528  commit ca7dea81f03801b1c7353fc00ecba689268109cf
1529  Author: Brian Warner <warner@lothar.com>
1530  Date:   Tue Oct 4 00:35:32 2011 -0400
1531 
1532      add .server to "reader", so we can get at it later
1533 
1534   src/allmydata/mutable/retrieve.py |    5 +++--
1535   1 files changed, 3 insertions(+), 2 deletions(-)
1536 
1537  commit 6ef516e24908ec195af084a7550d1921a5e983b0
1538  Author: Brian Warner <warner@lothar.com>
1539  Date:   Tue Oct 4 00:32:32 2011 -0400
1540 
1541      temporarily give Retrieve a _storage_broker, so it can map serverids to servers
1542 
1543   src/allmydata/mutable/checker.py   |    3 ++-
1544   src/allmydata/mutable/filenode.py  |    6 ++++--
1545   src/allmydata/mutable/retrieve.py  |    5 +++--
1546   src/allmydata/test/test_mutable.py |    4 ++--
1547   4 files changed, 11 insertions(+), 7 deletions(-)
1548 
1549  commit afe08e4dd3f4ff9ff7e8a2a8d28b181e3625bcc9
1550  Author: Brian Warner <warner@lothar.com>
1551  Date:   Tue Oct 4 00:21:51 2011 -0400
1552 
1553      mutable/retrieve.py: s/peer/server/
1554 
1555   src/allmydata/mutable/retrieve.py  |   82 +++++++++++++-------------
1556   src/allmydata/test/test_mutable.py |    6 +-
1557   2 files changed, 44 insertions(+), 44 deletions(-)
1558 
1559  commit 910afcb5d7f274880f68dd6cdb5b05f2bbc29adc
1560  Author: Brian Warner <warner@lothar.com>
1561  Date:   Tue Oct 4 00:16:01 2011 -0400
1562 
1563      web.status.PublishStatusPage: add comment, I think .problems isn't exercised
1564 
1565   src/allmydata/web/status.py |    2 ++
1566   1 files changed, 2 insertions(+), 0 deletions(-)
1567 
1568  commit 311466dd8c931bbba40d590ade867704282e7f1a
1569  Author: Brian Warner <warner@lothar.com>
1570  Date:   Mon Oct 3 23:48:16 2011 -0400
1571 
1572      API of PublishStatus.add_per_server_time()
1573 
1574   src/allmydata/mutable/publish.py |    5 +++--
1575   1 files changed, 3 insertions(+), 2 deletions(-)
1576 
1577  commit 2df5faa1b6cbfbaded520d2320305a62fe961118
1578  Author: Brian Warner <warner@lothar.com>
1579  Date:   Mon Oct 3 23:46:37 2011 -0400
1580 
1581      more simplifications
1582 
1583   src/allmydata/mutable/publish.py |    4 +---
1584   1 files changed, 1 insertions(+), 3 deletions(-)
1585 
1586  commit 6ac4544a3da385f2aad9392f906b90192f4f919a
1587  Author: Brian Warner <warner@lothar.com>
1588  Date:   Mon Oct 3 23:44:08 2011 -0400
1589 
1590      API of ServerMap.version_on_server()
1591 
1592   src/allmydata/mutable/publish.py   |    2 +-
1593   src/allmydata/mutable/servermap.py |    4 ++--
1594   src/allmydata/test/test_mutable.py |    5 ++---
1595   3 files changed, 5 insertions(+), 6 deletions(-)
1596 
1597  commit 3e187e322511072e4683329df6b2c6c733a66dba
1598  Author: Brian Warner <warner@lothar.com>
1599  Date:   Tue Oct 4 00:16:32 2011 -0400
1600 
1601      API of ServerMap.make_sharemap()
1602 
1603   src/allmydata/mutable/servermap.py |    4 ++--
1604   src/allmydata/test/test_mutable.py |    7 ++++---
1605   src/allmydata/web/status.py        |    4 ++--
1606   3 files changed, 8 insertions(+), 7 deletions(-)
1607 
1608  commit 318feed8437bdd8d4943c6569d38f7b54b6313cc
1609  Author: Brian Warner <warner@lothar.com>
1610  Date:   Mon Oct 3 23:36:19 2011 -0400
1611 
1612      small cleanups
1613 
1614   src/allmydata/mutable/publish.py |    4 ++--
1615   1 files changed, 2 insertions(+), 2 deletions(-)
1616 
1617  commit bd459ed5714e1db5a7163935c54b7b0b56db8349
1618  Author: Brian Warner <warner@lothar.com>
1619  Date:   Mon Oct 3 23:33:39 2011 -0400
1620 
1621      API of ServerMap.add_new_share()
1622 
1623   src/allmydata/mutable/publish.py   |    4 ++--
1624   src/allmydata/mutable/servermap.py |    6 ++----
1625   2 files changed, 4 insertions(+), 6 deletions(-)
1626 
1627  commit f2804fb6ed11d80088e0da8ed48e6c2922f2ffef
1628  Author: Brian Warner <warner@lothar.com>
1629  Date:   Mon Oct 3 23:30:26 2011 -0400
1630 
1631      API of ServerMap.get_bad_shares()
1632 
1633   src/allmydata/mutable/publish.py   |    3 +--
1634   src/allmydata/mutable/servermap.py |    9 ++++-----
1635   2 files changed, 5 insertions(+), 7 deletions(-)
1636 
1637  commit 965074a47b3ce1431cb46d9a233840afcf9105f5
1638  Author: Brian Warner <warner@lothar.com>
1639  Date:   Mon Oct 3 23:26:58 2011 -0400
1640 
1641      more small cleanups
1642 
1643   src/allmydata/mutable/publish.py |    6 +++---
1644   1 files changed, 3 insertions(+), 3 deletions(-)
1645 
1646  commit 38020da34f034f8889947dd3dc05e087ffff7106
1647  Author: Brian Warner <warner@lothar.com>
1648  Date:   Mon Oct 3 23:18:47 2011 -0400
1649 
1650      change Publish.bad_share_checkstrings
1651 
1652   src/allmydata/mutable/publish.py |    6 +++---
1653   1 files changed, 3 insertions(+), 3 deletions(-)
1654 
1655  commit 5efebcbd2ee0c2f299ea86f7591d856c0f265304
1656  Author: Brian Warner <warner@lothar.com>
1657  Date:   Mon Oct 3 23:16:31 2011 -0400
1658 
1659      change internals of Publish.update_goal()
1660 
1661   src/allmydata/mutable/publish.py |    8 +++-----
1662   1 files changed, 3 insertions(+), 5 deletions(-)
1663 
1664  commit e91b55ff4c2a69165b71f2c7b217ac319ff4c527
1665  Author: Brian Warner <warner@lothar.com>
1666  Date:   Mon Oct 3 23:11:42 2011 -0400
1667 
1668      get rid of Publish.connections
1669 
1670   src/allmydata/mutable/publish.py |   27 +++++----------------------
1671   1 files changed, 5 insertions(+), 22 deletions(-)
1672 
1673  commit 64e9a53b3229ebe2f9ebf7ed502d539311d0e037
1674  Author: Brian Warner <warner@lothar.com>
1675  Date:   Mon Oct 3 23:05:32 2011 -0400
1676 
1677      change Publish.bad_servers
1678 
1679   src/allmydata/mutable/publish.py |   10 +++++-----
1680   1 files changed, 5 insertions(+), 5 deletions(-)
1681 
1682  commit b85a934bef315a06bcfe00c9c12a3627fed2b918
1683  Author: Brian Warner <warner@lothar.com>
1684  Date:   Mon Oct 3 23:03:07 2011 -0400
1685 
1686      Publish.bad_servers: fix bug, this should be a set of serverids, not writers
1687 
1688   src/allmydata/mutable/publish.py |    2 +-
1689   1 files changed, 1 insertions(+), 1 deletions(-)
1690 
1691  commit 605ea15ec15ed671513819003ccd211cdb9761e0
1692  Author: Brian Warner <warner@lothar.com>
1693  Date:   Mon Oct 3 23:00:21 2011 -0400
1694 
1695      change .placed
1696 
1697   src/allmydata/mutable/publish.py |    6 +++---
1698   1 files changed, 3 insertions(+), 3 deletions(-)
1699 
1700  commit f7aba37b1b345d5b6d5cb16e3b3f6f3c1afb658e
1701  Author: Brian Warner <warner@lothar.com>
1702  Date:   Mon Oct 3 22:59:22 2011 -0400
1703 
1704      temporarily stash IServer as .server on the "writer" object
1705 
1706   src/allmydata/mutable/publish.py |    2 ++
1707   1 files changed, 2 insertions(+), 0 deletions(-)
1708 
1709  commit f9b551d788e7db1f187fce5ab98ab5d5fe4e1c36
1710  Author: Brian Warner <warner@lothar.com>
1711  Date:   Mon Oct 3 22:48:18 2011 -0400
1712 
1713      change Publish.goal and API of log_goal() to use IServer, not serverid
1714 
1715   src/allmydata/mutable/publish.py |   48 ++++++++++++++--------------
1716   1 files changed, 24 insertions(+), 24 deletions(-)
1717 
1718  commit 75f20616558e4900b8b1f685dd99aa838de6d452
1719  Author: Brian Warner <warner@lothar.com>
1720  Date:   Mon Oct 3 15:27:02 2011 -0400
1721 
1722      API of ServerMap.get_known_shares()
1723 
1724   src/allmydata/mutable/publish.py   |   16 ++++++++++------
1725   src/allmydata/mutable/servermap.py |    7 ++-----
1726   2 files changed, 12 insertions(+), 11 deletions(-)
1727 
1728  commit 1c38c9d37bb08221b4418762234b1a62397b3b4b
1729  Author: Brian Warner <warner@lothar.com>
1730  Date:   Mon Oct 3 15:20:29 2011 -0400
1731 
1732      Publish.full_serverlist
1733 
1734   src/allmydata/mutable/publish.py |   10 +++++-----
1735   1 files changed, 5 insertions(+), 5 deletions(-)
1736 
1737  commit b6cbd215a04b9cde31a7d92a97a7f048622b16f1
1738  Author: Brian Warner <warner@lothar.com>
1739  Date:   Mon Oct 3 15:12:31 2011 -0400
1740 
1741      API of ServerMap.all_servers()
1742 
1743   src/allmydata/mutable/servermap.py |   19 ++++++-------------
1744   1 files changed, 6 insertions(+), 13 deletions(-)
1745 
1746  commit e63cd0315fae65357b1727ec6d5ff3c6e0d27c98
1747  Author: Brian Warner <warner@lothar.com>
1748  Date:   Mon Oct 3 15:10:18 2011 -0400
1749 
1750      remove ServerMap.connections, set_rref_for_serverid()
1751 
1752   src/allmydata/mutable/servermap.py |   11 +----------
1753   1 files changed, 1 insertions(+), 10 deletions(-)
1754 
1755  commit 4df52db2f80eb12eefa5d57103c24893cde89553
1756  Author: Brian Warner <warner@lothar.com>
1757  Date:   Mon Oct 3 15:04:06 2011 -0400
1758 
1759      API of ServerMap.mark_server_reachable()
1760 
1761   src/allmydata/mutable/servermap.py |    7 ++-----
1762   1 files changed, 2 insertions(+), 5 deletions(-)
1763 
1764  commit 69c715bde77944dc25181b3dbbeb042c816f9a1b
1765  Author: Brian Warner <warner@lothar.com>
1766  Date:   Mon Oct 3 15:03:21 2011 -0400
1767 
1768      API of ServerMap.mark_server_unreachable()
1769 
1770   src/allmydata/mutable/servermap.py |    9 +++------
1771   1 files changed, 3 insertions(+), 6 deletions(-)
1772 
1773  commit 3d784d60eec1c508858e3a617e4411ffbcc3c1fa
1774  Author: Brian Warner <warner@lothar.com>
1775  Date:   Mon Oct 3 15:02:03 2011 -0400
1776 
1777      API of status.set_privkey_from()
1778 
1779   src/allmydata/mutable/servermap.py |    7 +++----
1780   1 files changed, 3 insertions(+), 4 deletions(-)
1781 
1782  commit 544ed3ea29bed7e66da7fd29ca3f6f076f27a9e6
1783  Author: Brian Warner <warner@lothar.com>
1784  Date:   Mon Oct 3 15:01:15 2011 -0400
1785 
1786      API of status.add_per_server_time()
1787 
1788   src/allmydata/mutable/servermap.py |    7 ++++---
1789   1 files changed, 4 insertions(+), 3 deletions(-)
1790 
1791  commit fffe5008b6320bd1e04c3c68389a2bf2ee383fa8
1792  Author: Brian Warner <warner@lothar.com>
1793  Date:   Mon Oct 3 14:59:02 2011 -0400
1794 
1795      remove unused .versionmap
1796 
1797   src/allmydata/mutable/servermap.py |    7 -------
1798   1 files changed, 0 insertions(+), 7 deletions(-)
1799 
1800  commit 2816562e090d2294179db3588dafcca18de1bc2b
1801  Author: Brian Warner <warner@lothar.com>
1802  Date:   Mon Oct 3 14:57:51 2011 -0400
1803 
1804      remove serverid from all log messages. Also one unused lambda.
1805 
1806   src/allmydata/mutable/servermap.py |   30 +++++++++++++-------------
1807   1 files changed, 15 insertions(+), 15 deletions(-)
1808 
1809  commit 28fa6b1a2738fa98c1f1dbd3d0e01ae98912d11f
1810  Author: Brian Warner <warner@lothar.com>
1811  Date:   Mon Oct 3 14:54:30 2011 -0400
1812 
1813      removed unused _readers
1814 
1815   src/allmydata/mutable/servermap.py |    3 ---
1816   1 files changed, 0 insertions(+), 3 deletions(-)
1817 
1818  commit a8e4ed3d645ab592d1add6a1e69b6d1ebfb77817
1819  Author: Brian Warner <warner@lothar.com>
1820  Date:   Mon Oct 3 14:54:16 2011 -0400
1821 
1822      remove unused _sharemap
1823 
1824   src/allmydata/mutable/servermap.py |    1 -
1825   1 files changed, 0 insertions(+), 1 deletions(-)
1826 
1827  commit 3f072e55cf1d0700f9fffe23f8f3a475725df588
1828  Author: Brian Warner <warner@lothar.com>
1829  Date:   Mon Oct 3 14:49:03 2011 -0400
1830 
1831      _must_query
1832 
1833   src/allmydata/mutable/servermap.py |    8 ++++----
1834   1 files changed, 4 insertions(+), 4 deletions(-)
1835 
1836  commit c599a059b8df3f5785e4bf89fb6ecc6d8dcd708b
1837  Author: Brian Warner <warner@lothar.com>
1838  Date:   Mon Oct 3 14:48:05 2011 -0400
1839 
1840      _queries_outstanding
1841 
1842   src/allmydata/mutable/servermap.py |   16 +++++++---------
1843   1 files changed, 7 insertions(+), 9 deletions(-)
1844 
1845  commit 7743759f98ac2c07926b2fdbd80bf52dfab33085
1846  Author: Brian Warner <warner@lothar.com>
1847  Date:   Mon Oct 3 14:46:17 2011 -0400
1848 
1849      _empty_servers
1850 
1851   src/allmydata/mutable/servermap.py |    5 ++---
1852   1 files changed, 2 insertions(+), 3 deletions(-)
1853 
1854  commit 6bb1825916828a713a32cdf7f7411fa3ea2e1e5d
1855  Author: Brian Warner <warner@lothar.com>
1856  Date:   Mon Oct 3 14:45:39 2011 -0400
1857 
1858      _good_servers
1859 
1860   src/allmydata/mutable/servermap.py |    4 ++--
1861   1 files changed, 2 insertions(+), 2 deletions(-)
1862 
1863  commit 1768fab1b51d8dd93ecabbaaabfadfa20cf6c3d4
1864  Author: Brian Warner <warner@lothar.com>
1865  Date:   Mon Oct 3 14:44:59 2011 -0400
1866 
1867      _bad_servers
1868 
1869   src/allmydata/mutable/servermap.py |   14 +++++++-------
1870   1 files changed, 7 insertions(+), 7 deletions(-)
1871 
1872  commit dccbaef30f0ba714c746bf6d4a1a803c36e17b65
1873  Author: Brian Warner <warner@lothar.com>
1874  Date:   Mon Oct 3 14:41:54 2011 -0400
1875 
1876      API of _try_to_set_pubkey()
1877 
1878   src/allmydata/mutable/servermap.py |    7 ++++---
1879   1 files changed, 4 insertions(+), 3 deletions(-)
1880 
1881  commit 0481ea70042ba3575f15eac7fd0780f8ece580cc
1882  Author: Brian Warner <warner@lothar.com>
1883  Date:   Mon Oct 3 14:35:02 2011 -0400
1884 
1885      API of notify_server_corruption()
1886 
1887   src/allmydata/mutable/servermap.py |    6 +++---
1888   1 files changed, 3 insertions(+), 3 deletions(-)
1889 
1890  commit bea9cba18fb3b9c11bb22f18356a263ecec7351e
1891  Author: Brian Warner <warner@lothar.com>
1892  Date:   Mon Oct 3 14:34:09 2011 -0400
1893 
1894      API of _got_signature_one_share()
1895 
1896   src/allmydata/mutable/servermap.py |    9 +++++----
1897   1 files changed, 5 insertions(+), 4 deletions(-)
1898 
1899  commit 1520123583cf78650706e114b15bb5b0ac1f4a14
1900  Author: Brian Warner <warner@lothar.com>
1901  Date:   Mon Oct 3 14:32:33 2011 -0400
1902 
1903      API of _try_to_validate_privkey()
1904 
1905   src/allmydata/mutable/servermap.py |    9 +++++----
1906   1 files changed, 5 insertions(+), 4 deletions(-)
1907 
1908  commit 938852c9c8519c7a078f58a9b1f4dd8ec8b6715e
1909  Author: Brian Warner <warner@lothar.com>
1910  Date:   Mon Oct 3 14:31:48 2011 -0400
1911 
1912      API and internals of _add_lease_failed()
1913 
1914   src/allmydata/mutable/servermap.py |    8 ++++----
1915   1 files changed, 4 insertions(+), 4 deletions(-)
1916 
1917  commit 3843dba367e3c19e176a622ab853cb51d2472ddf
1918  Author: Brian Warner <warner@lothar.com>
1919  Date:   Mon Oct 3 14:30:37 2011 -0400
1920 
1921      API of _privkey_query_failed()
1922 
1923   src/allmydata/mutable/servermap.py |    5 +++--
1924   1 files changed, 3 insertions(+), 2 deletions(-)
1925 
1926  commit 2219a710e1633cd57d0ca0786490de87b3e19ba7
1927  Author: Brian Warner <warner@lothar.com>
1928  Date:   Mon Oct 3 14:29:43 2011 -0400
1929 
1930      fix bug in call to _privkey_query_failed, unrelated to refactoring
1931 
1932   src/allmydata/mutable/servermap.py |    2 +-
1933   1 files changed, 1 insertions(+), 1 deletions(-)
1934 
1935  commit ae615bec7d0d1b269710b6902797b12f9592ad62
1936  Author: Brian Warner <warner@lothar.com>
1937  Date:   Mon Oct 3 14:27:17 2011 -0400
1938 
1939      API of _got_corrupt_share()
1940 
1941   src/allmydata/mutable/servermap.py |   17 +++++++++--------
1942   1 files changed, 9 insertions(+), 8 deletions(-)
1943 
1944  commit cb51c95a6f4e077278157a77dab060c8c1ad7a81
1945  Author: Brian Warner <warner@lothar.com>
1946  Date:   Mon Oct 3 14:23:16 2011 -0400
1947 
1948      API of _got_results()
1949 
1950   src/allmydata/mutable/servermap.py |    9 +++++----
1951   1 files changed, 5 insertions(+), 4 deletions(-)
1952 
1953  commit bac9154fe0af18f226999a58ffc2362d8cf4b802
1954  Author: Brian Warner <warner@lothar.com>
1955  Date:   Mon Oct 3 14:19:19 2011 -0400
1956 
1957      API of _query_failed()
1958 
1959   src/allmydata/mutable/servermap.py |    5 +++--
1960   1 files changed, 3 insertions(+), 2 deletions(-)
1961 
1962  commit fdc29a8ca95d4b5c503e5382b9e5d4d02141ba12
1963  Author: Brian Warner <warner@lothar.com>
1964  Date:   Mon Oct 3 14:17:20 2011 -0400
1965 
1966      API of _do_read()
1967 
1968   src/allmydata/mutable/servermap.py |    6 ++++--
1969   1 files changed, 4 insertions(+), 2 deletions(-)
1970 
1971  commit e7e9e338f28d004aa4d423d11c65f1e271ac7322
1972  Author: Brian Warner <warner@lothar.com>
1973  Date:   Mon Oct 3 14:20:21 2011 -0400
1974 
1975      API of _do_query()
1976 
1977   src/allmydata/mutable/servermap.py |   15 +++++++--------
1978   1 files changed, 7 insertions(+), 8 deletions(-)
1979 
1980  commit 330625b9dac4cdbe72a11464a893065b9aeed453
1981  Author: Brian Warner <warner@lothar.com>
1982  Date:   Mon Oct 3 14:43:05 2011 -0400
1983 
1984      next step: first batch of updates to ServermapUpdater
1985 
1986      updates:
1987       most method-local variables in update()
1988       API of _build_initial_querylist()
1989       API of _send_initial_requests()
1990       .full_serverlist
1991       .extra_servers
1992 
1993   src/allmydata/mutable/servermap.py |   39 ++++++++++++++------------
1994   1 files changed, 21 insertions(+), 18 deletions(-)
1995 
1996  commit 4aadc584fa7dcb2daa86b048c81dee0049ba26d9
1997  Author: Brian Warner <warner@lothar.com>
1998  Date:   Mon Oct 3 15:07:00 2011 -0400
1999 
2000      internal change: index _bad_shares with IServer
2001 
2002   src/allmydata/mutable/servermap.py |   20 ++++++++++----------
2003   1 files changed, 10 insertions(+), 10 deletions(-)
2004 
2005  commit 16d4e6fa82a9907dbdc92094213387c6a4164e41
2006  Author: Brian Warner <warner@lothar.com>
2007  Date:   Mon Oct 3 18:20:47 2011 +0100
2008 
2009      internal change: index _known_shares with IServer instead of serverid
2010 
2011      callers are unchanged
2012 
2013   src/allmydata/mutable/servermap.py |   42 +++++++++++++++----------
2014   1 files changed, 25 insertions(+), 17 deletions(-)
2015 
2016  commit ceeb5f4938cc814a0c75d1b8f4018aed965c2176
2017  Author: Brian Warner <warner@lothar.com>
2018  Date:   Mon Oct 3 18:11:43 2011 +0100
2019 
2020      accessors and name cleanup for servermap.Servermap.last_update_mode/time
2021 
2022   src/allmydata/mutable/filenode.py  |    6 +++---
2023   src/allmydata/mutable/publish.py   |    4 ++--
2024   src/allmydata/mutable/servermap.py |   17 +++++++++++------
2025   3 files changed, 16 insertions(+), 11 deletions(-)
2026 
2027  commit 8d3cbda82661c0a7e5c3d3b65cf7a5d5ab7e32c0
2028  Author: Brian Warner <warner@lothar.com>
2029  Date:   Mon Oct 3 18:11:14 2011 +0100
2030 
2031      accessors and name cleanup for servermap.Servermap.problems
2032 
2033   src/allmydata/mutable/servermap.py |   21 +++++++++++++--------
2034   src/allmydata/test/test_mutable.py |    6 +++---
2035   2 files changed, 16 insertions(+), 11 deletions(-)
2036 
2037  commit 348f57988f79389db0aab7672e6eaa9a6d8e3219
2038  Author: Brian Warner <warner@lothar.com>
2039  Date:   Mon Oct 3 18:10:41 2011 +0100
2040 
2041      accessors and name cleanup for servermap.Servermap.bad_shares
2042 
2043   src/allmydata/mutable/publish.py   |    2 +-
2044   src/allmydata/mutable/servermap.py |   30 ++++++++++++++-----------
2045   2 files changed, 18 insertions(+), 14 deletions(-)
2046 
2047  commit 520c9368134673cdf76c653c5e1bb91c2ab5d51e
2048  Author: Brian Warner <warner@lothar.com>
2049  Date:   Mon Oct 3 18:10:05 2011 +0100
2050 
2051      accessors and name cleanup for servermap.Servermap.servermap .
2052 
2053   src/allmydata/mutable/publish.py   |   14 +++++----
2054   src/allmydata/mutable/servermap.py |   38 ++++++++++++++-----------
2055   2 files changed, 29 insertions(+), 23 deletions(-)
2056 
2057  commit b8b8dc38287a91dbdf494426ac801d9381ce5841
2058  Author: Brian Warner <warner@lothar.com>
2059  Date:   Mon Oct 3 18:08:02 2011 +0100
2060 
2061      fix reachable_servers
2062 
2063   src/allmydata/mutable/checker.py   |    3 ++-
2064   src/allmydata/mutable/publish.py   |    4 +++-
2065   src/allmydata/mutable/servermap.py |   12 ++++++++++--
2066   3 files changed, 15 insertions(+), 4 deletions(-)
2067 
2068  commit cb0cfd1adfefad357c187aaaf690c3df68b622bc
2069  Author: Brian Warner <warner@lothar.com>
2070  Date:   Mon Oct 3 18:06:03 2011 +0100
2071 
2072      fix Servermap.unreachable_servers
2073 
2074   src/allmydata/mutable/servermap.py |   11 ++++++++---
2075   1 files changed, 8 insertions(+), 3 deletions(-)
2076 
2077  commit 2d9ea79b94bd4db674d40386fda90825785ac495
2078  Author: Brian Warner <warner@lothar.com>
2079  Date:   Mon Oct 3 18:03:48 2011 +0100
2080 
2081      give ServerMap a StorageFarmBroker, temporary
2082 
2083      this makes it possible for the ServerMap to accept bare serverids and still
2084      build data structures with IServers
2085 
2086   src/allmydata/mutable/checker.py   |    2 +-
2087   src/allmydata/mutable/filenode.py  |    2 +-
2088   src/allmydata/mutable/publish.py   |    2 +-
2089   src/allmydata/mutable/servermap.py |    5 +++--
2090   src/allmydata/test/test_mutable.py |    8 ++++----
2091   5 files changed, 10 insertions(+), 9 deletions(-)
2092 
2093  commit 718d1aeff6fded893f65397806d22ece928b0dd4
2094  Author: Brian Warner <warner@lothar.com>
2095  Date:   Mon Oct 3 13:43:30 2011 -0400
2096 
2097      add StorageFarmBroker.get_server_for_id(), temporary helper
2098 
2099      This will go away once we're passing IServers everywhere.
2100 
2101   src/allmydata/storage_client.py  |    2 ++
2102   src/allmydata/test/no_network.py |   13 +++++++++++++
2103   2 files changed, 15 insertions(+), 0 deletions(-)
2104 
2105  commit ece20231d7fda0d503704842a4aa068dfbc2e54e
2106  Author: Brian Warner <warner@lothar.com>
2107  Date:   Sun Oct 2 01:11:50 2011 +0100
2108 
2109      add proper accessors for Servermap.connections, to make refactoring easier
2110 
2111   src/allmydata/mutable/publish.py   |    6 +++---
2112   src/allmydata/mutable/retrieve.py  |   10 +++++-----
2113   src/allmydata/mutable/servermap.py |   17 +++++++++++------
2114   3 files changed, 19 insertions(+), 14 deletions(-)
2115 
2116  commit 3b943d6bf302ff702668081a612fc4fe2604cf9c
2117  Author: Brian Warner <warner@lothar.com>
2118  Date:   Fri Sep 23 10:34:30 2011 -0700
2119 
2120      mutable/servermap.py and neighbors: s/peer/server/
2121 
2122   src/allmydata/mutable/checker.py   |   22 +-
2123   src/allmydata/mutable/publish.py   |  204 +++++++-------
2124   src/allmydata/mutable/servermap.py |  402 +++++++++++++-------------
2125   src/allmydata/test/test_mutable.py |   18 +-
2126   4 files changed, 323 insertions(+), 323 deletions(-)
2127]
2128[TAG allmydata-tahoe-1.9.0
2129warner@lothar.com**20111031052301
2130 Ignore-this: cf598210dd1f314a1a121bf29a3d5918
2131]
2132Patch bundle hash:
213310cb61f6d14335a29d7f4d49ae66b9359666f990