Rev 6309: (jelmer) Fix fallback for RemoteBranch.revision_id_to_dotted_revno, in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6309 [merge]
revision-id: pqm at pqm.ubuntu.com-20111128035243-w2jbl870d8lq94v1
parent: pqm at pqm.ubuntu.com-20111128030327-ps8yfespwmhati3y
parent: jelmer at samba.org-20111126204900-e2pb0tkn6ji66nwy
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-11-28 03:52:43 +0000
message:
  (jelmer) Fix fallback for RemoteBranch.revision_id_to_dotted_revno,
   and add a test. (Jelmer Vernooij)
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2011-11-28 03:03:27 +0000
+++ b/bzrlib/remote.py	2011-11-28 03:52:43 +0000
@@ -3363,7 +3363,7 @@
                 self._remote_path(), revision_id)
         except errors.UnknownSmartMethod:
             self._ensure_real()
-            return self._real_branch.revision_id_to_revno(revision_id)
+            return self._real_branch.revision_id_to_dotted_revno(revision_id)
         if response[0] == 'ok':
             return tuple([int(x) for x in response[1:]])
         else:

=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py	2011-11-25 18:45:53 +0000
+++ b/bzrlib/tests/test_remote.py	2011-11-28 03:52:43 +0000
@@ -2075,6 +2075,15 @@
             branch.revision_id_to_dotted_revno, 'unknown')
         self.assertFinished(client)
 
+    def test_dotted_no_smart_verb(self):
+        self.setup_smart_server_with_call_log()
+        branch = self.make_branch('.')
+        self.disable_verb('Branch.revision_id_to_revno')
+        self.reset_smart_call_log()
+        self.assertEquals((0, ),
+            branch.revision_id_to_dotted_revno('null:'))
+        self.assertLength(7, self.hpss_calls)
+
 
 class TestBzrDirGetSetConfig(RemoteBzrDirTestCase):