Ticket #393: misc-docs-davidsarah.darcs.patch

5 patches for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:

Thu Aug 11 00:57:06 BST 2011  david-sarah@jacaranda.org
  * docs/frontends/webapi.txt: clean up formatting (reflow).

Thu Aug 11 01:00:13 BST 2011  david-sarah@jacaranda.org
  * docs/frontends/webapi.txt: clean up formatting (tabs->spaces).

Thu Aug 11 01:01:58 BST 2011  david-sarah@jacaranda.org
  * docs/frontends/webapi.txt: minor corrections; remove reference to test grid.

Fri Aug 12 16:48:08 BST 2011  david-sarah@jacaranda.org
  * docs/configuration.rst: add section about the types of node, and clarify when setting web.port enables web-API service. refs #1444

Tue Aug 23 02:24:31 BST 2011  david-sarah@jacaranda.org
  * Minor improvements to documentation for MDMF. refs #393

New patches:

[docs/frontends/webapi.txt: clean up formatting (reflow).
david-sarah@jacaranda.org**20110810235706
 Ignore-this: d87a5a64d906067153182056616d4eeb
] {
hunk ./docs/frontends/webapi.rst 114
 actions to upload, rename, and unlink files.
 
 When an error occurs, the HTTP response code will be set to an appropriate
-400-series code (like 404 Not Found for an unknown childname, or 400 Bad Request
-when the parameters to a web-API operation are invalid), and the HTTP response
-body will usually contain a few lines of explanation as to the cause of the
-error and possible responses. Unusual exceptions may result in a 500 Internal
-Server Error as a catch-all, with a default response body containing
-a Nevow-generated HTML-ized representation of the Python exception stack trace
-that caused the problem. CLI programs which want to copy the response body to
-stderr should provide an "Accept: text/plain" header to their requests to get
-a plain text stack trace instead. If the Accept header contains ``*/*``, or
-``text/*``, or text/html (or if there is no Accept header), HTML tracebacks will
-be generated.
+400-series code (like 404 Not Found for an unknown childname, or
+400 Bad Request when the parameters to a web-API operation are invalid), and
+the HTTP response body will usually contain a few lines of explanation as to
+the cause of the error and possible responses. Unusual exceptions may result
+in a 500 Internal Server Error as a catch-all, with a default response body
+containing a Nevow-generated HTML-ized representation of the Python exception
+stack trace that caused the problem. CLI programs that want to copy the
+response body to stderr should provide an "Accept: text/plain" header to
+their requests to get a plain text stack trace instead. If the Accept header
+contains ``*/*``, or ``text/*``, or text/html (or if there is no Accept
+header), HTML tracebacks will be generated.
 
 
 URLs
hunk ./docs/frontends/webapi.rst 189
 Child Lookup
 ------------
 
-Tahoe directories contain named child entries, just like directories in a regular
-local filesystem. These child entries, called "dirnodes", consist of a name,
-metadata, a write slot, and a read slot. The write and read slots normally contain
-a write-cap and read-cap referring to the same object, which can be either a file
-or a subdirectory. The write slot may be empty (actually, both may be empty,
-but that is unusual).
+Tahoe directories contain named child entries, just like directories in a
+regular local filesystem. These child entries, called "dirnodes", consist of
+a name, metadata, a write slot, and a read slot. The write and read slots
+normally contain a write-cap and read-cap referring to the same object, which
+can be either a file or a subdirectory. The write slot may be empty (actually,
+both may be empty, but that is unusual).
 
 If you have a Tahoe URL that refers to a directory, and want to reference a
 named child inside it, just append the child name to the URL. For example, if
hunk ./docs/frontends/webapi.rst 365
  retrieve the same contents that were just uploaded. This will create any
  necessary intermediate subdirectories.
 
- To use the /uri/$FILECAP form, $FILECAP must be a write-cap for a mutable file.
+ To use the /uri/$FILECAP form, $FILECAP must be a write-cap for a mutable
+ file.
 
  In the /uri/$DIRCAP/[SUBDIRS../]FILENAME form, if the target file is a
  writeable mutable file, that file's contents will be overwritten
merger 0.0 (
hunk ./docs/frontends/webapi.rst 369
- writeable mutable file, that file's contents will be overwritten in-place. If
- it is a read-cap for a mutable file, an error will occur. If it is an
- immutable file, the old file will be discarded, and a new one will be put in
- its place.
+ writeable mutable file, that file's contents will be overwritten
+ in-place. If it is a read-cap for a mutable file, an error will occur.
+ If it is an immutable file, the old file will be discarded, and a new
+ one will be put in its place. If the target file is a writable mutable
+ file, you may also specify an "offset" parameter -- a byte offset that
+ determines where in the mutable file the data from the HTTP request
+ body is placed. This operation is relatively efficient for MDMF mutable
+ files, and is relatively inefficient (but still supported) for SDMF
+ mutable files. If no offset parameter is specified, then the entire
+ file is replaced with the data from the HTTP request body. For an
+ immutable file, the "offset" parameter is not valid.
hunk ./docs/frontends/webapi.rst 369
- writeable mutable file, that file's contents will be overwritten in-place. If
- it is a read-cap for a mutable file, an error will occur. If it is an
+ writeable mutable file, that file's contents will be overwritten in-place.
+ If it is a read-cap for a mutable file, an error will occur. If it is an
)
hunk ./docs/frontends/webapi.rst 474
  writing a directory the web-API client should ensure that the contents
  of "rw_uri" and "ro_uri" for a given PROPDICT are a consistent
  (write cap, read cap) pair if possible. If the web-API client only has
- one cap and does not know whether it is a write cap or read cap, then
- it is acceptable to set "rw_uri" to that cap and omit "ro_uri". The
- client must not put a write cap into a "ro_uri" field.
+ one cap and does not know whether it is a write cap or read cap, then it is
+ acceptable to set "rw_uri" to that cap and omit "ro_uri". The client must
+ not put a write cap into a "ro_uri" field.
 
  The metadata may have a "no-write" field. If this is set to true in the
  metadata of a link, it will not be possible to open that link for writing
hunk ./docs/frontends/webapi.rst 502
  immutable files, literal files, and deep-immutable directories.
 
  For forward-compatibility, a deep-immutable directory can also contain caps
- in a format that is unknown to the web-API server. When such caps are retrieved
- from a deep-immutable directory in a "ro_uri" field, they will be prefixed
- with the string "imm.", indicating that they must not be decoded without
- checking that they are immutable. The "imm." prefix must not be stripped
- off without performing this check. (Future versions of the web-API server
- will perform it where necessary.)
+ in a format that is unknown to the web-API server. When such caps are
+ retrieved from a deep-immutable directory in a "ro_uri" field, they will be
+ prefixed with the string "imm.", indicating that they must not be decoded
+ without checking that they are immutable. The "imm." prefix must not be
+ stripped off without performing this check. (Future versions of the web-API
+ server will perform it where necessary.)
  
  The cap for each child may be given either in the "rw_uri" or "ro_uri"
  field of the PROPDICT (not both). If a cap is given in the "rw_uri" field,
hunk ./docs/frontends/webapi.rst 576
  the parent names, preventing the server from creating the necessary parent
  directory, or if it would require changing any immutable directory.
 
- The URL of this operation points to the parent of the bottommost new directory,
- whereas the /uri/$DIRCAP/[SUBDIRS../]SUBDIR?t=mkdir operation above has a URL
- that points directly to the bottommost new directory.
+ The URL of this operation points to the parent of the bottommost new
+ directory, whereas the /uri/$DIRCAP/[SUBDIRS../]SUBDIR?t=mkdir operation
+ above has a URL that points directly to the bottommost new directory.
 
 ``POST /uri/$DIRCAP/[SUBDIRS../]?t=mkdir-with-children&name=NAME``
 
hunk ./docs/frontends/webapi.rst 620
 ``GET /uri/$DIRCAP/[SUBDIRS../]FILENAME?t=json``
 
  This returns a machine-parseable JSON-encoded description of the given
- object. The JSON always contains a list, and the first element of the list is
- always a flag that indicates whether the referenced object is a file or a
- directory. If it is a capability to a file, then the information includes
+ object. The JSON always contains a list, and the first element of the list
+ is always a flag that indicates whether the referenced object is a file or
+ a directory. If it is a capability to a file, then the information includes
  file size and URI, like this::
 
   GET /uri/$FILECAP?t=json :
hunk ./docs/frontends/webapi.rst 804
    contents-or-metadata change (if "tahoe backup" was run on a different
    operating system).
 
-3. You might be confused by the fact that changing the contents of a
-   mutable file in Tahoe doesn't have any effect on any links pointing at
-   that file in any directories, although "tahoe backup" sets the link
-   'ctime'/'mtime' to reflect timestamps about the local file corresponding
-   to the Tahoe file to which the link points.
+3. You might be confused by the fact that changing the contents of a mutable
+   file in Tahoe doesn't have any effect on any links pointing at that file
+   in any directories, although "tahoe backup" sets the link 'ctime'/'mtime'
+   to reflect timestamps about the local file corresponding to the Tahoe file
+   to which the link points.
 
 4. Also, quite apart from Tahoe, you might be confused about the meaning
    of the "ctime" in UNIX local filesystems, which people sometimes think
hunk ./docs/frontends/webapi.rst 842
  location. To prevent this (and make the operation return an error instead
  of overwriting), add a "replace=false" argument, as "?t=uri&replace=false".
  With replace=false, this operation will return an HTTP 409 "Conflict" error
- if there is already an object at the given location, rather than
- overwriting the existing object. To allow the operation to overwrite a
- file, but return an error when trying to overwrite a directory, use
- "replace=only-files" (this behavior is closer to the traditional UNIX "mv"
- command). Note that "true", "t", and "1" are all synonyms for "True", and
- "false", "f", and "0" are synonyms for "False", and the parameter is
- case-insensitive.
+ if there is already an object at the given location, rather than overwriting
+ the existing object. To allow the operation to overwrite a file, but return
+ an error when trying to overwrite a directory, use "replace=only-files"
+ (this behavior is closer to the traditional UNIX "mv" command). Note that
+ "true", "t", and "1" are all synonyms for "True", and "false", "f", and "0"
+ are synonyms for "False", and the parameter is case-insensitive.
  
hunk ./docs/frontends/webapi.rst 849
- Note that this operation does not take its child cap in the form of
- separate "rw_uri" and "ro_uri" fields. Therefore, it cannot accept a
- child cap in a format unknown to the web-API server, unless its URI
- starts with "ro." or "imm.". This restriction is necessary because the
- server is not able to attenuate an unknown write cap to a read cap.
- Unknown URIs starting with "ro." or "imm.", on the other hand, are
- assumed to represent read caps. The client should not prefix a write
- cap with "ro." or "imm." and pass it to this operation, since that
- would result in granting the cap's write authority to holders of the
- directory read cap.
+ Note that this operation does not take its child cap in the form of separate
+ "rw_uri" and "ro_uri" fields. Therefore, it cannot accept a child cap in a
+ format unknown to the web-API server, unless its URI starts with "ro." or
+ "imm.". This restriction is necessary because the server is not able to
+ attenuate an unknown write cap to a read cap. Unknown URIs starting with
+ "ro." or "imm.", on the other hand, are assumed to represent read caps.
+ The client should not prefix a write cap with "ro." or "imm." and pass it
+ to this operation, since that would result in granting the cap's write
+ authority to holders of the directory read cap.
 
 
 Adding Multiple Files or Directories to a Parent Directory at Once
hunk ./docs/frontends/webapi.rst 875
  "children" value returned by the "GET /uri/$DIRCAP?t=json" operation
  described above. In this format, each key is a child names, and the
  corresponding value is a tuple of (type, childinfo). "type" is ignored, and
- "childinfo" is a dictionary that contains "rw_uri", "ro_uri", and
- "metadata" keys. You can take the output of "GET /uri/$DIRCAP1?t=json" and
- use it as the input to "POST /uri/$DIRCAP2?t=set_children" to make DIR2
- look very much like DIR1 (except for any existing children of DIR2 that
- were not overwritten, and any existing "tahoe" metadata keys as described
- below).
+ "childinfo" is a dictionary that contains "rw_uri", "ro_uri", and "metadata"
+ keys. You can take the output of "GET /uri/$DIRCAP1?t=json" and use it as
+ the input to "POST /uri/$DIRCAP2?t=set_children" to make DIR2 look very
+ much like DIR1 (except for any existing children of DIR2 that were not
+ overwritten, and any existing "tahoe" metadata keys as described below).
 
  When the set_children request contains a child name that already exists in
  the target directory, this command defaults to overwriting that child with
hunk ./docs/frontends/webapi.rst 1193
  unlinked from the parent. Unlike deleting a subdirectory in a UNIX local
  filesystem, the subtree need not be empty; if it isn't, then other references
  into the subtree will see that the child subdirectories are not modified by
- this operation. Only the link from the given directory to its child is severed.
+ this operation. Only the link from the given directory to its child is
+ severed.
 
hunk ./docs/frontends/webapi.rst 1196
- In Tahoe-LAFS v1.9.0 and later, t=unlink can be used as a synonym for t=delete.
- If interoperability with older web-API servers is required, t=delete should
- be used.
+ In Tahoe-LAFS v1.9.0 and later, t=unlink can be used as a synonym for
+ t=delete. If interoperability with older web-API servers is required,
+ t=delete should be used.
 
 
 Renaming A Child
hunk ./docs/frontends/webapi.rst 1860
 Tahoe provides a mutable filesystem, but the ways that the filesystem can
 change are limited. The only thing that can change is that the mapping from
 child names to child objects that each directory contains can be changed by
-adding a new child name pointing to an object, removing an existing child name,
-or changing an existing child name to point to a different object.
+adding a new child name pointing to an object, removing an existing child
+name, or changing an existing child name to point to a different object.
 
 Obviously if you query Tahoe for information about the filesystem and then act
 to change the filesystem (such as by getting a listing of the contents of a
hunk ./docs/frontends/webapi.rst 1870
 if you use the URI instead of the pathname of an object when you act upon the
 object, then the only change that can happen is if the object is a directory
 then the set of child names it has might be different. If, on the other hand,
-you act upon the object using its pathname, then a different object might be in
-that place, which can result in more kinds of surprises.
+you act upon the object using its pathname, then a different object might be
+in that place, which can result in more kinds of surprises.
 
 For example, suppose you are writing code which recursively downloads the
 contents of a directory. The first thing your code does is fetch the listing
hunk ./docs/frontends/webapi.rst 1946
 Tahoe-1.1; back with Tahoe-1.0 the web client was responsible for serializing
 web requests themselves).
 
-For more details, please see the "Consistency vs Availability" and "The Prime
-Coordination Directive" sections of `mutable.rst <../specifications/mutable.rst>`_.
+For more details, please see the "Consistency vs Availability" and
+"The Prime Coordination Directive" sections of `mutable.rst
+<../specifications/mutable.rst>`_.
 
 
 .. [1] URLs and HTTP and UTF-8, Oh My
hunk ./docs/frontends/webapi.rst 1960
  URL-escaped UTF-8 encoded Unicode string.
  For example, suppose we want to provoke the server into using a filename of
  "f i a n c e-acute e" (i.e. f i a n c U+00E9 e). The UTF-8 encoding of this
- is 0x66 0x69 0x61 0x6e 0x63 0xc3 0xa9 0x65 (or "fianc\\xC3\\xA9e", as python's
- ``repr()`` function would show). To encode this into a URL, the non-printable
- characters must be escaped with the urlencode ``%XX`` mechanism, giving
- us "fianc%C3%A9e". Thus, the first line of the HTTP request will be
- "``GET /uri/CAP...?save=true&filename=fianc%C3%A9e HTTP/1.1``". Not all
- browsers provide this: IE7 by default uses the Latin-1 encoding, which is
- "fianc%E9e" (although it has a configuration option to send URLs as UTF-8).
+ is 0x66 0x69 0x61 0x6e 0x63 0xc3 0xa9 0x65 (or "fianc\\xC3\\xA9e", as
+ Python's ``repr()`` function would show). To encode this into a URL, the
+ non-printable characters must be escaped with the urlencode ``%XX``
+ mechanism, giving us "fianc%C3%A9e". Thus, the first line of the HTTP request
+ will be "``GET /uri/CAP...?save=true&filename=fianc%C3%A9e HTTP/1.1``".
+ Not all browsers provide this: IE7 by default uses the Latin-1 encoding,
+ which is "fianc%E9e" (although it has a configuration option to send URLs
+ as UTF-8).
 
  The response header will need to indicate a non-ASCII filename. The actual
  mechanism to do this is not clear. For ASCII filenames, the response header
}
[docs/frontends/webapi.txt: clean up formatting (tabs->spaces).
david-sarah@jacaranda.org**20110811000013
 Ignore-this: 4021abb804775e78fe317d577d8e4803
] {
hunk ./docs/frontends/webapi.rst 9
 2.  `Basic Concepts: GET, PUT, DELETE, POST`_
 3.  `URLs`_
 
-       1. `Child Lookup`_
+    1. `Child Lookup`_
 
 4.  `Slow Operations, Progress, and Cancelling`_
 5.  `Programmatic Operations`_
hunk ./docs/frontends/webapi.rst 628
   GET /uri/$FILECAP?t=json :
 
    [ "filenode", {
-        "ro_uri": file_uri,
-        "verify_uri": verify_uri,
-        "size": bytes,
-        "mutable": false
-        } ]
+       "ro_uri": file_uri,
+       "verify_uri": verify_uri,
+       "size": bytes,
+       "mutable": false
+       } ]
 
  If it is a capability to a directory followed by a path from that directory
  to a file, then the information also includes metadata from the link to the
hunk ./docs/frontends/webapi.rst 641
   GET /uri/$DIRCAP/[SUBDIRS../]FILENAME?t=json
 
    [ "filenode", {
-        "ro_uri": file_uri,
-        "verify_uri": verify_uri,
-        "size": bytes,
-        "mutable": false,
-        "metadata": {
-          "ctime": 1202777696.7564139,
-          "mtime": 1202777696.7564139,
-          "tahoe": {
-                "linkcrtime": 1202777696.7564139,
-                "linkmotime": 1202777696.7564139
-                } } } ]
+       "ro_uri": file_uri,
+       "verify_uri": verify_uri,
+       "size": bytes,
+       "mutable": false,
+       "metadata": {
+         "ctime": 1202777696.7564139,
+         "mtime": 1202777696.7564139,
+         "tahoe": {
+           "linkcrtime": 1202777696.7564139,
+           "linkmotime": 1202777696.7564139
+           } } } ]
 
  If it is a directory, then it includes information about the children of
  this directory, as a mapping from child name to a set of data about the
hunk ./docs/frontends/webapi.rst 664
   GET /uri/$DIRCAP/[SUBDIRS../]SUBDIR?t=json :
 
    [ "dirnode", {
-        "rw_uri": read_write_uri,
-        "ro_uri": read_only_uri,
-        "verify_uri": verify_uri,
-        "mutable": true,
-        "children": {
-          "foo.txt": [ "filenode", {
-                  "ro_uri": uri,
-                  "size": bytes,
-                  "metadata": {
-                        "ctime": 1202777696.7564139,
-                        "mtime": 1202777696.7564139,
-                        "tahoe": {
-                          "linkcrtime": 1202777696.7564139,
-                          "linkmotime": 1202777696.7564139
-                          } } } ],
-          "subdir":  [ "dirnode", {
-                  "rw_uri": rwuri,
-                  "ro_uri": rouri,
-                  "metadata": {
-                        "ctime": 1202778102.7589991,
-                        "mtime": 1202778111.2160511,
-                        "tahoe": {
-                          "linkcrtime": 1202777696.7564139,
-                          "linkmotime": 1202777696.7564139
-                        } } } ]
-        } } ]
+       "rw_uri": read_write_uri,
+       "ro_uri": read_only_uri,
+       "verify_uri": verify_uri,
+       "mutable": true,
+       "children": {
+         "foo.txt": [ "filenode", {
+             "ro_uri": uri,
+             "size": bytes,
+             "metadata": {
+               "ctime": 1202777696.7564139,
+               "mtime": 1202777696.7564139,
+               "tahoe": {
+                 "linkcrtime": 1202777696.7564139,
+                 "linkmotime": 1202777696.7564139
+                 } } } ],
+         "subdir":  [ "dirnode", {
+             "rw_uri": rwuri,
+             "ro_uri": rouri,
+             "metadata": {
+               "ctime": 1202778102.7589991,
+               "mtime": 1202778111.2160511,
+               "tahoe": {
+                 "linkcrtime": 1202777696.7564139,
+                 "linkmotime": 1202777696.7564139
+               } } } ]
+       } } ]
 
  In the above example, note how 'children' is a dictionary in which the keys
  are child names and the values depend upon whether the child is a file or a
hunk ./docs/frontends/webapi.rst 709
   GET /uri/$UNKNOWNCAP?t=json :
 
    [ "unknown", {
-        "ro_uri": unknown_read_uri
-        } ]
+       "ro_uri": unknown_read_uri
+       } ]
 
   GET /uri/$DIRCAP/[SUBDIRS../]UNKNOWNCHILDNAME?t=json :
 
hunk ./docs/frontends/webapi.rst 715
    [ "unknown", {
-        "rw_uri": unknown_write_uri,
-        "ro_uri": unknown_read_uri,
-        "mutable": true,
-        "metadata": {
-          "ctime": 1202777696.7564139,
-          "mtime": 1202777696.7564139,
-          "tahoe": {
-                "linkcrtime": 1202777696.7564139,
-                "linkmotime": 1202777696.7564139
-                } } } ]
+       "rw_uri": unknown_write_uri,
+       "ro_uri": unknown_read_uri,
+       "mutable": true,
+       "metadata": {
+         "ctime": 1202777696.7564139,
+         "mtime": 1202777696.7564139,
+         "tahoe": {
+           "linkcrtime": 1202777696.7564139,
+           "linkmotime": 1202777696.7564139
+           } } } ]
 
  As in the case of file nodes, the metadata will only be present when the
  capability is to a directory followed by a path. The "mutable" field is also
hunk ./docs/frontends/webapi.rst 1274
  dictionary with the following keys::
 
   storage-index: a base32-encoded string with the objects's storage index,
-                                or an empty string for LIT files
+                 or an empty string for LIT files
   summary: a string, with a one-line summary of the stats of the file
   results: a dictionary that describes the state of the file. For LIT files,
hunk ./docs/frontends/webapi.rst 1277
-                  this dictionary has only the 'healthy' key, which will always be
-                  True. For distributed files, this dictionary has the following
-                  keys:
-       count-shares-good: the number of good shares that were found
-       count-shares-needed: 'k', the number of shares required for recovery
-       count-shares-expected: 'N', the number of total shares generated
-       count-good-share-hosts: this was intended to be the number of distinct
-                                                       storage servers with good shares. It is currently
-                                                       (as of Tahoe-LAFS v1.8.0) computed incorrectly;
-                                                       see ticket #1115.
-       count-wrong-shares: for mutable files, the number of shares for
-                                               versions other than the 'best' one (highest
-                                               sequence number, highest roothash). These are
-                                               either old ...
-       count-recoverable-versions: for mutable files, the number of
-                                                               recoverable versions of the file. For
-                                                               a healthy file, this will equal 1.
-       count-unrecoverable-versions: for mutable files, the number of
-                                                                 unrecoverable versions of the file.
-                                                                 For a healthy file, this will be 0.
-       count-corrupt-shares: the number of shares with integrity failures
-       list-corrupt-shares: a list of "share locators", one for each share
-                                                that was found to be corrupt. Each share locator
-                                                is a list of (serverid, storage_index, sharenum).
-       needs-rebalancing: (bool) True if there are multiple shares on a single
-                                          storage server, indicating a reduction in reliability
-                                          that could be resolved by moving shares to new
-                                          servers.
-       servers-responding: list of base32-encoded storage server identifiers,
-                                               one for each server which responded to the share
-                                               query.
-       healthy: (bool) True if the file is completely healthy, False otherwise.
-                        Healthy files have at least N good shares. Overlapping shares
-                        do not currently cause a file to be marked unhealthy. If there
-                        are at least N good shares, then corrupt shares do not cause the
-                        file to be marked unhealthy, although the corrupt shares will be
-                        listed in the results (list-corrupt-shares) and should be manually
-                        removed to wasting time in subsequent downloads (as the
-                        downloader rediscovers the corruption and uses alternate shares).
-                        Future compatibility: the meaning of this field may change to
-                        reflect whether the servers-of-happiness criterion is met
-                        (see ticket #614).
-       sharemap: dict mapping share identifier to list of serverids
-                         (base32-encoded strings). This indicates which servers are
-                         holding which shares. For immutable files, the shareid is
-                         an integer (the share number, from 0 to N-1). For
-                         immutable files, it is a string of the form
-                         'seq%d-%s-sh%d', containing the sequence number, the
-                         roothash, and the share number.
+           this dictionary has only the 'healthy' key, which will always be
+           True. For distributed files, this dictionary has the following
+           keys:
+    count-shares-good: the number of good shares that were found
+    count-shares-needed: 'k', the number of shares required for recovery
+    count-shares-expected: 'N', the number of total shares generated
+    count-good-share-hosts: this was intended to be the number of distinct
+                            storage servers with good shares. It is currently
+                            (as of Tahoe-LAFS v1.8.0) computed incorrectly;
+                            see ticket #1115.
+    count-wrong-shares: for mutable files, the number of shares for
+                        versions other than the 'best' one (highest
+                        sequence number, highest roothash). These are
+                        either old ...
+    count-recoverable-versions: for mutable files, the number of
+                                recoverable versions of the file. For
+                                a healthy file, this will equal 1.
+    count-unrecoverable-versions: for mutable files, the number of
+                                  unrecoverable versions of the file.
+                                  For a healthy file, this will be 0.
+    count-corrupt-shares: the number of shares with integrity failures
+    list-corrupt-shares: a list of "share locators", one for each share
+                         that was found to be corrupt. Each share locator
+                         is a list of (serverid, storage_index, sharenum).
+    needs-rebalancing: (bool) True if there are multiple shares on a single
+                       storage server, indicating a reduction in reliability
+                       that could be resolved by moving shares to new
+                       servers.
+    servers-responding: list of base32-encoded storage server identifiers,
+                        one for each server which responded to the share
+                        query.
+    healthy: (bool) True if the file is completely healthy, False otherwise.
+             Healthy files have at least N good shares. Overlapping shares
+             do not currently cause a file to be marked unhealthy. If there
+             are at least N good shares, then corrupt shares do not cause the
+             file to be marked unhealthy, although the corrupt shares will be
+             listed in the results (list-corrupt-shares) and should be
+             manually removed to wasting time in subsequent downloads (as the
+             downloader rediscovers the corruption and uses alternate shares).
+             Future compatibility: the meaning of this field may change to
+             reflect whether the servers-of-happiness criterion is met
+             (see ticket #614).
+    sharemap: dict mapping share identifier to list of serverids
+              (base32-encoded strings). This indicates which servers are
+              holding which shares. For immutable files, the shareid is
+              an integer (the share number, from 0 to N-1). For
+              immutable files, it is a string of the form
+              'seq%d-%s-sh%d', containing the sequence number, the
+              roothash, and the share number.
 
 ``POST $URL?t=start-deep-check``    (must add &ophandle=XYZ)
 
hunk ./docs/frontends/webapi.rst 1360
  machine-readable JSON dictionary with the following keys::
 
   finished: a boolean, True if the operation is complete, else False. Some
-                       of the remaining keys may not be present until the operation
-                       is complete.
+            of the remaining keys may not be present until the operation
+            is complete.
   root-storage-index: a base32-encoded string with the storage index of the
hunk ./docs/frontends/webapi.rst 1363
-                                         starting point of the deep-check operation
+                      starting point of the deep-check operation
   count-objects-checked: count of how many objects were checked. Note that
hunk ./docs/frontends/webapi.rst 1365
-                                                non-distributed objects (i.e. small immutable LIT
-                                                files) are not checked, since for these objects,
-                                                the data is contained entirely in the URI.
+                         non-distributed objects (i.e. small immutable LIT
+                         files) are not checked, since for these objects,
+                         the data is contained entirely in the URI.
   count-objects-healthy: how many of those objects were completely healthy
   count-objects-unhealthy: how many were damaged in some way
   count-corrupt-shares: how many shares were found to have corruption,
hunk ./docs/frontends/webapi.rst 1371
-                                               summed over all objects examined
+                        summed over all objects examined
   list-corrupt-shares: a list of "share identifiers", one for each share
hunk ./docs/frontends/webapi.rst 1373
-                                          that was found to be corrupt. Each share identifier
-                                          is a list of (serverid, storage_index, sharenum).
+                       that was found to be corrupt. Each share identifier
+                       is a list of (serverid, storage_index, sharenum).
   list-unhealthy-files: a list of (pathname, check-results) tuples, for
hunk ./docs/frontends/webapi.rst 1376
-                                               each file that was not fully healthy. 'pathname' is
-                                               a list of strings (which can be joined by "/"
-                                               characters to turn it into a single string),
-                                               relative to the directory on which deep-check was
-                                               invoked. The 'check-results' field is the same as
-                                               that returned by t=check&output=JSON, described
-                                               above.
+                        each file that was not fully healthy. 'pathname' is
+                        a list of strings (which can be joined by "/"
+                        characters to turn it into a single string),
+                        relative to the directory on which deep-check was
+                        invoked. The 'check-results' field is the same as
+                        that returned by t=check&output=JSON, described
+                        above.
   stats: a dictionary with the same keys as the t=start-deep-stats command
hunk ./docs/frontends/webapi.rst 1384
-                (described below)
+         (described below)
 
 ``POST $URL?t=stream-deep-check``
 
hunk ./docs/frontends/webapi.rst 1452
  will contain the following keys::
 
   storage-index: a base32-encoded string with the objects's storage index,
-                                or an empty string for LIT files
+                 or an empty string for LIT files
   repair-attempted: (bool) True if repair was attempted
   repair-successful: (bool) True if repair was attempted and the file was
hunk ./docs/frontends/webapi.rst 1455
-                                        fully healthy afterwards. False if no repair was
-                                        attempted, or if a repair attempt failed.
+                     fully healthy afterwards. False if no repair was
+                     attempted, or if a repair attempt failed.
   pre-repair-results: a dictionary that describes the state of the file
hunk ./docs/frontends/webapi.rst 1458
-                                         before any repair was performed. This contains exactly
-                                         the same keys as the 'results' value of the t=check
-                                         response, described above.
+                      before any repair was performed. This contains exactly
+                      the same keys as the 'results' value of the t=check
+                      response, described above.
   post-repair-results: a dictionary that describes the state of the file
hunk ./docs/frontends/webapi.rst 1462
-                                          after any repair was performed. If no repair was
-                                          performed, post-repair-results and pre-repair-results
-                                          will be the same. This contains exactly the same keys
-                                          as the 'results' value of the t=check response,
-                                          described above.
+                       after any repair was performed. If no repair was
+                       performed, post-repair-results and pre-repair-results
+                       will be the same. This contains exactly the same keys
+                       as the 'results' value of the t=check response,
+                       described above.
 
 ``POST $URL?t=start-deep-check&repair=true``    (must add &ophandle=XYZ)
 
hunk ./docs/frontends/webapi.rst 1484
 
   finished: (bool) True if the operation has completed, else False
   root-storage-index: a base32-encoded string with the storage index of the
-                                         starting point of the deep-check operation
+                      starting point of the deep-check operation
   count-objects-checked: count of how many objects were checked
 
   count-objects-healthy-pre-repair: how many of those objects were completely
hunk ./docs/frontends/webapi.rst 1488
-                                                                       healthy, before any repair
+                                    healthy, before any repair
   count-objects-unhealthy-pre-repair: how many were damaged in some way
   count-objects-healthy-post-repair: how many of those objects were completely
hunk ./docs/frontends/webapi.rst 1491
-                                                                         healthy, after any repair
+                                      healthy, after any repair
   count-objects-unhealthy-post-repair: how many were damaged in some way
 
   count-repairs-attempted: repairs were attempted on this many objects.
hunk ./docs/frontends/webapi.rst 1497
   count-repairs-successful: how many repairs resulted in healthy objects
   count-repairs-unsuccessful: how many repairs resulted did not results in
-                                                         completely healthy objects
+                              completely healthy objects
   count-corrupt-shares-pre-repair: how many shares were found to have
hunk ./docs/frontends/webapi.rst 1499
-                                                                  corruption, summed over all objects
-                                                                  examined, before any repair
+                                   corruption, summed over all objects
+                                   examined, before any repair
   count-corrupt-shares-post-repair: how many shares were found to have
hunk ./docs/frontends/webapi.rst 1502
-                                                                       corruption, summed over all objects
-                                                                       examined, after any repair
+                                    corruption, summed over all objects
+                                    examined, after any repair
   list-corrupt-shares: a list of "share identifiers", one for each share
hunk ./docs/frontends/webapi.rst 1505
-                                          that was found to be corrupt (before any repair).
-                                          Each share identifier is a list of (serverid,
-                                          storage_index, sharenum).
+                       that was found to be corrupt (before any repair).
+                       Each share identifier is a list of (serverid,
+                       storage_index, sharenum).
   list-remaining-corrupt-shares: like list-corrupt-shares, but mutable shares
hunk ./docs/frontends/webapi.rst 1509
-                                                                that were successfully repaired are not
-                                                                included. These are shares that need
-                                                                manual processing. Since immutable shares
-                                                                cannot be modified by clients, all corruption
-                                                                in immutable shares will be listed here.
+                                 that were successfully repaired are not
+                                 included. These are shares that need
+                                 manual processing. Since immutable shares
+                                 cannot be modified by clients, all corruption
+                                 in immutable shares will be listed here.
   list-unhealthy-files: a list of (pathname, check-results) tuples, for
hunk ./docs/frontends/webapi.rst 1515
-                                               each file that was not fully healthy. 'pathname' is
-                                               relative to the directory on which deep-check was
-                                               invoked. The 'check-results' field is the same as
-                                               that returned by t=check&repair=true&output=JSON,
-                                               described above.
+                        each file that was not fully healthy. 'pathname' is
+                        relative to the directory on which deep-check was
+                        invoked. The 'check-results' field is the same as
+                        that returned by t=check&repair=true&output=JSON,
+                        described above.
   stats: a dictionary with the same keys as the t=start-deep-stats command
hunk ./docs/frontends/webapi.rst 1521
-                (described below)
+         (described below)
 
 ``POST $URL?t=stream-deep-check&repair=true``
 
hunk ./docs/frontends/webapi.rst 1577
   verifycaps: list of (printable) verify cap strings
   storage-index: list of (base32) storage index strings
   stats: a dictionary with the same keys as the t=start-deep-stats command
-                (described below)
+         (described below)
 
 ``POST $DIRURL?t=start-deep-size``   (must add &ophandle=XYZ)
 
hunk ./docs/frontends/webapi.rst 1615
   size-literal-files: same, for LIT files
   size-directories: size of directories (includes size-literal-files)
   size-files-histogram: list of (minsize, maxsize, count) buckets,
-                                               with a histogram of filesizes, 5dB/bucket,
-                                               for both literal and immutable files
+                        with a histogram of filesizes, 5dB/bucket,
+                        for both literal and immutable files
   largest-directory: number of children in the largest directory
   largest-immutable-file: number of bytes in the largest CHK file
 
hunk ./docs/frontends/webapi.rst 1726
   progress-hash (float): 1.0 when the file has been hashed
   progress-ciphertext (float): 1.0 when the file has been encrypted.
   progress-encode-push (float): 1.0 when the file has been encoded and
-                                                               pushed to the storage servers. For helper
-                                                               uploads, the ciphertext value climbs to 1.0
-                                                               first, then encoding starts. For unassisted
-                                                               uploads, ciphertext and encode-push progress
-                                                               will climb at the same pace.
+                                pushed to the storage servers. For helper
+                                uploads, the ciphertext value climbs to 1.0
+                                first, then encoding starts. For unassisted
+                                uploads, ciphertext and encode-push progress
+                                will climb at the same pace.
 
  The "download" op-dict will contain the following keys::
 
}
[docs/frontends/webapi.txt: minor corrections; remove reference to test grid.
david-sarah@jacaranda.org**20110811000158
 Ignore-this: c7adcad548440755902af78f4b424378
] {
hunk ./docs/frontends/webapi.rst 158
 
  http://127.0.0.1:3456/uri/ + $CAP
 
-So, to access the directory named above (which happens to be the
-publically-writeable sample directory on the Tahoe test grid, described at
-http://allmydata.org/trac/tahoe/wiki/TestGrid), the URL would be::
+So, to access the directory named above, the URL would be::
 
  http://127.0.0.1:3456/uri/URI%3ADIR2%3Adjrdkfawoqihigoett4g6auz6a%3Ajx5mplfpwexnoqff7y5e4zjus4lidm76dcuarpct7cckorh2dpgq/
 
hunk ./docs/frontends/webapi.rst 1184
 
 ``POST /uri/$DIRCAP/[SUBDIRS../]?t=delete&name=CHILDNAME``
 
-``POST /uri/$DIRCAP/[SUBDIRS../]?t=unlink&name=CHILDNAME``
+``POST /uri/$DIRCAP/[SUBDIRS../]?t=unlink&name=CHILDNAME``    (Tahoe >= v1.9)
 
  This instructs the node to remove a child object (file or subdirectory) from
  the given directory, which must be mutable. Note that the entire subtree is
hunk ./docs/frontends/webapi.rst 1288
     count-wrong-shares: for mutable files, the number of shares for
                         versions other than the 'best' one (highest
                         sequence number, highest roothash). These are
-                        either old ...
+                        either old, or created by an uncoordinated write.
     count-recoverable-versions: for mutable files, the number of
                                 recoverable versions of the file. For
                                 a healthy file, this will equal 1.
}
[docs/configuration.rst: add section about the types of node, and clarify when setting web.port enables web-API service. refs #1444
david-sarah@jacaranda.org**20110812154808
 Ignore-this: 817e49edf648f8ec8a291ae11aaa6a96
] {
hunk ./docs/configuration.rst 5
 Configuring a Tahoe-LAFS node
 =============================
 
-1.  `Overall Node Configuration`_
-2.  `Client Configuration`_
-3.  `Storage Server Configuration`_
-4.  `Frontend Configuration`_
-5.  `Running A Helper`_
-6.  `Running An Introducer`_
-7.  `Other Files in BASEDIR`_
-8.  `Other files`_
-9.  `Backwards Compatibility Files`_
-10. `Example`_
+1.  `Node Types`_
+2.  `Overall Node Configuration`_
+3.  `Client Configuration`_
+4.  `Storage Server Configuration`_
+5.  `Frontend Configuration`_
+6.  `Running A Helper`_
+7.  `Running An Introducer`_
+8.  `Other Files in BASEDIR`_
+9.  `Other files`_
+10. `Backwards Compatibility Files`_
+11. `Example`_
 
hunk ./docs/configuration.rst 17
-A Tahoe-LAFS node is configured by writing to files in its base
-directory. These files are read by the node when it starts, so each time you
-change them, you need to restart the node.
+
+A Tahoe-LAFS node is configured by writing to files in its base directory.
+These files are read by the node when it starts, so each time you change them,
+you need to restart the node.
 
 The node also writes state to its base directory, so it will create files on
 its own.
hunk ./docs/configuration.rst 57
     ``pb://soklj4y7eok5c3xkmjeqpw@192.168.69.247:44801/eqpwqtzm``
 
 
+Node Types
+==========
+
+A node can be a client/server, an introducer, a statistics gatherer, or a
+key generator.
+
+Client/server nodes provide one or more of the following services:
+
+* web-API service
+* SFTP service
+* FTP service
+* drop-upload service
+* helper service
+* storage service.
+
+A client/server node that provides storage service (i.e. storing shares for
+other nodes) is called a "storage server". If it provides any of the other
+services, it is a "storage client". A client/server node that provides
+web-API service is called a "gateway".
+
+
 Overall Node Configuration
 ==========================
 
hunk ./docs/configuration.rst 83
 This section controls the network behavior of the node overall: which ports
 and IP addresses are used, when connections are timed out, etc. This
-configuration is independent of the services that the node is offering: the
-same controls are used for client and introducer nodes.
+configuration applies to all node types and is independent of the services
+that the node is offering.
 
 If your node is behind a firewall or NAT device and you want other clients to
 connect to it, you'll need to open a port in the firewall or NAT, and specify
hunk ./docs/configuration.rst 101
 
 ``web.port = (strports string, optional)``
 
-    This controls where the node's webserver should listen, providing
-    filesystem access and node status as defined in
-    `<frontends/webapi.rst>`_. This file contains a Twisted "strports"
-    specification such as "``3456``" or "``tcp:3456:interface=127.0.0.1``".
-    The "``tahoe create-node``" or "``tahoe create-client``" commands set the
-    ``web.port`` to "``tcp:3456:interface=127.0.0.1``" by default; this is
-    overridable by the ``--webport`` option. You can make it use SSL by
-    writing "``ssl:3456:privateKey=mykey.pem:certKey=cert.pem``" instead.
+    This controls where the node's web server should listen, providing node
+    status and, if the node is a client/server, providing web-API service
+    as defined in `webapi.rst <frontends/webapi.rst>_`.
+
+    This file contains a Twisted "strports" specification such as "``3456``"
+    or "``tcp:3456:interface=127.0.0.1``". The "``tahoe create-node``" or
+    "``tahoe create-client``" commands set the ``web.port`` to
+    "``tcp:3456:interface=127.0.0.1``" by default; this is overridable by
+    the ``--webport`` option. You can make it use SSL by writing
+    "``ssl:3456:privateKey=mykey.pem:certKey=cert.pem``" instead.
 
     If this is not provided, the node will not run a web server.
 
}
[Minor improvements to documentation for MDMF. refs #393
david-sarah@jacaranda.org**20110823012431
 Ignore-this: 7a1b1b3a8aea0d69cbc0ed93beb2c7f1
] {
hunk ./docs/configuration.rst 357
 ``mutable.format = sdmf or mdmf``
 
     This value tells Tahoe-LAFS what the default mutable file format should
-    be. If ``mutable.format=sdmf``, then newly created mutable files will be
-    in the old SDMF format. This is desirable for clients that operate on
-    grids where some peers run older versions of Tahoe-LAFS, as these older
-    versions cannot read the new MDMF mutable file format. If
-    ``mutable.format`` is ``mdmf``, then newly created mutable files will use
-    the new MDMF format, which supports efficient in-place modification and
-    streaming downloads. You can overwrite this value using a special
-    mutable-type parameter in the webapi. If you do not specify a value here,
-    Tahoe-LAFS will use SDMF for all newly-created mutable files.
+    be. If ``mutable.format=sdmf``, then newly created mutable files will by
+    default be in the SDMF format. This is desirable for clients that operate
+    on grids where some peers run versions of Tahoe-LAFS prior to v1.9.0, as
+    these older versions cannot read the new MDMF mutable file format. If
+    ``mutable.format`` is ``mdmf``, then newly created mutable files will by
+    default use the new MDMF format, which supports efficient in-place
+    modification and streaming downloads. You can override this value using a
+    ``mutable-type`` query parameter in the web-API or a ``--mutable-type=``
+    option in CLI commands. If you do not specify a value here, Tahoe-LAFS
+    will use SDMF as the format for newly-created mutable files when the
+    ``mutable-type`` query parameter or option is not specified.
 
     Note that this parameter only applies to mutable files. Mutable
     directories, which are stored as mutable files, are not controlled by
hunk ./docs/configuration.rst 374
     this parameter and will always use SDMF. We may revisit this decision
     in future versions of Tahoe-LAFS.
 
+
 Frontend Configuration
 ======================
 
hunk ./docs/frontends/webapi.rst 367
  file.
 
  In the /uri/$DIRCAP/[SUBDIRS../]FILENAME form, if the target file is a
- writeable mutable file, that file's contents will be overwritten in-place. If
- it is a read-cap for a mutable file, an error will occur. If it is an
- immutable file, the old file will be discarded, and a new one will be put in
- its place.
+ writeable mutable file, that file's contents will be overwritten in-place.
+ If it is a read-cap for a mutable file, an error will occur. If it is an
+ immutable file, the old file will be discarded, and a new one will be put
+ in its place. If the target file is a writeable mutable file, you may also
+ specify an "offset" parameter -- a byte offset that determines where in
+ the mutable file the data from the HTTP request body will be placed. This
+ operation is relatively efficient for MDMF mutable files, and is relatively
+ inefficient (but still supported) for SDMF mutable files. If no offset
+ parameter is specified, then the entire file will be replaced with the data
+ from the HTTP request body. For an immutable file, the "offset" parameter
+ is not valid.
 
  When creating a new file, if "mutable=true" is in the query arguments, the
  operation will create a mutable file instead of an immutable one.
hunk ./docs/frontends/webapi.rst 397
  this operation. The file-cap is returned as the body of the HTTP response.
 
  If "mutable=true" is in the query arguments, the operation will create a
- mutable file, and return its write-cap in the HTTP respose. The default is
- to create an immutable file, returning the read-cap as a response. If
+ mutable file, and return its write-cap in the HTTP response. The default
+ is to create an immutable file, returning the read-cap as a response. If
  you create a mutable file, you can also use the "mutable-type" query
  parameter. If "mutable-type=sdmf", then the mutable file will be created
hunk ./docs/frontends/webapi.rst 401
- in the old SDMF mutable file format. This is desirable for files that
- need to be read by old clients. If "mutable-type=mdmf", then the file
- will be created in the new MDMF mutable file format. MDMF mutable files
- can be downloaded more efficiently, and modified in-place efficiently,
- but are not compatible with older versions of Tahoe-LAFS. If no
- "mutable-type" argument is given, the file is created in whatever
- format was configured in tahoe.cfg.
+ in the SDMF mutable file format. This is desirable for files that need to
+ be read by clients of a Tahoe-LAFS version prior to v1.9.0. If
+ "mutable-type=mdmf", then the file will be created in the new MDMF mutable
+ file format. MDMF mutable files can be downloaded more efficiently, and
+ modified in-place efficiently, but are not compatible with older versions
+ of Tahoe-LAFS. If no "mutable-type" argument is given, the file is created
+ in whatever format was specified in the ``[client]mutable.format``
+ configuration variable of the web-API server's ``tahoe.cfg`` (see
+ `<../configuration.rst>`_).
 
 
 Creating A New Directory
}

Context:

[mutable/layout.py: fix unused import. refs #393
david-sarah@jacaranda.org**20110816225043
 Ignore-this: 7c9d6d91521ceb9a7abd14b2c60c0604
] 
[mutable/retrieve.py: cosmetics and remove a stale comment. refs #393
david-sarah@jacaranda.org**20110816214612
 Ignore-this: 916e60c9dff1ef85595822e609ff34b7
] 
[mutable/filenode.py: don't fetch more segments than necesasry to update the file
Kevan Carstensen <kevan@isnotajoke.com>**20110813210005
 Ignore-this: 2b0ad0533baa6f19f18851317dfc9f15
] 
[test/test_mutable: test for incorrect div_ceil equations
Kevan Carstensen <kevan@isnotajoke.com>**20110813183936
 Ignore-this: 74e6061ab2ec5e706a1235611f87d5d6
] 
[mutable/retrieve.py: use floor division to calculate segment boundaries, don't fetch more segments than necessary
Kevan Carstensen <kevan@isnotajoke.com>**20110813183833
 Ignore-this: 3e272249107afd3fbc1dd30c6a4f1e31
] 
[mdmf: clean up boolean expressions, correct typos, remove self._paused, and don't unconditionally initialize block hash trees, asll as suggested by davidsarahs' review comments
Kevan Carstensen <kevan@isnotajoke.com>**20110813183710
 Ignore-this: cc6ad9f98b64f379151aa58b77b6c4e5
] 
[now that tests pass with full-size keys, return test-keys to normal (522bit)
warner@lothar.com**20110811175418
 Ignore-this: dbce8a6699ba9a90d91cffbc8aa87900
] 
[fix SHARE_HASH_CHAIN_SIZE computation
warner@lothar.com**20110811175350
 Ignore-this: 4508359d2207c8c1b7552b546697264
] 
[More idiomatic resolution of the conflict between ticket393-MDMF-2 and trunk. refs #393
david-sarah@jacaranda.org**20110810202942
 Ignore-this: 7fc54a30ab0bc6ce75b7d819800c1182
] 
[Replace the hard-coded 522-bit RSA key size used for tests with a TEST_RSA_KEY_SIZE constant defined in test/common.py (part 2). refs #393
david-sarah@jacaranda.org**20110810202310
 Ignore-this: 7fbd4d004279599bbcb10f7b31fb010f
] 
[Replace the hard-coded 522-bit RSA key size used for tests with a TEST_RSA_KEY_SIZE constant defined in test/common.py (part 1). refs #393
david-sarah@jacaranda.org**20110810202243
 Ignore-this: c58d8130a2f383ff4421c632499b027b
] 
[merge some minor conflicts in test code from the 393-2 branch and trunk
zooko@zooko.com**20110810172139
 Ignore-this: 4a16f13eeae585c7c1dbe18c67072c90
] 
[doc: eliminate the phrase "rootcap" from doc/frontends/FTP-and-SFTP.rst
zooko@zooko.com**20110809132601
 Ignore-this: f7e1dd212daa65c81fb57977bce24304
 Two different people have asked me for help, saying they couldn't figure out what a "rootcap" is. Hopefully just calling it a "cap" will make it easier for them to find out from the other docs what it is.
] 
[test_web.py: fix a test failure dependent on whether simplejson.loads returns a unicode or str object.
david-sarah@jacaranda.org**20110808213925
 Ignore-this: f7b267be8be56fcabc968e3c89999490
] 
[immutable/filenode: fix pyflakes warnings
Kevan Carstensen <kevan@isnotajoke.com>**20110807004514
 Ignore-this: e8d875bf8b1c5571e31b0eff42ecf64c
] 
[test: fix assorted tests broken by MDMF changes
Kevan Carstensen <kevan@isnotajoke.com>**20110807004459
 Ignore-this: 9a0dc7e5c74bfe840a9fce278619a103
] 
[uri: add MDMF and MDMF directory caps, add extension hint support
Kevan Carstensen <kevan@isnotajoke.com>**20110807004436
 Ignore-this: 6486b7d4dc0e849c6b1e9cdfb6318eac
] 
[test/test_mutable: tests for MDMF
Kevan Carstensen <kevan@isnotajoke.com>**20110807004414
 Ignore-this: 29f9c3a806d67df0ed09c4f0d857d347
 
 These are their own patch because they cut across a lot of the changes
 I've made in implementing MDMF in such a way as to make it difficult to
 split them up into the other patches.
] 
[webapi changes for MDMF
Kevan Carstensen <kevan@isnotajoke.com>**20110807004348
 Ignore-this: d6d4dac680baa4c99b05882b3828796c
 
     - Learn how to create MDMF files and directories through the
       mutable-type argument.
     - Operate with the interface changes associated with MDMF and #993.
     - Learn how to do partial updates of mutable files.
] 
[mutable/servermap: Rework the servermap to work with MDMF mutable files
Kevan Carstensen <kevan@isnotajoke.com>**20110807004259
 Ignore-this: 154b987fa0af716c41185b88ff7ee2e1
] 
[dirnode: teach dirnode to make MDMF directories
Kevan Carstensen <kevan@isnotajoke.com>**20110807004224
 Ignore-this: 765ccd6a07ff752bf6057a3dab9e5abd
] 
[Fix some test failures caused by #393 patch.
david-sarah@jacaranda.org**20110802032810
 Ignore-this: 7f65e5adb5c859af289cea7011216fef
] 
[docs: amend configuration, webapi documentation to talk about MDMF
Kevan Carstensen <kevan@isnotajoke.com>**20110802022056
 Ignore-this: 4cab9b7e4ab79cc1efdabe2d457f27a6
] 
[cli: teach CLI how to create MDMF mutable files
Kevan Carstensen <kevan@isnotajoke.com>**20110802021613
 Ignore-this: 18d0ff98e75be231eed3c53319e76936
 
 Specifically, 'tahoe mkdir' and 'tahoe put' now take a --mutable-type
 argument.
] 
[frontends/sftpd: Resolve incompatibilities between SFTP frontend and MDMF changes
Kevan Carstensen <kevan@isnotajoke.com>**20110802021207
 Ignore-this: 5e0f6e961048f71d4eed6d30210ffd2e
] 
[mutable/layout: Define MDMF share format, write tools for working with MDMF share format
Kevan Carstensen <kevan@isnotajoke.com>**20110802021120
 Ignore-this: fa76ef4800939e19ba3cbc22a2eab4e
 
 The changes in layout.py are mostly concerned with the MDMF share
 format. In particular, we define read and write proxy objects used by
 retrieval, publishing, and other code to write and read the MDMF share
 format. We create equivalent proxies for SDMF objects so that these
 objects can be suitably general.
] 
[immutable/filenode: implement unified filenode interface
Kevan Carstensen <kevan@isnotajoke.com>**20110802020905
 Ignore-this: d9a442fc285157f134f5d1b4607c6a48
] 
[immutable/literal.py: Implement interface changes in literal nodes.
Kevan Carstensen <kevan@isnotajoke.com>**20110802020814
 Ignore-this: 4371e71a50e65ce2607c4d67d3a32171
] 
[test/common: Alter common test code to work with MDMF.
Kevan Carstensen <kevan@isnotajoke.com>**20110802015643
 Ignore-this: e564403182d0030439b168dd9f8726fa
 
 This mostly has to do with making the test code implement the new
 unified filenode interfaces.
] 
[mutable: train checker and repairer to work with MDMF mutable files
Kevan Carstensen <kevan@isnotajoke.com>**20110802015140
 Ignore-this: 8b1928925bed63708b71ab0de8d4306f
] 
[nodemaker: teach nodemaker about MDMF caps
Kevan Carstensen <kevan@isnotajoke.com>**20110802014926
 Ignore-this: 430c73121b6883b99626cfd652fc65c4
] 
[client: teach client how to create and work with MDMF files
Kevan Carstensen <kevan@isnotajoke.com>**20110802014811
 Ignore-this: d72fbc4c2ca63f00d9ab9dc2919098ff
] 
[mutable/filenode: Modify mutable filenodes for use with MDMF
Kevan Carstensen <kevan@isnotajoke.com>**20110802014501
 Ignore-this: 3c230bb0ebe60a94c667b0ee0c3b28e0
 
 In particular:
     - Break MutableFileNode and MutableFileVersion into distinct classes.
     - Implement the interface modifications made for MDMF.
     - Be aware of MDMF caps.
     - Learn how to create and work with MDMF files.
] 
[nodemaker: teach nodemaker how to create MDMF mutable files
Kevan Carstensen <kevan@isnotajoke.com>**20110802014258
 Ignore-this: 2bf1fd4f8c1d1ad0e855c678347b76c2
] 
[interfaces: change interfaces to work with MDMF
Kevan Carstensen <kevan@isnotajoke.com>**20110802014119
 Ignore-this: 2f441022cf888c044bc9e6dd609db139
 
 A lot of this work concerns #993, in that it unifies (to an extent) the
 interfaces of mutable and immutable files.
] 
[mutable/publish: teach the publisher how to publish MDMF mutable files
Kevan Carstensen <kevan@isnotajoke.com>**20110802013931
 Ignore-this: 115217ec2b289452ec774cb725da8a86
 
 Like the downloader, the publisher needs some substantial changes to handle multiple segment mutable files.
] 
[mutable/retrieve: rework the mutable downloader to handle multiple-segment files
Kevan Carstensen <kevan@isnotajoke.com>**20110802013524
 Ignore-this: 398d11b5cb993b50e5e4fa6e7a3856dc
 
 The downloader needs substantial reworking to handle multiple segment
 mutable files, which it needs to handle for MDMF.
] 
[Fix repeated 'the' in license text.
david-sarah@jacaranda.org**20110819204836
 Ignore-this: b3bd4e9ec22029fe15533ad2a60003ad
] 
[Remove Non-Profit Open Software License from the set of 'added permission' licenses. Although it actually does qualify as an Open Source license (because it allows relicensing under plain OSL), its wording is unclear and could easily be misunderstood, and it contributes to incompatible license proliferation.
david-sarah@jacaranda.org**20110819204742
 Ignore-this: 7373819a6b5367581356728ea62cabb1
] 
[docs: change links that pointed to COPYING.TGPPL.html to point to COPYING.TGPPL.rst instead
zooko@zooko.com**20110819060142
 Ignore-this: 301652554fd7ab4bfa5aa8f8a2863a9e
] 
[docs: formatting: reflow to fill-column 77
zooko@zooko.com**20110819060110
 Ignore-this: ed1317c126f07c63b944bd2fa6aa2d21
] 
[docs: formatting: M-x whitespace-cleanup
zooko@zooko.com**20110819060041
 Ignore-this: 8554b16a25067094d0dc4dc71e1b3950
] 
[licensing: add to the list of licenses that we grant the added permission for
zooko@zooko.com**20110819054656
 Ignore-this: eb1490416ac6b7414a27f150a8a8a047
 Added: most of the ones listed on the FSF's "List of Free Software, GPL Incompatible Licenses", plus the Non-Profit Open Software License.
] 
[docs: reflow the added text at the top of COPYING.GPL to fill-column 77
zooko@zooko.com**20110819053059
 Ignore-this: e994ed6ffbcc12656406f11cb862ce99
] 
[docs: reformat COPYING.TGPPL.html to COPYING.TGPPL.rst
zooko@zooko.com**20110819052753
 Ignore-this: 34ddf623e0a6de008ba859ca9c92b2fd
] 
[docs: reflow docs/logging.rst to fill-column 77
zooko@zooko.com**20110819044103
 Ignore-this: a6901f2244995f278ddf8d75d29410bf
] 
[doc: fix formatting error in docs/logging.rst
zooko@zooko.com**20110819043946
 Ignore-this: fa182dbbe7f4fda15e0a8bfcf7f00051
] 
[Cleanups for suppression of UserWarnings. refs #1435
david-sarah@jacaranda.org**20110818040749
 Ignore-this: 3863ef399c1c382a1365d51f000d314c
] 
[suppress warning emitted by newer zope.interface with Nevow 0.10
zooko@zooko.com**20110817203134
 Ignore-this: b86d4ce0ed1c0da76d1f9eaf8d08d9c4
 refs #1435
] 
[doc: formatting: reflow to fill-column=77
zooko@zooko.com**20110809132510
 Ignore-this: 2d6d2e203d52925968b4451f36364792
] 
[allmydata/__init__.py, test_version.py: make version parsing understand '<=', with test. refs #1435
david-sarah@jacaranda.org**20110815035153
 Ignore-this: 8c3a75f4a2b42b56bac48b5053c5e9c2
] 
[_auto_deps.py: change the requirement for zope.interface to <= 3.6.2, >= 3.6.6. fixes #1435
david-sarah@jacaranda.org**20110815025347
 Ignore-this: 17a88c0f6573f044fbcd6b666667bd37
] 
[Makefile and setup.py: remove setup.py commands that we no longer need, and their uses in the Makefile. Delete a stale and incorrect comment about updating _version.py. Also fix some coding style checks in the Makefile to operate on all source files.
david-sarah@jacaranda.org**20110801031952
 Ignore-this: 80a435dee3bc6e29058d4b37ff579922
] 
[remove misc/debian[_helpers], rely upon official packaging instead. fixes #1454
warner@lothar.com**20110811182705
 Ignore-this: 79673cafc7c108db49b5ab908d7b4668
] 
[Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454
david-sarah@jacaranda.org**20110801031857
 Ignore-this: 347cbeff45757db630ce34d0cfb84f92
] 
[replace tabs with spaces in the #1441 'tahoe debug' synopsis
warner@lothar.com**20110811173704
 Ignore-this: 513fbfb18a3dd93119ea3700118df7ee
] 
[Correct the information printed by '/usr/bin/tahoe debug --help' on Debian/Ubuntu. fixes #1441
david-sarah@jacaranda.org**20110724162530
 Ignore-this: 30d4b8c20e420e9a9d1b73eba1113ae
] 
[doc: edit the explanation of K-of-N tradeoffs
zooko@zooko.com**20110804193409
 Ignore-this: ab6f4e35a995c2099340b5c9c5d30f40
] 
[doc: clean up formatting of doc/configuration.rst
zooko@zooko.com**20110804192722
 Ignore-this: 7a98a3a8afb7e5441ff1f534211199ba
 reflow to 77 chars line width, M-x white-space cleanup, blank link between name and definition
] 
[Add test for webopen. fixes #1149
david-sarah@jacaranda.org**20110724211659
 Ignore-this: 1e22853f7eb05e24c3141d56a513f661
] 
[test_client.py: relax a check in test_create_drop_uploader so that it should pass on Python 2.4.x. refs #1429
david-sarah@jacaranda.org**20110810052504
 Ignore-this: 1380749ceaf33c30e26c50d57476616c
] 
[test/common_util.py: correct fix to mkdir_nonascii. refs #1472
david-sarah@jacaranda.org**20110810051906
 Ignore-this: 93c0c33370bc47d95c26c4cce8e05290
] 
[test/common_util.py: fix a typo. refs #1472
david-sarah@jacaranda.org**20110810044235
 Ignore-this: f88643d7c82cb3577686d77bbff9e2bc
] 
[test_client.py, test_drop_upload.py: fix pyflakes warnings.
david-sarah@jacaranda.org**20110810034505
 Ignore-this: 1e2d71bf2f43d63cbb423d32a6f96793
] 
[Factor out methods dealing with non-ASCII directories and filenames from test_drop_upload.py into common_util.py. refs #1429, #1472
david-sarah@jacaranda.org**20110810031558
 Ignore-this: 3de8f945fa7a58fc318a1184bad0fd1a
] 
[test_client.py: add a test that the drop-uploader is initialized correctly by client.py. Also give the DropUploader service a name, which is necessary for the test. refs #1429
david-sarah@jacaranda.org**20110810030538
 Ignore-this: 13d511ea9bbe9da2dcffe4a91ce94eae
] 
[drop-upload: rename 'start' method to 'startService', which is what you're supposed to use to start a Service. refs #1429
david-sarah@jacaranda.org**20110810030345
 Ignore-this: d1f5e5c63937ea37be37324e2f1ae99d
] 
[test_drop_upload.py: add comment explaining why we don't use FilePath.setContent. refs #1429
david-sarah@jacaranda.org**20110810025942
 Ignore-this: b95358030b63cb467d1d7f1b9a9b6978
] 
[test_drop_upload.py: fix some grammatical and spelling nits. refs #1429
david-sarah@jacaranda.org**20110809221231
 Ignore-this: fd331acddd9f754173f274a34fe62f03
] 
[drop-upload: report the configured local directory being absent differently from it being a file
zooko@zooko.com**20110809220930
 Ignore-this: a08879100f5f20e609be3f0ffa3b25cc
 refs #1429
] 
[drop-upload: rename the 'upload.uri' parameter to 'upload.dircap', and a couple of cleanups to error messages. refs #1429
zooko@zooko.com**20110809220508
 Ignore-this: 4846368cbe331e8653bdce1f314e276b
 I rerecorded this patch, originally by David-Sarah, to use "darcs replace" instead of editing to do the renames. This uncovered one missed rename in Client.init_drop_uploader. (Which also means that code isn't exercised by the current unit tests.)
 refs #1429
] 
[drop-upload test for non-existent local dir separately from test for non-directory local dir
zooko@zooko.com**20110809220115
 Ignore-this: cd85f345c02f5cb71b1c1527bd4ebddc
 A candidate patch for #1429 has a bug when it is using FilePath.is_dir() to detect whether the configured local dir exists and is a directory. FilePath.is_dir() raises exception, instead of returning False, if the thing doesn't exist. This test is to make sure that DropUploader.__init__ raise different exceptions for those two cases.
 refs #1429
] 
[drop-upload: unit tests for the configuration options being named "cap" instead of "uri"
zooko@zooko.com**20110809215913
 Ignore-this: 958c78fffb3d76b3e4817647f824e7f9
 This is a subset of a patch that David-Sarah attached to #1429. This is just the unit-tests part of that patch, and uses darcs record instead of hunks to change the names.
 refs #1429
] 
[src/allmydata/storage/server.py: use the filesystem of storage/shares/, rather than storage/, to calculate remaining space. fixes #1384
david-sarah@jacaranda.org**20110719022752
 Ignore-this: a4781043cfd453dbb66ae4f108d80bea
] 
[test_storage.py: test that we are using the filesystem of storage/shares/, rather than storage/, to calculate remaining space, and that the HTML status output reflects the values returned by fileutil.get_disk_stats. This version works with older versions of the mock library. refs #1384
david-sarah@jacaranda.org**20110809190722
 Ignore-this: db447caca37a459ca49563efa58db58c
] 
[Work around ref #1472 by having test_drop_upload delete the non-ASCII directories it creates.
david-sarah@jacaranda.org**20110809012334
 Ignore-this: 5881fd5db419ba8ad12e0b2a82f6c4f0
] 
[Remove all trailing whitespace from .py files.
david-sarah@jacaranda.org**20110809001117
 Ignore-this: d2658b5ce44af70cc606ae4d3085b7cc
] 
[test_drop_upload.py: fix unused imports. refs #1429
david-sarah@jacaranda.org**20110808235422
 Ignore-this: 834f6b946bfea699d7d8c743edd66671
] 
[Documentation for drop-upload frontend. refs #1429
david-sarah@jacaranda.org**20110808182146
 Ignore-this: b33110834e586c0b784d1736c2af5779
] 
[Drop-upload frontend, rerecorded for 1.9 beta (and correcting a minor mistake). Includes some fixes for Windows but not the Windows inotify implementation. fixes #1429
david-sarah@jacaranda.org**20110808234049
 Ignore-this: 67f824c7f554e9a3a85f9fd2e1123d97
] 
[node.py: ensure that client and introducer nodes record their port number and use that port on the next restart, fixing a regression caused by #1385. fixes #1469.
david-sarah@jacaranda.org**20110806221934
 Ignore-this: 1aa9d340b6570320ab2f9edc89c9e0a8
] 
[test_runner.py: fix a race condition in the test when NODE_URL_FILE is written before PORTNUM_FILE. refs #1469
david-sarah@jacaranda.org**20110806231842
 Ignore-this: ab01ae7cec3a073e29eec473e64052a0
] 
[test_runner.py: cleanups of HOTLINE_FILE writing and removal.
david-sarah@jacaranda.org**20110806231652
 Ignore-this: 25f5c5d6f5d8faebb26a4ce80110a335
] 
[test_runner.py: remove an unused constant.
david-sarah@jacaranda.org**20110806221416
 Ignore-this: eade2695cbabbea9cafeaa8debe410bb
] 
[node.py: fix the error path for a missing config option so that it works for a Unicode base directory.
david-sarah@jacaranda.org**20110806221007
 Ignore-this: 4eb9cc04b2ce05182a274a0d69dafaf3
] 
[test_runner.py: test that client and introducer nodes record their port number and use that port on the next restart. This tests for a regression caused by ref #1385.
david-sarah@jacaranda.org**20110806220635
 Ignore-this: 40a0c040b142dbddd47e69b3c3712f5
] 
[test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114] when the tahoe.cfg file has been written with CRLF line endings. refs #1385
david-sarah@jacaranda.org**20110804003032
 Ignore-this: 7b7afdcf99da6671afac2d42828883eb
] 
[test_client.py: repair Basic.test_error_on_old_config_files. refs #1385
david-sarah@jacaranda.org**20110803235036
 Ignore-this: 31e2a9c3febe55948de7e144353663e
] 
[test_checker.py: increase timeout for TooParallel.test_immutable again. The ARM buildslave took 38 seconds, so 40 seconds is too close to the edge; make it 80.
david-sarah@jacaranda.org**20110803214042
 Ignore-this: 2d8026a6b25534e01738f78d6c7495cb
] 
[test_runner.py: fix RunNode.test_introducer to not rely on the mtime of introducer.furl to detect when the node has restarted. Instead we detect when node.url has been written. refs #1385
david-sarah@jacaranda.org**20110803180917
 Ignore-this: 11ddc43b107beca42cb78af88c5c394c
] 
[Further improve error message about old config files. refs #1385
david-sarah@jacaranda.org**20110803174546
 Ignore-this: 9d6cc3c288d9863dce58faafb3855917
] 
[Slightly improve error message about old config files (avoid unnecessary Unicode escaping). refs #1385
david-sarah@jacaranda.org**20110803163848
 Ignore-this: a3e3930fba7ccf90b8db3d2ed5829df4
] 
[test_checker.py: increase timeout for TooParallel.test_immutable (was consistently failing on ARM buildslave).
david-sarah@jacaranda.org**20110803163213
 Ignore-this: d0efceaf12628e8791862b80c85b5d56
] 
[Fix the bug that prevents an introducer from starting when introducer.furl already exists. Also remove some dead code that used to read old config files, and rename 'warn_about_old_config_files' to reflect that it's not a warning. refs #1385
david-sarah@jacaranda.org**20110803013212
 Ignore-this: 2d6cd14bd06a7493b26f2027aff78f4d
] 
[test_runner.py: modify RunNode.test_introducer to test that starting an introducer works when the introducer.furl file already exists. refs #1385
david-sarah@jacaranda.org**20110803012704
 Ignore-this: 8cf7f27ac4bfbb5ad8ca4a974106d437
] 
[verifier: correct a bug introduced in changeset [5106] that caused us to only verify the first block of a file. refs #1395
david-sarah@jacaranda.org**20110802172437
 Ignore-this: 87fb77854a839ff217dce73544775b11
] 
[test_repairer: add a deterministic test of share data corruption that always flips the bits of the last byte of the share data. refs #1395
david-sarah@jacaranda.org**20110802175841
 Ignore-this: 72f54603785007e88220c8d979e08be7
] 
[verifier: serialize the fetching of blocks within a share so that we don't use too much RAM
zooko@zooko.com**20110802063703
 Ignore-this: debd9bac07dcbb6803f835a9e2eabaa1
 
 Shares are still verified in parallel, but within a share, don't request a
 block until the previous block has been verified and the memory we used to hold
 it has been freed up.
 
 Patch originally due to Brian. This version has a mockery-patchery-style test
 which is "low tech" (it implements the patching inline in the test code instead
 of using an extension of the mock.patch() function from the mock library) and
 which unpatches in case of exception.
 
 fixes #1395
] 
[add docs about timing-channel attacks
Brian Warner <warner@lothar.com>**20110802044541
 Ignore-this: 73114d5f5ed9ce252597b707dba3a194
] 
['test-coverage' now needs PYTHONPATH=. to find TOP/twisted/plugins/
Brian Warner <warner@lothar.com>**20110802041952
 Ignore-this: d40f1f4cb426ea1c362fc961baedde2
] 
[remove nodeid from WriteBucketProxy classes and customers
warner@lothar.com**20110801224317
 Ignore-this: e55334bb0095de11711eeb3af827e8e8
 refs #1363
] 
[remove get_serverid() from ReadBucketProxy and customers, including Checker
warner@lothar.com**20110801224307
 Ignore-this: 837aba457bc853e4fd413ab1a94519cb
 and debug.py dump-share commands
 refs #1363
] 
[reject old-style (pre-Tahoe-LAFS-v1.3) configuration files
zooko@zooko.com**20110801232423
 Ignore-this: b58218fcc064cc75ad8f05ed0c38902b
 Check for the existence of any of them and if any are found raise exception which will abort the startup of the node.
 This is a backwards-incompatible change for anyone who is still using old-style configuration files.
 fixes #1385
] 
[whitespace-cleanup
zooko@zooko.com**20110725015546
 Ignore-this: 442970d0545183b97adc7bd66657876c
] 
[tests: use fileutil.write() instead of open() to ensure timely close even without CPython-style reference counting
zooko@zooko.com**20110331145427
 Ignore-this: 75aae4ab8e5fa0ad698f998aaa1888ce
 Some of these already had an explicit close() but I went ahead and replaced them with fileutil.write() as well for the sake of uniformity.
] 
[Address Kevan's comment in #776 about Options classes missed when adding 'self.command_name'. refs #776, #1359
david-sarah@jacaranda.org**20110801221317
 Ignore-this: 8881d42cf7e6a1d15468291b0cb8fab9
] 
[docs/frontends/webapi.rst: change some more instances of 'delete' or 'remove' to 'unlink', change some section titles, and use two blank lines between all sections. refs #776, #1104
david-sarah@jacaranda.org**20110801220919
 Ignore-this: 572327591137bb05c24c44812d4b163f
] 
[cleanup: implement rm as a synonym for unlink rather than vice-versa. refs #776
david-sarah@jacaranda.org**20110801220108
 Ignore-this: 598dcbed870f4f6bb9df62de9111b343
] 
[docs/webapi.rst: address Kevan's comments about use of 'delete' on ref #1104
david-sarah@jacaranda.org**20110801205356
 Ignore-this: 4fbf03864934753c951ddeff64392491
] 
[docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104
david-sarah@jacaranda.org**20110713002722
 Ignore-this: 304d2a330d5e6e77d5f1feed7814b21c
] 
[WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104
david-sarah@jacaranda.org**20110713001218
 Ignore-this: 3eef6b3f81b94a9c0020a38eb20aa069
] 
[src/allmydata/web/filenode.py: delete a stale comment that was made incorrect by changeset [3133].
david-sarah@jacaranda.org**20110801203009
 Ignore-this: b3912e95a874647027efdc97822dd10e
] 
[fix typo introduced during rebasing of 'remove get_serverid from
Brian Warner <warner@lothar.com>**20110801200341
 Ignore-this: 4235b0f585c0533892193941dbbd89a8
 DownloadStatus.add_dyhb_request and customers' patch, to fix test failure.
] 
[remove get_serverid from DownloadStatus.add_dyhb_request and customers
zooko@zooko.com**20110801185401
 Ignore-this: db188c18566d2d0ab39a80c9dc8f6be6
 This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk.
 refs #1363
] 
[remove get_serverid from DownloadStatus.add_block_request and customers
zooko@zooko.com**20110801185344
 Ignore-this: 8bfa8201d6147f69b0fbe31beea9c1e
 This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk.
 refs #1363
] 
[apply zooko's advice: storage_client get_known_servers() returns a frozenset, caller sorts
warner@lothar.com**20110801174452
 Ignore-this: 2aa13ea6cbed4e9084bd604bf8633692
 refs #1363
] 
[test_immutable.Test: rewrite to use NoNetworkGrid, now takes 2.7s not 97s
warner@lothar.com**20110801174444
 Ignore-this: 54f30b5d7461d2b3514e2a0172f3a98c
 remove now-unused ShareManglingMixin
 refs #1363
] 
[DownloadStatus.add_known_share wants to be used by Finder, web.status
warner@lothar.com**20110801174436
 Ignore-this: 1433bcd73099a579abe449f697f35f9
 refs #1363
] 
[replace IServer.name() with get_name(), and get_longname()
warner@lothar.com**20110801174428
 Ignore-this: e5a6f7f6687fd7732ddf41cfdd7c491b
 
 This patch was originally written by Brian, but was re-recorded by Zooko to use
 darcs replace instead of hunks for any file in which it would result in fewer
 total hunks.
 refs #1363
] 
[upload.py: apply David-Sarah's advice rename (un)contacted(2) trackers to first_pass/second_pass/next_pass
zooko@zooko.com**20110801174143
 Ignore-this: e36e1420bba0620a0107bd90032a5198
 This patch was written by Brian but was re-recorded by Zooko (with David-Sarah looking on) to use darcs replace instead of editing to rename the three variables to their new names.
 refs #1363
] 
[Coalesce multiple Share.loop() calls, make downloads faster. Closes #1268.
Brian Warner <warner@lothar.com>**20110801151834
 Ignore-this: 48530fce36c01c0ff708f61c2de7e67a
] 
[src/allmydata/_auto_deps.py: 'i686' is another way of spelling x86.
david-sarah@jacaranda.org**20110801034035
 Ignore-this: 6971e0621db2fba794d86395b4d51038
] 
[tahoe_rm.py: better error message when there is no path. refs #1292
david-sarah@jacaranda.org**20110122064212
 Ignore-this: ff3bb2c9f376250e5fd77eb009e09018
] 
[test_cli.py: Test for error message when 'tahoe rm' is invoked without a path. refs #1292
david-sarah@jacaranda.org**20110104105108
 Ignore-this: 29ec2f2e0251e446db96db002ad5dd7d
] 
[src/allmydata/__init__.py: suppress a spurious warning from 'bin/tahoe --version[-and-path]' about twisted-web and twisted-core packages.
david-sarah@jacaranda.org**20110801005209
 Ignore-this: 50e7cd53cca57b1870d9df0361c7c709
] 
[test_cli.py: use to_str on fields loaded using simplejson.loads in new tests. refs #1304
david-sarah@jacaranda.org**20110730032521
 Ignore-this: d1d6dfaefd1b4e733181bf127c79c00b
] 
[cli: make 'tahoe cp' overwrite mutable files in-place
Kevan Carstensen <kevan@isnotajoke.com>**20110729202039
 Ignore-this: b2ad21a19439722f05c49bfd35b01855
] 
[SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. Also change the lines of the error messages to end in CRLF, and take into account Kevan's review comments. fixes #1442, #1446
david-sarah@jacaranda.org**20110729233102
 Ignore-this: d2f2bb4664f25007d1602bf7333e2cdd
] 
[src/allmydata/scripts/cli.py: fix pyflakes warning.
david-sarah@jacaranda.org**20110728021402
 Ignore-this: 94050140ddb99865295973f49927c509
] 
[Fix the help synopses of CLI commands to include [options] in the right place. fixes #1359, fixes #636
david-sarah@jacaranda.org**20110724225440
 Ignore-this: 2a8e488a5f63dabfa9db9efd83768a5
] 
[encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120
david-sarah@jacaranda.org**20110629185356
 Ignore-this: 5ebacbe6903dfa83ffd3ff8436a97787
] 
[docs/man/tahoe.1: add man page. fixes #1420
david-sarah@jacaranda.org**20110724171728
 Ignore-this: fc7601ec7f25494288d6141d0ae0004c
] 
[Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435
david-sarah@jacaranda.org**20110721234941
 Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9
] 
[frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it.
david-sarah@jacaranda.org**20110722000320
 Ignore-this: 55cd558b791526113db3f83c00ec328a
] 
[Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429
david-sarah@jacaranda.org**20110721233658
 Ignore-this: 81b41745477163c9b39c0b59db91cc62
] 
[misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334
david-sarah@jacaranda.org**20110722035402
 Ignore-this: 5d03f544c4154f088e26c7107494bf39
] 
[misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334
david-sarah@jacaranda.org**20110722024907
 Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c
] 
[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
david-sarah@jacaranda.org**20110718005949
 Ignore-this: 81837fbce073e93d88a3e7ae3122458c
] 
[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
david-sarah@jacaranda.org**20110717194315
 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
] 
[README.txt: say that quickstart.rst is in the docs directory.
david-sarah@jacaranda.org**20110717192400
 Ignore-this: bc6d35a85c496b77dbef7570677ea42a
] 
[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
zooko@zooko.com**20110717114226
 Ignore-this: df222120d41447ce4102616921626c82
 fixes #1383
] 
[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
david-sarah@jacaranda.org**20110716181813
 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
] 
[docs: add missing link in NEWS.rst
zooko@zooko.com**20110712153307
 Ignore-this: be7b7eb81c03700b739daa1027d72b35
] 
[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
zooko@zooko.com**20110712153229
 Ignore-this: 723c4f9e2211027c79d711715d972c5
 Also remove a couple of vestigial references to figleaf, which is long gone.
 fixes #1409 (remove contrib/fuse)
] 
[add Protovis.js-based download-status timeline visualization
Brian Warner <warner@lothar.com>**20110629222606
 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
 
 provide status overlap info on the webapi t=json output, add decode/decrypt
 rate tooltips, add zoomin/zoomout buttons
] 
[add more download-status data, fix tests
Brian Warner <warner@lothar.com>**20110629222555
 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
] 
[prepare for viz: improve DownloadStatus events
Brian Warner <warner@lothar.com>**20110629222542
 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
 
 consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
] 
[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
zooko@zooko.com**20110629185711
 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
] 
[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
david-sarah@jacaranda.org**20110130235809
 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
] 
[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
david-sarah@jacaranda.org**20110626054124
 Ignore-this: abb864427a1b91bd10d5132b4589fd90
] 
[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
david-sarah@jacaranda.org**20110623205528
 Ignore-this: c63e23146c39195de52fb17c7c49b2da
] 
[Rename test_package_initialization.py to (much shorter) test_import.py .
Brian Warner <warner@lothar.com>**20110611190234
 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
 
 The former name was making my 'ls' listings hard to read, by forcing them
 down to just two columns.
] 
[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
zooko@zooko.com**20110611163741
 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
 fixes #1412
] 
[wui: right-align the size column in the WUI
zooko@zooko.com**20110611153758
 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
 fixes #1412
] 
[docs: three minor fixes
zooko@zooko.com**20110610121656
 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
 CREDITS for arc for stats tweak
 fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
 English usage tweak
] 
[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
david-sarah@jacaranda.org**20110609223719
 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
] 
[server.py:  get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
wilcoxjg@gmail.com**20110527120135
 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
 interfaces.py:  modified the return type of RIStatsProvider.get_stats to allow for None as a return value
 NEWS.rst, stats.py: documentation of change to get_latencies
 stats.rst: now documents percentile modification in get_latencies
 test_storage.py:  test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
 fixes #1392
] 
[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
david-sarah@jacaranda.org**20110517011214
 Ignore-this: 6a5be6e70241e3ec0575641f64343df7
] 
[docs: convert NEWS to NEWS.rst and change all references to it.
david-sarah@jacaranda.org**20110517010255
 Ignore-this: a820b93ea10577c77e9c8206dbfe770d
] 
[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
david-sarah@jacaranda.org**20110512140559
 Ignore-this: 784548fc5367fac5450df1c46890876d
] 
[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
david-sarah@jacaranda.org**20110130164923
 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
] 
[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
zooko@zooko.com**20110128142006
 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
] 
[M-x whitespace-cleanup
zooko@zooko.com**20110510193653
 Ignore-this: dea02f831298c0f65ad096960e7df5c7
] 
[docs: fix typo in running.rst, thanks to arch_o_median
zooko@zooko.com**20110510193633
 Ignore-this: ca06de166a46abbc61140513918e79e8
] 
[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
david-sarah@jacaranda.org**20110204204902
 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
] 
[relnotes.txt: forseeable -> foreseeable. refs #1342
david-sarah@jacaranda.org**20110204204116
 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
] 
[replace remaining .html docs with .rst docs
zooko@zooko.com**20110510191650
 Ignore-this: d557d960a986d4ac8216d1677d236399
 Remove install.html (long since deprecated).
 Also replace some obsolete references to install.html with references to quickstart.rst.
 Fix some broken internal references within docs/historical/historical_known_issues.txt.
 Thanks to Ravi Pinjala and Patrick McDonald.
 refs #1227
] 
[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
zooko@zooko.com**20110428055232
 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
] 
[munin tahoe_files plugin: fix incorrect file count
francois@ctrlaltdel.ch**20110428055312
 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
 fixes #1391
] 
[corrected "k must never be smaller than N" to "k must never be greater than N"
secorp@allmydata.org**20110425010308
 Ignore-this: 233129505d6c70860087f22541805eac
] 
[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
david-sarah@jacaranda.org**20110411190738
 Ignore-this: 7847d26bc117c328c679f08a7baee519
] 
[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
david-sarah@jacaranda.org**20110410155844
 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
] 
[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
david-sarah@jacaranda.org**20110410155705
 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
] 
[remove unused variable detected by pyflakes
zooko@zooko.com**20110407172231
 Ignore-this: 7344652d5e0720af822070d91f03daf9
] 
[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
david-sarah@jacaranda.org**20110401202750
 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
] 
[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
Brian Warner <warner@lothar.com>**20110325232511
 Ignore-this: d5307faa6900f143193bfbe14e0f01a
] 
[control.py: remove all uses of s.get_serverid()
warner@lothar.com**20110227011203
 Ignore-this: f80a787953bd7fa3d40e828bde00e855
] 
[web: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011159
 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
] 
[immutable/downloader/fetcher.py: remove all get_serverid() calls
warner@lothar.com**20110227011156
 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
] 
[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
warner@lothar.com**20110227011153
 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
 
 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
 _shares_from_server dict was being popped incorrectly (using shnum as the
 index instead of serverid). I'm still thinking through the consequences of
 this bug. It was probably benign and really hard to detect. I think it would
 cause us to incorrectly believe that we're pulling too many shares from a
 server, and thus prefer a different server rather than asking for a second
 share from the first server. The diversity code is intended to spread out the
 number of shares simultaneously being requested from each server, but with
 this bug, it might be spreading out the total number of shares requested at
 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
 segment, so the effect doesn't last very long).
] 
[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
warner@lothar.com**20110227011150
 Ignore-this: d8d56dd8e7b280792b40105e13664554
 
 test_download.py: create+check MyShare instances better, make sure they share
 Server objects, now that finder.py cares
] 
[immutable/downloader/finder.py: reduce use of get_serverid(), one left
warner@lothar.com**20110227011146
 Ignore-this: 5785be173b491ae8a78faf5142892020
] 
[immutable/offloaded.py: reduce use of get_serverid() a bit more
warner@lothar.com**20110227011142
 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
] 
[immutable/upload.py: reduce use of get_serverid()
warner@lothar.com**20110227011138
 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
] 
[immutable/checker.py: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011134
 Ignore-this: e480a37efa9e94e8016d826c492f626e
] 
[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
warner@lothar.com**20110227011132
 Ignore-this: 6078279ddf42b179996a4b53bee8c421
 MockIServer stubs
] 
[upload.py: rearrange _make_trackers a bit, no behavior changes
warner@lothar.com**20110227011128
 Ignore-this: 296d4819e2af452b107177aef6ebb40f
] 
[happinessutil.py: finally rename merge_peers to merge_servers
warner@lothar.com**20110227011124
 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
] 
[test_upload.py: factor out FakeServerTracker
warner@lothar.com**20110227011120
 Ignore-this: 6c182cba90e908221099472cc159325b
] 
[test_upload.py: server-vs-tracker cleanup
warner@lothar.com**20110227011115
 Ignore-this: 2915133be1a3ba456e8603885437e03
] 
[happinessutil.py: server-vs-tracker cleanup
warner@lothar.com**20110227011111
 Ignore-this: b856c84033562d7d718cae7cb01085a9
] 
[upload.py: more tracker-vs-server cleanup
warner@lothar.com**20110227011107
 Ignore-this: bb75ed2afef55e47c085b35def2de315
] 
[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
warner@lothar.com**20110227011103
 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
] 
[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
warner@lothar.com**20110227011100
 Ignore-this: 7ea858755cbe5896ac212a925840fe68
 
 No behavioral changes, just updating variable/method names and log messages.
 The effects outside these three files should be minimal: some exception
 messages changed (to say "server" instead of "peer"), and some internal class
 names were changed. A few things still use "peer" to minimize external
 changes, like UploadResults.timings["peer_selection"] and
 happinessutil.merge_peers, which can be changed later.
] 
[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
warner@lothar.com**20110227011056
 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
] 
[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
warner@lothar.com**20110227011051
 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
] 
[test: increase timeout on a network test because Francois's ARM machine hit that timeout
zooko@zooko.com**20110317165909
 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
] 
[docs/configuration.rst: add a "Frontend Configuration" section
Brian Warner <warner@lothar.com>**20110222014323
 Ignore-this: 657018aa501fe4f0efef9851628444ca
 
 this points to docs/frontends/*.rst, which were previously underlinked
] 
[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
"Brian Warner <warner@lothar.com>"**20110221061544
 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
] 
[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
david-sarah@jacaranda.org**20110221015817
 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
] 
[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
david-sarah@jacaranda.org**20110221020125
 Ignore-this: b0744ed58f161bf188e037bad077fc48
] 
[Refactor StorageFarmBroker handling of servers
Brian Warner <warner@lothar.com>**20110221015804
 Ignore-this: 842144ed92f5717699b8f580eab32a51
 
 Pass around IServer instance instead of (peerid, rref) tuple. Replace
 "descriptor" with "server". Other replacements:
 
  get_all_servers -> get_connected_servers/get_known_servers
  get_servers_for_index -> get_servers_for_psi (now returns IServers)
 
 This change still needs to be pushed further down: lots of code is now
 getting the IServer and then distributing (peerid, rref) internally.
 Instead, it ought to distribute the IServer internally and delay
 extracting a serverid or rref until the last moment.
 
 no_network.py was updated to retain parallelism.
] 
[TAG allmydata-tahoe-1.8.2
warner@lothar.com**20110131020101] 
Patch bundle hash:
930f9bfa144b1f9500c98bb9695c47bee56c3edb