Rev 5896: (spiv) Fix the formatting of more docstrings. (Andrew Bennetts) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu May 19 10:51:42 UTC 2011


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5896 [merge]
revision-id: pqm at pqm.ubuntu.com-20110519105137-amzagrral2ldm1lq
parent: pqm at pqm.ubuntu.com-20110519091947-5u0csgddxucufsrm
parent: andrew.bennetts at canonical.com-20110519093238-nwmz5fkehlu37hag
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-05-19 10:51:37 +0000
message:
  (spiv) Fix the formatting of more docstrings. (Andrew Bennetts)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/cethread.py             thread.py-20110208152810-i29un3um8v6marcr-1
  bzrlib/chunk_writer.py         chunk_writer.py-20080630234519-6ggn4id17nipovny-1
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/controldir.py           controldir.py-20100802102926-hvtvh0uae5epuibp-1
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/email_message.py        email_message.py-20070718143823-660zfcl54xi1v65u-1
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/inter.py                inter.py-20060302012326-a57300cb382c618f
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
  bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/vf_repository.py        vf_repository.py-20110502151858-yh9nnoxpokg86unk-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-05-18 16:42:48 +0000
+++ b/bzrlib/branch.py	2011-05-19 09:32:38 +0000
@@ -454,6 +454,7 @@
             after. If None, the rest of history is included.
         :param stop_rule: if stop_revision_id is not None, the precise rule
             to use for termination:
+
             * 'exclude' - leave the stop revision out of the result (default)
             * 'include' - the stop revision is the last item in the result
             * 'with-merges' - include the stop revision and all of its
@@ -461,6 +462,7 @@
             * 'with-merges-without-common-ancestry' - filter out revisions 
               that are in both ancestries
         :param direction: either 'reverse' or 'forward':
+
             * reverse means return the start_revision_id first, i.e.
               start at the most recent revision and go backwards in history
             * forward returns tuples in the opposite order to reverse.
@@ -1417,7 +1419,7 @@
         :param to_location: The url to produce the checkout at
         :param revision_id: The revision to check out
         :param lightweight: If True, produce a lightweight checkout, otherwise,
-        produce a bound branch (heavyweight checkout)
+            produce a bound branch (heavyweight checkout)
         :param accelerator_tree: A tree which can be used for retrieving file
             contents more quickly than the revision tree, i.e. a workingtree.
             The revision tree will be used for cases where accelerator_tree's

=== modified file 'bzrlib/btree_index.py'
--- a/bzrlib/btree_index.py	2011-04-07 10:36:24 +0000
+++ b/bzrlib/btree_index.py	2011-05-19 09:32:38 +0000
@@ -162,7 +162,7 @@
         :param references: An iterable of iterables of keys. Each is a
             reference to another key.
         :param value: The value to associate with the key. It may be any
-            bytes as long as it does not contain \0 or \n.
+            bytes as long as it does not contain \\0 or \\n.
         """
         # Ensure that 'key' is a StaticTuple
         key = static_tuple.StaticTuple.from_sequence(key).intern()

=== modified file 'bzrlib/cethread.py'
--- a/bzrlib/cethread.py	2011-02-10 12:37:27 +0000
+++ b/bzrlib/cethread.py	2011-05-19 09:32:38 +0000
@@ -103,6 +103,7 @@
         """Declare which exceptions will be ignored.
 
         :param ignored: Can be either:
+        
            - None: all exceptions will be raised,
            - an exception class: the instances of this class will be ignored,
            - a tuple of exception classes: the instances of any class of the

=== modified file 'bzrlib/chunk_writer.py'
--- a/bzrlib/chunk_writer.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/chunk_writer.py	2011-05-19 09:32:38 +0000
@@ -122,14 +122,14 @@
         bytes that did not fit in the chunk.
 
         :return: (compressed_bytes, unused_bytes, num_nulls_needed)
-            compressed_bytes    a list of bytes that were output from the
-                                compressor. If the compressed length was not
-                                exactly chunk_size, the final string will be a
-                                string of all null bytes to pad this to
-                                chunk_size
-            unused_bytes        None, or the last bytes that were added, which
-                                we could not fit.
-            num_nulls_needed    How many nulls are padded at the end
+
+            * compressed_bytes: a list of bytes that were output from the
+              compressor. If the compressed length was not exactly chunk_size,
+              the final string will be a string of all null bytes to pad this
+              to chunk_size
+            * unused_bytes: None, or the last bytes that were added, which we
+              could not fit.
+            * num_nulls_needed: How many nulls are padded at the end
         """
         self.bytes_in = None # Free the data cached so far, we don't need it
         out = self.compressor.flush(Z_FINISH)
@@ -164,10 +164,11 @@
         :param extra_bytes: Optional, if supplied we will add it with
             Z_SYNC_FLUSH
         :return: (bytes_out, bytes_out_len, alt_compressed)
-            bytes_out   is the compressed bytes returned from the compressor
-            bytes_out_len the length of the compressed output
-            compressor  An object with everything packed in so far, and
-                        Z_SYNC_FLUSH called.
+
+            * bytes_out: is the compressed bytes returned from the compressor
+            * bytes_out_len: the length of the compressed output
+            * compressor: An object with everything packed in so far, and
+              Z_SYNC_FLUSH called.
         """
         compressor = zlib.compressobj()
         bytes_out = []

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2011-05-17 20:58:43 +0000
+++ b/bzrlib/commands.py	2011-05-19 09:32:38 +0000
@@ -357,58 +357,51 @@
     summary, then a complete description of the command.  A grammar
     description will be inserted.
 
-    aliases
-        Other accepted names for this command.
-
-    takes_args
-        List of argument forms, marked with whether they are optional,
-        repeated, etc.
-
-                Examples:
-
-                ['to_location', 'from_branch?', 'file*']
-
-                'to_location' is required
-                'from_branch' is optional
-                'file' can be specified 0 or more times
-
-    takes_options
-        List of options that may be given for this command.  These can
-        be either strings, referring to globally-defined options,
-        or option objects.  Retrieve through options().
-
-    hidden
-        If true, this command isn't advertised.  This is typically
+    :cvar aliases: Other accepted names for this command.
+
+    :cvar takes_args: List of argument forms, marked with whether they are
+        optional, repeated, etc.  Examples::
+
+            ['to_location', 'from_branch?', 'file*']
+
+        * 'to_location' is required
+        * 'from_branch' is optional
+        * 'file' can be specified 0 or more times
+
+    :cvar takes_options: List of options that may be given for this command.
+        These can be either strings, referring to globally-defined options, or
+        option objects.  Retrieve through options().
+
+    :cvar hidden: If true, this command isn't advertised.  This is typically
         for commands intended for expert users.
 
-    encoding_type
-        Command objects will get a 'outf' attribute, which has been
-        setup to properly handle encoding of unicode strings.
-        encoding_type determines what will happen when characters cannot
-        be encoded
-            strict - abort if we cannot decode
-            replace - put in a bogus character (typically '?')
-            exact - do not encode sys.stdout
-
-            NOTE: by default on Windows, sys.stdout is opened as a text
-            stream, therefore LF line-endings are converted to CRLF.
-            When a command uses encoding_type = 'exact', then
-            sys.stdout is forced to be a binary stream, and line-endings
-            will not mangled.
-
-    :ivar invoked_as:
+    :cvar encoding_type: Command objects will get a 'outf' attribute, which has
+        been setup to properly handle encoding of unicode strings.
+        encoding_type determines what will happen when characters cannot be
+        encoded:
+
+        * strict - abort if we cannot decode
+        * replace - put in a bogus character (typically '?')
+        * exact - do not encode sys.stdout
+
+        NOTE: by default on Windows, sys.stdout is opened as a text stream,
+        therefore LF line-endings are converted to CRLF.  When a command uses
+        encoding_type = 'exact', then sys.stdout is forced to be a binary
+        stream, and line-endings will not mangled.
+
+    :cvar invoked_as:
         A string indicating the real name under which this command was
-        invoked, before expansion of aliases. 
+        invoked, before expansion of aliases.
         (This may be None if the command was constructed and run in-process.)
 
     :cvar hooks: An instance of CommandHooks.
 
-    :ivar __doc__: The help shown by 'bzr help command' for this command.
+    :cvar __doc__: The help shown by 'bzr help command' for this command.
         This is set by assigning explicitly to __doc__ so that -OO can
         be used::
 
-        class Foo(Command):
-            __doc__ = "My help goes here"
+            class Foo(Command):
+                __doc__ = "My help goes here"
     """
     aliases = []
     takes_args = []
@@ -1275,19 +1268,19 @@
 
 
 class Provider(object):
-    '''Generic class to be overriden by plugins'''
+    """Generic class to be overriden by plugins"""
 
     def plugin_for_command(self, cmd_name):
-        '''Takes a command and returns the information for that plugin
+        """Takes a command and returns the information for that plugin
 
         :return: A dictionary with all the available information
-        for the requested plugin
-        '''
+            for the requested plugin
+        """
         raise NotImplementedError
 
 
 class ProvidersRegistry(registry.Registry):
-    '''This registry exists to allow other providers to exist'''
+    """This registry exists to allow other providers to exist"""
 
     def __iter__(self):
         for key, provider in self.iteritems():

=== modified file 'bzrlib/controldir.py'
--- a/bzrlib/controldir.py	2011-04-05 01:12:15 +0000
+++ b/bzrlib/controldir.py	2011-05-19 09:32:38 +0000
@@ -226,6 +226,7 @@
         get at a repository.
 
         :param _unsupported: a private parameter, not part of the api.
+
         TODO: static convenience version of this?
         """
         raise NotImplementedError(self.open_repository)
@@ -314,8 +315,8 @@
         whether one existed before or not; and a local branch is always
         created.
 
-        if revision_id is not None, then the clone operation may tune
-            itself to download less data.
+        :param revision_id: if revision_id is not None, then the clone
+            operation may tune itself to download less data.
         :param accelerator_tree: A tree which can be used for retrieving file
             contents more quickly than the revision tree, i.e. a workingtree.
             The revision tree will be used for cases where accelerator_tree's

=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2011-05-06 17:40:36 +0000
+++ b/bzrlib/diff.py	2011-05-19 10:51:37 +0000
@@ -463,7 +463,7 @@
     """Show in text form the changes from one tree to another.
 
     :param to_file: The output stream.
-    :param specific_files:Include only changes to these files - None for all
+    :param specific_files: Include only changes to these files - None for all
         changes.
     :param external_diff_options: If set, use an external GNU diff and pass 
         these options.
@@ -942,6 +942,7 @@
         """Factory for producing a DiffTree.
 
         Designed to accept options used by show_diff_trees.
+
         :param old_tree: The tree to show as old in the comparison
         :param new_tree: The tree to show as new in the comparison
         :param to_file: File to write comparisons to

=== modified file 'bzrlib/email_message.py'
--- a/bzrlib/email_message.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/email_message.py	2011-05-19 09:32:38 +0000
@@ -181,7 +181,7 @@
     def string_with_encoding(string_):
         """Return a str object together with an encoding.
 
-        :param string_: A str or unicode object.
+        :param string\\_: A str or unicode object.
         :return: A tuple (str, encoding), where encoding is one of 'ascii',
             'utf-8', or '8-bit', in that preferred order.
         """

=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2011-04-07 10:36:24 +0000
+++ b/bzrlib/index.py	2011-05-19 09:32:38 +0000
@@ -70,20 +70,20 @@
 class GraphIndexBuilder(object):
     """A builder that can build a GraphIndex.
 
-    The resulting graph has the structure:
+    The resulting graph has the structure::
 
-    _SIGNATURE OPTIONS NODES NEWLINE
-    _SIGNATURE     := 'Bazaar Graph Index 1' NEWLINE
-    OPTIONS        := 'node_ref_lists=' DIGITS NEWLINE
-    NODES          := NODE*
-    NODE           := KEY NULL ABSENT? NULL REFERENCES NULL VALUE NEWLINE
-    KEY            := Not-whitespace-utf8
-    ABSENT         := 'a'
-    REFERENCES     := REFERENCE_LIST (TAB REFERENCE_LIST){node_ref_lists - 1}
-    REFERENCE_LIST := (REFERENCE (CR REFERENCE)*)?
-    REFERENCE      := DIGITS  ; digits is the byte offset in the index of the
-                              ; referenced key.
-    VALUE          := no-newline-no-null-bytes
+      _SIGNATURE OPTIONS NODES NEWLINE
+      _SIGNATURE     := 'Bazaar Graph Index 1' NEWLINE
+      OPTIONS        := 'node_ref_lists=' DIGITS NEWLINE
+      NODES          := NODE*
+      NODE           := KEY NULL ABSENT? NULL REFERENCES NULL VALUE NEWLINE
+      KEY            := Not-whitespace-utf8
+      ABSENT         := 'a'
+      REFERENCES     := REFERENCE_LIST (TAB REFERENCE_LIST){node_ref_lists - 1}
+      REFERENCE_LIST := (REFERENCE (CR REFERENCE)*)?
+      REFERENCE      := DIGITS  ; digits is the byte offset in the index of the
+                                ; referenced key.
+      VALUE          := no-newline-no-null-bytes
     """
 
     def __init__(self, reference_lists=0, key_elements=1):
@@ -185,11 +185,12 @@
         :param value: The value associate with this key. Must not contain
             newlines or null characters.
         :return: (node_refs, absent_references)
-            node_refs   basically a packed form of 'references' where all
-                        iterables are tuples
-            absent_references   reference keys that are not in self._nodes.
-                                This may contain duplicates if the same key is
-                                referenced in multiple lists.
+        
+            * node_refs: basically a packed form of 'references' where all
+              iterables are tuples
+            * absent_references: reference keys that are not in self._nodes.
+              This may contain duplicates if the same key is referenced in
+              multiple lists.
         """
         as_st = StaticTuple.from_sequence
         self._check_key(key)
@@ -220,7 +221,7 @@
         :param references: An iterable of iterables of keys. Each is a
             reference to another key.
         :param value: The value to associate with the key. It may be any
-            bytes as long as it does not contain \0 or \n.
+            bytes as long as it does not contain \\0 or \\n.
         """
         (node_refs,
          absent_references) = self._check_key_ref_value(key, references, value)

=== modified file 'bzrlib/inter.py'
--- a/bzrlib/inter.py	2011-05-08 12:42:43 +0000
+++ b/bzrlib/inter.py	2011-05-19 09:32:38 +0000
@@ -78,6 +78,7 @@
                        the InterObject instance.
         :param target: the object to be the 'target' member of
                        the InterObject instance.
+
         If an optimised worker exists it will be used otherwise
         a default Inter worker instance will be created.
         """

=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2011-05-14 22:49:10 +0000
+++ b/bzrlib/log.py	2011-05-19 09:32:38 +0000
@@ -1159,6 +1159,7 @@
     This includes the revisions which directly change the file id,
     and the revisions which merge these changes. So if the
     revision graph is::
+
         A-.
         |\ \
         B C E
@@ -1339,27 +1340,28 @@
     to indicate which LogRevision attributes it supports:
 
     - supports_delta must be True if this log formatter supports delta.
-        Otherwise the delta attribute may not be populated.  The 'delta_format'
-        attribute describes whether the 'short_status' format (1) or the long
-        one (2) should be used.
+      Otherwise the delta attribute may not be populated.  The 'delta_format'
+      attribute describes whether the 'short_status' format (1) or the long
+      one (2) should be used.
 
     - supports_merge_revisions must be True if this log formatter supports
-        merge revisions.  If not, then only mainline revisions will be passed
-        to the formatter.
+      merge revisions.  If not, then only mainline revisions will be passed
+      to the formatter.
 
     - preferred_levels is the number of levels this formatter defaults to.
-        The default value is zero meaning display all levels.
-        This value is only relevant if supports_merge_revisions is True.
+      The default value is zero meaning display all levels.
+      This value is only relevant if supports_merge_revisions is True.
 
     - supports_tags must be True if this log formatter supports tags.
-        Otherwise the tags attribute may not be populated.
+      Otherwise the tags attribute may not be populated.
 
     - supports_diff must be True if this log formatter supports diffs.
-        Otherwise the diff attribute may not be populated.
+      Otherwise the diff attribute may not be populated.
 
     Plugins can register functions to show custom revision properties using
     the properties_handler_registry. The registered function
-    must respect the following interface description:
+    must respect the following interface description::
+
         def my_show_properties(properties_dict):
             # code that returns a dict {'name':'value'} of the properties
             # to be shown
@@ -1728,13 +1730,14 @@
 
     def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
         """Format log info into one string. Truncate tail of string
-        :param  revno:      revision number or None.
-                            Revision numbers counts from 1.
-        :param  rev:        revision object
-        :param  max_chars:  maximum length of resulting string
-        :param  tags:       list of tags or None
-        :param  prefix:     string to prefix each line
-        :return:            formatted truncated string
+
+        :param revno:      revision number or None.
+                           Revision numbers counts from 1.
+        :param rev:        revision object
+        :param max_chars:  maximum length of resulting string
+        :param tags:       list of tags or None
+        :param prefix:     string to prefix each line
+        :return:           formatted truncated string
         """
         out = []
         if revno:

=== modified file 'bzrlib/shelf.py'
--- a/bzrlib/shelf.py	2010-09-25 20:08:01 +0000
+++ b/bzrlib/shelf.py	2011-05-19 09:32:38 +0000
@@ -65,7 +65,8 @@
         """Iterable of tuples describing shelvable changes.
 
         As well as generating the tuples, this updates several members.
-        Tuples may be:
+        Tuples may be::
+
            ('add file', file_id, work_kind, work_path)
            ('delete file', file_id, target_kind, target_path)
            ('rename', file_id, target_path, work_path)

=== modified file 'bzrlib/smart/bzrdir.py'
--- a/bzrlib/smart/bzrdir.py	2011-02-28 23:07:53 +0000
+++ b/bzrlib/smart/bzrdir.py	2011-05-19 09:32:38 +0000
@@ -86,7 +86,7 @@
 class SmartServerRequestBzrDir(SmartServerRequest):
 
     def do(self, path, *args):
-        """Open a BzrDir at path, and return self.do_bzrdir_request(*args)."""
+        """Open a BzrDir at path, and return `self.do_bzrdir_request(*args)`."""
         try:
             self._bzrdir = BzrDir.open_from_transport(
                 self.transport_from_client_path(path))

=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py	2010-06-11 05:57:09 +0000
+++ b/bzrlib/smart/protocol.py	2011-05-19 09:32:38 +0000
@@ -654,7 +654,7 @@
         """Make a remote call with a readv array.
 
         The body is encoded with one line per readv offset pair. The numbers in
-        each pair are separated by a comma, and no trailing \n is emitted.
+        each pair are separated by a comma, and no trailing \\n is emitted.
         """
         if 'hpss' in debug.debug_flags:
             mutter('hpss call w/readv: %s', repr(args)[1:-1])
@@ -1332,7 +1332,7 @@
         """Make a remote call with a readv array.
 
         The body is encoded with one line per readv offset pair. The numbers in
-        each pair are separated by a comma, and no trailing \n is emitted.
+        each pair are separated by a comma, and no trailing \\n is emitted.
         """
         if 'hpss' in debug.debug_flags:
             mutter('hpss call w/readv: %s', repr(args)[1:-1])

=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py	2011-05-03 22:22:59 +0000
+++ b/bzrlib/smart/request.py	2011-05-19 09:32:38 +0000
@@ -135,7 +135,7 @@
         It will return a SmartServerResponse if the command does not expect a
         body.
 
-        :param *args: the arguments of the request.
+        :param args: the arguments of the request.
         """
         self._check_enabled()
         return self.do(*args)

=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py	2011-04-07 10:36:24 +0000
+++ b/bzrlib/trace.py	2011-05-19 09:32:38 +0000
@@ -332,7 +332,7 @@
     :param to_file: A file-like object to which messages will be sent.
 
     :returns: A memento that should be passed to _pop_log_file to restore the
-    previously active logging.
+        previously active logging.
     """
     global _trace_file
     # make a new handler

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2011-05-13 14:02:14 +0000
+++ b/bzrlib/tree.py	2011-05-19 09:32:38 +0000
@@ -174,6 +174,7 @@
              g
 
         The yield order (ignoring root) would be::
+
           a, f, a/b, a/d, a/b/c, a/d/e, f/g
 
         :param yield_parents: If True, yield the parents from the root leading
@@ -289,6 +290,7 @@
 
         :param file_id: The file_id of the file.
         :param path: The path of the file.
+
         If both file_id and path are supplied, an implementation may use
         either one.
         """
@@ -860,7 +862,7 @@
         None)
     :param trees: The trees to find file_ids within
     :param require_versioned: if true, all specified filenames must occur in
-    at least one tree.
+        at least one tree.
     :return: a set of file ids for the specified filenames and their children.
     """
     if not filenames:

=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py	2011-04-11 01:23:58 +0000
+++ b/bzrlib/ui/__init__.py	2011-05-19 09:32:38 +0000
@@ -319,7 +319,7 @@
         """Get a boolean question answered from the user.
 
         :param prompt: a message to prompt the user with. Should be a single
-        line without terminating \n.
+            line without terminating \\n.
         :return: True or False for y/yes or n/no.
         """
         raise NotImplementedError(self.get_boolean)
@@ -328,7 +328,7 @@
         """Get an integer from the user.
 
         :param prompt: a message to prompt the user with. Could be a multi-line
-            prompt but without a terminating \n.
+            prompt but without a terminating \\n.
 
         :return: A signed integer.
         """

=== modified file 'bzrlib/vf_repository.py'
--- a/bzrlib/vf_repository.py	2011-05-15 17:58:19 +0000
+++ b/bzrlib/vf_repository.py	2011-05-19 09:32:38 +0000
@@ -1425,8 +1425,8 @@
             the revision key from each parsed line will be looked up in the
             revision_keys filter.
         :return: a dictionary mapping altered file-ids to an iterable of
-        revision_ids. Each altered file-ids has the exact revision_ids that
-        altered it listed explicitly.
+            revision_ids. Each altered file-ids has the exact revision_ids that
+            altered it listed explicitly.
         """
         seen = set(self._serializer._find_text_key_references(
                 line_iterator).iterkeys())
@@ -1461,8 +1461,8 @@
         :param _inv_weave: The inventory weave from this repository or None.
             If None, the inventory weave will be opened automatically.
         :return: a dictionary mapping altered file-ids to an iterable of
-        revision_ids. Each altered file-ids has the exact revision_ids that
-        altered it listed explicitly.
+            revision_ids. Each altered file-ids has the exact revision_ids that
+            altered it listed explicitly.
         """
         selected_keys = set((revid,) for revid in revision_ids)
         w = _inv_weave or self.inventories

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2011-05-13 14:02:14 +0000
+++ b/bzrlib/workingtree_4.py	2011-05-19 09:32:38 +0000
@@ -1453,7 +1453,7 @@
         """See WorkingTreeFormat.initialize().
 
         :param revision_id: allows creating a working tree at a different
-        revision than the branch is at.
+            revision than the branch is at.
         :param accelerator_tree: A tree which can be used for retrieving file
             contents more quickly than the revision tree, i.e. a workingtree.
             The revision tree will be used for cases where accelerator_tree's




More information about the bazaar-commits mailing list