Rev 4097: (andrew) Add some medium._remember_is_before((1, 13)) calls. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4097
revision-id: pqm at pqm.ubuntu.com-20090309074558-icfv4ysggekuw4fi
parent: pqm at pqm.ubuntu.com-20090309070558-koep1iv8v0esc18d
parent: andrew.bennetts at canonical.com-20090309055610-xz0myl30bu5glng4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-09 07:45:58 +0000
message:
  (andrew) Add some medium._remember_is_before((1, 13)) calls.
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 4094.1.1
    revision-id: andrew.bennetts at canonical.com-20090309055610-xz0myl30bu5glng4
    parent: pqm at pqm.ubuntu.com-20090309023123-7hvnfrilrt5ql771
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: insert-stream-require-1.13
    timestamp: Mon 2009-03-09 15:56:10 +1000
    message:
      Add some medium._remember_is_before((1, 13)) calls.
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2009-03-07 20:45:34 +0000
+++ b/bzrlib/remote.py	2009-03-09 05:56:10 +0000
@@ -151,6 +151,7 @@
         try:
             response = self._call(verb, path, stacking)
         except errors.UnknownSmartMethod:
+            medium._remember_remote_is_before((1, 13))
             return self._vfs_cloning_metadir(require_stacking=require_stacking)
         if len(response) != 3:
             raise errors.UnexpectedSmartServerResponse(response)
@@ -242,7 +243,7 @@
                     raise errors.UnexpectedSmartServerResponse(response)
                 return response
             except errors.UnknownSmartMethod:
-                pass
+                medium._remember_remote_is_before((1, 13))
         response = self._call('BzrDir.open_branch', path)
         if response[0] != 'ok':
             raise errors.UnexpectedSmartServerResponse(response)
@@ -301,7 +302,11 @@
         medium = self._client._medium
         if medium._is_remote_before((1, 13)):
             raise errors.UnknownSmartMethod(verb)
-        response = self._call(verb, path)
+        try:
+            response = self._call(verb, path)
+        except errors.UnknownSmartMethod:
+            medium._remember_remote_is_before((1, 13))
+            raise
         if response[0] != 'ok':
             raise errors.UnexpectedSmartServerResponse(response)
         return response, None
@@ -460,6 +465,7 @@
             response = a_bzrdir._call(verb, path, network_name, shared_str)
         except errors.UnknownSmartMethod:
             # Fallback - use vfs methods
+            medium._remember_remote_is_before((1, 13))
             return self._vfs_initialize(a_bzrdir, shared)
         else:
             # Turn the response into a RemoteRepository object.
@@ -1662,6 +1668,7 @@
             response = a_bzrdir._call(verb, path, network_name)
         except errors.UnknownSmartMethod:
             # Fallback - use vfs methods
+            medium._remember_remote_is_before((1, 13))
             return self._vfs_initialize(a_bzrdir)
         if response[0] != 'ok':
             raise errors.UnexpectedSmartServerResponse(response)
@@ -1899,6 +1906,7 @@
         try:
             response = self._call('Branch.get_tags_bytes', self._remote_path())
         except errors.UnknownSmartMethod:
+            medium._remember_remote_is_before((1, 13))
             return self._vfs_get_tags_bytes()
         return response[0]
 
@@ -2106,6 +2114,7 @@
         try:
             response = self._call('Branch.get_parent', self._remote_path())
         except errors.UnknownSmartMethod:
+            medium._remember_remote_is_before((1, 13))
             return self._vfs_get_parent_location()
         if len(response) != 1:
             raise errors.UnexpectedSmartServerResponse(response)