Rev 2225: Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2225
revision-id: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:23:40 +1000
message:
  Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2007-04-16 02:56:19 +0000
+++ b/bzrlib/remote.py	2007-04-16 17:23:40 +0000
@@ -287,8 +287,8 @@
             return True
         path = self.bzrdir._path_for_remote_call(self._client)
         response = self._client.call('Repository.has_revision', path, revision_id)
-        assert response[0] in ('ok', 'no'), 'unexpected response code %s' % (response,)
-        return response[0] == 'ok'
+        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
+        return response[0] == 'yes'
 
     def gather_stats(self, revid=None, committers=None):
         """See Repository.gather_stats()."""

=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py	2007-03-13 05:52:01 +0000
+++ b/bzrlib/smart/repository.py	2007-04-16 17:23:40 +0000
@@ -80,7 +80,7 @@
             present.
         """
         if repository.has_revision(revision_id):
-            return SmartServerResponse(('ok', ))
+            return SmartServerResponse(('yes', ))
         else:
             return SmartServerResponse(('no', ))
 

=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2007-04-13 06:18:40 +0000
+++ b/bzrlib/tests/test_smart.py	2007-04-16 17:23:40 +0000
@@ -571,7 +571,7 @@
             request.execute(backing.local_abspath(''), 'revid'))
 
     def test_present_revision(self):
-        """For a present revision, ('ok', ) is returned."""
+        """For a present revision, ('yes', ) is returned."""
         backing = self.get_transport()
         request = smart.repository.SmartServerRequestHasRevision(backing)
         tree = self.make_branch_and_memory_tree('.')
@@ -581,7 +581,7 @@
         r1 = tree.commit('a commit', rev_id=rev_id_utf8)
         tree.unlock()
         self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
-        self.assertEqual(SmartServerResponse(('ok', )),
+        self.assertEqual(SmartServerResponse(('yes', )),
             request.execute(backing.local_abspath(''), rev_id_utf8))