Rev 6298: (jelmer) Add HPSS call for in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Nov 25 14:22:44 UTC 2011
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6298 [merge]
revision-id: pqm at pqm.ubuntu.com-20111125142243-y4j74jb7phvc25vz
parent: pqm at pqm.ubuntu.com-20111125135741-kbnof2f16li9l1ws
parent: jelmer at samba.org-20111125134448-lrqyns16zaj4shc2
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-11-25 14:22:43 +0000
message:
(jelmer) Add HPSS call for
``VersionedFileRepository.get_serializer_format``. (Jelmer Vernooij)
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_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2011-11-25 13:31:19 +0000
+++ b/bzrlib/remote.py 2011-11-25 14:22:43 +0000
@@ -1591,8 +1591,16 @@
return list(self.revision_trees([revision_id]))[0]
def get_serializer_format(self):
- self._ensure_real()
- return self._real_repository.get_serializer_format()
+ path = self.bzrdir._path_for_remote_call(self._client)
+ try:
+ response = self._call('VersionedFileRepository.get_serializer_format',
+ path)
+ except errors.UnknownSmartMethod:
+ self._ensure_real()
+ return self._real_repository.get_serializer_format()
+ if response[0] != 'ok':
+ raise errors.UnexpectedSmartServerResponse(response)
+ return response[1]
def get_commit_builder(self, branch, parents, config, timestamp=None,
timezone=None, committer=None, revprops=None,
=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py 2011-11-25 12:03:11 +0000
+++ b/bzrlib/smart/repository.py 2011-11-25 13:44:48 +0000
@@ -335,6 +335,20 @@
('history-incomplete', earliest_revno, earliest_revid))
+class SmartServerRepositoryGetSerializerFormat(SmartServerRepositoryRequest):
+
+ def do_repository_request(self, repository):
+ """Return the serializer format for this repository.
+
+ New in 2.5.0.
+
+ :param repository: The repository to query
+ :return: A smart server response ('ok', FORMAT)
+ """
+ serializer = repository.get_serializer_format()
+ return SuccessfulSmartServerResponse(('ok', serializer))
+
+
class SmartServerRequestHasRevision(SmartServerRepositoryRequest):
def do_repository_request(self, repository, revision_id):
=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py 2011-11-25 13:31:19 +0000
+++ b/bzrlib/smart/request.py 2011-11-25 14:22:43 +0000
@@ -665,6 +665,9 @@
'Repository.tarball', 'bzrlib.smart.repository',
'SmartServerRepositoryTarball')
request_handlers.register_lazy(
+ 'VersionedFileRepository.get_serializer_format', 'bzrlib.smart.repository',
+ 'SmartServerRepositoryGetSerializerFormat')
+request_handlers.register_lazy(
'rmdir', 'bzrlib.smart.vfs', 'RmdirRequest')
request_handlers.register_lazy(
'stat', 'bzrlib.smart.vfs', 'StatRequest')
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2011-11-25 13:31:19 +0000
+++ b/bzrlib/tests/test_remote.py 2011-11-25 14:22:43 +0000
@@ -2278,6 +2278,19 @@
client._calls)
+class TestRepositoryGetSerializerFormat(TestRemoteRepository):
+
+ def test_get_serializer_format(self):
+ transport_path = 'hill'
+ repo, client = self.setup_fake_client_and_repository(transport_path)
+ client.add_success_response('ok', '7')
+ self.assertEquals('7', repo.get_serializer_format())
+ self.assertEqual(
+ [('call', 'VersionedFileRepository.get_serializer_format',
+ ('hill/', ))],
+ client._calls)
+
+
class TestRepositoryGetGraph(TestRemoteRepository):
def test_get_graph(self):
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2011-11-25 13:31:19 +0000
+++ b/bzrlib/tests/test_smart.py 2011-11-25 14:22:43 +0000
@@ -2037,6 +2037,19 @@
self.assertTrue(repo.make_working_trees())
+class TestSmartServerRepositoryGetSerializerFormat(
+ tests.TestCaseWithMemoryTransport):
+
+ def test_get_serializer_format(self):
+ backing = self.get_transport()
+ repo = self.make_repository('.', format='2a')
+ request_class = smart_repo.SmartServerRepositoryGetSerializerFormat
+ request = request_class(backing)
+ self.assertEqual(
+ smart_req.SuccessfulSmartServerResponse(('ok', '10')),
+ request.execute(''))
+
+
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
def make_repo_needing_autopacking(self, path='.'):
@@ -2198,6 +2211,8 @@
smart_repo.SmartServerRepositoryTarball)
self.assertHandlerEqual('Repository.unlock',
smart_repo.SmartServerRepositoryUnlock)
+ self.assertHandlerEqual('VersionedFileRepository.get_serializer_format',
+ smart_repo.SmartServerRepositoryGetSerializerFormat)
self.assertHandlerEqual('Transport.is_readonly',
smart_req.SmartServerIsReadonly)
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt 2011-11-25 13:31:19 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2011-11-25 14:22:43 +0000
@@ -108,7 +108,8 @@
* New HPSS calls ``Repository.has_signature_for_revision_id``,
``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
``BzrDir.has_workingtree``, ``Branch.put_config_file``,
- ``Branch.break_lock`` and ``Repository.break_lock``,
+ ``Branch.break_lock``, ``Repository.break_lock``,
+ ``VersionedFileRepository.get_serializer_format``.
and ``Repository.all_revision_ids``.
(Jelmer Vernooij)
More information about the bazaar-commits
mailing list