Rev 4889: Bring in some tiny text tweaks from 2.5 for bzrlib.smart.protocol and bzrlib.smart.request. in http://bazaar.launchpad.net/~jameinel/bzr/2.1-all-reconnect-819604

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-all-reconnect-819604

------------------------------------------------------------
revno: 4889
revision-id: john at arbash-meinel.com-20120912075951-mn4glmivewawsa9i
parent: john at arbash-meinel.com-20120912073929-0vavweteyac1j3bx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-all-reconnect-819604
timestamp: Wed 2012-09-12 11:59:51 +0400
message:
  Bring in some tiny text tweaks from 2.5 for bzrlib.smart.protocol and bzrlib.smart.request.
  
  No functional changes here, just minor updates to be clear that there aren't any real
  changes that matter.
-------------- next part --------------
=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py	2011-10-07 16:11:40 +0000
+++ b/bzrlib/smart/protocol.py	2012-09-12 07:59:51 +0000
@@ -648,7 +648,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])
@@ -1222,6 +1222,7 @@
                     if first_chunk is None:
                         first_chunk = chunk
                     self._write_prefixed_body(chunk)
+                    self.flush()
                     if 'hpssdetail' in debug.debug_flags:
                         # Not worth timing separately, as _write_func is
                         # actually buffered
@@ -1323,7 +1324,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-10-10 12:41:10 +0000
+++ b/bzrlib/smart/request.py	2012-09-12 07:59:51 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
+# Copyright (C) 2006-2012 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -134,7 +134,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)
@@ -534,8 +534,9 @@
 request_handlers.register_lazy(
     'Branch.lock_write', 'bzrlib.smart.branch',
     'SmartServerBranchRequestLockWrite', info='semi')
-request_handlers.register_lazy( 'Branch.revision_history',
-    'bzrlib.smart.branch', 'SmartServerRequestRevisionHistory', info='read')
+request_handlers.register_lazy(
+    'Branch.revision_history', 'bzrlib.smart.branch',
+    'SmartServerRequestRevisionHistory', info='read')
 request_handlers.register_lazy(
     'Branch.set_config_option', 'bzrlib.smart.branch',
     'SmartServerBranchRequestSetConfigOption', info='idem')
@@ -552,8 +553,8 @@
     'Branch.set_parent_location', 'bzrlib.smart.branch',
     'SmartServerBranchRequestSetParentLocation', info='idem')
 request_handlers.register_lazy(
-    'Branch.unlock', 'bzrlib.smart.branch', 'SmartServerBranchRequestUnlock',
-    info='semi')
+    'Branch.unlock', 'bzrlib.smart.branch',
+    'SmartServerBranchRequestUnlock', info='semi')
 request_handlers.register_lazy(
     'BzrDir.cloning_metadir', 'bzrlib.smart.bzrdir',
     'SmartServerBzrDirRequestCloningMetaDir', info='read')
@@ -676,5 +677,5 @@
 request_handlers.register_lazy(
     'stat', 'bzrlib.smart.vfs', 'StatRequest', info='read')
 request_handlers.register_lazy(
-    'Transport.is_readonly', 'bzrlib.smart.request', 'SmartServerIsReadonly',
-    info='read')
+    'Transport.is_readonly', 'bzrlib.smart.request',
+    'SmartServerIsReadonly', info='read')