Context Navigation

Back to Ticket #948

Ticket #948: all-darcspatch.txt

File all-darcspatch.txt, 122.9 KB (added by davidsarah, at 2010-02-27T07:08:51Z)
All patches to be applied for #948

Line
1	Mon Feb 22 02:45:04 GMT Standard Time 2010 david-sarah@jacaranda.org
2	* Change direct accesses to an_uri.storage_index to calls to .get_storage_index() (fixes #948)
3
4	Mon Feb 22 02:53:52 GMT Standard Time 2010 david-sarah@jacaranda.org
5	* Additions to test_web.py for #948
6
7	Mon Feb 22 03:36:52 GMT Standard Time 2010 david-sarah@jacaranda.org
8	* Additional fix for abbrev_si, with test
9
10	Wed Feb 24 04:33:45 GMT Standard Time 2010 david-sarah@jacaranda.org
11	* dirnode: add tests of literal dirnodes (current and fix for #948)
12
13	Wed Feb 24 07:54:33 GMT Standard Time 2010 david-sarah@jacaranda.org
14	* directories: add DIR2-LIT directories to test_deepcheck.py (#948)
15
16	Wed Feb 24 08:02:20 GMT Standard Time 2010 david-sarah@jacaranda.org
17	* Additional fixes for DIR2-LIT More Info page and deep-check/manifest operations (#948)
18
19	Wed Feb 24 08:15:42 GMT Standard Time 2010 david-sarah@jacaranda.org
20	* Updates to NEWS for 1.6.1
21
22	Thu Feb 25 04:18:24 GMT Standard Time 2010 david-sarah@jacaranda.org
23	* Additional test for DIR2-LIT directories in test_web.py, fixed version (#948)
24
25	Sat Feb 27 06:55:51 GMT Standard Time 2010 david-sarah@jacaranda.org
26	* Change code that gives a base32 SI or an empty string to be more straightforward. (#948)
27
28	New patches:
29
30	[Change direct accesses to an_uri.storage_index to calls to .get_storage_index() (fixes #948)
31	david-sarah@jacaranda.org**20100222024504
32	Ignore-this: 91f6fccb5fd9456aa0e02d312f902928
33	] {
34	hunk ./src/allmydata/dirnode.py 349
35	return self._uri
36
37	def get_storage_index(self):
38	- return self._uri._filenode_uri.storage_index
39	+ return self._uri.get_storage_index()
40
41	def check(self, monitor, verify=False, add_lease=False):
42	"""Perform a file check. See IChecker.check for details."""
43	hunk ./src/allmydata/immutable/checker.py 42
44	for (serverid, serverrref) in servers:
45	assert precondition(isinstance(serverid, str))
46
47	- prefix = "%s" % base32.b2a_l(verifycap.storage_index[:8], 60)
48	+ prefix = "%s" % base32.b2a_l(verifycap.get_storage_index()[:8], 60)
49	log.PrefixingLogMixin.__init__(self, facility="tahoe.immutable.checker", prefix=prefix)
50
51	self._verifycap = verifycap
52	hunk ./src/allmydata/immutable/checker.py 53
53	self._add_lease = add_lease
54
55	frs = file_renewal_secret_hash(secret_holder.get_renewal_secret(),
56	- self._verifycap.storage_index)
57	+ self._verifycap.get_storage_index())
58	self.file_renewal_secret = frs
59	fcs = file_cancel_secret_hash(secret_holder.get_cancel_secret(),
60	hunk ./src/allmydata/immutable/checker.py 56
61	- self._verifycap.storage_index)
62	+ self._verifycap.get_storage_index())
63	self.file_cancel_secret = fcs
64
65	def _get_renewal_secret(self, peerid):
66	hunk ./src/allmydata/immutable/checker.py 148
67	results."""
68
69	vcap = self._verifycap
70	- b = layout.ReadBucketProxy(bucket, serverid, vcap.storage_index)
71	+ b = layout.ReadBucketProxy(bucket, serverid, vcap.get_storage_index())
72	veup = download.ValidatedExtendedURIProxy(b, vcap)
73	d = veup.start()
74
75	hunk ./src/allmydata/immutable/checker.py 252
76	then disconnected and ceased responding, or returned a failure, it is
77	still marked with the True flag for 'success'.
78	"""
79	- d = self._get_buckets(ss, self._verifycap.storage_index, serverid)
80	+ d = self._get_buckets(ss, self._verifycap.get_storage_index(), serverid)
81
82	def _got_buckets(result):
83	bucketdict, serverid, success = result
84	hunk ./src/allmydata/immutable/checker.py 299
85	def _curry_empty_corrupted(res):
86	buckets, serverid, responded = res
87	return (set(buckets), serverid, set(), set(), responded)
88	- d = self._get_buckets(ss, self._verifycap.storage_index, serverid)
89	+ d = self._get_buckets(ss, self._verifycap.get_storage_index(), serverid)
90	d.addCallback(_curry_empty_corrupted)
91	return d
92
93	hunk ./src/allmydata/immutable/checker.py 304
94	def _format_results(self, results):
95	- cr = CheckResults(self._verifycap, self._verifycap.storage_index)
96	+ cr = CheckResults(self._verifycap, self._verifycap.get_storage_index())
97	d = {}
98	d['count-shares-needed'] = self._verifycap.needed_shares
99	d['count-shares-expected'] = self._verifycap.total_shares
100	hunk ./src/allmydata/immutable/checker.py 319
101	for sharenum in theseverifiedshares:
102	verifiedshares.setdefault(sharenum, set()).add(thisserverid)
103	for sharenum in thesecorruptshares:
104	- corruptsharelocators.append((thisserverid, self._verifycap.storage_index, sharenum))
105	+ corruptsharelocators.append((thisserverid, self._verifycap.get_storage_index(), sharenum))
106	for sharenum in theseincompatibleshares:
107	hunk ./src/allmydata/immutable/checker.py 321
108	- incompatiblesharelocators.append((thisserverid, self._verifycap.storage_index, sharenum))
109	+ incompatiblesharelocators.append((thisserverid, self._verifycap.get_storage_index(), sharenum))
110
111	d['count-shares-good'] = len(verifiedshares)
112	d['count-good-share-hosts'] = len([s for s in servers.keys() if servers[s]])
113	hunk ./src/allmydata/immutable/download.py 754
114	precondition(IVerifierURI.providedBy(v), v)
115	precondition(IDownloadTarget.providedBy(target), target)
116
117	- prefix=base32.b2a_l(v.storage_index[:8], 60)
118	- log.PrefixingLogMixin.__init__(self, facility="tahoe.immutable.download", prefix=prefix)
119	self._storage_broker = storage_broker
120	hunk ./src/allmydata/immutable/download.py 755
121	-
122	self._verifycap = v
123	hunk ./src/allmydata/immutable/download.py 756
124	- self._storage_index = v.storage_index
125	+ self._storage_index = v.get_storage_index()
126	self._uri_extension_hash = v.uri_extension_hash
127
128	hunk ./src/allmydata/immutable/download.py 759
129	+ prefix=base32.b2a_l(self._storage_index[:8], 60)
130	+ log.PrefixingLogMixin.__init__(self, facility="tahoe.immutable.download", prefix=prefix)
131	+
132	self._started = time.time()
133	self._status = s = DownloadStatus()
134	s.set_status("Starting")
135	hunk ./src/allmydata/immutable/filenode.py 228
136	return self.u.to_string()
137
138	def get_storage_index(self):
139	- return self.u.storage_index
140	+ return self.u.get_storage_index()
141
142	def check_and_repair(self, monitor, verify=False, add_lease=False):
143	verifycap = self.get_verify_cap()
144	hunk ./src/allmydata/immutable/filenode.py 241
145	monitor=monitor)
146	d = c.start()
147	def _maybe_repair(cr):
148	- crr = CheckAndRepairResults(self.u.storage_index)
149	+ crr = CheckAndRepairResults(self.u.get_storage_index())
150	crr.pre_repair_results = cr
151	if cr.is_healthy():
152	crr.post_repair_results = cr
153	hunk ./src/allmydata/immutable/repairer.py 49
154	def __init__(self, storage_broker, secret_holder, verifycap, monitor):
155	assert precondition(isinstance(verifycap, CHKFileVerifierURI))
156
157	- logprefix = si_b2a(verifycap.storage_index)[:5]
158	+ logprefix = si_b2a(verifycap.get_storage_index())[:5]
159	log.PrefixingLogMixin.__init__(self, "allmydata.immutable.repairer",
160	prefix=logprefix)
161
162	hunk ./src/allmydata/scripts/debug.py 392
163	print >>out, " UEB hash:", base32.b2a(u.uri_extension_hash)
164	print >>out, " size:", u.size
165	print >>out, " k/N: %d/%d" % (u.needed_shares, u.total_shares)
166	- print >>out, " storage index:", si_b2a(u.storage_index)
167	- _dump_secrets(u.storage_index, secret, nodeid, out)
168	+ print >>out, " storage index:", si_b2a(u.get_storage_index())
169	+ _dump_secrets(u.get_storage_index(), secret, nodeid, out)
170	elif isinstance(u, uri.CHKFileVerifierURI):
171	if show_header:
172	print >>out, "CHK Verifier URI:"
173	hunk ./src/allmydata/scripts/debug.py 400
174	print >>out, " UEB hash:", base32.b2a(u.uri_extension_hash)
175	print >>out, " size:", u.size
176	print >>out, " k/N: %d/%d" % (u.needed_shares, u.total_shares)
177	- print >>out, " storage index:", si_b2a(u.storage_index)
178	+ print >>out, " storage index:", si_b2a(u.get_storage_index())
179
180	elif isinstance(u, uri.LiteralFileURI):
181	if show_header:
182	hunk ./src/allmydata/scripts/debug.py 412
183	print >>out, "SSK Writeable URI:"
184	print >>out, " writekey:", base32.b2a(u.writekey)
185	print >>out, " readkey:", base32.b2a(u.readkey)
186	- print >>out, " storage index:", si_b2a(u.storage_index)
187	+ print >>out, " storage index:", si_b2a(u.get_storage_index())
188	print >>out, " fingerprint:", base32.b2a(u.fingerprint)
189	print >>out
190	if nodeid:
191	hunk ./src/allmydata/scripts/debug.py 419
192	we = hashutil.ssk_write_enabler_hash(u.writekey, nodeid)
193	print >>out, " write_enabler:", base32.b2a(we)
194	print >>out
195	- _dump_secrets(u.storage_index, secret, nodeid, out)
196	+ _dump_secrets(u.get_storage_index(), secret, nodeid, out)
197
198	elif isinstance(u, uri.ReadonlySSKFileURI):
199	if show_header:
200	hunk ./src/allmydata/scripts/debug.py 425
201	print >>out, "SSK Read-only URI:"
202	print >>out, " readkey:", base32.b2a(u.readkey)
203	- print >>out, " storage index:", si_b2a(u.storage_index)
204	+ print >>out, " storage index:", si_b2a(u.get_storage_index())
205	print >>out, " fingerprint:", base32.b2a(u.fingerprint)
206	elif isinstance(u, uri.SSKVerifierURI):
207	if show_header:
208	hunk ./src/allmydata/scripts/debug.py 430
209	print >>out, "SSK Verifier URI:"
210	- print >>out, " storage index:", si_b2a(u.storage_index)
211	+ print >>out, " storage index:", si_b2a(u.get_storage_index())
212	print >>out, " fingerprint:", base32.b2a(u.fingerprint)
213
214	elif isinstance(u, uri.DirectoryURI):
215	hunk ./src/allmydata/test/common.py 48
216	bad_shares = {}
217
218	def __init__(self, filecap):
219	- precondition(isinstance(filecap, uri.CHKFileURI), filecap)
220	+ precondition(isinstance(filecap, (uri.CHKFileURI, uri.LiteralFileURI)), filecap)
221	self.my_uri = filecap
222	hunk ./src/allmydata/test/common.py 50
223	- self.storage_index = self.my_uri.storage_index
224	+ self.storage_index = self.my_uri.get_storage_index()
225
226	def get_uri(self):
227	return self.my_uri.to_string()
228	hunk ./src/allmydata/test/common.py 193
229	assert isinstance(filecap, (uri.WriteableSSKFileURI,
230	uri.ReadonlySSKFileURI))
231	self.my_uri = filecap
232	- self.storage_index = self.my_uri.storage_index
233	+ self.storage_index = self.my_uri.get_storage_index()
234	return self
235	def get_cap(self):
236	return self.my_uri
237	hunk ./src/allmydata/test/common.py 1005
238	else:
239	k = random.choice(ks)
240	del shares[k]
241	- self.replace_shares(shares, storage_index=self.uri.storage_index)
242	+ self.replace_shares(shares, storage_index=self.uri.get_storage_index())
243
244	return unused
245
246	hunk ./src/allmydata/test/common.py 1015
247	assert ks, (shares.keys(), sharenum)
248	k = ks[0]
249	shares[k] = corruptor_func(shares[k])
250	- self.replace_shares(shares, storage_index=self.uri.storage_index)
251	+ self.replace_shares(shares, storage_index=self.uri.get_storage_index())
252	return corruptor_func
253
254	def _corrupt_all_shares(self, unused, corruptor_func):
255	hunk ./src/allmydata/test/test_checker.py 71
256	serverid_1 = "\x00"*20
257	serverid_f = "\xff"*20
258	u = uri.CHKFileURI("\x00"16, "\x00"32, 3, 10, 1234)
259	- cr = check_results.CheckResults(u, u.storage_index)
260	+ cr = check_results.CheckResults(u, u.get_storage_index())
261	cr.set_healthy(True)
262	cr.set_needs_rebalancing(False)
263	cr.set_summary("groovy")
264	hunk ./src/allmydata/test/test_checker.py 111
265	cr.set_healthy(False)
266	cr.set_recoverable(False)
267	cr.set_summary("rather dead")
268	- data["list-corrupt-shares"] = [(serverid_1, u.storage_index, 2)]
269	+ data["list-corrupt-shares"] = [(serverid_1, u.get_storage_index(), 2)]
270	cr.set_data(data)
271	html = self.render2(w)
272	s = self.remove_tags(html)
273	hunk ./src/allmydata/test/test_checker.py 170
274	serverid_f = "\xff"*20
275	u = uri.CHKFileURI("\x00"16, "\x00"32, 3, 10, 1234)
276
277	- pre_cr = check_results.CheckResults(u, u.storage_index)
278	+ pre_cr = check_results.CheckResults(u, u.get_storage_index())
279	pre_cr.set_healthy(False)
280	pre_cr.set_recoverable(True)
281	pre_cr.set_needs_rebalancing(False)
282	hunk ./src/allmydata/test/test_checker.py 188
283	}
284	pre_cr.set_data(data)
285
286	- post_cr = check_results.CheckResults(u, u.storage_index)
287	+ post_cr = check_results.CheckResults(u, u.get_storage_index())
288	post_cr.set_healthy(True)
289	post_cr.set_recoverable(True)
290	post_cr.set_needs_rebalancing(False)
291	hunk ./src/allmydata/test/test_checker.py 206
292	}
293	post_cr.set_data(data)
294
295	- crr = check_results.CheckAndRepairResults(u.storage_index)
296	+ crr = check_results.CheckAndRepairResults(u.get_storage_index())
297	crr.pre_repair_results = pre_cr
298	crr.post_repair_results = post_cr
299	crr.repair_attempted = False
300	hunk ./src/allmydata/test/test_dirnode.py 552
301	self.expected_verifycaps.add(u_v)
302	si = n.get_storage_index()
303	self.expected_storage_indexes.add(base32.b2a(si))
304	- expected_si = n._uri._filenode_uri.storage_index
305	+ expected_si = n._uri.get_storage_index()
306	self.failUnlessEqual(si, expected_si)
307
308	d = n.list()
309	hunk ./src/allmydata/test/test_filenode.py 49
310	self.failUnlessEqual(fn1.get_write_uri(), None)
311	self.failUnlessEqual(fn1.get_readonly_uri(), u.to_string())
312	self.failUnlessEqual(fn1.get_size(), 1000)
313	- self.failUnlessEqual(fn1.get_storage_index(), u.storage_index)
314	+ self.failUnlessEqual(fn1.get_storage_index(), u.get_storage_index())
315	fn1.raise_error()
316	fn2.raise_error()
317	d = {}
318	hunk ./src/allmydata/test/test_immutable.py 24
319	# The following process of deleting 8 of the shares and asserting that you can't
320	# download it is more to test this test code than to test the Tahoe code...
321	def _then_delete_8(unused=None):
322	- self.replace_shares(stash[0], storage_index=self.uri.storage_index)
323	+ self.replace_shares(stash[0], storage_index=self.uri.get_storage_index())
324	for i in range(8):
325	self._delete_a_share()
326	d.addCallback(_then_delete_8)
327	hunk ./src/allmydata/test/test_mutable.py 1926
328	privkey_s = privkey.serialize()
329	u = uri.WriteableSSKFileURI(ssk_writekey_hash(privkey_s),
330	ssk_pubkey_fingerprint_hash(pubkey_s))
331	- self._storage_index = u.storage_index
332	+ self._storage_index = u.get_storage_index()
333	d.addCallback(_got_key)
334	def _break_peer0(res):
335	si = self._storage_index
336	hunk ./src/allmydata/test/test_repairer.py 660
337	return res
338	d.addCallback(_stash_it)
339	def _put_it_all_back(ignored):
340	- self.replace_shares(stash[0], storage_index=self.uri.storage_index)
341	+ self.replace_shares(stash[0], storage_index=self.uri.get_storage_index())
342	return ignored
343
344	def _repair_from_corruption(shnum, corruptor_func):
345	hunk ./src/allmydata/test/test_upload.py 260
346	def _check_large(self, newuri, size):
347	u = uri.from_string(newuri)
348	self.failUnless(isinstance(u, uri.CHKFileURI))
349	- self.failUnless(isinstance(u.storage_index, str))
350	- self.failUnlessEqual(len(u.storage_index), 16)
351	+ self.failUnless(isinstance(u.get_storage_index(), str))
352	+ self.failUnlessEqual(len(u.get_storage_index()), 16)
353	self.failUnless(isinstance(u.key, str))
354	self.failUnlessEqual(len(u.key), 16)
355	self.failUnlessEqual(u.size, size)
356	hunk ./src/allmydata/test/test_upload.py 385
357	def _check_large(self, newuri, size):
358	u = uri.from_string(newuri)
359	self.failUnless(isinstance(u, uri.CHKFileURI))
360	- self.failUnless(isinstance(u.storage_index, str))
361	- self.failUnlessEqual(len(u.storage_index), 16)
362	+ self.failUnless(isinstance(u.get_storage_index(), str))
363	+ self.failUnlessEqual(len(u.get_storage_index()), 16)
364	self.failUnless(isinstance(u.key, str))
365	self.failUnlessEqual(len(u.key), 16)
366	self.failUnlessEqual(u.size, size)
367	hunk ./src/allmydata/test/test_upload.py 473
368	def _check_large(self, newuri, size):
369	u = uri.from_string(newuri)
370	self.failUnless(isinstance(u, uri.CHKFileURI))
371	- self.failUnless(isinstance(u.storage_index, str))
372	- self.failUnlessEqual(len(u.storage_index), 16)
373	+ self.failUnless(isinstance(u.get_storage_index(), str))
374	+ self.failUnlessEqual(len(u.get_storage_index()), 16)
375	self.failUnless(isinstance(u.key, str))
376	self.failUnlessEqual(len(u.key), 16)
377	self.failUnlessEqual(u.size, size)
378	hunk ./src/allmydata/test/test_uri.py 105
379	needed_shares=needed_shares,
380	total_shares=total_shares,
381	size=size)
382	- self.failUnlessEqual(u.storage_index, storage_index)
383	+ self.failUnlessEqual(u.get_storage_index(), storage_index)
384	self.failUnlessEqual(u.key, key)
385	self.failUnlessEqual(u.uri_extension_hash, uri_extension_hash)
386	self.failUnlessEqual(u.needed_shares, needed_shares)
387	hunk ./src/allmydata/test/test_uri.py 125
388	self.failUnlessEqual(uri.CHKFileURI.init_from_human_encoding(he), u)
389
390	u2 = uri.from_string(u.to_string())
391	- self.failUnlessEqual(u2.storage_index, storage_index)
392	+ self.failUnlessEqual(u2.get_storage_index(), storage_index)
393	self.failUnlessEqual(u2.key, key)
394	self.failUnlessEqual(u2.uri_extension_hash, uri_extension_hash)
395	self.failUnlessEqual(u2.needed_shares, needed_shares)
396	hunk ./src/allmydata/test/test_uri.py 322
397
398	u5 = u4.get_verify_cap()
399	self.failUnless(IVerifierURI.providedBy(u5))
400	- self.failUnlessEqual(u5.storage_index, u.storage_index)
401	+ self.failUnlessEqual(u5.get_storage_index(), u.get_storage_index())
402	u7 = u.get_verify_cap()
403	self.failUnless(IVerifierURI.providedBy(u7))
404	hunk ./src/allmydata/test/test_uri.py 325
405	- self.failUnlessEqual(u7.storage_index, u.storage_index)
406	+ self.failUnlessEqual(u7.get_storage_index(), u.get_storage_index())
407
408	he = u5.to_human_encoding()
409	u5_h = uri.SSKVerifierURI.init_from_human_encoding(he)
410	hunk ./src/allmydata/test/test_web.py 1532
411	self.failUnless(filecap.startswith("URI:SSK:"), filecap)
412	self.filecap = filecap
413	u = uri.WriteableSSKFileURI.init_from_string(filecap)
414	- self.failUnless(u.storage_index in FakeMutableFileNode.all_contents)
415	+ self.failUnless(u.get_storage_index() in FakeMutableFileNode.all_contents)
416	n = self.s.create_node_from_uri(filecap)
417	return n.download_best_version()
418	d.addCallback(_check)
419	hunk ./src/allmydata/test/test_web.py 2784
420	self.failUnless(filecap.startswith("URI:SSK:"), filecap)
421	self.filecap = filecap
422	u = uri.WriteableSSKFileURI.init_from_string(filecap)
423	- self.failUnless(u.storage_index in FakeMutableFileNode.all_contents)
424	+ self.failUnless(u.get_storage_index() in FakeMutableFileNode.all_contents)
425	n = self.s.create_node_from_uri(filecap)
426	return n.download_best_version()
427	d.addCallback(_check1)
428	hunk ./src/allmydata/uri.py 437
429	return self._filenode_uri.to_string().split(':')[2][:5]
430
431	def abbrev_si(self):
432	- return base32.b2a(self._filenode_uri.storage_index)[:5]
433	+ return base32.b2a(self._filenode_uri.get_storage_index())[:5]
434
435	def is_mutable(self):
436	return True
437	}
438	[Additions to test_web.py for #948
439	david-sarah@jacaranda.org**20100222025352
440	Ignore-this: b99be703923efc75db75894a05e6a527
441	] {
442	hunk ./src/allmydata/test/test_web.py 1213
443	d2.addCallback(lambda ign:
444	self.failUnlessRWChildURIIs(n, u"dirchild",
445	caps['dircap']))
446	+ d2.addCallback(lambda ign:
447	+ self.failUnlessROChildURIIs(n, u"dirchild-lit",
448	+ caps['litdircap']))
449	+ d2.addCallback(lambda ign:
450	+ self.failUnlessROChildURIIs(n, u"dirchild-empty",
451	+ caps['emptydircap']))
452	return d2
453	d.addCallback(_check)
454	d.addCallback(lambda res:
455	hunk ./src/allmydata/test/test_web.py 1245
456	d2.addCallback(lambda ign:
457	self.failUnlessROChildURIIs(n, u"dirchild-imm",
458	caps['immdircap']))
459	+ d2.addCallback(lambda ign:
460	+ self.failUnlessROChildURIIs(n, u"dirchild-lit",
461	+ caps['litdircap']))
462	+ d2.addCallback(lambda ign:
463	+ self.failUnlessROChildURIIs(n, u"dirchild-empty",
464	+ caps['emptydircap']))
465	return d2
466	d.addCallback(_check)
467	d.addCallback(lambda res:
468	hunk ./src/allmydata/test/test_web.py 1263
469	d.addCallback(self.failUnlessROChildURIIs, u"unknownchild-imm", caps['unknown_immcap'])
470	d.addCallback(lambda res: self._foo_node.get(u"newdir"))
471	d.addCallback(self.failUnlessROChildURIIs, u"dirchild-imm", caps['immdircap'])
472	+ d.addCallback(lambda res: self._foo_node.get(u"newdir"))
473	+ d.addCallback(self.failUnlessROChildURIIs, u"dirchild-lit", caps['litdircap'])
474	+ d.addCallback(lambda res: self._foo_node.get(u"newdir"))
475	+ d.addCallback(self.failUnlessROChildURIIs, u"dirchild-empty", caps['emptydircap'])
476	d.addErrback(self.explain_web_error)
477	return d
478
479	hunk ./src/allmydata/test/test_web.py 2086
480	d.addCallback(self.failUnlessROChildURIIs, u"unknownchild-imm", caps['unknown_immcap'])
481	d.addCallback(lambda res: self._foo_node.get(u"newdir"))
482	d.addCallback(self.failUnlessROChildURIIs, u"dirchild-imm", caps['immdircap'])
483	+ d.addCallback(lambda res: self._foo_node.get(u"newdir"))
484	+ d.addCallback(self.failUnlessROChildURIIs, u"dirchild-lit", caps['litdircap'])
485	+ d.addCallback(lambda res: self._foo_node.get(u"newdir"))
486	+ d.addCallback(self.failUnlessROChildURIIs, u"dirchild-empty", caps['emptydircap'])
487	return d
488
489	def test_POST_mkdir_immutable_bad(self):
490	hunk ./src/allmydata/test/test_web.py 2172
491	unknown_immcap = "imm.lafs://immutable_from_the_future"
492	node4 = self.s.create_node_from_uri(make_mutable_file_uri())
493	dircap = DirectoryNode(node4, None, None).get_uri()
494	+ litdircap = "URI:DIR2-LIT:ge3dumj2mewdcotyfqydulbshj5x2lbm"
495	+ emptydircap = "URI:DIR2-LIT:"
496	newkids = {u"child-imm": ["filenode", {"rw_uri": filecap1,
497	"ro_uri": self._make_readonly(filecap1),
498	"metadata": md1, }],
499	hunk ./src/allmydata/test/test_web.py 2186
500	u"unknownchild-imm": ["unknown", {"ro_uri": unknown_immcap}],
501	u"dirchild": ["dirnode", {"rw_uri": dircap,
502	"ro_uri": self._make_readonly(dircap)}],
503	+ u"dirchild-lit": ["dirnode", {"ro_uri": litdircap}],
504	+ u"dirchild-empty": ["dirnode", {"ro_uri": emptydircap}],
505	}
506	return newkids, {'filecap1': filecap1,
507	'filecap2': filecap2,
508	hunk ./src/allmydata/test/test_web.py 2195
509	'unknown_rwcap': unknown_rwcap,
510	'unknown_rocap': unknown_rocap,
511	'unknown_immcap': unknown_immcap,
512	- 'dircap': dircap}
513	+ 'dircap': dircap,
514	+ 'litdircap': litdircap,
515	+ 'emptydircap': emptydircap}
516
517	def _create_immutable_children(self):
518	contents, n, filecap1 = self.makefile(12)
519	hunk ./src/allmydata/test/test_web.py 2207
520	assert not dnode.is_mutable()
521	unknown_immcap = "imm.lafs://immutable_from_the_future"
522	immdircap = dnode.get_uri()
523	+ litdircap = "URI:DIR2-LIT:ge3dumj2mewdcotyfqydulbshj5x2lbm"
524	+ emptydircap = "URI:DIR2-LIT:"
525	newkids = {u"child-imm": ["filenode", {"ro_uri": filecap1,
526	"metadata": md1, }],
527	u"unknownchild-imm": ["unknown", {"ro_uri": unknown_immcap}],
528	hunk ./src/allmydata/test/test_web.py 2213
529	u"dirchild-imm": ["dirnode", {"ro_uri": immdircap}],
530	+ u"dirchild-lit": ["dirnode", {"ro_uri": litdircap}],
531	+ u"dirchild-empty": ["dirnode", {"ro_uri": emptydircap}],
532	}
533	return newkids, {'filecap1': filecap1,
534	'unknown_immcap': unknown_immcap,
535	hunk ./src/allmydata/test/test_web.py 2218
536	- 'immdircap': immdircap}
537	+ 'immdircap': immdircap,
538	+ 'litdircap': litdircap,
539	+ 'emptydircap': emptydircap}
540
541	def test_POST_mkdir_no_parentdir_initial_children(self):
542	(newkids, caps) = self._create_initial_children()
543	hunk ./src/allmydata/test/test_web.py 2289
544	d2.addCallback(lambda ign:
545	self.failUnlessROChildURIIs(n, u"dirchild-imm",
546	caps['immdircap']))
547	+ d2.addCallback(lambda ign:
548	+ self.failUnlessROChildURIIs(n, u"dirchild-lit",
549	+ caps['litdircap']))
550	+ d2.addCallback(lambda ign:
551	+ self.failUnlessROChildURIIs(n, u"dirchild-empty",
552	+ caps['emptydircap']))
553	return d2
554	d.addCallback(_after_mkdir)
555	return d
556	}
557	[Additional fix for abbrev_si, with test
558	david-sarah@jacaranda.org**20100222033652
559	Ignore-this: 7dc1c7031cd395fb4ec0a5aa96e69a10
560	] {
561	hunk ./src/allmydata/test/test_uri.py 473
562	self.failIf(IFileURI.providedBy(u1))
563	self.failUnless(IDirnodeURI.providedBy(u1))
564	self.failUnlessEqual(u1.get_verify_cap(), None)
565	+ self.failUnlessEqual(u1.get_storage_index(), None)
566	+ self.failUnlessEqual(u1.abbrev_si(), "<LIT>")
567	hunk ./src/allmydata/uri.py 437
568	return self._filenode_uri.to_string().split(':')[2][:5]
569
570	def abbrev_si(self):
571	- return base32.b2a(self._filenode_uri.get_storage_index())[:5]
572	+ si = self._filenode_uri.get_storage_index()
573	+ if si is None:
574	+ return "<LIT>"
575	+ return base32.b2a(si)[:5]
576
577	def is_mutable(self):
578	return True
579	}
580	[dirnode: add tests of literal dirnodes (current and fix for #948)
581	david-sarah@jacaranda.org**20100224043345
582	Ignore-this: f18cd17d72ed2495a646fa6c3af42aa1
583	] {
584	hunk ./src/allmydata/test/test_dirnode.py 6
585	from zope.interface import implements
586	from twisted.trial import unittest
587	from twisted.internet import defer
588	+from twisted.internet.interfaces import IConsumer
589	from allmydata import uri, dirnode
590	from allmydata.client import Client
591	from allmydata.immutable import upload
592	hunk ./src/allmydata/test/test_dirnode.py 27
593	from base64 import b32decode
594	import common_util as testutil
595
596	+class MemAccum:
597	+ implements(IConsumer)
598	+ def registerProducer(self, producer, streaming):
599	+ self.producer = producer
600	+ self.producer.resumeProducing()
601	+ pass
602	+ def unregisterProducer(self):
603	+ pass
604	+ def write(self, data):
605	+ assert not hasattr(self, 'data')
606	+ self.data = data
607	+ self.producer.resumeProducing()
608	+
609	+setup_py_uri = "URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861"
610	+one_uri = "URI:LIT:n5xgk" # LIT for "one"
611	+mut_write_uri = "URI:SSK:vfvcbdfbszyrsaxchgevhmmlii:euw4iw7bbnkrrwpzuburbhppuxhc3gwxv26f6imekhz7zyw2ojnq"
612	+empty_litdir_uri = "URI:DIR2-LIT:"
613	+tiny_litdir_uri = "URI:DIR2-LIT:gqytunj2onug64tufqzdcosvkjetutcjkq5gw4tvm5vwszdgnz5hgyzufqydulbshj5x2lbm" # contains one child which is itself also LIT
614	+mut_read_uri = "URI:SSK-RO:jf6wkflosyvntwxqcdo7a54jvm:euw4iw7bbnkrrwpzuburbhppuxhc3gwxv26f6imekhz7zyw2ojnq"
615	+future_write_uri = "x-tahoe-crazy://I_am_from_the_future."
616	+future_read_uri = "x-tahoe-crazy-readonly://I_am_from_the_future."
617	+
618	class Dirnode(GridTestMixin, unittest.TestCase,
619	testutil.ShouldFailMixin, testutil.StallMixin, ErrorMixin):
620	timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
621	hunk ./src/allmydata/test/test_dirnode.py 76
622	c = self.g.clients[0]
623	nm = c.nodemaker
624
625	- setup_py_uri = "URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861"
626	- one_uri = "URI:LIT:n5xgk" # LIT for "one"
627	- mut_write_uri = "URI:SSK:vfvcbdfbszyrsaxchgevhmmlii:euw4iw7bbnkrrwpzuburbhppuxhc3gwxv26f6imekhz7zyw2ojnq"
628	- mut_read_uri = "URI:SSK-RO:jf6wkflosyvntwxqcdo7a54jvm:euw4iw7bbnkrrwpzuburbhppuxhc3gwxv26f6imekhz7zyw2ojnq"
629	- future_write_uri = "x-tahoe-crazy://I_am_from_the_future."
630	- future_read_uri = "x-tahoe-crazy-readonly://I_am_from_the_future."
631	kids = {u"one": (nm.create_from_cap(one_uri), {}),
632	u"two": (nm.create_from_cap(setup_py_uri),
633	{"metakey": "metavalue"}),
634	hunk ./src/allmydata/test/test_dirnode.py 82
635	u"mut": (nm.create_from_cap(mut_write_uri, mut_read_uri), {}),
636	u"fut": (nm.create_from_cap(future_write_uri, future_read_uri), {}),
637	u"fro": (nm.create_from_cap(None, future_read_uri), {}),
638	+ u"empty_litdir": (nm.create_from_cap(empty_litdir_uri), {}),
639	+ u"tiny_litdir": (nm.create_from_cap(tiny_litdir_uri), {}),
640	}
641	d = c.create_dirnode(kids)
642
643	hunk ./src/allmydata/test/test_dirnode.py 100
644	d.addCallback(_created)
645
646	def _check_kids(children):
647	- self.failUnlessEqual(sorted(children.keys()),
648	- [u"fro", u"fut", u"mut", u"one", u"two"])
649	+ self.failUnlessEqual(set(children.keys()),
650	+ set([u"one", u"two", u"mut", u"fut", u"fro", u"empty_litdir", u"tiny_litdir"]))
651	one_node, one_metadata = children[u"one"]
652	two_node, two_metadata = children[u"two"]
653	mut_node, mut_metadata = children[u"mut"]
654	hunk ./src/allmydata/test/test_dirnode.py 107
655	fut_node, fut_metadata = children[u"fut"]
656	fro_node, fro_metadata = children[u"fro"]
657	+ emptylit_node, emptylit_metadata = children[u"empty_litdir"]
658	+ tinylit_node, tinylit_metadata = children[u"tiny_litdir"]
659
660	self.failUnlessEqual(one_node.get_size(), 3)
661	self.failUnlessEqual(one_node.get_uri(), one_uri)
662	hunk ./src/allmydata/test/test_dirnode.py 133
663	self.failUnlessEqual(fro_node.get_uri(), "ro." + future_read_uri)
664	self.failUnlessEqual(fut_node.get_readonly_uri(), "ro." + future_read_uri)
665	self.failUnless(isinstance(fro_metadata, dict), fro_metadata)
666	+
667	+ self.failIf(emptylit_node.is_unknown())
668	+ self.failUnlessEqual(emptylit_node.get_storage_index(), None)
669	+ self.failIf(tinylit_node.is_unknown())
670	+ self.failUnlessEqual(tinylit_node.get_storage_index(), None)
671	+
672	+ d2 = defer.succeed(None)
673	+ d2.addCallback(lambda ignored: emptylit_node.list())
674	+ d2.addCallback(lambda children: self.failUnlessEqual(children, {}))
675	+ d2.addCallback(lambda ignored: tinylit_node.list())
676	+ d2.addCallback(lambda children: self.failUnlessEqual(set(children.keys()),
677	+ set([u"short"])))
678	+ d2.addCallback(lambda ignored: tinylit_node.list())
679	+ d2.addCallback(lambda children: children[u"short"][0].read(MemAccum()))
680	+ d2.addCallback(lambda accum: self.failUnlessEqual(accum.data, "The end."))
681	+ return d2
682	+
683	d.addCallback(_check_kids)
684
685	d.addCallback(lambda ign: nm.create_new_mutable_directory(kids))
686	hunk ./src/allmydata/test/test_dirnode.py 179
687	c = self.g.clients[0]
688	nm = c.nodemaker
689
690	- setup_py_uri = "URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861"
691	- one_uri = "URI:LIT:n5xgk" # LIT for "one"
692	- mut_write_uri = "URI:SSK:vfvcbdfbszyrsaxchgevhmmlii:euw4iw7bbnkrrwpzuburbhppuxhc3gwxv26f6imekhz7zyw2ojnq"
693	- mut_read_uri = "URI:SSK-RO:e3mdrzfwhoq42hy5ubcz6rp3o4:ybyibhnp3vvwuq2vaw2ckjmesgkklfs6ghxleztqidihjyofgw7q"
694	- future_write_uri = "x-tahoe-crazy://I_am_from_the_future."
695	- future_read_uri = "x-tahoe-crazy-readonly://I_am_from_the_future."
696	kids = {u"one": (nm.create_from_cap(one_uri), {}),
697	u"two": (nm.create_from_cap(setup_py_uri),
698	{"metakey": "metavalue"}),
699	hunk ./src/allmydata/test/test_dirnode.py 183
700	u"fut": (nm.create_from_cap(None, future_read_uri), {}),
701	+ u"empty_litdir": (nm.create_from_cap(empty_litdir_uri), {}),
702	+ u"tiny_litdir": (nm.create_from_cap(tiny_litdir_uri), {}),
703	}
704	d = c.create_immutable_dirnode(kids)
705
706	hunk ./src/allmydata/test/test_dirnode.py 204
707	d.addCallback(_created)
708
709	def _check_kids(children):
710	- self.failUnlessEqual(sorted(children.keys()), [u"fut", u"one", u"two"])
711	+ self.failUnlessEqual(set(children.keys()),
712	+ set([u"one", u"two", u"fut", u"empty_litdir", u"tiny_litdir"]))
713	one_node, one_metadata = children[u"one"]
714	two_node, two_metadata = children[u"two"]
715	fut_node, fut_metadata = children[u"fut"]
716	hunk ./src/allmydata/test/test_dirnode.py 209
717	+ emptylit_node, emptylit_metadata = children[u"empty_litdir"]
718	+ tinylit_node, tinylit_metadata = children[u"tiny_litdir"]
719
720	self.failUnlessEqual(one_node.get_size(), 3)
721	self.failUnlessEqual(one_node.get_uri(), one_uri)
722	hunk ./src/allmydata/test/test_dirnode.py 226
723	self.failUnlessEqual(fut_node.get_uri(), "imm." + future_read_uri)
724	self.failUnlessEqual(fut_node.get_readonly_uri(), "imm." + future_read_uri)
725	self.failUnless(isinstance(fut_metadata, dict), fut_metadata)
726	+
727	+ self.failIf(emptylit_node.is_unknown())
728	+ self.failUnlessEqual(emptylit_node.get_storage_index(), None)
729	+ self.failIf(tinylit_node.is_unknown())
730	+ self.failUnlessEqual(tinylit_node.get_storage_index(), None)
731	+
732	+ d2 = defer.succeed(None)
733	+ d2.addCallback(lambda ignored: emptylit_node.list())
734	+ d2.addCallback(lambda children: self.failUnlessEqual(children, {}))
735	+ d2.addCallback(lambda ignored: tinylit_node.list())
736	+ d2.addCallback(lambda children: self.failUnlessEqual(set(children.keys()),
737	+ set([u"short"])))
738	+ d2.addCallback(lambda ignored: tinylit_node.list())
739	+ d2.addCallback(lambda children: children[u"short"][0].read(MemAccum()))
740	+ d2.addCallback(lambda accum: self.failUnlessEqual(accum.data, "The end."))
741	+ return d2
742	+
743	d.addCallback(_check_kids)
744
745	d.addCallback(lambda ign: nm.create_from_cap(self.cap.to_string()))
746	hunk ./src/allmydata/test/test_dirnode.py 399
747	# should have been stripped (and "ro." should have been prepended to the
748	# ro_uri, since it's unknown).
749	def _check_kids(children):
750	- self.failUnlessEqual(sorted(children.keys()), [u"child"])
751	+ self.failUnlessEqual(set(children.keys()), set([u"child"]))
752	child_node, child_metadata = children[u"child"]
753
754	self.failUnlessEqual(child_node.get_write_uri(), stripped_write_uri)
755	hunk ./src/allmydata/test/test_dirnode.py 656
756
757	d.addCallback(lambda res: n.list())
758	d.addCallback(lambda children:
759	- self.failUnlessEqual(sorted(children.keys()),
760	- sorted([u"child", u"subdir"])))
761	+ self.failUnlessEqual(set(children.keys()),
762	+ set([u"child", u"subdir"])))
763
764	d.addCallback(lambda res: n.start_deep_stats().when_done())
765	def _check_deepstats(stats):
766	hunk ./src/allmydata/test/test_dirnode.py 729
767	child, metadata = res
768	self.failUnless(isinstance(child, dirnode.DirectoryNode))
769	# edge-metadata needs at least one path segment
770	- self.failUnlessEqual(sorted(metadata.keys()), [])
771	+ self.failUnlessEqual(set(metadata.keys()), set([]))
772	d.addCallback(_check_child_and_metadata1)
773	d.addCallback(lambda res:
774	n.get_child_and_metadata_at_path(u"child"))
775	hunk ./src/allmydata/test/test_dirnode.py 965
776
777	d.addCallback(lambda res: n.list())
778	d.addCallback(lambda children:
779	- self.failUnlessEqual(sorted(children.keys()),
780	- sorted([u"child"])))
781	+ self.failUnlessEqual(set(children.keys()),
782	+ set([u"child"])))
783
784	uploadable1 = upload.Data("some data", convergence="converge")
785	d.addCallback(lambda res: n.add_file(u"newfile", uploadable1))
786	hunk ./src/allmydata/test/test_dirnode.py 981
787	overwrite=False))
788	d.addCallback(lambda res: n.list())
789	d.addCallback(lambda children:
790	- self.failUnlessEqual(sorted(children.keys()),
791	- sorted([u"child", u"newfile"])))
792	+ self.failUnlessEqual(set(children.keys()),
793	+ set([u"child", u"newfile"])))
794	d.addCallback(lambda res: n.get_metadata_for(u"newfile"))
795	d.addCallback(lambda metadata:
796	self.failUnlessEqual(set(metadata.keys()),
797	hunk ./src/allmydata/test/test_dirnode.py 1012
798	n.move_child_to(u"child", self.subdir2))
799	d.addCallback(lambda res: n.list())
800	d.addCallback(lambda children:
801	- self.failUnlessEqual(sorted(children.keys()),
802	- sorted([u"newfile", u"subdir2"])))
803	+ self.failUnlessEqual(set(children.keys()),
804	+ set([u"newfile", u"subdir2"])))
805	d.addCallback(lambda res: self.subdir2.list())
806	d.addCallback(lambda children:
807	hunk ./src/allmydata/test/test_dirnode.py 1016
808	- self.failUnlessEqual(sorted(children.keys()),
809	- sorted([u"child"])))
810	+ self.failUnlessEqual(set(children.keys()),
811	+ set([u"child"])))
812	d.addCallback(lambda res: self.subdir2.get(u"child"))
813	d.addCallback(lambda child:
814	self.failUnlessEqual(child.get_uri(),
815	hunk ./src/allmydata/test/test_dirnode.py 1028
816	self.subdir2.move_child_to(u"child", n, u"newchild"))
817	d.addCallback(lambda res: n.list())
818	d.addCallback(lambda children:
819	- self.failUnlessEqual(sorted(children.keys()),
820	- sorted([u"newchild", u"newfile",
821	- u"subdir2"])))
822	+ self.failUnlessEqual(set(children.keys()),
823	+ set([u"newchild", u"newfile",
824	+ u"subdir2"])))
825	d.addCallback(lambda res: self.subdir2.list())
826	d.addCallback(lambda children:
827	hunk ./src/allmydata/test/test_dirnode.py 1033
828	- self.failUnlessEqual(sorted(children.keys()), []))
829	+ self.failUnlessEqual(set(children.keys()), set([])))
830
831	# now make sure that we honor overwrite=False
832	d.addCallback(lambda res:
833	hunk ./src/allmydata/test/test_dirnode.py 1083
834	return d
835	d.addCallback(_check)
836	def _check_kids(kids2):
837	- self.failUnlessEqual(sorted(kids.keys()), sorted(kids2.keys()))
838	+ self.failUnlessEqual(set(kids.keys()), set(kids2.keys()))
839	self.failUnlessEqual(kids2[u"kid2"][1]["metakey"], "metavalue")
840	d.addCallback(_check_kids)
841	return d
842	}
843	[directories: add DIR2-LIT directories to test_deepcheck.py (#948)
844	david-sarah@jacaranda.org**20100224075433
845	Ignore-this: ed1dcbe45870f5efae0ebbcdff677a4b
846	] {
847	hunk ./src/allmydata/test/test_deepcheck.py 149
848	if not unit:
849	# stream should end with a newline, so split returns ""
850	continue
851	- yield simplejson.loads(unit)
852	+ try:
853	+ yield simplejson.loads(unit)
854	+ except ValueError, le:
855	+ le.args = tuple(le.args + (unit,))
856	+ raise
857
858	def web(self, n, method="GET", **kwargs):
859	# returns (data, url)
860	hunk ./src/allmydata/test/test_deepcheck.py 207
861
862	class DeepCheckWebGood(DeepCheckBase, unittest.TestCase):
863	# construct a small directory tree (with one dir, one immutable file, one
864	- # mutable file, one LIT file, and a loop), and then check/examine it in
865	- # various ways.
866	+ # mutable file, two LIT files, one DIR2:LIT empty dir, one DIR2:LIT tiny
867	+ # dir, and a loop), and then check/examine it in various ways.
868
869	def set_up_tree(self):
870	# 2.9s
871	hunk ./src/allmydata/test/test_deepcheck.py 213
872
873	- # root
874	- # mutable
875	- # large
876	- # small
877	- # small2
878	- # loop -> root
879	c0 = self.g.clients[0]
880	d = c0.create_dirnode()
881	def _created_root(n):
882	hunk ./src/allmydata/test/test_deepcheck.py 247
883	self.small2_uri = n.get_uri()
884	d.addCallback(_created_small2)
885
886	+ empty_litdir_uri = "URI:DIR2-LIT:"
887	+ tiny_litdir_uri = "URI:DIR2-LIT:gqytunj2onug64tufqzdcosvkjetutcjkq5gw4tvm5vwszdgnz5hgyzufqydulbshj5x2lbm" # contains one child which is itself also LIT
888	+
889	+ d.addCallback(lambda ign: self.root._create_and_validate_node(None, empty_litdir_uri, name=u"test_deepcheck empty_lit_dir"))
890	+ def _created_empty_lit_dir(n):
891	+ self.empty_lit_dir = n
892	+ self.empty_lit_dir_uri = n.get_uri()
893	+ self.root.set_node(u"empty_lit_dir", n)
894	+ d.addCallback(_created_empty_lit_dir)
895	+
896	+ d.addCallback(lambda ign: self.root._create_and_validate_node(None, tiny_litdir_uri, name=u"test_deepcheck tiny_lit_dir"))
897	+ def _created_tiny_lit_dir(n):
898	+ self.tiny_lit_dir = n
899	+ self.tiny_lit_dir_uri = n.get_uri()
900	+ self.root.set_node(u"tiny_lit_dir", n)
901	+ d.addCallback(_created_tiny_lit_dir)
902	+
903	d.addCallback(lambda ign: self.root.set_node(u"loop", self.root))
904	return d
905
906	hunk ./src/allmydata/test/test_deepcheck.py 348
907	return d
908
909	def check_stats_good(self, s):
910	- self.failUnlessEqual(s["count-directories"], 1)
911	- self.failUnlessEqual(s["count-files"], 4)
912	+ self.failUnlessEqual(s["count-directories"], 3)
913	+ self.failUnlessEqual(s["count-files"], 5)
914	self.failUnlessEqual(s["count-immutable-files"], 1)
915	hunk ./src/allmydata/test/test_deepcheck.py 351
916	- self.failUnlessEqual(s["count-literal-files"], 2)
917	+ self.failUnlessEqual(s["count-literal-files"], 3)
918	self.failUnlessEqual(s["count-mutable-files"], 1)
919	# don't check directories: their size will vary
920	# s["largest-directory"]
921	hunk ./src/allmydata/test/test_deepcheck.py 356
922	# s["size-directories"]
923	- self.failUnlessEqual(s["largest-directory-children"], 5)
924	+ self.failUnlessEqual(s["largest-directory-children"], 7)
925	self.failUnlessEqual(s["largest-immutable-file"], 13000)
926	# to re-use this function for both the local
927	# dirnode.start_deep_stats() and the webapi t=start-deep-stats, we
928	hunk ./src/allmydata/test/test_deepcheck.py 364
929	# returns a list of tuples, but JSON only knows about lists., so
930	# t=start-deep-stats returns a list of lists.
931	histogram = [tuple(stuff) for stuff in s["size-files-histogram"]]
932	- self.failUnlessEqual(histogram, [(11, 31, 2),
933	+ self.failUnlessEqual(histogram, [(4, 10, 1), (11, 31, 2),
934	(10001, 31622, 1),
935	])
936	self.failUnlessEqual(s["size-immutable-files"], 13000)
937	hunk ./src/allmydata/test/test_deepcheck.py 368
938	- self.failUnlessEqual(s["size-literal-files"], 48)
939	+ self.failUnlessEqual(s["size-literal-files"], 56)
940
941	def do_web_stream_manifest(self, ignored):
942	d = self.web(self.root, method="POST", t="stream-manifest")
943	hunk ./src/allmydata/test/test_deepcheck.py 381
944	files = [u for u in units if u["type"] in ("file", "directory")]
945	assert units[-1]["type"] == "stats"
946	stats = units[-1]["stats"]
947	- self.failUnlessEqual(len(files), 5)
948	- # [root,mutable,large] are distributed, [small,small2] are not
949	+ self.failUnlessEqual(len(files), 8)
950	+ # [root,mutable,large] are distributed, [small,small2,empty_litdir,tiny_litdir] are not
951	self.failUnlessEqual(len([f for f in files
952	hunk ./src/allmydata/test/test_deepcheck.py 384
953	- if f["verifycap"] is not None]), 3)
954	+ if f["verifycap"] != ""]), 3)
955	self.failUnlessEqual(len([f for f in files
956	hunk ./src/allmydata/test/test_deepcheck.py 386
957	- if f["verifycap"] is None]), 2)
958	+ if f["verifycap"] == ""]), 5)
959	self.failUnlessEqual(len([f for f in files
960	hunk ./src/allmydata/test/test_deepcheck.py 388
961	- if f["repaircap"] is not None]), 3)
962	+ if f["repaircap"] != ""]), 3)
963	self.failUnlessEqual(len([f for f in files
964	hunk ./src/allmydata/test/test_deepcheck.py 390
965	- if f["repaircap"] is None]), 2)
966	+ if f["repaircap"] == ""]), 5)
967	self.failUnlessEqual(len([f for f in files
968	hunk ./src/allmydata/test/test_deepcheck.py 392
969	- if f["storage-index"] is not None]), 3)
970	+ if f["storage-index"] != ""]), 3)
971	self.failUnlessEqual(len([f for f in files
972	hunk ./src/allmydata/test/test_deepcheck.py 394
973	- if f["storage-index"] is None]), 2)
974	+ if f["storage-index"] == ""]), 5)
975	# make sure that a mutable file has filecap==repaircap!=verifycap
976	mutable = [f for f in files
977	if f["cap"] is not None
978	hunk ./src/allmydata/test/test_deepcheck.py 437
979	d.addCallback(self.failUnlessEqual, None, "small")
980	d.addCallback(lambda ign: self.small2.check(Monitor()))
981	d.addCallback(self.failUnlessEqual, None, "small2")
982	+ d.addCallback(lambda ign: self.empty_lit_dir.check(Monitor()))
983	+ d.addCallback(self.failUnlessEqual, None, "empty_lit_dir")
984	+ d.addCallback(lambda ign: self.tiny_lit_dir.check(Monitor()))
985	+ d.addCallback(self.failUnlessEqual, None, "tiny_lit_dir")
986
987	# and again with verify=True
988	d.addCallback(lambda ign: self.root.check(Monitor(), verify=True))
989	hunk ./src/allmydata/test/test_deepcheck.py 453
990	d.addCallback(self.failUnlessEqual, None, "small")
991	d.addCallback(lambda ign: self.small2.check(Monitor(), verify=True))
992	d.addCallback(self.failUnlessEqual, None, "small2")
993	+ d.addCallback(lambda ign: self.empty_lit_dir.check(Monitor(), verify=True))
994	+ d.addCallback(self.failUnlessEqual, None, "empty_lit_dir")
995	+ d.addCallback(lambda ign: self.tiny_lit_dir.check(Monitor(), verify=True))
996	+ d.addCallback(self.failUnlessEqual, None, "tiny_lit_dir")
997
998	# and check_and_repair(), which should be a nop
999	d.addCallback(lambda ign: self.root.check_and_repair(Monitor()))
1000	hunk ./src/allmydata/test/test_deepcheck.py 463
1001	d.addCallback(self.check_and_repair_is_healthy, self.root, "root")
1002	d.addCallback(lambda ign: self.mutable.check_and_repair(Monitor()))
1003	d.addCallback(self.check_and_repair_is_healthy, self.mutable, "mutable")
1004	- #TODO d.addCallback(lambda ign: self.large.check_and_repair(Monitor()))
1005	- #TODO d.addCallback(self.check_and_repair_is_healthy, self.large, "large")
1006	- #TODO d.addCallback(lambda ign: self.small.check_and_repair(Monitor()))
1007	- #TODO d.addCallback(self.failUnlessEqual, None, "small")
1008	- #TODO d.addCallback(lambda ign: self.small2.check_and_repair(Monitor()))
1009	- #TODO d.addCallback(self.failUnlessEqual, None, "small2")
1010	+ d.addCallback(lambda ign: self.large.check_and_repair(Monitor()))
1011	+ d.addCallback(self.check_and_repair_is_healthy, self.large, "large")
1012	+ d.addCallback(lambda ign: self.small.check_and_repair(Monitor()))
1013	+ d.addCallback(self.failUnlessEqual, None, "small")
1014	+ d.addCallback(lambda ign: self.small2.check_and_repair(Monitor()))
1015	+ d.addCallback(self.failUnlessEqual, None, "small2")
1016	+ d.addCallback(lambda ign: self.empty_lit_dir.check_and_repair(Monitor()))
1017	+ d.addCallback(self.failUnlessEqual, None, "empty_lit_dir")
1018	+ d.addCallback(lambda ign: self.tiny_lit_dir.check_and_repair(Monitor()))
1019
1020	# check_and_repair(verify=True)
1021	d.addCallback(lambda ign: self.root.check_and_repair(Monitor(), verify=True))
1022	hunk ./src/allmydata/test/test_deepcheck.py 478
1023	d.addCallback(self.check_and_repair_is_healthy, self.root, "root")
1024	d.addCallback(lambda ign: self.mutable.check_and_repair(Monitor(), verify=True))
1025	d.addCallback(self.check_and_repair_is_healthy, self.mutable, "mutable")
1026	- #TODO d.addCallback(lambda ign: self.large.check_and_repair(Monitor(), verify=True))
1027	- #TODO d.addCallback(self.check_and_repair_is_healthy, self.large, "large",
1028	- #TODO incomplete=True)
1029	- #TODO d.addCallback(lambda ign: self.small.check_and_repair(Monitor(), verify=True))
1030	- #TODO d.addCallback(self.failUnlessEqual, None, "small")
1031	- #TODO d.addCallback(lambda ign: self.small2.check_and_repair(Monitor(), verify=True))
1032	- #TODO d.addCallback(self.failUnlessEqual, None, "small2")
1033	+ d.addCallback(lambda ign: self.large.check_and_repair(Monitor(), verify=True))
1034	+ d.addCallback(self.check_and_repair_is_healthy, self.large, "large", incomplete=True)
1035	+ d.addCallback(lambda ign: self.small.check_and_repair(Monitor(), verify=True))
1036	+ d.addCallback(self.failUnlessEqual, None, "small")
1037	+ d.addCallback(lambda ign: self.small2.check_and_repair(Monitor(), verify=True))
1038	+ d.addCallback(self.failUnlessEqual, None, "small2")
1039	+ d.addCallback(self.failUnlessEqual, None, "small2")
1040	+ d.addCallback(lambda ign: self.empty_lit_dir.check_and_repair(Monitor(), verify=True))
1041	+ d.addCallback(self.failUnlessEqual, None, "empty_lit_dir")
1042	+ d.addCallback(lambda ign: self.tiny_lit_dir.check_and_repair(Monitor(), verify=True))
1043
1044
1045	# now deep-check the root, with various verify= and repair= options
1046	hunk ./src/allmydata/test/test_deepcheck.py 631
1047	d.addCallback(self.json_check_lit, self.small, "small")
1048	d.addCallback(lambda ign: self.web_json(self.small2, t="check"))
1049	d.addCallback(self.json_check_lit, self.small2, "small2")
1050	+ d.addCallback(lambda ign: self.web_json(self.empty_lit_dir, t="check"))
1051	+ d.addCallback(self.json_check_lit, self.empty_lit_dir, "empty_lit_dir")
1052	+ d.addCallback(lambda ign: self.web_json(self.tiny_lit_dir, t="check"))
1053	+ d.addCallback(self.json_check_lit, self.tiny_lit_dir, "tiny_lit_dir")
1054
1055	# check and verify
1056	d.addCallback(lambda ign:
1057	hunk ./src/allmydata/test/test_deepcheck.py 653
1058	d.addCallback(lambda ign:
1059	self.web_json(self.small2, t="check", verify="true"))
1060	d.addCallback(self.json_check_lit, self.small2, "small2+v")
1061	+ d.addCallback(lambda ign: self.web_json(self.empty_lit_dir, t="check", verify="true"))
1062	+ d.addCallback(self.json_check_lit, self.empty_lit_dir, "empty_lit_dir+v")
1063	+ d.addCallback(lambda ign: self.web_json(self.tiny_lit_dir, t="check", verify="true"))
1064	+ d.addCallback(self.json_check_lit, self.tiny_lit_dir, "tiny_lit_dir+v")
1065
1066	# check and repair, no verify
1067	d.addCallback(lambda ign:
1068	hunk ./src/allmydata/test/test_deepcheck.py 674
1069	d.addCallback(lambda ign:
1070	self.web_json(self.small2, t="check", repair="true"))
1071	d.addCallback(self.json_check_lit, self.small2, "small2+r")
1072	+ d.addCallback(lambda ign: self.web_json(self.empty_lit_dir, t="check", repair="true"))
1073	+ d.addCallback(self.json_check_lit, self.empty_lit_dir, "empty_lit_dir+r")
1074	+ d.addCallback(lambda ign: self.web_json(self.tiny_lit_dir, t="check", repair="true"))
1075	+ d.addCallback(self.json_check_lit, self.tiny_lit_dir, "tiny_lit_dir+r")
1076
1077	# check+verify+repair
1078	d.addCallback(lambda ign:
1079	hunk ./src/allmydata/test/test_deepcheck.py 695
1080	d.addCallback(lambda ign:
1081	self.web_json(self.small2, t="check", repair="true", verify="true"))
1082	d.addCallback(self.json_check_lit, self.small2, "small2+vr")
1083	+ d.addCallback(lambda ign: self.web_json(self.empty_lit_dir, t="check", repair="true", verify=True))
1084	+ d.addCallback(self.json_check_lit, self.empty_lit_dir, "empty_lit_dir+vr")
1085	+ d.addCallback(lambda ign: self.web_json(self.tiny_lit_dir, t="check", repair="true", verify=True))
1086	+ d.addCallback(self.json_check_lit, self.tiny_lit_dir, "tiny_lit_dir+vr")
1087
1088	# now run a deep-check, with various verify= and repair= flags
1089	d.addCallback(lambda ign:
1090	hunk ./src/allmydata/test/test_deepcheck.py 723
1091	d.addCallback(lambda ign: self.web(self.large, t="info"))
1092	d.addCallback(lambda ign: self.web(self.small, t="info"))
1093	d.addCallback(lambda ign: self.web(self.small2, t="info"))
1094	+ d.addCallback(lambda ign: self.web(self.empty_lit_dir, t="info"))
1095	+ d.addCallback(lambda ign: self.web(self.tiny_lit_dir, t="info"))
1096
1097	return d
1098
1099	hunk ./src/allmydata/test/test_deepcheck.py 765
1100	def _check((out,err)):
1101	self.failUnlessEqual(err, "")
1102	lines = [l for l in out.split("\n") if l]
1103	- self.failUnlessEqual(len(lines), 5)
1104	+ self.failUnlessEqual(len(lines), 8)
1105	caps = {}
1106	for l in lines:
1107	try:
1108	hunk ./src/allmydata/test/test_deepcheck.py 780
1109	self.failUnlessEqual(caps[self.large.get_uri()], "large")
1110	self.failUnlessEqual(caps[self.small.get_uri()], "small")
1111	self.failUnlessEqual(caps[self.small2.get_uri()], "small2")
1112	+ self.failUnlessEqual(caps[self.empty_lit_dir.get_uri()], "empty_lit_dir")
1113	+ self.failUnlessEqual(caps[self.tiny_lit_dir.get_uri()], "tiny_lit_dir")
1114	d.addCallback(_check)
1115	return d
1116
1117	hunk ./src/allmydata/test/test_deepcheck.py 851
1118	lines = [l.strip() for l in out.split("\n") if l]
1119	self.failUnless("count-immutable-files: 1" in lines)
1120	self.failUnless("count-mutable-files: 1" in lines)
1121	- self.failUnless("count-literal-files: 2" in lines)
1122	- self.failUnless("count-files: 4" in lines)
1123	- self.failUnless("count-directories: 1" in lines)
1124	+ self.failUnless("count-literal-files: 3" in lines)
1125	+ self.failUnless("count-files: 5" in lines)
1126	+ self.failUnless("count-directories: 3" in lines)
1127	self.failUnless("size-immutable-files: 13000 (13.00 kB, 12.70 kiB)" in lines, lines)
1128	hunk ./src/allmydata/test/test_deepcheck.py 855
1129	- self.failUnless("size-literal-files: 48" in lines)
1130	- self.failUnless(" 11-31 : 2 (31 B, 31 B)".strip() in lines)
1131	- self.failUnless("10001-31622 : 1 (31.62 kB, 30.88 kiB)".strip() in lines)
1132	+ self.failUnless("size-literal-files: 56" in lines, lines)
1133	+ self.failUnless(" 4-10 : 1 (10 B, 10 B)".strip() in lines, lines)
1134	+ self.failUnless(" 11-31 : 2 (31 B, 31 B)".strip() in lines, lines)
1135	+ self.failUnless("10001-31622 : 1 (31.62 kB, 30.88 kiB)".strip() in lines, lines)
1136	d.addCallback(_check3)
1137	return d
1138
1139	hunk ./src/allmydata/test/test_deepcheck.py 873
1140	self.failUnlessEqual(data["count-immutable-files"], 1)
1141	self.failUnlessEqual(data["count-immutable-files"], 1)
1142	self.failUnlessEqual(data["count-mutable-files"], 1)
1143	- self.failUnlessEqual(data["count-literal-files"], 2)
1144	- self.failUnlessEqual(data["count-files"], 4)
1145	- self.failUnlessEqual(data["count-directories"], 1)
1146	+ self.failUnlessEqual(data["count-literal-files"], 3)
1147	+ self.failUnlessEqual(data["count-files"], 5)
1148	+ self.failUnlessEqual(data["count-directories"], 3)
1149	self.failUnlessEqual(data["size-immutable-files"], 13000)
1150	hunk ./src/allmydata/test/test_deepcheck.py 877
1151	- self.failUnlessEqual(data["size-literal-files"], 48)
1152	+ self.failUnlessEqual(data["size-literal-files"], 56)
1153	+ self.failUnless([4,10,1] in data["size-files-histogram"])
1154	self.failUnless([11,31,2] in data["size-files-histogram"])
1155	self.failUnless([10001,31622,1] in data["size-files-histogram"])
1156	d.addCallback(_check4)
1157	}
1158	[Additional fixes for DIR2-LIT More Info page and deep-check/manifest operations (#948)
1159	david-sarah@jacaranda.org**20100224080220
1160	Ignore-this: 3b431b712f380b5476231ebd99648a7f
1161	] {
1162	hunk ./src/allmydata/check_results.py 102
1163	def __init__(self, root_storage_index):
1164	self.root_storage_index = root_storage_index
1165	if root_storage_index is None:
1166	- self.root_storage_index_s = "<none>"
1167	+ self.root_storage_index_s = "<none>" # is this correct?
1168	else:
1169	self.root_storage_index_s = base32.b2a(root_storage_index)
1170
1171	hunk ./src/allmydata/dirnode.py 359
1172
1173	def list(self):
1174	"""I return a Deferred that fires with a dictionary mapping child
1175	- name to a tuple of (IFileNode or IDirectoryNode, metadata)."""
1176	+ name to a tuple of (IFilesystemNode, metadata)."""
1177	return self._read()
1178
1179	def has_child(self, name):
1180	hunk ./src/allmydata/dirnode.py 384
1181
1182	def get(self, name):
1183	"""I return a Deferred that fires with the named child node,
1184	- which is either an IFileNode or an IDirectoryNode."""
1185	+ which is an IFilesystemNode."""
1186	assert isinstance(name, unicode)
1187	d = self._read()
1188	d.addCallback(self._get, name)
1189	hunk ./src/allmydata/dirnode.py 392
1190
1191	def get_child_and_metadata(self, name):
1192	"""I return a Deferred that fires with the (node, metadata) pair for
1193	- the named child. The node is either an IFileNode or an
1194	- IDirectoryNode, and the metadata is a dictionary."""
1195	+ the named child. The node is an IFilesystemNode, and the metadata
1196	+ is a dictionary."""
1197	assert isinstance(name, unicode)
1198	d = self._read()
1199	d.addCallback(self._get_with_metadata, name)
1200	hunk ./src/allmydata/dirnode.py 416
1201	return d
1202
1203	def get_child_at_path(self, path):
1204	- """Transform a child path into an IDirectoryNode or IFileNode.
1205	+ """Transform a child path into an IFilesystemNode.
1206
1207	I perform a recursive series of 'get' operations to find the named
1208	descendant node. I return a Deferred that fires with the node, or
1209	hunk ./src/allmydata/dirnode.py 430
1210	return d
1211
1212	def get_child_and_metadata_at_path(self, path):
1213	- """Transform a child path into an IDirectoryNode or IFileNode and
1214	+ """Transform a child path into an IFilesystemNode and
1215	a metadata dictionary from the last edge that was traversed.
1216	"""
1217
1218	hunk ./src/allmydata/dirnode.py 835
1219	root_si = root.get_storage_index()
1220	self._lp = log.msg(format="deep-check starting (%(si)s),"
1221	" verify=%(verify)s, repair=%(repair)s",
1222	- si=base32.b2a(root_si), verify=verify, repair=repair)
1223	+ si=base32.b2a(root_si or ""), verify=verify, repair=repair)
1224	self._verify = verify
1225	self._repair = repair
1226	self._add_lease = add_lease
1227	hunk ./src/allmydata/web/directory.py 928
1228
1229	status = { "stats": s["stats"],
1230	"finished": m.is_finished(),
1231	- "origin": base32.b2a(m.origin_si),
1232	+ "origin": base32.b2a(m.origin_si or ""),
1233	}
1234	if m.is_finished():
1235	# don't return manifest/verifycaps/SIs unless the operation is
1236	hunk ./src/allmydata/web/directory.py 949
1237	return simplejson.dumps(status, indent=1)
1238
1239	def _si_abbrev(self):
1240	- return base32.b2a(self.monitor.origin_si)[:6]
1241	+ si = self.monitor.origin_si
1242	+ if not si:
1243	+ return "<LIT>"
1244	+ return base32.b2a(si)[:6]
1245
1246	def render_title(self, ctx):
1247	return T.title["Manifest of SI=%s" % self._si_abbrev()]
1248	hunk ./src/allmydata/web/directory.py 1050
1249	v = node.get_verify_cap()
1250	if v:
1251	v = v.to_string()
1252	- d["verifycap"] = v
1253	+ d["verifycap"] = v or ""
1254
1255	r = node.get_repair_cap()
1256	if r:
1257	hunk ./src/allmydata/web/directory.py 1055
1258	r = r.to_string()
1259	- d["repaircap"] = r
1260	+ d["repaircap"] = r or ""
1261
1262	si = node.get_storage_index()
1263	if si:
1264	hunk ./src/allmydata/web/directory.py 1060
1265	si = base32.b2a(si)
1266	- d["storage-index"] = si
1267	+ d["storage-index"] = si or ""
1268
1269	j = simplejson.dumps(d, ensure_ascii=True)
1270	assert "\n" not in j
1271	hunk ./src/allmydata/web/directory.py 1110
1272	v = node.get_verify_cap()
1273	if v:
1274	v = v.to_string()
1275	- data["verifycap"] = v
1276	+ data["verifycap"] = v or ""
1277
1278	r = node.get_repair_cap()
1279	if r:
1280	hunk ./src/allmydata/web/directory.py 1115
1281	r = r.to_string()
1282	- data["repaircap"] = r
1283	+ data["repaircap"] = r or ""
1284
1285	si = node.get_storage_index()
1286	if si:
1287	hunk ./src/allmydata/web/directory.py 1120
1288	si = base32.b2a(si)
1289	- data["storage-index"] = si
1290	+ data["storage-index"] = si or ""
1291
1292	if self.repair:
1293	d = node.check_and_repair(self.monitor, self.verify, self.add_lease)
1294	hunk ./src/allmydata/web/info.py 89
1295	node = self.original
1296	if not IDirectoryNode.providedBy(node):
1297	return ""
1298	- return ctx.tag[node.get_verify_cap().to_string()]
1299	+ verifier = node.get_verify_cap()
1300	+ if verifier:
1301	+ return ctx.tag[node.get_verify_cap().to_string()]
1302	+ return ""
1303
1304	def render_file_writecap(self, ctx, data):
1305	node = self.original
1306	}
1307	[Updates to NEWS for 1.6.1
1308	david-sarah@jacaranda.org**20100224081542
1309	Ignore-this: ae1ca1892d7013bcb5f54f201459632
1310	] {
1311	hunk ./NEWS 7
1312
1313	** Bugfixes
1314
1315	-*** Correct handling of Immutable Directories
1316	+*** Correct handling of Small Immutable Directories
1317
1318	hunk ./NEWS 9
1319	-Immutable directories can now be deep-checked (in v1.6.0 running deep-check on
1320	-a system which included immutable directories would result in an exception
1321	-which caused the deep-check operation to abort). (#948)
1322	+Immutable directories can now be deep-checked and listed in the web UI in
1323	+all cases. (In v1.6.0, some operations, such as deep-check, on a directory
1324	+graph that included very small immutable directories, would result in an
1325	+exception causing the whole operation to abort.) (#948)
1326
1327	** Usability Improvements
1328
1329	hunk ./NEWS 16
1330	-Improved user interface messages (#681, #837, #939).
1331	+Improved user interface messages and error reporting. (#681, #837, #939)
1332	+
1333	+The timeouts for operation handles have been greatly increased, so that
1334	+you can view the results of an operation up to 4 days after it has
1335	+completed. After viewing them for the first time, the results are
1336	+retained for a further day. (#577)
1337
1338	* Release 1.6.0 (2010-02-01)
1339
1340	}
1341	[Additional test for DIR2-LIT directories in test_web.py, fixed version (#948)
1342	david-sarah@jacaranda.org**20100225041824
1343	Ignore-this: 86d710f438439f27aa372b84411af011
1344	] {
1345	hunk ./src/allmydata/test/common.py 116
1346	pass
1347
1348	def get_size(self):
1349	+ if isinstance(self.my_uri, uri.LiteralFileURI):
1350	+ return self.my_uri.get_size()
1351	try:
1352	data = self.all_contents[self.my_uri.to_string()]
1353	except KeyError, le:
1354	hunk ./src/allmydata/test/common.py 136
1355	return d
1356
1357	def _read(self, ignored, consumer, offset, size):
1358	- if self.my_uri.to_string() not in self.all_contents:
1359	- raise NotEnoughSharesError(None, 0, 3)
1360	- data = self.all_contents[self.my_uri.to_string()]
1361	+ if isinstance(self.my_uri, uri.LiteralFileURI):
1362	+ data = self.my_uri.data
1363	+ else:
1364	+ if self.my_uri.to_string() not in self.all_contents:
1365	+ raise NotEnoughSharesError(None, 0, 3)
1366	+ data = self.all_contents[self.my_uri.to_string()]
1367	start = offset
1368	if size is not None:
1369	end = offset + size
1370	hunk ./src/allmydata/test/common.py 296
1371	return d
1372
1373	def download_best_version(self):
1374	+ if isinstance(self.my_uri, uri.LiteralFileURI):
1375	+ return defer.succeed(self.my_uri.data)
1376	if self.storage_index not in self.all_contents:
1377	return defer.fail(NotEnoughSharesError(None, 0, 3))
1378	return defer.succeed(self.all_contents[self.storage_index])
1379	hunk ./src/allmydata/test/common.py 301
1380	+
1381	def overwrite(self, new_contents):
1382	if len(new_contents) > self.MUTABLE_SIZELIMIT:
1383	raise FileTooLargeError("SDMF is limited to one segment, and "
1384	hunk ./src/allmydata/test/common.py 475
1385	if self.stats_gatherer_furl:
1386	write("stats_gatherer.furl", self.stats_gatherer_furl)
1387
1388	- # give subclasses a chance to append liens to the node's tahoe.cfg
1389	+ # give subclasses a chance to append lines to the node's tahoe.cfg
1390	# files before they are launched.
1391	self._set_up_nodes_extra_config()
1392
1393	hunk ./src/allmydata/test/test_web.py 997
1394	self.failUnless(MKDIR_BUTTON_RE.search(res), res)
1395	d.addCallback(_check4)
1396
1397	+ # and at a literal directory
1398	+ tiny_litdir_uri = "URI:DIR2-LIT:gqytunj2onug64tufqzdcosvkjetutcjkq5gw4tvm5vwszdgnz5hgyzufqydulbshj5x2lbm" # contains one child which is itself also LIT
1399	+ d.addCallback(lambda res:
1400	+ self.GET("/uri/" + tiny_litdir_uri + "/", followRedirect=True))
1401	+ def _check5(res):
1402	+ self.failUnless('(immutable)' in res, res)
1403	+ self.failUnless(re.search('<td>FILE</td>'
1404	+ r'\s+<td><a href="[\.\/]+/file/URI%3ALIT%3Akrugkidfnzsc4/@@named=/short">short</a></td>', res), res)
1405	+ d.addCallback(_check5)
1406	return d
1407
1408	def test_GET_DIRURL_badtype(self):
1409	}
1410	[Change code that gives a base32 SI or an empty string to be more straightforward. (#948)
1411	david-sarah@jacaranda.org**20100227065551
1412	Ignore-this: ba2b0eb430635fcfb09faeca5046ed21
1413	] {
1414	hunk ./src/allmydata/dirnode.py 833
1415	class DeepChecker:
1416	def __init__(self, root, verify, repair, add_lease):
1417	root_si = root.get_storage_index()
1418	+ if root_si:
1419	+ root_si_base32 = base32.b2a(root_si)
1420	+ else:
1421	+ root_si_base32 = ""
1422	self._lp = log.msg(format="deep-check starting (%(si)s),"
1423	" verify=%(verify)s, repair=%(repair)s",
1424	hunk ./src/allmydata/dirnode.py 839
1425	- si=base32.b2a(root_si or ""), verify=verify, repair=repair)
1426	+ si=root_si_base32, verify=verify, repair=repair)
1427	self._verify = verify
1428	self._repair = repair
1429	self._add_lease = add_lease
1430	hunk ./src/allmydata/web/directory.py 926
1431	m = self.monitor
1432	s = m.get_status()
1433
1434	+ if m.origin_si:
1435	+ origin_base32 = base32.b2a(m.origin_si)
1436	+ else:
1437	+ origin_base32 = ""
1438	status = { "stats": s["stats"],
1439	"finished": m.is_finished(),
1440	hunk ./src/allmydata/web/directory.py 932
1441	- "origin": base32.b2a(m.origin_si or ""),
1442	+ "origin": origin_base32,
1443	}
1444	if m.is_finished():
1445	# don't return manifest/verifycaps/SIs unless the operation is
1446	}
1447
1448	Context:
1449
1450	[docs: update relnotes.txt for v1.6.1
1451	zooko@zooko.com**20100224065755
1452	Ignore-this: 6d078e94425462ac8d074e3e7c82da28
1453	]
1454	[docs: NEWS and relnotes-short.txt and CREDITS for v1.6.1
1455	zooko@zooko.com**20100224065231
1456	Ignore-this: 41c056ae48c639e5a934d4c1983bc118
1457	]
1458	[misc/coverage.el: improve filename matching
1459	Brian Warner <warner@lothar.com>**20100224044757
1460	Ignore-this: 8d9fb1d2a71e01370da006a2fef04346
1461	]
1462	[test_util.py: improve coverage of util.time_format
1463	Brian Warner <warner@lothar.com>**20100224044637
1464	Ignore-this: bd93495132fe73a9c117d35c1a4e2d72
1465	]
1466	[docs/performance.txt: split out CPU from network, expand on mutable costs
1467	Brian Warner <warner@lothar.com>**20100224043813
1468	Ignore-this: 4779e78ca0eed1dcbd1652e6287219f1
1469	]
1470	[Tweak to 'tahoe ls --help' output (#837)
1471	david-sarah@jacaranda.org**20100224030231
1472	Ignore-this: 9c86ff8ee1f2c9b8a4f6e205a58905f
1473	]
1474	[Test behaviour of 'tahoe ls' for unknown objects (#837)
1475	david-sarah@jacaranda.org**20100224025913
1476	Ignore-this: b999f6239796a90cadb41e8650aa3782
1477	]
1478	[docs/FTP: the Twisted patch (t3462) has landed, will be in the next release
1479	Brian Warner <warner@lothar.com>**20100223210402
1480	Ignore-this: ddc5c8da8c95d8c19380d8c7ecbaf18
1481	]
1482	[Change OphandleTable to use a deterministic clock, so we can test it
1483	Kevan Carstensen <kevan@isnotajoke.com>**20100220210713
1484	Ignore-this: a7437f4eda359bdfa243bd534f23bf52
1485
1486	To test the changes for #577, we need a deterministic way to simulate
1487	the passage of long periods of time. twisted.internet.task.Clock seems,
1488	from my Googling, to be the way to go for this functionality. I changed
1489	a few things so that OphandleTable would use twisted.internet.task.Clock
1490	when testing:
1491
1492	* WebishServer.__init___ now takes an optional 'clock' parameter,
1493	* which it passes to the root.Root instance it creates.
1494	* root.Root.__init__ now takes an optional 'clock' parameter, which it
1495	passes to the OphandleTable.__init__ method.
1496	* OphandleTable.__init__ now takes an optional 'clock' parameter. If
1497	it is provided, and it isn't None, its callLater method will be used
1498	to schedule ophandle expirations (as opposed to using
1499	reactor.callLater, which is what OphandleTable does normally).
1500	* The WebMixin object in test_web.py now sets a self.clock parameter,
1501	which is a twisted.internet.task.Clock that it feeds to the
1502	WebishServer it creates.
1503
1504	Tests using the WebMixin can control the passage of time in
1505	OphandleTable by accessing self.clock.
1506	]
1507	[Add tests for the ophandle expiration behavior in #577
1508	Kevan Carstensen <kevan@isnotajoke.com>**20100221010455
1509	Ignore-this: 87a435108999c24920354b58fd78353f
1510	]
1511	[Update docs/frontends/webapi.txt to reflect the new expiration times in #577
1512	Kevan Carstensen <kevan@isnotajoke.com>**20100221010716
1513	Ignore-this: cefee2ba800c285ae4148fe2dff39a3b
1514	]
1515	[Increase ophandle expiration times, per #577
1516	Kevan Carstensen <kevan@isnotajoke.com>**20100221010512
1517	Ignore-this: 247f61fe8855a0c76fef3777a957f495
1518	]
1519	[setup: comment-out the dependency on pycrypto, see #953
1520	zooko@zooko.com**20100215050844
1521	Ignore-this: 2751120921ff35b8189d8fcd896da149
1522	]
1523	[Add tests for #939
1524	Kevan Carstensen <kevan@isnotajoke.com>**20100212062137
1525	Ignore-this: 5459e8c64ba76cca70aa720e68549637
1526	]
1527	[Alter CLI utilities to handle nonexistent aliases better
1528	Kevan Carstensen <kevan@isnotajoke.com>**20100211024318
1529	Ignore-this: e698ea4a57f5fe27c24336581ca0cf65
1530	]
1531	[web/storage.py: display total-seen on the last-complete-cycle line. For #940.
1532	Brian Warner <warner@lothar.com>**20100208002010
1533	Ignore-this: c0ed860f3e9628d3171d2b055d96c5aa
1534	]
1535	[adding pycrypto to the auto dependencies
1536	secorp@allmydata.com**20100206054314
1537	Ignore-this: b873fc00a6a5b001d30d479e6053cf2f
1538	]
1539	[Improve behaviour of 'tahoe ls' for unknown objects, addressing kevan's comments
1540	david-sarah@jacaranda.org**20100220061313
1541	Ignore-this: 6205025c477f1c999473a4ae67e1c83
1542	]
1543	[docs running.html - "tahoe run ." does not work with the current installation, replaced with "tahoe start ."
1544	secorp@allmydata.com**20100206165320
1545	Ignore-this: fdb2dcb0e417d303cd43b1951a4f8c03
1546	]
1547	[code coverage: replace figleaf with coverage.py, should work on py2.6 now.
1548	Brian Warner <warner@lothar.com>**20100203165421
1549	Ignore-this: 46ab590360be6a385cb4fc4e68b6b42c
1550
1551	It still lacks the right HTML report (the builtin report is very pretty, but
1552	lacks the "lines uncovered" numbers that I want), and the half-finished
1553	delta-from-last-run measurements.
1554	]
1555	[More cleanups to test_cli using new utilities for reading and writing files.
1556	david-sarah@jacaranda.org**20100206013855
1557	Ignore-this: 9fd2294406b346bfe9144fff6a61f789
1558	]
1559	[Fix race conditions and missing callback in allmydata.test.test_cli.Cp.test_copy_using_filecap, add utilities for one-liner reading and writing of files, and fix cases in test_cli where files were not being closed after writing.
1560	david-sarah@jacaranda.org**20100206013727
1561	Ignore-this: 49da6c33190d526a4ae84c472f04d5f4
1562	]
1563	[docs: install.html: link into Python 2.5.5 download page
1564	zooko@zooko.com**20100202065852
1565	Ignore-this: 1a9471b8175b7de5741d8445a7ede29d
1566	]
1567	[TAG allmydata-tahoe-1.6.0
1568	zooko@zooko.com**20100202061125
1569	Ignore-this: dee6ade7ac1452cf5d1d9c69a8146d84
1570	]
1571	[docs: install.html: recommend Python 2.5 (because I can build extension modules for it with mingw), architecture.txt: point out that our Proof of Retrievability feature is client-side-only
1572	zooko@zooko.com**20100202053842
1573	Ignore-this: e33fd413a91771c77b17d7de0f215bea
1574	]
1575	[architecture.txt: remove trailing whitespace, wrap lines: no content changes
1576	Brian Warner <warner@lothar.com>**20100202055304
1577	Ignore-this: 1662f37d1162858ac2619db27bcc411f
1578	]
1579	[docs: a couple of small edits to release notes (thanks Peter)
1580	zooko@zooko.com**20100202054832
1581	Ignore-this: 1d0963c43ff19c92775b124c49c8a88a
1582	]
1583	[docs: CREDITS: where due
1584	zooko@zooko.com**20100202053831
1585	Ignore-this: 11646dd603ac715ae8277a4bb9562215
1586	]
1587	[docs: a few small edits to performance.txt and README
1588	zooko@zooko.com**20100202052750
1589	Ignore-this: bf8b1b7438e8fb6da09eec9713c78533
1590	]
1591	[More comprehensive changes and ticket references for NEWS
1592	david-sarah@jacaranda.org**20100202061256
1593	Ignore-this: 696cf0106e8a7fd388afc5b55fba8a1b
1594	]
1595	[docs: a few edits to architecture.txt, most significantly highlighting "future work" to avoid confusing it with the current version, and adding a "future work" about a random-sampling Proof of Retrievability verifier
1596	zooko@zooko.com**20100202045117
1597	Ignore-this: 81122b3042ea9ee6bc12e795c2386d59
1598	]
1599	[docs: a few edits and updates to relnotes.txt, relnotes-short.txt, and NEWS in preparation for v1.6.0
1600	zooko@zooko.com**20100202043222
1601	Ignore-this: d90c644fa61d78e33cbdf0be428bb07a
1602	]
1603	[Fill in 'docs/performance.txt' with some performance information
1604	Kevan Carstensen <kevan@isnotajoke.com>**20100202005914
1605	Ignore-this: c66b255b2bd2e7e11f5707b25e7b38be
1606	]
1607	[Document leakage of cap URLs via phishing filters in known_issues.txt
1608	david-sarah@jacaranda.org**20100202015238
1609	Ignore-this: 78e668dbca77c0e3a73e10c0b74cf024
1610	]
1611	[docs: updates to relnotes.txt, NEWS, architecture, historical_known_issues, install.html, etc.
1612	zooko@zooko.com**20100201181809
1613	Ignore-this: f4fc924652af746862c8ee4d9ba97bf6
1614	]
1615	[immutable: downloader accepts notifications of buckets even if those notifications arrive after he has begun downloading shares.
1616	zooko@zooko.com**20100201061610
1617	Ignore-this: 5b09709f27603a3157eba7ba70028955
1618	This can be useful if one of the ones that he has already begun downloading fails. See #287 for discussion. This fixes part of #287 which part was a regression caused by #928, namely this fixes fail-over in case a share is corrupted (or the server returns an error or disconnects). This does not fix the related issue mentioned in #287 if a server hangs and doesn't reply to requests for blocks.
1619
1620	]
1621	[tests: don't require tahoe to run with no noise if we are using an old twisted that emits DeprecationWarnings
1622	zooko@zooko.com**20100201052323
1623	Ignore-this: 69668c772cce612a0c6936a2195ebd2a
1624	]
1625	[tests: stop being surprised that Nevow no longer prints out warnings when it tries to find its static files
1626	zooko@zooko.com**20100201041144
1627	Ignore-this: 77b4ac383165d98dfe2a9008ce794742
1628	Unless we are using a sufficiently new version of Nevow, in which case if it prints out warnings then this is a hard test failure. :-)
1629	]
1630	[cli: suppress DeprecationWarnings emitted from importing nevow and twisted. Fixes #859
1631	david-sarah@jacaranda.org**20100201004429
1632	Ignore-this: 22d7216921cd5f04381c0194ed501bbe
1633	]
1634	[Improvements to test_hung_server, and fix for status updates in download.py
1635	david-sarah@jacaranda.org**20100130064303
1636	Ignore-this: dd889c643afdcf0f86d55855aafda6ad
1637	]
1638	[Improvements to test_unknownnode to cover invalid cap URIs with known prefixes
1639	david-sarah@jacaranda.org**20100130063908
1640	Ignore-this: e1a298942c21207473e418ea5efd6276
1641	]
1642	[immutable: fix bug in tests, change line-endings to unix style, add comment
1643	zooko@zooko.com**20100129184237
1644	Ignore-this: f6bd875fe974c55c881e05eddf8d3436
1645	]
1646	[Fix invalid trailing commas in JSON example
1647	david-sarah@jacaranda.org**20100129201742
1648	Ignore-this: d99e0a8ead4fafabf39a1daf11ec450b
1649	]
1650	[docs: update relnotes.txt for Tahoe-LAFS v1.6
1651	zooko@zooko.com**20100128171257
1652	Ignore-this: 920df92152aead69ef861b9b2e8ff218
1653	]
1654	[Address comments by Kevan on 833 and add test for stripping spaces
1655	david-sarah@jacaranda.org**20100127230642
1656	Ignore-this: de36aeaf4afb3ba05dbeb49a5e9a6b26
1657	]
1658	[New tests for #928
1659	david-sarah@jacaranda.org**20100129123845
1660	Ignore-this: 5c520f40141f0d9c000ffb05a4698995
1661	]
1662	[immutable: download from the first servers which provide at least K buckets instead of waiting for all servers to reply
1663	zooko@zooko.com**20100127233417
1664	Ignore-this: c855355a40d96827e1d0c469a8d8ab3f
1665	This should put an end to the phenomenon I've been seeing that a single hung server can cause all downloads on a grid to hang. Also it should speed up all downloads by (a) not-waiting for responses to queries that it doesn't need, and (b) downloading shares from the servers which answered the initial query the fastest.
1666	Also, do not count how many buckets you've gotten when deciding whether the download has enough shares or not -- instead count how many buckets to unique shares that you've gotten. This appears to improve a slightly weird behavior in the current download code in which receiving >= K different buckets all to the same sharenumber would make it think it had enough to download the file when in fact it hadn't.
1667	This patch needs tests before it is actually ready for trunk.
1668	]
1669	[Eliminate 'foo if test else bar' syntax that isn't supported by Python 2.4
1670	david-sarah@jacaranda.org**20100129035210
1671	Ignore-this: 70eafd487b4b6299beedd63b4a54a0c
1672	]
1673	[Fix example JSON in webapi.txt that cannot occur in practice
1674	david-sarah@jacaranda.org**20100129032742
1675	Ignore-this: 361a1ba663d77169aeef93caef870097
1676	]
1677	[Add mutable field to t=json output for unknown nodes, when mutability is known
1678	david-sarah@jacaranda.org**20100129031424
1679	Ignore-this: 1516d63559bdfeb6355485dff0f5c04e
1680	]
1681	[Show -IMM and -RO suffixes for types of immutable and read-only unknown nodes in directory listings
1682	david-sarah@jacaranda.org**20100128220800
1683	Ignore-this: dc5c17c0a566398f88e4303c41321e66
1684	]
1685	[Fix inaccurate comment in test_mutant_dirnodes_are_omitted
1686	david-sarah@jacaranda.org**20100128202456
1687	Ignore-this: 9fa17ed7feac9e4d084f1b2338c76fca
1688	]
1689	[test_runner: cleanup, refactor common code into a non-executable method
1690	Brian Warner <warner@lothar.com>**20100127224040
1691	Ignore-this: 4cb4aada87777771f688edfd8129ffca
1692
1693	Having both test_node() and test_client() (one of which calls the other) felt
1694	confusing to me, so I changed it to have test_node(), test_client(), and a
1695	common do_create() helper method.
1696	]
1697	[scripts/runner.py: simplify David-Sarah's clever grouped-commands usage trick
1698	Brian Warner <warner@lothar.com>**20100127223758
1699	Ignore-this: 70877ebf06ae59f32960b0aa4ce1d1ae
1700	]
1701	[tahoe backup: skip all symlinks, with warning. Fixes #850, addresses #641.
1702	Brian Warner <warner@lothar.com>**20100127223517
1703	Ignore-this: ab5cf05158d32a575ca8efc0f650033f
1704	]
1705	[NEWS: update with all recent user-visible changes
1706	Brian Warner <warner@lothar.com>**20100127222209
1707	Ignore-this: 277d24568018bf4f3fb7736fda64eceb
1708	]
1709	["tahoe backup": fix --exclude-vcs docs to include Git
1710	Brian Warner <warner@lothar.com>**20100127201044
1711	Ignore-this: 756a58dde21bdc65aa62b81803605b5
1712	]
1713	[docs: fix references to --no-storage, explanation of [storage] section
1714	Brian Warner <warner@lothar.com>**20100127200956
1715	Ignore-this: f4be1763a585e1ac6299a4f1b94a59e0
1716	]
1717	[cli: merge the better version of David-Sarah's split-usage-and-help patch with the earlier version that I mistakenly committed
1718	zooko@zooko.com**20100126044559
1719	Ignore-this: 284d188e13b7901013cbb650168e6447
1720	]
1721	[Split tahoe --help options into groups.
1722	david-sarah@jacaranda.org**20100112043935
1723	Ignore-this: 610f9c41b00e6863e3cd047379733e3a
1724	]
1725	[Miscellaneous documentation, test, and code formatting tweaks.
1726	david-sarah@jacaranda.org**20100127070309
1727	Ignore-this: 84ca7e4bb7c64221ae2c61144ef5edef
1728	]
1729	[Prevent mutable objects from being retrieved from an immutable directory, and associated forward-compatibility improvements.
1730	david-sarah@jacaranda.org**20100127064430
1731	Ignore-this: 5ef6a3554cf6bef0bf0712cc7d6c0252
1732	]
1733	[Use if instead of assert to check for twisted ftp patch
1734	david-sarah@jacaranda.org**20100127015529
1735	Ignore-this: 66959d946bd1a835ece6f074e75086b2
1736	]
1737	[docs: further CREDITS level-ups for Nils, Kevan, David-Sarah
1738	zooko@zooko.com**20100126170021
1739	Ignore-this: 1e513e85cf7b7abf57f056e6d7544b38
1740	]
1741	[ftpd: clearer error message if Twisted needs a patch (by Nils Durner)
1742	zooko@zooko.com**20100126143411
1743	Ignore-this: 440e6831ae6da5135c1edd081c93871f
1744	]
1745	[Add 'docs/performance.txt', which (for the moment) describes mutable file performance issues
1746	Kevan Carstensen <kevan@isnotajoke.com>**20100115204500
1747	Ignore-this: ade4e500217db2509aee35aacc8c5dbf
1748	]
1749	[docs: more CREDITS for François, Kevan, and David-Sarah
1750	zooko@zooko.com**20100126132133
1751	Ignore-this: f37d4977c13066fcac088ba98a31b02e
1752	]
1753	[tahoe_backup.py: display warnings on errors instead of stopping the whole backup. Fix #729.
1754	francois@ctrlaltdel.ch**20100120094249
1755	Ignore-this: 7006ea4b0910b6d29af6ab4a3997a8f9
1756
1757	This patch displays a warning to the user in two cases:
1758
1759	1. When special files like symlinks, fifos, devices, etc. are found in the
1760	local source.
1761
1762	2. If files or directories are not readables by the user running the 'tahoe
1763	backup' command.
1764
1765	In verbose mode, the number of skipped files and directories is printed at the
1766	end of the backup.
1767
1768	Exit status returned by 'tahoe backup':
1769
1770	- 0 everything went fine
1771	- 1 the backup failed
1772	- 2 files were skipped during the backup
1773
1774	]
1775	[Message saying that we couldn't find bin/tahoe should say where we looked
1776	david-sarah@jacaranda.org**20100116204556
1777	Ignore-this: 1068576fd59ea470f1e19196315d1bb
1778	]
1779	[Change running.html to describe 'tahoe run'
1780	david-sarah@jacaranda.org**20100112044409
1781	Ignore-this: 23ad0114643ce31b56e19bb14e011e4f
1782	]
1783	[cli: split usage strings into groups (patch by David-Sarah Hopwood)
1784	zooko@zooko.com**20100126043921
1785	Ignore-this: 51928d266a7292b873f87f7d53c9a01e
1786	]
1787	[Add create-node CLI command, and make create-client equivalent to create-node --no-storage (fixes #760)
1788	david-sarah@jacaranda.org**20100116052055
1789	Ignore-this: 47d08b18c69738685e13ff365738d5a
1790	]
1791	[contrib/fuse/runtests.py: Fix #888, configure settings in tahoe.cfg and don't treat warnings as failure
1792	francois@ctrlaltdel.ch**20100109123010
1793	Ignore-this: 2590d44044acd7dfa3690c416cae945c
1794
1795	Fix a few bitrotten pieces in the FUSE test script. It now configures tahoe
1796	node settings by editing tahoe.cfg which is the new supported method.
1797
1798	It alos tolerate warnings issued by the mount command, the cause of these
1799	warnings is the same as in #876 (contrib/fuse/runtests.py doesn't tolerate
1800	deprecations warnings).
1801
1802	]
1803	[Fix webapi t=mkdir with multpart/form-data, as on the Welcome page. Closes #919.
1804	Brian Warner <warner@lothar.com>**20100121065052
1805	Ignore-this: 1f20ea0a0f1f6d6c1e8e14f193a92c87
1806	]
1807	[Fix boodlegrid use of set_children
1808	david-sarah@jacaranda.org**20100126063414
1809	Ignore-this: 3aa2d4836f76303b2bacecd09611f999
1810	]
1811	[Remove replace= parameter to mkdir-immutable and mkdir-with-children
1812	david-sarah@jacaranda.org**20100124224325
1813	Ignore-this: 25207bcc946c0c43d9528718e76ba7b
1814	]
1815	[Warn about test failures due to setting FLOG* env vars
1816	david-sarah@jacaranda.org**20100124220629
1817	Ignore-this: 1c25247ca0f0840390a1b7259a9f4a3c
1818	]
1819	[Patch to accept t=set-children as well as t=set_children
1820	david-sarah@jacaranda.org**20100124030020
1821	Ignore-this: 2c061f12af817cdf77feeeb64098ec3a
1822	]
1823	[tahoe_add_alias.py: minor refactoring
1824	Brian Warner <warner@lothar.com>**20100115064220
1825	Ignore-this: 29910e81ad11209c9e493d65fd2dab9b
1826	]
1827	[test_dirnode.py: reduce scope of a Client instance, suggested by Kevan.
1828	Brian Warner <warner@lothar.com>**20100115062713
1829	Ignore-this: b35efd9e6027e43de6c6f509bfb4ccaa
1830	]
1831	[test_provisioning: STAN is not always a list. Fix by David-Sarah Hopwood.
1832	Brian Warner <warner@lothar.com>**20100115014632
1833	Ignore-this: 9989de7f1e00907706d2b63153138219
1834	]
1835	[web/directory.py mkdir-immutable: hush pyflakes, add TODO for #903 behavior
1836	Brian Warner <warner@lothar.com>**20100114222804
1837	Ignore-this: 717cd3b9a1c8aeee76938c9641db7356
1838	]
1839	[hush pyflakes-0.4.0 warnings: slightly less-trivial fixes. Closes #900.
1840	Brian Warner <warner@lothar.com>**20100114221719
1841	Ignore-this: f774f4637e256ad55502659413a811a8
1842
1843	This includes one fix (in test_web) which was testing the wrong thing.
1844	]
1845	[hush pyflakes-0.4.0 warnings: remove trivial unused variables. For #900.
1846	Brian Warner <warner@lothar.com>**20100114221529
1847	Ignore-this: e96106c8f1a99fbf93306fbfe9a294cf
1848	]
1849	[tahoe add-alias/create-alias: don't corrupt non-newline-terminated alias
1850	Brian Warner <warner@lothar.com>**20100114210246
1851	Ignore-this: 9c994792e53a85159d708760a9b1b000
1852	file. Closes #741.
1853	]
1854	[change docs and --help to use "grid" instead of "virtual drive": closes #892.
1855	Brian Warner <warner@lothar.com>**20100114201119
1856	Ignore-this: a20d4a4dcc4de4e3b404ff72d40fc29b
1857
1858	Thanks to David-Sarah Hopwood for the patch.
1859	]
1860	[backupdb.txt: fix ST_CTIME reference
1861	Brian Warner <warner@lothar.com>**20100114194052
1862	Ignore-this: 5a189c7a1181b07dd87f0a08ea31b6d3
1863	]
1864	[client.py: fix/update comments on KeyGenerator
1865	Brian Warner <warner@lothar.com>**20100113004226
1866	Ignore-this: 2208adbb3fd6a911c9f44e814583cabd
1867	]
1868	[Clean up log.err calls, for one of the issues in #889.
1869	Brian Warner <warner@lothar.com>**20100112013343
1870	Ignore-this: f58455ce15f1fda647c5fb25d234d2db
1871
1872	allmydata.util.log.err() either takes a Failure as the first positional
1873	argument, or takes no positional arguments and must be invoked in an
1874	exception handler. Fixed its signature to match both foolscap.logging.log.err
1875	and twisted.python.log.err . Included a brief unit test.
1876	]
1877	[tidy up DeadReferenceError handling, ignore them in add_lease calls
1878	Brian Warner <warner@lothar.com>**20100112000723
1879	Ignore-this: 72f1444e826fd0b9db6d318f89603c38
1880
1881	Stop checking separately for ConnectionDone/ConnectionLost, since those have
1882	been folded into DeadReferenceError since foolscap-0.3.1 . Write
1883	rrefutil.trap_deadref() in terms of rrefutil.trap_and_discard() to improve
1884	code coverage.
1885	]
1886	[NEWS: improve "tahoe backup" notes, mention first-backup-after-upgrade duration
1887	Brian Warner <warner@lothar.com>**20100111190132
1888	Ignore-this: 10347c590b3375964579ba6c2b0edb4f
1889
1890	Thanks to Francois Deppierraz for the suggestion.
1891	]
1892	[test_repairer: add (commented-out) test_each_byte, to see exactly what the
1893	Brian Warner <warner@lothar.com>**20100110203552
1894	Ignore-this: 8e84277d5304752edeff052b97821815
1895	Verifier misses
1896
1897	The results (described in #819) match our expectations: it misses corruption
1898	in unused share fields and in most container fields (which are only visible
1899	to the storage server, not the client). 1265 bytes of a 2753 byte
1900	share (hosting a 56-byte file with an artifically small segment size) are
1901	unused, mostly in the unused tail of the overallocated UEB space (765 bytes),
1902	and the allocated-but-unwritten plaintext_hash_tree (480 bytes).
1903	]
1904	[repairer: fix some wrong offsets in the randomized verifier tests, debugged by Brian
1905	zooko@zooko.com**20100110203721
1906	Ignore-this: 20604a609db8706555578612c1c12feb
1907	fixes #819
1908	]
1909	[test_repairer: fix colliding basedir names, which caused test inconsistencies
1910	Brian Warner <warner@lothar.com>**20100110084619
1911	Ignore-this: b1d56dd27e6ab99a7730f74ba10abd23
1912	]
1913	[repairer: add deterministic test for #819, mark as TODO
1914	zooko@zooko.com**20100110013619
1915	Ignore-this: 4cb8bb30b25246de58ed2b96fa447d68
1916	]
1917	[contrib/fuse/runtests.py: Tolerate the tahoe CLI returning deprecation warnings
1918	francois@ctrlaltdel.ch**20100109175946
1919	Ignore-this: 419c354d9f2f6eaec03deb9b83752aee
1920
1921	Depending on the versions of external libraries such as Twisted of Foolscap,
1922	the tahoe CLI can display deprecation warnings on stdout. The tests should
1923	not interpret those warnings as a failure if the node is in fact correctly
1924	started.
1925
1926	See http://allmydata.org/trac/tahoe/ticket/859 for an example of deprecation
1927	warnings.
1928
1929	fixes #876
1930	]
1931	[contrib: fix fuse_impl_c to use new Python API
1932	zooko@zooko.com**20100109174956
1933	Ignore-this: 51ca1ec7c2a92a0862e9b99e52542179
1934	original patch by Thomas Delaet, fixed by François, reviewed by Brian, committed by me
1935	]
1936	[docs: CREDITS: add David-Sarah to the CREDITS file
1937	zooko@zooko.com**20100109060435
1938	Ignore-this: 896062396ad85f9d2d4806762632f25a
1939	]
1940	[mutable/publish: don't loop() right away upon DeadReferenceError. Closes #877
1941	Brian Warner <warner@lothar.com>**20100102220841
1942	Ignore-this: b200e707b3f13aa8251981362b8a3e61
1943
1944	The bug was that a disconnected server could cause us to re-enter the initial
1945	loop() call, sending multiple queries to a single server, provoking an
1946	incorrect UCWE. To fix it, stall the loop() with an eventual.fireEventually()
1947	]
1948	[immutable/checker.py: oops, forgot some imports. Also hush pyflakes.
1949	Brian Warner <warner@lothar.com>**20091229233909
1950	Ignore-this: 4d61bd3f8113015a4773fd4768176e51
1951	]
1952	[mutable repair: return successful=False when numshares<k (thus repair fails),
1953	Brian Warner <warner@lothar.com>**20091229233746
1954	Ignore-this: d881c3275ff8c8bee42f6a80ca48441e
1955	instead of weird errors. Closes #874 and #786.
1956
1957	Previously, if the file had 0 shares, this would raise TypeError as it tried
1958	to call download_version(None). If the file had some shares but fewer than
1959	'k', it would incorrectly raise MustForceRepairError.
1960
1961	Added get_successful() to the IRepairResults API, to give repair() a place to
1962	report non-code-bug problems like this.
1963	]
1964	[node.py/interfaces.py: minor docs fixes
1965	Brian Warner <warner@lothar.com>**20091229230409
1966	Ignore-this: c86ad6342ef0f95d50639b4f99cd4ddf
1967	]
1968	[NEWS: fix 1.4.1 announcement w.r.t. add-lease behavior in older releases
1969	Brian Warner <warner@lothar.com>**20091229230310
1970	Ignore-this: bbbbb9c961f3bbcc6e5dbe0b1594822
1971	]
1972	[checker: don't let failures in add-lease affect checker results. Closes #875.
1973	Brian Warner <warner@lothar.com>**20091229230108
1974	Ignore-this: ef1a367b93e4d01298c2b1e6ca59c492
1975
1976	Mutable servermap updates and the immutable checker, when run with
1977	add_lease=True, send both the do-you-have-block and add-lease commands in
1978	parallel, to avoid an extra round trip time. Many older servers have problems
1979	with add-lease and raise various exceptions, which don't generally matter.
1980	The client-side code was catching+ignoring some of them, but unrecognized
1981	exceptions were passed through to the DYHB code, concealing the DYHB results
1982	from the checker, making it think the server had no shares.
1983
1984	The fix is to separate the code paths. Both commands are sent at the same
1985	time, but the errback path from add-lease is handled separately. Known
1986	exceptions are ignored, the others (both unknown-remote and all-local) are
1987	logged (log.WEIRD, which will trigger an Incident), but neither will affect
1988	the DYHB results.
1989
1990	The add-lease message is sent first, and we know that the server handles them
1991	synchronously. So when the checker is done, we can be sure that all the
1992	add-lease messages have been retired. This makes life easier for unit tests.
1993	]
1994	[test_cli: verify fix for "tahoe get" not creating empty file on error (#121)
1995	Brian Warner <warner@lothar.com>**20091227235444
1996	Ignore-this: 6444d52413b68eb7c11bc3dfdc69c55f
1997	]
1998	[addendum to "Fix 'tahoe ls' on files (#771)"
1999	Brian Warner <warner@lothar.com>**20091227232149
2000	Ignore-this: 6dd5e25f8072a3153ba200b7fdd49491
2001
2002	tahoe_ls.py: tolerate missing metadata
2003	web/filenode.py: minor cleanups
2004	test_cli.py: test 'tahoe ls FILECAP'
2005	]
2006	[Fix 'tahoe ls' on files (#771). Patch adapted from Kevan Carstensen.
2007	Brian Warner <warner@lothar.com>**20091227225443
2008	Ignore-this: 8bf8c7b1cd14ea4b0ebd453434f4fe07
2009
2010	web/filenode.py: also serve edge metadata when using t=json on a
2011	DIRCAP/childname object.
2012	tahoe_ls.py: list file objects as if we were listing one-entry directories.
2013	Show edge metadata if we have it, which will be true when doing
2014	'tahoe ls DIRCAP/filename' and false when doing 'tahoe ls
2015	FILECAP'
2016	]
2017	[tahoe_get: don't create the output file on error. Closes #121.
2018	Brian Warner <warner@lothar.com>**20091227220404
2019	Ignore-this: 58d5e793a77ec6e87d9394ade074b926
2020	]
2021	[webapi: don't accept zero-length childnames during traversal. Closes #358, #676.
2022	Brian Warner <warner@lothar.com>**20091227201043
2023	Ignore-this: a9119dec89e1c7741f2289b0cad6497b
2024
2025	This forbids operations that would implicitly create a directory with a
2026	zero-length (empty string) name, like what you'd get if you did "tahoe put
2027	local /oops/blah" (#358) or "POST /uri/CAP//?t=mkdir" (#676). The error
2028	message is fairly friendly too.
2029
2030	Also added code to "tahoe put" to catch this error beforehand and suggest the
2031	correct syntax (i.e. without the leading slash).
2032	]
2033	[CLI: send 'Accept:' header to ask for text/plain tracebacks. Closes #646.
2034	Brian Warner <warner@lothar.com>**20091227195828
2035	Ignore-this: 44c258d4d4c7dac0ed58adb22f73331
2036
2037	The webapi has been looking for an Accept header since 1.4.0, but it treats a
2038	missing header as equal to / (to honor RFC2616). This change finally
2039	modifies our CLI tools to ask for "text/plain, application/octet-stream",
2040	which seems roughly correct (we either want a plain-text traceback or error
2041	message, or an uninterpreted chunk of binary data to save to disk). Some day
2042	we'll figure out how JSON fits into this scheme.
2043	]
2044	[Makefile: upload-tarballs: switch from xfer-client to flappclient, closes #350
2045	Brian Warner <warner@lothar.com>**20091227163703
2046	Ignore-this: 3beeecdf2ad9c2438ab57f0e33dcb357
2047
2048	I've also set up a new flappserver on source@allmydata.org to receive the
2049	tarballs. We still need to replace the gutsy buildslave (which is where the
2050	tarballs used to be generated+uploaded) and give it the new FURL.
2051	]
2052	[misc/ringsim.py: make it deterministic, more detail about grid-is-full behavior
2053	Brian Warner <warner@lothar.com>**20091227024832
2054	Ignore-this: a691cc763fb2e98a4ce1767c36e8e73f
2055	]
2056	[misc/ringsim.py: tool to discuss #302
2057	Brian Warner <warner@lothar.com>**20091226060339
2058	Ignore-this: fc171369b8f0d97afeeb8213e29d10ed
2059	]
2060	[docs: fix helper.txt to describe new config style
2061	zooko@zooko.com**20091224223522
2062	Ignore-this: 102e7692dc414a4b466307f7d78601fe
2063	]
2064	[docs/stats.txt: add TOC, notes about controlling gatherer's listening port
2065	Brian Warner <warner@lothar.com>**20091224202133
2066	Ignore-this: 8eef63b0e18db5aa8249c2eafde02c05
2067
2068	Thanks to Jody Harris for the suggestions.
2069	]
2070	[Add docs/stats.py, explaining Tahoe stats, the gatherer, and the munin plugins.
2071	Brian Warner <warner@lothar.com>**20091223052400
2072	Ignore-this: 7c9eeb6e5644eceda98b59a67730ccd5
2073	]
2074	[more #859: avoid deprecation warning for unit tests too, hush pyflakes
2075	Brian Warner <warner@lothar.com>**20091215000147
2076	Ignore-this: 193622e24d31077da825a11ed2325fd3
2077
2078	* factor maybe-import-sha logic into util.hashutil
2079	]
2080	[use hashlib module if available, thus avoiding a DeprecationWarning for importing the old sha module; fixes #859
2081	zooko@zooko.com**20091214212703
2082	Ignore-this: 8d0f230a4bf8581dbc1b07389d76029c
2083	]
2084	[docs: reflow architecture.txt to 78-char lines
2085	zooko@zooko.com**20091208232943
2086	Ignore-this: 88f55166415f15192e39407815141f77
2087	]
2088	[docs: update the about.html a little
2089	zooko@zooko.com**20091208212737
2090	Ignore-this: 3fe2d9653c6de0727d3e82bd70f2a8ed
2091	]
2092	[docs: remove obsolete doc file "codemap.txt"
2093	zooko@zooko.com**20091113163033
2094	Ignore-this: 16bc21a1835546e71d1b344c06c61ebb
2095	I started to update this to reflect the current codebase, but then I thought (a) nobody seemed to notice that it hasn't been updated since December 2007, and (b) it will just bit-rot again, so I'm removing it.
2096	]
2097	[mutable/retrieve.py: stop reaching into private MutableFileNode attributes
2098	Brian Warner <warner@lothar.com>**20091208172921
2099	Ignore-this: 61e548798c1105aed66a792bf26ceef7
2100	]
2101	[mutable/servermap.py: stop reaching into private MutableFileNode attributes
2102	Brian Warner <warner@lothar.com>**20091208172608
2103	Ignore-this: b40a6b62f623f9285ad96fda139c2ef2
2104	]
2105	[mutable/servermap.py: oops, query N+e servers in MODE_WRITE, not k+e
2106	Brian Warner <warner@lothar.com>**20091208171156
2107	Ignore-this: 3497f4ab70dae906759007c3cfa43bc
2108
2109	under normal conditions, this wouldn't cause any problems, but if the shares
2110	are really sparse (perhaps because new servers were added), then
2111	file-modifies might stop looking too early and leave old shares in place
2112	]
2113	[control.py: fix speedtest: use download_best_version (not read) on mutable nodes
2114	Brian Warner <warner@lothar.com>**20091207060512
2115	Ignore-this: 7125eabfe74837e05f9291dd6414f917
2116	]
2117	[FTP-and-SFTP.txt: fix ssh-keygen pointer
2118	Brian Warner <warner@lothar.com>**20091207052803
2119	Ignore-this: bc2a70ee8c58ec314e79c1262ccb22f7
2120	]
2121	[setup: ignore _darcs in the "test-clean" test and make the "clean" step remove all .egg's in the root dir
2122	zooko@zooko.com**20091206184835
2123	Ignore-this: 6066bd160f0db36d7bf60aba405558d2
2124	]
2125	[remove MutableFileNode.download(), prefer download_best_version() instead
2126	Brian Warner <warner@lothar.com>**20091201225438
2127	Ignore-this: 5733eb373a902063e09fd52cc858dec0
2128	]
2129	[Simplify immutable download API: use just filenode.read(consumer, offset, size)
2130	Brian Warner <warner@lothar.com>**20091201225330
2131	Ignore-this: bdedfb488ac23738bf52ae6d4ab3a3fb
2132
2133	* remove Downloader.download_to_data/download_to_filename/download_to_filehandle
2134	* remove download.Data/FileName/FileHandle targets
2135	* remove filenode.download/download_to_data/download_to_filename methods
2136	* leave Downloader.download (the whole Downloader will go away eventually)
2137	* add util.consumer.MemoryConsumer/download_to_data, for convenience
2138	(this is mostly used by unit tests, but it gets used by enough non-test
2139	code to warrant putting it in allmydata.util)
2140	* update tests
2141	* removes about 180 lines of code. Yay negative code days!
2142
2143	Overall plan is to rewrite immutable/download.py and leave filenode.read() as
2144	the sole read-side API.
2145	]
2146	[server.py: undo my bogus 'correction' of David-Sarah's comment fix
2147	Brian Warner <warner@lothar.com>**20091201024607
2148	Ignore-this: ff4bb58f6a9e045b900ac3a89d6f506a
2149
2150	and move it to a better line
2151	]
2152	[Implement more coherent behavior when copying with dircaps/filecaps (closes #761). Patch by Kevan Carstensen.
2153	"Brian Warner <warner@lothar.com>"**20091130211009]
2154	[storage.py: update comment
2155	"Brian Warner <warner@lothar.com>"**20091130195913]
2156	[storage server: detect disk space usage on Windows too (fixes #637)
2157	david-sarah@jacaranda.org**20091121055644
2158	Ignore-this: 20fb30498174ce997befac7701fab056
2159	]
2160	[make status of finished operations consistently "Finished"
2161	david-sarah@jacaranda.org**20091121061543
2162	Ignore-this: 97d483e8536ccfc2934549ceff7055a3
2163	]
2164	[NEWS: update with all user-visible changes since the last release
2165	Brian Warner <warner@lothar.com>**20091127224217
2166	Ignore-this: 741da6cd928e939fb6d21a61ea3daf0b
2167	]
2168	[update "tahoe backup" docs, and webapi.txt's mkdir-with-children
2169	Brian Warner <warner@lothar.com>**20091127055900
2170	Ignore-this: defac1fb9a2335b0af3ef9dbbcc67b7e
2171	]
2172	[Add dirnodes to backupdb and "tahoe backup", closes #606.
2173	Brian Warner <warner@lothar.com>**20091126234257
2174	Ignore-this: fa88796fcad1763c6a2bf81f56103223
2175
2176	* backups now share dirnodes with any previous backup, in any location,
2177	so renames and moves are handled very efficiently
2178	* "tahoe backup" no longer bothers reading the previous snapshot
2179	* if you switch grids, you should delete ~/.tahoe/private/backupdb.sqlite,
2180	to force new uploads of all files and directories
2181	]
2182	[webapi: fix t=check for DIR2-LIT (i.e. empty immutable directories)
2183	Brian Warner <warner@lothar.com>**20091126232731
2184	Ignore-this: 8513c890525c69c1eca0e80d53a231f8
2185	]
2186	[PipelineError: fix str() on python2.4 . Closes #842.
2187	Brian Warner <warner@lothar.com>**20091124212512
2188	Ignore-this: e62c92ea9ede2ab7d11fe63f43b9c942
2189	]
2190	[test_uri.py: s/NewDirnode/Dirnode/ , now that they aren't "new" anymore
2191	Brian Warner <warner@lothar.com>**20091120075553
2192	Ignore-this: 61c8ef5e45a9d966873a610d8349b830
2193	]
2194	[interface name cleanups: IFileNode, IImmutableFileNode, IMutableFileNode
2195	Brian Warner <warner@lothar.com>**20091120075255
2196	Ignore-this: e3d193c229e2463e1d0b0c92306de27f
2197
2198	The proper hierarchy is:
2199	IFilesystemNode
2200	+IFileNode
2201	++IMutableFileNode
2202	++IImmutableFileNode
2203	+IDirectoryNode
2204
2205	Also expand test_client.py (NodeMaker) to hit all IFilesystemNode types.
2206	]
2207	[class name cleanups: s/FileNode/ImmutableFileNode/
2208	Brian Warner <warner@lothar.com>**20091120072239
2209	Ignore-this: 4b3218f2d0e585c62827e14ad8ed8ac1
2210
2211	also fix test/bench_dirnode.py for recent dirnode changes
2212	]
2213	[Use DIR-IMM and t=mkdir-immutable for "tahoe backup", for #828
2214	Brian Warner <warner@lothar.com>**20091118192813
2215	Ignore-this: a4720529c9bc6bc8b22a3d3265925491
2216	]
2217	[web/directory.py: use "DIR-IMM" to describe immutable directories, not DIR-RO
2218	Brian Warner <warner@lothar.com>**20091118191832
2219	Ignore-this: aceafd6ab4bf1cc0c2a719ef7319ac03
2220	]
2221	[web/info.py: hush pyflakes
2222	Brian Warner <warner@lothar.com>**20091118191736
2223	Ignore-this: edc5f128a2b8095fb20686a75747c8
2224	]
2225	[make get_size/get_current_size consistent for all IFilesystemNode classes
2226	Brian Warner <warner@lothar.com>**20091118191624
2227	Ignore-this: bd3449cf96e4827abaaf962672c1665a
2228
2229	* stop caching most_recent_size in dirnode, rely upon backing filenode for it
2230	* start caching most_recent_size in MutableFileNode
2231	* return None when you don't know, not "?"
2232	* only render None as "?" in the web "more info" page
2233	* add get_size/get_current_size to UnknownNode
2234	]
2235	[ImmutableDirectoryURIVerifier: fix verifycap handling
2236	Brian Warner <warner@lothar.com>**20091118164238
2237	Ignore-this: 6bba5c717b54352262eabca6e805d590
2238	]
2239	[Add t=mkdir-immutable to the webapi. Closes #607.
2240	Brian Warner <warner@lothar.com>**20091118070900
2241	Ignore-this: 311e5fab9a5f28b9e8a28d3d08f3c0d
2242
2243	* change t=mkdir-with-children to not use multipart/form encoding. Instead,
2244	the request body is all JSON. t=mkdir-immutable uses this format too.
2245	* make nodemaker.create_immutable_dirnode() get convergence from SecretHolder,
2246	but let callers override it
2247	* raise NotDeepImmutableError instead of using assert()
2248	* add mutable= argument to DirectoryNode.create_subdirectory(), default True
2249	]
2250	[move convergence secret into SecretHolder, next to lease secret
2251	Brian Warner <warner@lothar.com>**20091118015444
2252	Ignore-this: 312f85978a339f2d04deb5bcb8f511bc
2253	]
2254	[nodemaker: implement immutable directories (internal interface), for #607
2255	Brian Warner <warner@lothar.com>**20091112002233
2256	Ignore-this: d09fccf41813fdf7e0db177ed9e5e130
2257
2258	* nodemaker.create_from_cap() now handles DIR2-CHK and DIR2-LIT
2259	* client.create_immutable_dirnode() is used to create them
2260	* no webapi yet
2261	]
2262	[stop using IURI()/etc as an adapter
2263	Brian Warner <warner@lothar.com>**20091111224542
2264	Ignore-this: 9611da7ea6a4696de2a3b8c08776e6e0
2265	]
2266	[clean up uri-vs-cap terminology, emphasize cap instances instead of URI strings
2267	Brian Warner <warner@lothar.com>**20091111222619
2268	Ignore-this: 93626385f6e7f039ada71f54feefe267
2269
2270	* "cap" means a python instance which encapsulates a filecap/dircap (uri.py)
2271	* "uri" means a string with a "URI:" prefix
2272	* FileNode instances are created with (and retain) a cap instance, and
2273	generate uri strings on demand
2274	* .get_cap/get_readcap/get_verifycap/get_repaircap return cap instances
2275	* .get_uri/get_readonly_uri return uri strings
2276
2277	* add filenode.download_to_filename() for control.py, should find a better way
2278	* use MutableFileNode.init_from_cap, not .init_from_uri
2279	* directory URI instances: use get_filenode_cap, not get_filenode_uri
2280	* update/cleanup bench_dirnode.py to match, add Makefile target to run it
2281	]
2282	[add parser for immutable directory caps: DIR2-CHK, DIR2-LIT, DIR2-CHK-Verifier
2283	Brian Warner <warner@lothar.com>**20091104181351
2284	Ignore-this: 854398cc7a75bada57fa97c367b67518
2285	]
2286	[wui: s/TahoeLAFS/Tahoe-LAFS/
2287	zooko@zooko.com**20091029035050
2288	Ignore-this: 901e64cd862e492ed3132bd298583c26
2289	]
2290	[tests: bump up the timeout on test_repairer to see if 120 seconds was too short for François's ARM box to do the test even when it was doing it right.
2291	zooko@zooko.com**20091027224800
2292	Ignore-this: 95e93dc2e018b9948253c2045d506f56
2293	]
2294	[dirnode.pack_children(): add deep_immutable= argument
2295	Brian Warner <warner@lothar.com>**20091026162809
2296	Ignore-this: d5a2371e47662c4bc6eff273e8181b00
2297
2298	This will be used by DIR2:CHK to enforce the deep-immutability requirement.
2299	]
2300	[webapi: use t=mkdir-with-children instead of a children= arg to t=mkdir .
2301	Brian Warner <warner@lothar.com>**20091026011321
2302	Ignore-this: 769cab30b6ab50db95000b6c5a524916
2303
2304	This is safer: in the earlier API, an old webapi server would silently ignore
2305	the initial children, and clients trying to set them would have to fetch the
2306	newly-created directory to discover the incompatibility. In the new API,
2307	clients using t=mkdir-with-children against an old webapi server will get a
2308	clear error.
2309	]
2310	[nodemaker.create_new_mutable_directory: pack_children() in initial_contents=
2311	Brian Warner <warner@lothar.com>**20091020005118
2312	Ignore-this: bd43c4eefe06fd32b7492bcb0a55d07e
2313	instead of creating an empty file and then adding the children later.
2314
2315	This should speed up mkdir(initial_children) considerably, removing two
2316	roundtrips and an entire read-modify-write cycle, probably bringing it down
2317	to a single roundtrip. A quick test (against the volunteergrid) suggests a
2318	30% speedup.
2319
2320	test_dirnode: add new tests to enforce the restrictions that interfaces.py
2321	claims for create_new_mutable_directory(): no UnknownNodes, metadata dicts
2322	]
2323	[test_dirnode.py: add tests of initial_children= args to client.create_dirnode
2324	Brian Warner <warner@lothar.com>**20091017194159
2325	Ignore-this: 2e2da28323a4d5d815466387914abc1b
2326	and nodemaker.create_new_mutable_directory
2327	]
2328	[update many dirnode interfaces to accept dict-of-nodes instead of dict-of-caps
2329	Brian Warner <warner@lothar.com>**20091017192829
2330	Ignore-this: b35472285143862a856bf4b361d692f0
2331
2332	interfaces.py: define INodeMaker, document argument values, change
2333	create_new_mutable_directory() to take dict-of-nodes. Change
2334	dirnode.set_nodes() and dirnode.create_subdirectory() too.
2335	nodemaker.py: use INodeMaker, update create_new_mutable_directory()
2336	client.py: have create_dirnode() delegate initial_children= to nodemaker
2337	dirnode.py (Adder): take dict-of-nodes instead of list-of-nodes, which
2338	updates set_nodes() and create_subdirectory()
2339	web/common.py (convert_initial_children_json): create dict-of-nodes
2340	web/directory.py: same
2341	web/unlinked.py: same
2342	test_dirnode.py: update tests to match
2343	]
2344	[dirnode.py: move pack_children() out to a function, for eventual use by others
2345	Brian Warner <warner@lothar.com>**20091017180707
2346	Ignore-this: 6a823fb61f2c180fd38d6742d3196a7a
2347	]
2348	[move dirnode.CachingDict to dictutil.AuxValueDict, generalize method names,
2349	Brian Warner <warner@lothar.com>**20091017180005
2350	Ignore-this: b086933cf429df0fcea16a308d2640dd
2351	improve tests. Let dirnode _pack_children accept either dict or AuxValueDict.
2352	]
2353	[test/common.py: update FakeMutableFileNode to new contents= callable scheme
2354	Brian Warner <warner@lothar.com>**20091013052154
2355	Ignore-this: 62f00a76454a2190d1c8641c5993632f
2356	]
2357	[The initial_children= argument to nodemaker.create_new_mutable_directory is
2358	Brian Warner <warner@lothar.com>**20091013031922
2359	Ignore-this: 72e45317c21f9eb9ec3bd79bd4311f48
2360	now enabled.
2361	]
2362	[client.create_mutable_file(contents=) now accepts a callable, which is
2363	Brian Warner <warner@lothar.com>**20091013031232
2364	Ignore-this: 3c89d2f50c1e652b83f20bd3f4f27c4b
2365	invoked with the new MutableFileNode and is supposed to return the initial
2366	contents. This can be used by e.g. a new dirnode which needs the filenode's
2367	writekey to encrypt its initial children.
2368
2369	create_mutable_file() still accepts a bytestring too, or None for an empty
2370	file.
2371	]
2372	[webapi: t=mkdir now accepts initial children, using the same JSON that t=json
2373	Brian Warner <warner@lothar.com>**20091013023444
2374	Ignore-this: 574a46ed46af4251abf8c9580fd31ef7
2375	emits.
2376
2377	client.create_dirnode(initial_children=) now works.
2378	]
2379	[replace dirnode.create_empty_directory() with create_subdirectory(), which
2380	Brian Warner <warner@lothar.com>**20091013021520
2381	Ignore-this: 6b57cb51bcfcc6058d0df569fdc8a9cf
2382	takes an initial_children= argument
2383	]
2384	[dirnode.set_children: change return value: fire with self instead of None
2385	Brian Warner <warner@lothar.com>**20091013015026
2386	Ignore-this: f1d14e67e084e4b2a4e25fa849b0e753
2387	]
2388	[dirnode.set_nodes: change return value: fire with self instead of None
2389	Brian Warner <warner@lothar.com>**20091013014546
2390	Ignore-this: b75b3829fb53f7399693f1c1a39aacae
2391	]
2392	[dirnode.set_children: take a dict, not a list
2393	Brian Warner <warner@lothar.com>**20091013002440
2394	Ignore-this: 540ce72ce2727ee053afaae1ff124e21
2395	]
2396	[dirnode.set_uri/set_children: change signature to take writecap+readcap
2397	Brian Warner <warner@lothar.com>**20091012235126
2398	Ignore-this: 5df617b2d379a51c79148a857e6026b1
2399	instead of a single cap. The webapi t=set_children call benefits too.
2400	]
2401	[replace Client.create_empty_dirnode() with create_dirnode(), in anticipation
2402	Brian Warner <warner@lothar.com>**20091012224506
2403	Ignore-this: cbdaa4266ecb3c6496ffceab4f95709d
2404	of adding initial_children= argument.
2405
2406	Includes stubbed-out initial_children= support.
2407	]
2408	[test_web.py: use a less-fake client, making test harness smaller
2409	Brian Warner <warner@lothar.com>**20091012222808
2410	Ignore-this: 29e95147f8c94282885c65b411d100bb
2411	]
2412	[webapi.txt: document t=set_children, other small edits
2413	Brian Warner <warner@lothar.com>**20091009200446
2414	Ignore-this: 4d7e76b04a7b8eaa0a981879f778ea5d
2415	]
2416	[Verifier: check the full cryptext-hash tree on each share. Removed .todos
2417	Brian Warner <warner@lothar.com>**20091005221849
2418	Ignore-this: 6fb039c5584812017d91725e687323a5
2419	from the last few test_repairer tests that were waiting on this.
2420	]
2421	[Verifier: check the full block-hash-tree on each share
2422	Brian Warner <warner@lothar.com>**20091005214844
2423	Ignore-this: 3f7ccf6d253f32340f1bf1da27803eee
2424
2425	Removed the .todo from two test_repairer tests that check this. The only
2426	remaining .todos are on the three crypttext-hash-tree tests.
2427	]
2428	[Verifier: check the full share-hash chain on each share
2429	Brian Warner <warner@lothar.com>**20091005213443
2430	Ignore-this: 3d30111904158bec06a4eac22fd39d17
2431
2432	Removed the .todo from two test_repairer tests that check this.
2433	]
2434	[test_repairer: rename Verifier test cases to be more precise and less verbose
2435	Brian Warner <warner@lothar.com>**20091005201115
2436	Ignore-this: 64be7094e33338c7c2aea9387e138771
2437	]
2438	[immutable/checker.py: rearrange code a little bit, make it easier to follow
2439	Brian Warner <warner@lothar.com>**20091005200252
2440	Ignore-this: 91cc303fab66faf717433a709f785fb5
2441	]
2442	[test/common.py: wrap docstrings to 80cols so I can read them more easily
2443	Brian Warner <warner@lothar.com>**20091005200143
2444	Ignore-this: b180a3a0235cbe309c87bd5e873cbbb3
2445	]
2446	[immutable/download.py: wrap to 80cols, no functional changes
2447	Brian Warner <warner@lothar.com>**20091005192542
2448	Ignore-this: 6b05fe3dc6d78832323e708b9e6a1fe
2449	]
2450	[CHK-hashes.svg: cross out plaintext hashes, since we don't include
2451	Brian Warner <warner@lothar.com>**20091005010803
2452	Ignore-this: bea2e953b65ec7359363aa20de8cb603
2453	them (until we finish #453)
2454	]
2455	[docs: a few licensing clarifications requested by Ubuntu
2456	zooko@zooko.com**20090927033226
2457	Ignore-this: 749fc8c9aeb6dc643669854a3e81baa7
2458	]
2459	[setup: remove binary WinFUSE modules
2460	zooko@zooko.com**20090924211436
2461	Ignore-this: 8aefc571d2ae22b9405fc650f2c2062
2462	I would prefer to have just source code, or indications of what 3rd-party packages are required, under revision control, and have the build process generate o
2463	r acquire the binaries as needed. Also, having these in our release tarballs is interfering with getting Tahoe-LAFS uploaded into Ubuntu Karmic. (Technicall
2464	y, they would accept binary modules as long as they came with the accompanying source so that they could satisfy their obligations under GPL2+ and TGPPL1+, bu
2465	t it is easier for now to remove the binaries from the source tree.)
2466	In this case, the binaries are from the tahoe-w32-client project: http://allmydata.org/trac/tahoe-w32-client , from which you can also get the source.
2467	]
2468	[setup: remove binary _fusemodule.so 's
2469	zooko@zooko.com**20090924211130
2470	Ignore-this: 74487bbe27d280762ac5dd5f51e24186
2471	I would prefer to have just source code, or indications of what 3rd-party packages are required, under revision control, and have the build process generate or acquire the binaries as needed. Also, having these in our release tarballs is interfering with getting Tahoe-LAFS uploaded into Ubuntu Karmic. (Technically, they would accept binary modules as long as they came with the accompanying source so that they could satisfy their obligations under GPL2+ and TGPPL1+, but it is easier for now to remove the binaries from the source tree.)
2472	In this case, these modules come from the MacFUSE project: http://code.google.com/p/macfuse/
2473	]
2474	[doc: add a copy of LGPL2 for documentation purposes for ubuntu
2475	zooko@zooko.com**20090924054218
2476	Ignore-this: 6a073b48678a7c84dc4fbcef9292ab5b
2477	]
2478	[setup: remove a convenience copy of figleaf, to ease inclusion into Ubuntu Karmic Koala
2479	zooko@zooko.com**20090924053215
2480	Ignore-this: a0b0c990d6e2ee65c53a24391365ac8d
2481	We need to carefully document the licence of figleaf in order to get Tahoe-LAFS into Ubuntu Karmic Koala. However, figleaf isn't really a part of Tahoe-LAFS per se -- this is just a "convenience copy" of a development tool. The quickest way to make Tahoe-LAFS acceptable for Karmic then, is to remove figleaf from the Tahoe-LAFS tarball itself. People who want to run figleaf on Tahoe-LAFS (as everyone should want) can install figleaf themselves. I haven't tested this -- there may be incompatibilities between upstream figleaf and the copy that we had here...
2482	]
2483	[setup: shebang for misc/build-deb.py to fail quickly
2484	zooko@zooko.com**20090819135626
2485	Ignore-this: 5a1b893234d2d0bb7b7346e84b0a6b4d
2486	Without this patch, when I ran "chmod +x ./misc/build-deb.py && ./misc/build-deb.py" then it hung indefinitely. (I wonder what it was doing.)
2487	]
2488	[docs: Shawn Willden grants permission for his contributions under GPL2+\|TGPPL1+
2489	zooko@zooko.com**20090921164651
2490	Ignore-this: ef1912010d07ff2ffd9678e7abfd0d57
2491	]
2492	[docs: Csaba Henk granted permission to license fuse.py under the same terms as Tahoe-LAFS itself
2493	zooko@zooko.com**20090921154659
2494	Ignore-this: c61ba48dcb7206a89a57ca18a0450c53
2495	]
2496	[setup: mark setup.py as having utf-8 encoding in it
2497	zooko@zooko.com**20090920180343
2498	Ignore-this: 9d3850733700a44ba7291e9c5e36bb91
2499	]
2500	[doc: licensing cleanups
2501	zooko@zooko.com**20090920171631
2502	Ignore-this: 7654f2854bf3c13e6f4d4597633a6630
2503	Use nice utf-8 © instead of "(c)". Remove licensing statements on utility modules that have been assigned to allmydata.com by their original authors. (Nattraverso was not assigned to allmydata.com -- it was LGPL'ed -- but I checked and src/allmydata/util/iputil.py was completely rewritten and doesn't contain any line of code from nattraverso.) Add notes to misc/debian/copyright about licensing on files that aren't just allmydata.com-licensed.
2504	]
2505	[build-deb.py: run darcsver early, otherwise we get the wrong version later on
2506	Brian Warner <warner@lothar.com>**20090918033620
2507	Ignore-this: 6635c5b85e84f8aed0d8390490c5392a
2508	]
2509	[new approach for debian packaging, sharing pieces across distributions. Still experimental, still only works for sid.
2510	warner@lothar.com**20090818190527
2511	Ignore-this: a75eb63db9106b3269badbfcdd7f5ce1
2512	]
2513	[new experimental deb-packaging rules. Only works for sid so far.
2514	Brian Warner <warner@lothar.com>**20090818014052
2515	Ignore-this: 3a26ad188668098f8f3cc10a7c0c2f27
2516	]
2517	[setup.py: read _version.py and pass to setup(version=), so more commands work
2518	Brian Warner <warner@lothar.com>**20090818010057
2519	Ignore-this: b290eb50216938e19f72db211f82147e
2520	like "setup.py --version" and "setup.py --fullname"
2521	]
2522	[test/check_speed.py: fix shbang line
2523	Brian Warner <warner@lothar.com>**20090818005948
2524	Ignore-this: 7f3a37caf349c4c4de704d0feb561f8d
2525	]
2526	[setup: remove bundled version of darcsver-1.2.1
2527	zooko@zooko.com**20090816233432
2528	Ignore-this: 5357f26d2803db2d39159125dddb963a
2529	That version of darcsver emits a scary error message when the darcs executable or the _darcs subdirectory is not found.
2530	This error is hidden (unless the --loud option is passed) in darcsver >= 1.3.1.
2531	Fixes #788.
2532	]
2533	[de-Service-ify Helper, pass in storage_broker and secret_holder directly.
2534	Brian Warner <warner@lothar.com>**20090815201737
2535	Ignore-this: 86b8ac0f90f77a1036cd604dd1304d8b
2536	This makes it more obvious that the Helper currently generates leases with
2537	the Helper's own secrets, rather than getting values from the client, which
2538	is arguably a bug that will likely be resolved with the Accounting project.
2539	]
2540	[immutable.Downloader: pass StorageBroker to constructor, stop being a Service
2541	Brian Warner <warner@lothar.com>**20090815192543
2542	Ignore-this: af5ab12dbf75377640a670c689838479
2543	child of the client, access with client.downloader instead of
2544	client.getServiceNamed("downloader"). The single "Downloader" instance is
2545	scheduled for demolition anyways, to be replaced by individual
2546	filenode.download calls.
2547	]
2548	[tests: double the timeout on test_runner.RunNode.test_introducer since feisty hit a timeout
2549	zooko@zooko.com**20090815160512
2550	Ignore-this: ca7358bce4bdabe8eea75dedc39c0e67
2551	I'm not sure if this is an actual timing issue (feisty is running on an overloaded VM if I recall correctly), or it there is a deeper bug.
2552	]
2553	[stop making History be a Service, it wasn't necessary
2554	Brian Warner <warner@lothar.com>**20090815114415
2555	Ignore-this: b60449231557f1934a751c7effa93cfe
2556	]
2557	[Overhaul IFilesystemNode handling, to simplify tests and use POLA internally.
2558	Brian Warner <warner@lothar.com>**20090815112846
2559	Ignore-this: 1db1b9c149a60a310228aba04c5c8e5f
2560
2561	* stop using IURI as an adapter
2562	* pass cap strings around instead of URI instances
2563	* move filenode/dirnode creation duties from Client to new NodeMaker class
2564	* move other Client duties to KeyGenerator, SecretHolder, History classes
2565	* stop passing Client reference to dirnode/filenode constructors
2566	- pass less-powerful references instead, like StorageBroker or Uploader
2567	* always create DirectoryNodes by wrapping a filenode (mutable for now)
2568	* remove some specialized mock classes from unit tests
2569
2570	Detailed list of changes (done one at a time, then merged together)
2571
2572	always pass a string to create_node_from_uri(), not an IURI instance
2573	always pass a string to IFilesystemNode constructors, not an IURI instance
2574	stop using IURI() as an adapter, switch on cap prefix in create_node_from_uri()
2575	client.py: move SecretHolder code out to a separate class
2576	test_web.py: hush pyflakes
2577	client.py: move NodeMaker functionality out into a separate object
2578	LiteralFileNode: stop storing a Client reference
2579	immutable Checker: remove Client reference, it only needs a SecretHolder
2580	immutable Upload: remove Client reference, leave SecretHolder and StorageBroker
2581	immutable Repairer: replace Client reference with StorageBroker and SecretHolder
2582	immutable FileNode: remove Client reference
2583	mutable.Publish: stop passing Client
2584	mutable.ServermapUpdater: get StorageBroker in constructor, not by peeking into Client reference
2585	MutableChecker: reference StorageBroker and History directly, not through Client
2586	mutable.FileNode: removed unused indirection to checker classes
2587	mutable.FileNode: remove Client reference
2588	client.py: move RSA key generation into a separate class, so it can be passed to the nodemaker
2589	move create_mutable_file() into NodeMaker
2590	test_dirnode.py: stop using FakeClient mockups, use NoNetworkGrid instead. This simplifies the code, but takes longer to run (17s instead of 6s). This should come down later when other cleanups make it possible to use simpler (non-RSA) fake mutable files for dirnode tests.
2591	test_mutable.py: clean up basedir names
2592	client.py: move create_empty_dirnode() into NodeMaker
2593	dirnode.py: get rid of DirectoryNode.create
2594	remove DirectoryNode.init_from_uri, refactor NodeMaker for customization, simplify test_web's mock Client to match
2595	stop passing Client to DirectoryNode, make DirectoryNode.create_with_mutablefile the normal DirectoryNode constructor, start removing client from NodeMaker
2596	remove Client from NodeMaker
2597	move helper status into History, pass History to web.Status instead of Client
2598	test_mutable.py: fix minor typo
2599	]
2600	[docs: edits for docs/running.html from Sam Mason
2601	zooko@zooko.com**20090809201416
2602	Ignore-this: 2207e80449943ebd4ed50cea57c43143
2603	]
2604	[docs: install.html: instruct Debian users to use this document and not to go find the DownloadDebianPackages page, ignore the warning at the top of it, and try it
2605	zooko@zooko.com**20090804123840
2606	Ignore-this: 49da654f19d377ffc5a1eff0c820e026
2607	http://allmydata.org/pipermail/tahoe-dev/2009-August/002507.html
2608	]
2609	[docs: relnotes.txt: reflow to 63 chars wide because google groups and some web forms seem to wrap to that
2610	zooko@zooko.com**20090802135016
2611	Ignore-this: 53b1493a0491bc30fb2935fad283caeb
2612	]
2613	[docs: about.html: fix English usage noticed by Amber
2614	zooko@zooko.com**20090802050533
2615	Ignore-this: 89965c4650f9bd100a615c401181a956
2616	]
2617	[docs: fix mis-spelled word in about.html
2618	zooko@zooko.com**20090802050320
2619	Ignore-this: fdfd0397bc7cef9edfde425dddeb67e5
2620	]
2621	[TAG allmydata-tahoe-1.5.0
2622	zooko@zooko.com**20090802031303
2623	Ignore-this: 94e5558e7225c39a86aae666ea00f166
2624	]
2625	Patch bundle hash:
2626	df5b24ed869925e246ca06bacd5b041d47b82eaf

Download in other formats:

Original Format