Ticket #641: 641-symlink-depth-limit-1.darcs.patch

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