Rev 3399: Minor docstring cleanups (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3399
revision-id:pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
parent: pqm at pqm.ubuntu.com-20080501112512-b9lgs4w8r43evtn1
parent: ian.clatworthy at canonical.com-20080501050654-y6ht6lylvyl0g6rd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 16:38:25 +0100
message:
  Minor docstring cleanups (Ian Clatworthy)
modified:
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    revno: 3395.1.1
    revision-id:ian.clatworthy at canonical.com-20080501050654-y6ht6lylvyl0g6rd
    parent: pqm at pqm.ubuntu.com-20080501045531-3hkmq9qzoeequw1s
    parent: ian.clatworthy at canonical.com-20080501031512-nxtv5cpcr3unqkf0
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Thu 2008-05-01 15:06:54 +1000
    message:
      Minor docstring cleanups (Ian Clatworthy)
    modified:
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    revno: 3394.2.2
    revision-id:ian.clatworthy at canonical.com-20080501031512-nxtv5cpcr3unqkf0
    parent: ian.clatworthy at canonical.com-20080501030859-8uu0pyuk36w0zkab
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: cleanups
    timestamp: Thu 2008-05-01 13:15:12 +1000
    message:
      show_tree_status docstring and deprecation cleanups
    modified:
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    revno: 3394.2.1
    revision-id:ian.clatworthy at canonical.com-20080501030859-8uu0pyuk36w0zkab
    parent: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: cleanups
    timestamp: Thu 2008-05-01 13:08:59 +1000
    message:
      add docstring for put_file_bytes_non_atomic
    modified:
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py	2008-04-05 13:45:37 +0000
+++ b/bzrlib/mutabletree.py	2008-05-01 03:08:59 +0000
@@ -240,6 +240,19 @@
         """
         raise NotImplementedError(self.mkdir)
 
+    @needs_write_lock
+    def put_file_bytes_non_atomic(self, file_id, bytes):
+        """Update the content of a file in the tree.
+        
+        Note that the file is written in-place rather than being
+        written to a temporary location and renamed. As a consequence,
+        readers can potentially see the file half-written.
+
+        :param file_id: file-id of the file
+        :param bytes: the new file contents
+        """
+        raise NotImplementedError(self.put_file_bytes_non_atomic)
+
     def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
         """Set the parents ids of the working tree.
 

=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2008-04-03 02:22:55 +0000
+++ b/bzrlib/status.py	2008-05-01 03:15:12 +0000
@@ -60,15 +60,15 @@
     :param show_ids: If set, includes each file's id.
     :param to_file: If set, write to this file (default stdout.)
     :param show_pending: If set, write pending merges.
-    :param revision: If None the compare latest revision with working tree
-        If not None it must be a RevisionSpec list.
-        If one revision show compared it with working tree.
-        If two revisions show status between first and second.
+    :param revision: If None, compare latest revision with working tree
+        If not None, it must be a RevisionSpec list.
+        If one revision, compare with working tree.
+        If two revisions, show status between first and second.
     :param short: If True, gives short SVN-style status lines.
     :param versioned: If True, only shows versioned files.
     """
     if show_unchanged is not None:
-        warn("show_status_trees with show_unchanged has been deprecated "
+        warn("show_tree_status with show_unchanged has been deprecated "
              "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
 
     if to_file is None: