Rev 4068: (robertc) Repository.StreamSource.get_stream -> Repository.get_stream in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4068
revision-id: pqm at pqm.ubuntu.com-20090302075518-h40c3t24efos1k9e
parent: pqm at pqm.ubuntu.com-20090302070021-dvcjdpf47t2aeari
parent: robertc at robertcollins.net-20090302071341-c7kzkzps5pxt3dgf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-02 07:55:18 +0000
message:
  (robertc) Repository.StreamSource.get_stream -> Repository.get_stream
  	in the smart server. (Robert Collins)
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
    ------------------------------------------------------------
    revno: 4060.1.5
    revision-id: robertc at robertcollins.net-20090302071341-c7kzkzps5pxt3dgf
    parent: robertc at robertcollins.net-20090302033807-af1b7awmfueyawts
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2009-03-02 18:13:41 +1100
    message:
      Verb change name requested by Andrew.
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2009-03-02 03:38:07 +0000
+++ b/bzrlib/remote.py	2009-03-02 07:13:41 +0000
@@ -1482,7 +1482,7 @@
         try:
             recipe = repo._serialise_search_recipe(search._recipe)
             response = repo._call_with_body_bytes_expecting_body(
-                'Repository.StreamSource.get_stream',
+                'Repository.get_stream',
                 (path, self.to_format.network_name()), recipe)
             response_tuple, response_handler = response
         except errors.UnknownSmartMethod:

=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py	2009-03-02 03:38:07 +0000
+++ b/bzrlib/smart/repository.py	2009-03-02 07:13:41 +0000
@@ -333,7 +333,7 @@
         return SuccessfulSmartServerResponse(('ok', token))
 
 
-class SmartServerRepositoryStreamSourceGetStream(SmartServerRepositoryRequest):
+class SmartServerRepositoryGetStream(SmartServerRepositoryRequest):
 
     def do_repository_request(self, repository, to_network_name):
         """Get a stream for inserting into a to_format repository.
@@ -400,7 +400,7 @@
 
 
 def _byte_stream_to_stream(byte_stream):
-    """Convert a byte stream into a format and a StreamSource stream.
+    """Convert a byte stream into a format and a stream.
 
     :param byte_stream: A bytes iterator, as output by _stream_to_byte_stream.
     :return: (RepositoryFormat, stream_generator)

=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py	2009-03-02 07:00:21 +0000
+++ b/bzrlib/smart/request.py	2009-03-02 07:55:18 +0000
@@ -472,8 +472,8 @@
 request_handlers.register_lazy(
     'Repository.unlock', 'bzrlib.smart.repository', 'SmartServerRepositoryUnlock')
 request_handlers.register_lazy(
-    'Repository.StreamSource.get_stream', 'bzrlib.smart.repository',
-    'SmartServerRepositoryStreamSourceGetStream')
+    'Repository.get_stream', 'bzrlib.smart.repository',
+    'SmartServerRepositoryGetStream')
 request_handlers.register_lazy(
     'Repository.tarball', 'bzrlib.smart.repository',
     'SmartServerRepositoryTarball')

=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2009-03-02 03:38:07 +0000
+++ b/bzrlib/tests/test_smart.py	2009-03-02 07:13:41 +0000
@@ -1201,8 +1201,8 @@
             smart.request.request_handlers.get('Repository.lock_write'),
             smart.repository.SmartServerRepositoryLockWrite)
         self.assertEqual(
-            smart.request.request_handlers.get('Repository.StreamSource.get_stream'),
-            smart.repository.SmartServerRepositoryStreamSourceGetStream)
+            smart.request.request_handlers.get('Repository.get_stream'),
+            smart.repository.SmartServerRepositoryGetStream)
         self.assertEqual(
             smart.request.request_handlers.get('Repository.tarball'),
             smart.repository.SmartServerRepositoryTarball)