/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 Canonical Ltd
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
16
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
17
from __future__ import absolute_import
18
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
19
import bz2
6280.9.4 by Jelmer Vernooij
use zlib instead.
20
import zlib
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
21
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
22
from bzrlib import (
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
23
    bencode,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
24
    branch,
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
25
    bzrdir as _mod_bzrdir,
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
26
    config as _mod_config,
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
27
    controldir,
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
28
    debug,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
29
    errors,
6280.8.1 by Jelmer Vernooij
Avoid _ensure_real in RemoteRepository.verify_revision_signature and RemoteRepository.sign_revision.
30
    gpg,
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
31
    graph,
6282.6.5 by Jelmer Vernooij
Use iter_inventory_deltas.
32
    inventory_delta,
4509.3.28 by Martin Pool
Add missing import
33
    lock,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
34
    lockdir,
6280.10.18 by Jelmer Vernooij
Ensure file ids are always utf8.
35
    osutils,
6284.1.1 by Jelmer Vernooij
Allow registering custom error handlers in the HPSS client.
36
    registry,
5158.4.1 by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats.
37
    repository as _mod_repository,
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
38
    revision as _mod_revision,
4913.4.2 by Jelmer Vernooij
Add Repository.get_known_graph_ancestry.
39
    static_tuple,
3228.4.11 by John Arbash Meinel
Deprecations abound.
40
    symbol_versioning,
6280.8.1 by Jelmer Vernooij
Avoid _ensure_real in RemoteRepository.verify_revision_signature and RemoteRepository.sign_revision.
41
    testament as _mod_testament,
5535.3.7 by Andrew Bennetts
Allow for trailing-slash differences between local url path vs. remote url path for remote branch's repository.
42
    urlutils,
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
43
    vf_repository,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
44
    vf_search,
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
45
    )
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
46
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
47
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
48
from bzrlib.errors import (
49
    NoSuchRevision,
50
    SmartProtocolError,
51
    )
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
52
from bzrlib.i18n import gettext
6267.1.3 by Jelmer Vernooij
Fix tests.
53
from bzrlib.inventory import Inventory
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
54
from bzrlib.lockable_files import LockableFiles
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
55
from bzrlib.smart import client, vfs, repository as smart_repo
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
56
from bzrlib.smart.client import _SmartClient
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
57
from bzrlib.revision import NULL_REVISION
6267.1.3 by Jelmer Vernooij
Fix tests.
58
from bzrlib.revisiontree import InventoryRevisionTree
5816.8.3 by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work.
59
from bzrlib.repository import RepositoryWriteLockResult, _LazyListJoin
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
60
from bzrlib.serializer import format_registry as serializer_format_registry
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
61
from bzrlib.trace import mutter, note, warning, log_exception_quietly
6362.6.1 by Jelmer Vernooij
Implement RemoteRepository.add_revision.
62
from bzrlib.versionedfile import ChunkedContentFactory, FulltextContentFactory
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
63
3445.1.5 by John Arbash Meinel
allow passing a 'graph' object into Branch.update_revisions.
64
6015.23.12 by John Arbash Meinel
Going with 100 to be friendlier to bandwith/latency constrained environs.
65
_DEFAULT_SEARCH_DEPTH = 100
6015.23.11 by John Arbash Meinel
allow a bit more flexibilty in how we walk the searches.
66
67
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
68
class _RpcHelper(object):
69
    """Mixin class that helps with issuing RPCs."""
70
71
    def _call(self, method, *args, **err_context):
72
        try:
73
            return self._client.call(method, *args)
74
        except errors.ErrorFromSmartServer, err:
75
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
76
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
77
    def _call_expecting_body(self, method, *args, **err_context):
78
        try:
79
            return self._client.call_expecting_body(method, *args)
80
        except errors.ErrorFromSmartServer, err:
81
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
82
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
83
    def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
84
        try:
85
            return self._client.call_with_body_bytes(method, args, body_bytes)
86
        except errors.ErrorFromSmartServer, err:
87
            self._translate_error(err, **err_context)
88
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
89
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
90
                                             **err_context):
91
        try:
92
            return self._client.call_with_body_bytes_expecting_body(
93
                method, args, body_bytes)
94
        except errors.ErrorFromSmartServer, err:
95
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
96
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
97
98
def response_tuple_to_repo_format(response):
99
    """Convert a response tuple describing a repository format to a format."""
100
    format = RemoteRepositoryFormat()
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
101
    format._rich_root_data = (response[0] == 'yes')
102
    format._supports_tree_reference = (response[1] == 'yes')
103
    format._supports_external_lookups = (response[2] == 'yes')
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
104
    format._network_name = response[3]
105
    return format
106
107
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
108
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
109
# does not have to be imported unless a remote format is involved.
110
111
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
112
    """Format representing bzrdirs accessed via a smart server"""
113
114
    supports_workingtrees = False
115
116
    def __init__(self):
5712.3.17 by Jelmer Vernooij
more fixes.
117
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
118
        # XXX: It's a bit ugly that the network name is here, because we'd
119
        # like to believe that format objects are stateless or at least
120
        # immutable,  However, we do at least avoid mutating the name after
121
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
122
        self._network_name = None
123
124
    def __repr__(self):
125
        return "%s(_network_name=%r)" % (self.__class__.__name__,
126
            self._network_name)
127
128
    def get_format_description(self):
129
        if self._network_name:
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
130
            try:
131
                real_format = controldir.network_format_registry.get(
132
                        self._network_name)
133
            except KeyError:
134
                pass
135
            else:
136
                return 'Remote: ' + real_format.get_format_description()
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
137
        return 'bzr remote bzrdir'
138
139
    def get_format_string(self):
140
        raise NotImplementedError(self.get_format_string)
141
142
    def network_name(self):
143
        if self._network_name:
144
            return self._network_name
145
        else:
146
            raise AssertionError("No network name set.")
147
148
    def initialize_on_transport(self, transport):
149
        try:
150
            # hand off the request to the smart server
151
            client_medium = transport.get_smart_medium()
152
        except errors.NoSmartMedium:
153
            # TODO: lookup the local format from a server hint.
154
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
155
            return local_dir_format.initialize_on_transport(transport)
156
        client = _SmartClient(client_medium)
157
        path = client.remote_path_from_transport(transport)
158
        try:
159
            response = client.call('BzrDirFormat.initialize', path)
160
        except errors.ErrorFromSmartServer, err:
161
            _translate_error(err, path=path)
162
        if response[0] != 'ok':
163
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
164
        format = RemoteBzrDirFormat()
165
        self._supply_sub_formats_to(format)
166
        return RemoteBzrDir(transport, format)
167
168
    def parse_NoneTrueFalse(self, arg):
169
        if not arg:
170
            return None
171
        if arg == 'False':
172
            return False
173
        if arg == 'True':
174
            return True
175
        raise AssertionError("invalid arg %r" % arg)
176
177
    def _serialize_NoneTrueFalse(self, arg):
178
        if arg is False:
179
            return 'False'
180
        if arg:
181
            return 'True'
182
        return ''
183
184
    def _serialize_NoneString(self, arg):
185
        return arg or ''
186
187
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
188
        create_prefix=False, force_new_repo=False, stacked_on=None,
189
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
190
        shared_repo=False):
191
        try:
192
            # hand off the request to the smart server
193
            client_medium = transport.get_smart_medium()
194
        except errors.NoSmartMedium:
195
            do_vfs = True
196
        else:
197
            # Decline to open it if the server doesn't support our required
198
            # version (3) so that the VFS-based transport will do it.
199
            if client_medium.should_probe():
200
                try:
201
                    server_version = client_medium.protocol_version()
202
                    if server_version != '2':
203
                        do_vfs = True
204
                    else:
205
                        do_vfs = False
206
                except errors.SmartProtocolError:
207
                    # Apparently there's no usable smart server there, even though
208
                    # the medium supports the smart protocol.
209
                    do_vfs = True
210
            else:
211
                do_vfs = False
212
        if not do_vfs:
213
            client = _SmartClient(client_medium)
214
            path = client.remote_path_from_transport(transport)
215
            if client_medium._is_remote_before((1, 16)):
216
                do_vfs = True
217
        if do_vfs:
218
            # TODO: lookup the local format from a server hint.
219
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
220
            self._supply_sub_formats_to(local_dir_format)
221
            return local_dir_format.initialize_on_transport_ex(transport,
222
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
223
                force_new_repo=force_new_repo, stacked_on=stacked_on,
224
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
225
                make_working_trees=make_working_trees, shared_repo=shared_repo,
226
                vfs_only=True)
227
        return self._initialize_on_transport_ex_rpc(client, path, transport,
228
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
229
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
230
231
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
232
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
233
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
234
        args = []
235
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
236
        args.append(self._serialize_NoneTrueFalse(create_prefix))
237
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
238
        args.append(self._serialize_NoneString(stacked_on))
239
        # stack_on_pwd is often/usually our transport
240
        if stack_on_pwd:
241
            try:
242
                stack_on_pwd = transport.relpath(stack_on_pwd)
243
                if not stack_on_pwd:
244
                    stack_on_pwd = '.'
245
            except errors.PathNotChild:
246
                pass
247
        args.append(self._serialize_NoneString(stack_on_pwd))
248
        args.append(self._serialize_NoneString(repo_format_name))
249
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
250
        args.append(self._serialize_NoneTrueFalse(shared_repo))
251
        request_network_name = self._network_name or \
252
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
253
        try:
254
            response = client.call('BzrDirFormat.initialize_ex_1.16',
255
                request_network_name, path, *args)
256
        except errors.UnknownSmartMethod:
257
            client._medium._remember_remote_is_before((1,16))
258
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
259
            self._supply_sub_formats_to(local_dir_format)
260
            return local_dir_format.initialize_on_transport_ex(transport,
261
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
262
                force_new_repo=force_new_repo, stacked_on=stacked_on,
263
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
264
                make_working_trees=make_working_trees, shared_repo=shared_repo,
265
                vfs_only=True)
266
        except errors.ErrorFromSmartServer, err:
267
            _translate_error(err, path=path)
268
        repo_path = response[0]
269
        bzrdir_name = response[6]
270
        require_stacking = response[7]
271
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
272
        format = RemoteBzrDirFormat()
273
        format._network_name = bzrdir_name
274
        self._supply_sub_formats_to(format)
275
        bzrdir = RemoteBzrDir(transport, format, _client=client)
276
        if repo_path:
277
            repo_format = response_tuple_to_repo_format(response[1:])
278
            if repo_path == '.':
279
                repo_path = ''
280
            if repo_path:
281
                repo_bzrdir_format = RemoteBzrDirFormat()
282
                repo_bzrdir_format._network_name = response[5]
283
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
284
                    repo_bzrdir_format)
285
            else:
286
                repo_bzr = bzrdir
287
            final_stack = response[8] or None
288
            final_stack_pwd = response[9] or None
289
            if final_stack_pwd:
290
                final_stack_pwd = urlutils.join(
291
                    transport.base, final_stack_pwd)
292
            remote_repo = RemoteRepository(repo_bzr, repo_format)
293
            if len(response) > 10:
294
                # Updated server verb that locks remotely.
295
                repo_lock_token = response[10] or None
296
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
297
                if repo_lock_token:
298
                    remote_repo.dont_leave_lock_in_place()
299
            else:
300
                remote_repo.lock_write()
5712.3.17 by Jelmer Vernooij
more fixes.
301
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
302
                final_stack_pwd, require_stacking)
303
            policy.acquire_repository()
304
        else:
305
            remote_repo = None
306
            policy = None
307
        bzrdir._format.set_branch_format(self.get_branch_format())
308
        if require_stacking:
309
            # The repo has already been created, but we need to make sure that
310
            # we'll make a stackable branch.
311
            bzrdir._format.require_stacking(_skip_repo=True)
312
        return remote_repo, bzrdir, require_stacking, policy
313
314
    def _open(self, transport):
315
        return RemoteBzrDir(transport, self)
316
317
    def __eq__(self, other):
318
        if not isinstance(other, RemoteBzrDirFormat):
319
            return False
320
        return self.get_format_description() == other.get_format_description()
321
322
    def __return_repository_format(self):
323
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
324
        # repository format has been asked for, tell the RemoteRepositoryFormat
325
        # that it should use that for init() etc.
326
        result = RemoteRepositoryFormat()
327
        custom_format = getattr(self, '_repository_format', None)
328
        if custom_format:
329
            if isinstance(custom_format, RemoteRepositoryFormat):
330
                return custom_format
331
            else:
332
                # We will use the custom format to create repositories over the
333
                # wire; expose its details like rich_root_data for code to
334
                # query
335
                result._custom_format = custom_format
336
        return result
337
338
    def get_branch_format(self):
339
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
340
        if not isinstance(result, RemoteBranchFormat):
341
            new_result = RemoteBranchFormat()
342
            new_result._custom_format = result
343
            # cache the result
344
            self.set_branch_format(new_result)
345
            result = new_result
346
        return result
347
348
    repository_format = property(__return_repository_format,
349
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
350
351
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
352
class RemoteControlStore(_mod_config.IniFileStore):
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
353
    """Control store which attempts to use HPSS calls to retrieve control store.
354
355
    Note that this is specific to bzr-based formats.
356
    """
357
358
    def __init__(self, bzrdir):
359
        super(RemoteControlStore, self).__init__()
360
        self.bzrdir = bzrdir
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
361
        self._real_store = None
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
362
6270.1.8 by Jelmer Vernooij
Fix RemoteControlStore.
363
    def lock_write(self, token=None):
364
        self._ensure_real()
365
        return self._real_store.lock_write(token)
366
367
    def unlock(self):
368
        self._ensure_real()
369
        return self._real_store.unlock()
370
371
    @needs_write_lock
372
    def save(self):
373
        # We need to be able to override the undecorated implementation
374
        self.save_without_locking()
375
376
    def save_without_locking(self):
377
        super(RemoteControlStore, self).save()
378
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
379
    def _ensure_real(self):
380
        self.bzrdir._ensure_real()
6270.1.8 by Jelmer Vernooij
Fix RemoteControlStore.
381
        if self._real_store is None:
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
382
            self._real_store = _mod_config.ControlStore(self.bzrdir)
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
383
384
    def external_url(self):
6270.1.15 by Jelmer Vernooij
Implement sensible .external_url().
385
        return self.bzrdir.user_url
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
386
387
    def _load_content(self):
388
        medium = self.bzrdir._client._medium
389
        path = self.bzrdir._path_for_remote_call(self.bzrdir._client)
390
        try:
391
            response, handler = self.bzrdir._call_expecting_body(
392
                'BzrDir.get_config_file', path)
393
        except errors.UnknownSmartMethod:
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
394
            self._ensure_real()
395
            return self._real_store._load_content()
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
396
        if len(response) and response[0] != 'ok':
397
            raise errors.UnexpectedSmartServerResponse(response)
398
        return handler.read_body_bytes()
399
400
    def _save_content(self, content):
6270.1.12 by Jelmer Vernooij
Note HPSS usage.
401
        # FIXME JRV 2011-11-22: Ideally this should use a
402
        # HPSS call too, but at the moment it is not possible
403
        # to write lock control directories.
404
        self._ensure_real()
405
        return self._real_store._save_content(content)
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
406
407
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
408
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
409
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
410
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
411
    def __init__(self, transport, format, _client=None, _force_probe=False):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
412
        """Construct a RemoteBzrDir.
413
414
        :param _client: Private parameter for testing. Disables probing and the
415
            use of a real bzrdir.
416
        """
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
417
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
418
        # this object holds a delegated bzrdir that uses file-level operations
419
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
420
        self._real_bzrdir = None
4634.47.3 by Andrew Bennetts
Add a BzrDir.open_2.1 verb that indicates if there is a workingtree present. Removes the last 2 VFS calls from incremental pushes.
421
        self._has_working_tree = None
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
422
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
423
        # create_branch for details.
424
        self._next_open_branch_result = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
425
426
        if _client is None:
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
427
            medium = transport.get_smart_medium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
428
            self._client = client._SmartClient(medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
429
        else:
430
            self._client = _client
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
431
            if not _force_probe:
432
                return
433
434
        self._probe_bzrdir()
435
4964.2.1 by Martin Pool
Add RemoteBzrDir repr
436
    def __repr__(self):
437
        return '%s(%r)' % (self.__class__.__name__, self._client)
438
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
439
    def _probe_bzrdir(self):
440
        medium = self._client._medium
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
441
        path = self._path_for_remote_call(self._client)
4634.47.3 by Andrew Bennetts
Add a BzrDir.open_2.1 verb that indicates if there is a workingtree present. Removes the last 2 VFS calls from incremental pushes.
442
        if medium._is_remote_before((2, 1)):
443
            self._rpc_open(path)
444
            return
445
        try:
446
            self._rpc_open_2_1(path)
447
            return
448
        except errors.UnknownSmartMethod:
449
            medium._remember_remote_is_before((2, 1))
450
            self._rpc_open(path)
451
452
    def _rpc_open_2_1(self, path):
453
        response = self._call('BzrDir.open_2.1', path)
454
        if response == ('no',):
455
            raise errors.NotBranchError(path=self.root_transport.base)
456
        elif response[0] == 'yes':
457
            if response[1] == 'yes':
458
                self._has_working_tree = True
459
            elif response[1] == 'no':
460
                self._has_working_tree = False
461
            else:
462
                raise errors.UnexpectedSmartServerResponse(response)
463
        else:
464
            raise errors.UnexpectedSmartServerResponse(response)
465
466
    def _rpc_open(self, path):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
467
        response = self._call('BzrDir.open', path)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
468
        if response not in [('yes',), ('no',)]:
469
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.26 by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
470
        if response == ('no',):
4634.47.3 by Andrew Bennetts
Add a BzrDir.open_2.1 verb that indicates if there is a workingtree present. Removes the last 2 VFS calls from incremental pushes.
471
            raise errors.NotBranchError(path=self.root_transport.base)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
472
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
473
    def _ensure_real(self):
474
        """Ensure that there is a _real_bzrdir set.
475
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
476
        Used before calls to self._real_bzrdir.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
477
        """
478
        if not self._real_bzrdir:
4789.2.1 by Robert Collins
Trigger hpssvfs backtrace dumps with RemoteBzrDir._ensure_real.
479
            if 'hpssvfs' in debug.debug_flags:
480
                import traceback
481
                warning('VFS BzrDir access triggered\n%s',
482
                    ''.join(traceback.format_stack()))
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
483
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
6402.1.1 by Jelmer Vernooij
Simplify probing.
484
                self.root_transport, probers=[_mod_bzrdir.BzrProber])
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
485
            self._format._network_name = \
486
                self._real_bzrdir._format.network_name()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
487
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
488
    def _translate_error(self, err, **context):
489
        _translate_error(err, bzrdir=self, **context)
490
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
491
    def break_lock(self):
492
        # Prevent aliasing problems in the next_open_branch_result cache.
493
        # See create_branch for rationale.
494
        self._next_open_branch_result = None
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
495
        return _mod_bzrdir.BzrDir.break_lock(self)
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
496
6305.5.10 by Jelmer Vernooij
Move to BzrDir.checkout_metadir.
497
    def _vfs_checkout_metadir(self):
498
        self._ensure_real()
499
        return self._real_bzrdir.checkout_metadir()
500
501
    def checkout_metadir(self):
6305.5.14 by Jelmer Vernooij
Client-side documentation.
502
        """Retrieve the controldir format to use for checkouts of this one.
503
        """
6305.5.10 by Jelmer Vernooij
Move to BzrDir.checkout_metadir.
504
        medium = self._client._medium
505
        if medium._is_remote_before((2, 5)):
506
            return self._vfs_checkout_metadir()
507
        path = self._path_for_remote_call(self._client)
508
        try:
509
            response = self._client.call('BzrDir.checkout_metadir',
510
                path)
511
        except errors.UnknownSmartMethod:
512
            medium._remember_remote_is_before((2, 5))
513
            return self._vfs_checkout_metadir()
514
        if len(response) != 3:
515
            raise errors.UnexpectedSmartServerResponse(response)
516
        control_name, repo_name, branch_name = response
517
        try:
518
            format = controldir.network_format_registry.get(control_name)
519
        except KeyError:
6305.5.14 by Jelmer Vernooij
Client-side documentation.
520
            raise errors.UnknownFormatError(kind='control',
521
                format=control_name)
6305.5.10 by Jelmer Vernooij
Move to BzrDir.checkout_metadir.
522
        if repo_name:
523
            try:
524
                repo_format = _mod_repository.network_format_registry.get(
525
                    repo_name)
526
            except KeyError:
527
                raise errors.UnknownFormatError(kind='repository',
528
                    format=repo_name)
529
            format.repository_format = repo_format
530
        if branch_name:
531
            try:
532
                format.set_branch_format(
533
                    branch.network_format_registry.get(branch_name))
534
            except KeyError:
535
                raise errors.UnknownFormatError(kind='branch',
536
                    format=branch_name)
537
        return format
538
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
539
    def _vfs_cloning_metadir(self, require_stacking=False):
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
540
        self._ensure_real()
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
541
        return self._real_bzrdir.cloning_metadir(
542
            require_stacking=require_stacking)
543
544
    def cloning_metadir(self, require_stacking=False):
545
        medium = self._client._medium
546
        if medium._is_remote_before((1, 13)):
547
            return self._vfs_cloning_metadir(require_stacking=require_stacking)
548
        verb = 'BzrDir.cloning_metadir'
549
        if require_stacking:
550
            stacking = 'True'
551
        else:
552
            stacking = 'False'
553
        path = self._path_for_remote_call(self._client)
554
        try:
555
            response = self._call(verb, path, stacking)
556
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
557
            medium._remember_remote_is_before((1, 13))
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
558
            return self._vfs_cloning_metadir(require_stacking=require_stacking)
4160.2.9 by Andrew Bennetts
Fix BzrDir.cloning_metadir RPC to fail on branch references, and make
559
        except errors.UnknownErrorFromSmartServer, err:
560
            if err.error_tuple != ('BranchReference',):
561
                raise
562
            # We need to resolve the branch reference to determine the
563
            # cloning_metadir.  This causes unnecessary RPCs to open the
564
            # referenced branch (and bzrdir, etc) but only when the caller
565
            # didn't already resolve the branch reference.
566
            referenced_branch = self.open_branch()
567
            return referenced_branch.bzrdir.cloning_metadir()
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
568
        if len(response) != 3:
569
            raise errors.UnexpectedSmartServerResponse(response)
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
570
        control_name, repo_name, branch_info = response
571
        if len(branch_info) != 2:
572
            raise errors.UnexpectedSmartServerResponse(response)
573
        branch_ref, branch_name = branch_info
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
574
        try:
575
            format = controldir.network_format_registry.get(control_name)
576
        except KeyError:
577
            raise errors.UnknownFormatError(kind='control', format=control_name)
578
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
579
        if repo_name:
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
580
            try:
581
                format.repository_format = _mod_repository.network_format_registry.get(
582
                    repo_name)
583
            except KeyError:
584
                raise errors.UnknownFormatError(kind='repository',
585
                    format=repo_name)
4084.2.2 by Robert Collins
Review feedback.
586
        if branch_ref == 'ref':
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
587
            # XXX: we need possible_transports here to avoid reopening the
4070.7.5 by Andrew Bennetts
Tweak comment.
588
            # connection to the referenced location
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
589
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
590
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
591
            format.set_branch_format(branch_format)
4084.2.2 by Robert Collins
Review feedback.
592
        elif branch_ref == 'branch':
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
593
            if branch_name:
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
594
                try:
595
                    branch_format = branch.network_format_registry.get(
596
                        branch_name)
597
                except KeyError:
598
                    raise errors.UnknownFormatError(kind='branch',
599
                        format=branch_name)
600
                format.set_branch_format(branch_format)
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
601
        else:
602
            raise errors.UnexpectedSmartServerResponse(response)
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
603
        return format
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
604
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
605
    def create_repository(self, shared=False):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
606
        # as per meta1 formats - just delegate to the format object which may
607
        # be parameterised.
608
        result = self._format.repository_format.initialize(self, shared)
609
        if not isinstance(result, RemoteRepository):
610
            return self.open_repository()
611
        else:
612
            return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
613
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
614
    def destroy_repository(self):
615
        """See BzrDir.destroy_repository"""
6266.2.1 by Jelmer Vernooij
New HPSS call BzrDir.destroy_repository.
616
        path = self._path_for_remote_call(self._client)
617
        try:
618
            response = self._call('BzrDir.destroy_repository', path)
619
        except errors.UnknownSmartMethod:
620
            self._ensure_real()
621
            self._real_bzrdir.destroy_repository()
622
            return
623
        if response[0] != 'ok':
624
            raise SmartProtocolError('unexpected response code %s' % (response,))
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
625
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
626
    def create_branch(self, name=None, repository=None,
627
                      append_revisions_only=None):
6436.1.2 by Jelmer Vernooij
Fix some tests.
628
        if name is None:
629
            name = self._get_selected_branch()
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
630
        # as per meta1 formats - just delegate to the format object which may
631
        # be parameterised.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
632
        real_branch = self._format.get_branch_format().initialize(self,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
633
            name=name, repository=repository,
634
            append_revisions_only=append_revisions_only)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
635
        if not isinstance(real_branch, RemoteBranch):
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
636
            if not isinstance(repository, RemoteRepository):
5536.1.10 by Andrew Bennetts
Give more helpful message in AssertionErrors, just in case.
637
                raise AssertionError(
638
                    'need a RemoteRepository to use with RemoteBranch, got %r'
639
                    % (repository,))
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
640
            result = RemoteBranch(self, repository, real_branch, name=name)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
641
        else:
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
642
            result = real_branch
643
        # BzrDir.clone_on_transport() uses the result of create_branch but does
644
        # not return it to its callers; we save approximately 8% of our round
645
        # trips by handing the branch we created back to the first caller to
646
        # open_branch rather than probing anew. Long term we need a API in
647
        # bzrdir that doesn't discard result objects (like result_branch).
648
        # RBC 20090225
649
        self._next_open_branch_result = result
650
        return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
651
5051.3.3 by Jelmer Vernooij
Add tests for colo branches.
652
    def destroy_branch(self, name=None):
2796.2.16 by Aaron Bentley
Documentation updates from review
653
        """See BzrDir.destroy_branch"""
6266.4.1 by Jelmer Vernooij
HPSS call 'BzrDir.destroy_branch'.
654
        path = self._path_for_remote_call(self._client)
655
        try:
6266.4.3 by Jelmer Vernooij
fix tests.
656
            if name is not None:
657
                args = (name, )
658
            else:
659
                args = ()
660
            response = self._call('BzrDir.destroy_branch', path, *args)
6266.4.1 by Jelmer Vernooij
HPSS call 'BzrDir.destroy_branch'.
661
        except errors.UnknownSmartMethod:
662
            self._ensure_real()
663
            self._real_bzrdir.destroy_branch(name=name)
664
            self._next_open_branch_result = None
665
            return
6266.4.3 by Jelmer Vernooij
fix tests.
666
        self._next_open_branch_result = None
6266.4.1 by Jelmer Vernooij
HPSS call 'BzrDir.destroy_branch'.
667
        if response[0] != 'ok':
668
            raise SmartProtocolError('unexpected response code %s' % (response,))
2796.2.6 by Aaron Bentley
Implement destroy_branch
669
5042.1.1 by Neil Martinsen-Burrell
Fix signature of RemoteBzrDir.create_workingtree
670
    def create_workingtree(self, revision_id=None, from_branch=None,
671
        accelerator_tree=None, hardlink=False):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
672
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
673
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
674
    def find_branch_format(self, name=None):
2018.5.124 by Robert Collins
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
675
        """Find the branch 'format' for this bzrdir.
676
677
        This might be a synthetic object for e.g. RemoteBranch and SVN.
678
        """
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
679
        b = self.open_branch(name=name)
2018.5.124 by Robert Collins
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
680
        return b._format
681
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
682
    def get_branches(self, possible_transports=None, ignore_fallbacks=False):
683
        path = self._path_for_remote_call(self._client)
684
        try:
685
            response, handler = self._call_expecting_body(
686
                'BzrDir.get_branches', path)
687
        except errors.UnknownSmartMethod:
688
            self._ensure_real()
689
            return self._real_bzrdir.get_branches()
690
        if response[0] != "success":
691
            raise errors.UnexpectedSmartServerResponse(response)
692
        body = bencode.bdecode(handler.read_body_bytes())
693
        ret = {}
694
        for (name, value) in body.iteritems():
695
            ret[name] = self._open_branch(name, value[0], value[1],
696
                possible_transports=possible_transports,
697
                ignore_fallbacks=ignore_fallbacks)
698
        return ret
699
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
700
    def get_branch_reference(self, name=None):
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
701
        """See BzrDir.get_branch_reference()."""
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
702
        if name is not None:
703
            # XXX JRV20100304: Support opening colocated branches
704
            raise errors.NoColocatedBranchSupport(self)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
705
        response = self._get_branch_reference()
706
        if response[0] == 'ref':
707
            return response[1]
708
        else:
709
            return None
710
711
    def _get_branch_reference(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
712
        path = self._path_for_remote_call(self._client)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
713
        medium = self._client._medium
4734.4.8 by Andrew Bennetts
Fix HPSS tests; pass 'location is a repository' message via smart server when possible (adds BzrDir.open_branchV3 verb).
714
        candidate_calls = [
715
            ('BzrDir.open_branchV3', (2, 1)),
716
            ('BzrDir.open_branchV2', (1, 13)),
717
            ('BzrDir.open_branch', None),
718
            ]
719
        for verb, required_version in candidate_calls:
720
            if required_version and medium._is_remote_before(required_version):
721
                continue
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
722
            try:
4734.4.8 by Andrew Bennetts
Fix HPSS tests; pass 'location is a repository' message via smart server when possible (adds BzrDir.open_branchV3 verb).
723
                response = self._call(verb, path)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
724
            except errors.UnknownSmartMethod:
4734.4.8 by Andrew Bennetts
Fix HPSS tests; pass 'location is a repository' message via smart server when possible (adds BzrDir.open_branchV3 verb).
725
                if required_version is None:
726
                    raise
727
                medium._remember_remote_is_before(required_version)
728
            else:
729
                break
730
        if verb == 'BzrDir.open_branch':
731
            if response[0] != 'ok':
732
                raise errors.UnexpectedSmartServerResponse(response)
733
            if response[1] != '':
734
                return ('ref', response[1])
735
            else:
736
                return ('branch', '')
737
        if response[0] not in ('ref', 'branch'):
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
738
            raise errors.UnexpectedSmartServerResponse(response)
4734.4.8 by Andrew Bennetts
Fix HPSS tests; pass 'location is a repository' message via smart server when possible (adds BzrDir.open_branchV3 verb).
739
        return response
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
740
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
741
    def _get_tree_branch(self, name=None):
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
742
        """See BzrDir._get_tree_branch()."""
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
743
        return None, self.open_branch(name=name)
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
744
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
745
    def _open_branch(self, name, kind, location_or_format,
746
                     ignore_fallbacks=False, possible_transports=None):
747
        if kind == 'ref':
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
748
            # a branch reference, use the existing BranchReference logic.
749
            format = BranchReferenceFormat()
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
750
            return format.open(self, name=name, _found=True,
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
751
                location=location_or_format, ignore_fallbacks=ignore_fallbacks,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
752
                possible_transports=possible_transports)
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
753
        branch_format_name = location_or_format
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
754
        if not branch_format_name:
755
            branch_format_name = None
756
        format = RemoteBranchFormat(network_name=branch_format_name)
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
757
        return RemoteBranch(self, self.find_repository(), format=format,
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
758
            setup_stacking=not ignore_fallbacks, name=name,
759
            possible_transports=possible_transports)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
760
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
761
    def open_branch(self, name=None, unsupported=False,
762
                    ignore_fallbacks=False, possible_transports=None):
763
        if unsupported:
764
            raise NotImplementedError('unsupported flag support not implemented yet.')
765
        if self._next_open_branch_result is not None:
766
            # See create_branch for details.
767
            result = self._next_open_branch_result
768
            self._next_open_branch_result = None
769
            return result
770
        response = self._get_branch_reference()
6436.3.3 by Jelmer Vernooij
Merge lp:bzr/2.5.
771
        if name is None:
772
            name = self._get_selected_branch()
6436.3.1 by Jelmer Vernooij
Add remote get_branches call.
773
        return self._open_branch(name, response[0], response[1],
774
            possible_transports=possible_transports,
775
            ignore_fallbacks=ignore_fallbacks)
776
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
777
    def _open_repo_v1(self, path):
778
        verb = 'BzrDir.find_repository'
779
        response = self._call(verb, path)
780
        if response[0] != 'ok':
781
            raise errors.UnexpectedSmartServerResponse(response)
782
        # servers that only support the v1 method don't support external
783
        # references either.
784
        self._ensure_real()
785
        repo = self._real_bzrdir.open_repository()
786
        response = response + ('no', repo._format.network_name())
787
        return response, repo
788
789
    def _open_repo_v2(self, path):
790
        verb = 'BzrDir.find_repositoryV2'
791
        response = self._call(verb, path)
792
        if response[0] != 'ok':
793
            raise errors.UnexpectedSmartServerResponse(response)
794
        self._ensure_real()
795
        repo = self._real_bzrdir.open_repository()
796
        response = response + (repo._format.network_name(),)
797
        return response, repo
798
799
    def _open_repo_v3(self, path):
800
        verb = 'BzrDir.find_repositoryV3'
4053.1.2 by Robert Collins
Actually make this branch work.
801
        medium = self._client._medium
802
        if medium._is_remote_before((1, 13)):
803
            raise errors.UnknownSmartMethod(verb)
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
804
        try:
805
            response = self._call(verb, path)
806
        except errors.UnknownSmartMethod:
807
            medium._remember_remote_is_before((1, 13))
808
            raise
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
809
        if response[0] != 'ok':
810
            raise errors.UnexpectedSmartServerResponse(response)
811
        return response, None
812
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
813
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
814
        path = self._path_for_remote_call(self._client)
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
815
        response = None
816
        for probe in [self._open_repo_v3, self._open_repo_v2,
817
            self._open_repo_v1]:
818
            try:
819
                response, real_repo = probe(path)
820
                break
821
            except errors.UnknownSmartMethod:
822
                pass
823
        if response is None:
824
            raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
825
        if response[0] != 'ok':
826
            raise errors.UnexpectedSmartServerResponse(response)
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
827
        if len(response) != 6:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
828
            raise SmartProtocolError('incorrect response length %s' % (response,))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
829
        if response[1] == '':
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
830
            # repo is at this dir.
831
            format = response_tuple_to_repo_format(response[2:])
3221.15.10 by Robert Collins
Add test that we can stack on a smart server from Jonathan Lange.
832
            # Used to support creating a real format instance when needed.
833
            format._creating_bzrdir = self
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
834
            remote_repo = RemoteRepository(self, format)
835
            format._creating_repo = remote_repo
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
836
            if real_repo is not None:
837
                remote_repo._set_real_repository(real_repo)
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
838
            return remote_repo
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
839
        else:
840
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
841
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
842
    def has_workingtree(self):
4634.47.3 by Andrew Bennetts
Add a BzrDir.open_2.1 verb that indicates if there is a workingtree present. Removes the last 2 VFS calls from incremental pushes.
843
        if self._has_working_tree is None:
6266.3.1 by Jelmer Vernooij
Add HPSS call for BzrDir.has_workingtree.
844
            path = self._path_for_remote_call(self._client)
845
            try:
846
                response = self._call('BzrDir.has_workingtree', path)
847
            except errors.UnknownSmartMethod:
848
                self._ensure_real()
849
                self._has_working_tree = self._real_bzrdir.has_workingtree()
850
            else:
851
                if response[0] not in ('yes', 'no'):
852
                    raise SmartProtocolError('unexpected response code %s' % (response,))
853
                self._has_working_tree = (response[0] == 'yes')
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
854
        return self._has_working_tree
855
856
    def open_workingtree(self, recommend_upgrade=True):
857
        if self.has_workingtree():
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
858
            raise errors.NotLocalUrl(self.root_transport)
859
        else:
860
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
861
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
862
    def _path_for_remote_call(self, client):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
863
        """Return the path to be used for this bzrdir in a remote call."""
5268.7.29 by Jelmer Vernooij
Fix remote tests.
864
        return urlutils.split_segment_parameters_raw(
865
            client.remote_path_from_transport(self.root_transport))[0]
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
866
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
867
    def get_branch_transport(self, branch_format, name=None):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
868
        self._ensure_real()
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
869
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
870
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
871
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
872
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
873
        return self._real_bzrdir.get_repository_transport(repository_format)
874
875
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
876
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
877
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
878
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
879
    def can_convert_format(self):
880
        """Upgrading of remote bzrdirs is not supported yet."""
881
        return False
882
5670.1.1 by Jelmer Vernooij
Remove all methods and arguments that were deprecated before bzr 2.0.0.
883
    def needs_format_conversion(self, format):
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
884
        """Upgrading of remote bzrdirs is not supported yet."""
885
        return False
886
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
887
    def _get_config(self):
888
        return RemoteBzrDirConfig(self)
3567.1.3 by Michael Hudson
fix problem
889
6270.1.19 by Jelmer Vernooij
Some changes discussed with vila on IRC.
890
    def _get_config_store(self):
891
        return RemoteControlStore(self)
6270.1.4 by Jelmer Vernooij
Add Branch.get_config_stack / BzrDir.get_config_stack.
892
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
893
5815.4.5 by Jelmer Vernooij
Use MetaDirVersionedFileRepositoryFormat (a Soyuz worthy name).
894
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
895
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
896
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
897
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
898
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
899
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
900
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
901
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
902
    the attributes rich_root_data and supports_tree_reference are set
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
903
    on a per instance basis, and are not set (and should not be) at
904
    the class level.
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
905
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
906
    :ivar _custom_format: If set, a specific concrete repository format that
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
907
        will be used when initializing a repository with this
908
        RemoteRepositoryFormat.
909
    :ivar _creating_repo: If set, the repository object that this
910
        RemoteRepositoryFormat was created for: it can be called into
3990.5.4 by Robert Collins
Review feedback.
911
        to obtain data like the network name.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
912
    """
913
3543.1.2 by Michael Hudson
the two character fix
914
    _matchingbzrdir = RemoteBzrDirFormat()
5684.2.1 by Jelmer Vernooij
Add bzrlib.tests.per_repository_vf.
915
    supports_full_versioned_files = True
5684.2.6 by Jelmer Vernooij
Implement .supports_funky_characters and .supports_leaving_lock.
916
    supports_leaving_lock = True
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
917
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
918
    def __init__(self):
5712.3.17 by Jelmer Vernooij
more fixes.
919
        _mod_repository.RepositoryFormat.__init__(self)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
920
        self._custom_format = None
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
921
        self._network_name = None
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
922
        self._creating_bzrdir = None
5766.1.1 by Jelmer Vernooij
Make revision-graph-can-have-wrong-parents a repository format attribute rather than a repository method.
923
        self._revision_graph_can_have_wrong_parents = None
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
924
        self._supports_chks = None
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
925
        self._supports_external_lookups = None
926
        self._supports_tree_reference = None
5684.2.6 by Jelmer Vernooij
Implement .supports_funky_characters and .supports_leaving_lock.
927
        self._supports_funky_characters = None
6145.2.2 by Jelmer Vernooij
Set supports_nesting_repositories.
928
        self._supports_nesting_repositories = None
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
929
        self._rich_root_data = None
930
4608.1.2 by Martin Pool
Add RemoteRepositoryFormat repr
931
    def __repr__(self):
932
        return "%s(_network_name=%r)" % (self.__class__.__name__,
933
            self._network_name)
934
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
935
    @property
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
936
    def fast_deltas(self):
937
        self._ensure_real()
938
        return self._custom_format.fast_deltas
939
940
    @property
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
941
    def rich_root_data(self):
942
        if self._rich_root_data is None:
943
            self._ensure_real()
944
            self._rich_root_data = self._custom_format.rich_root_data
945
        return self._rich_root_data
946
947
    @property
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
948
    def supports_chks(self):
949
        if self._supports_chks is None:
950
            self._ensure_real()
951
            self._supports_chks = self._custom_format.supports_chks
952
        return self._supports_chks
953
954
    @property
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
955
    def supports_external_lookups(self):
956
        if self._supports_external_lookups is None:
957
            self._ensure_real()
958
            self._supports_external_lookups = \
4104.4.2 by Robert Collins
Fix test_source for 1.13 landing.
959
                self._custom_format.supports_external_lookups
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
960
        return self._supports_external_lookups
961
962
    @property
5684.2.6 by Jelmer Vernooij
Implement .supports_funky_characters and .supports_leaving_lock.
963
    def supports_funky_characters(self):
964
        if self._supports_funky_characters is None:
965
            self._ensure_real()
966
            self._supports_funky_characters = \
967
                self._custom_format.supports_funky_characters
968
        return self._supports_funky_characters
969
970
    @property
6145.2.2 by Jelmer Vernooij
Set supports_nesting_repositories.
971
    def supports_nesting_repositories(self):
972
        if self._supports_nesting_repositories is None:
973
            self._ensure_real()
974
            self._supports_nesting_repositories = \
975
                self._custom_format.supports_nesting_repositories
976
        return self._supports_nesting_repositories
977
978
    @property
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
979
    def supports_tree_reference(self):
980
        if self._supports_tree_reference is None:
981
            self._ensure_real()
982
            self._supports_tree_reference = \
983
                self._custom_format.supports_tree_reference
984
        return self._supports_tree_reference
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
985
5766.1.1 by Jelmer Vernooij
Make revision-graph-can-have-wrong-parents a repository format attribute rather than a repository method.
986
    @property
987
    def revision_graph_can_have_wrong_parents(self):
988
        if self._revision_graph_can_have_wrong_parents is None:
989
            self._ensure_real()
990
            self._revision_graph_can_have_wrong_parents = \
991
                self._custom_format.revision_graph_can_have_wrong_parents
992
        return self._revision_graph_can_have_wrong_parents
993
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
994
    def _vfs_initialize(self, a_bzrdir, shared):
995
        """Helper for common code in initialize."""
996
        if self._custom_format:
997
            # Custom format requested
998
            result = self._custom_format.initialize(a_bzrdir, shared=shared)
999
        elif self._creating_bzrdir is not None:
1000
            # Use the format that the repository we were created to back
1001
            # has.
1002
            prior_repo = self._creating_bzrdir.open_repository()
1003
            prior_repo._ensure_real()
1004
            result = prior_repo._real_repository._format.initialize(
1005
                a_bzrdir, shared=shared)
1006
        else:
1007
            # assume that a_bzr is a RemoteBzrDir but the smart server didn't
1008
            # support remote initialization.
1009
            # We delegate to a real object at this point (as RemoteBzrDir
1010
            # delegate to the repository format which would lead to infinite
1011
            # recursion if we just called a_bzrdir.create_repository.
1012
            a_bzrdir._ensure_real()
1013
            result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
1014
        if not isinstance(result, RemoteRepository):
1015
            return self.open(a_bzrdir)
1016
        else:
1017
            return result
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1018
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1019
    def initialize(self, a_bzrdir, shared=False):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1020
        # Being asked to create on a non RemoteBzrDir:
1021
        if not isinstance(a_bzrdir, RemoteBzrDir):
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
1022
            return self._vfs_initialize(a_bzrdir, shared)
1023
        medium = a_bzrdir._client._medium
1024
        if medium._is_remote_before((1, 13)):
1025
            return self._vfs_initialize(a_bzrdir, shared)
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1026
        # Creating on a remote bzr dir.
1027
        # 1) get the network name to use.
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1028
        if self._custom_format:
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1029
            network_name = self._custom_format.network_name()
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1030
        elif self._network_name:
1031
            network_name = self._network_name
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1032
        else:
1033
            # Select the current bzrlib default and ask for that.
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1034
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1035
            reference_format = reference_bzrdir_format.repository_format
1036
            network_name = reference_format.network_name()
1037
        # 2) try direct creation via RPC
1038
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
1039
        verb = 'BzrDir.create_repository'
1040
        if shared:
1041
            shared_str = 'True'
1042
        else:
1043
            shared_str = 'False'
1044
        try:
1045
            response = a_bzrdir._call(verb, path, network_name, shared_str)
1046
        except errors.UnknownSmartMethod:
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
1047
            # Fallback - use vfs methods
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
1048
            medium._remember_remote_is_before((1, 13))
4017.3.3 by Robert Collins
Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.
1049
            return self._vfs_initialize(a_bzrdir, shared)
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1050
        else:
1051
            # Turn the response into a RemoteRepository object.
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1052
            format = response_tuple_to_repo_format(response[1:])
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1053
            # Used to support creating a real format instance when needed.
1054
            format._creating_bzrdir = a_bzrdir
1055
            remote_repo = RemoteRepository(a_bzrdir, format)
1056
            format._creating_repo = remote_repo
1057
            return remote_repo
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1058
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1059
    def open(self, a_bzrdir):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1060
        if not isinstance(a_bzrdir, RemoteBzrDir):
1061
            raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1062
        return a_bzrdir.open_repository()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1063
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1064
    def _ensure_real(self):
1065
        if self._custom_format is None:
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
1066
            try:
1067
                self._custom_format = _mod_repository.network_format_registry.get(
1068
                    self._network_name)
1069
            except KeyError:
1070
                raise errors.UnknownFormatError(kind='repository',
1071
                    format=self._network_name)
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1072
1073
    @property
1074
    def _fetch_order(self):
1075
        self._ensure_real()
1076
        return self._custom_format._fetch_order
1077
1078
    @property
1079
    def _fetch_uses_deltas(self):
1080
        self._ensure_real()
1081
        return self._custom_format._fetch_uses_deltas
1082
1083
    @property
1084
    def _fetch_reconcile(self):
1085
        self._ensure_real()
1086
        return self._custom_format._fetch_reconcile
1087
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1088
    def get_format_description(self):
4792.1.1 by Andrew Bennetts
Show real branch/repo format description in 'info -v' over HPSS.
1089
        self._ensure_real()
1090
        return 'Remote: ' + self._custom_format.get_format_description()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1091
1092
    def __eq__(self, other):
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
1093
        return self.__class__ is other.__class__
1752.2.87 by Andrew Bennetts
Make tests pass.
1094
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
1095
    def network_name(self):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
1096
        if self._network_name:
1097
            return self._network_name
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
1098
        self._creating_repo._ensure_real()
1099
        return self._creating_repo._real_repository._format.network_name()
1100
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
1101
    @property
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1102
    def pack_compresses(self):
1103
        self._ensure_real()
1104
        return self._custom_format.pack_compresses
1105
1106
    @property
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
1107
    def _serializer(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1108
        self._ensure_real()
1109
        return self._custom_format._serializer
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
1110
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1111
6289.1.1 by Jelmer Vernooij
Make Repository a base class of RemoteRepository
1112
class RemoteRepository(_mod_repository.Repository, _RpcHelper,
1113
        lock._RelockDebugMixin):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1114
    """Repository accessed over rpc.
1115
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1116
    For the moment most operations are performed using local transport-backed
1117
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1118
    """
1119
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
1120
    def __init__(self, remote_bzrdir, format, real_repository=None, _client=None):
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1121
        """Create a RemoteRepository instance.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1122
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1123
        :param remote_bzrdir: The bzrdir hosting this repository.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
1124
        :param format: The RemoteFormat object to use.
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1125
        :param real_repository: If not None, a local implementation of the
1126
            repository logic for the repository, usually accessing the data
1127
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1128
        :param _client: Private testing parameter - override the smart client
1129
            to be used by the repository.
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1130
        """
1131
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
1132
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1133
        else:
1134
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
1135
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1136
        if _client is None:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1137
            self._client = remote_bzrdir._client
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1138
        else:
1139
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
1140
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1141
        self._lock_mode = None
1142
        self._lock_token = None
6280.7.2 by Jelmer Vernooij
Add HPSS calls ``Repository.start_write_group``, ``Repository.abort_write_group`` and ``Repository.commit_write_group``.
1143
        self._write_group_tokens = None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1144
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1145
        self._leave_lock = False
4307.2.4 by Robert Collins
Enable caching of negative revision lookups in RemoteRepository write locks when no _real_repository has been constructed.
1146
        # Cache of revision parents; misses are cached during read locks, and
1147
        # write locks when no _real_repository has been set.
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
1148
        self._unstacked_provider = graph.CachingParentsProvider(
3896.1.1 by Andrew Bennetts
Remove broken debugging cruft, and some unused imports.
1149
            get_parent_map=self._get_parent_map_rpc)
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
1150
        self._unstacked_provider.disable_cache()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
1151
        # For tests:
1152
        # These depend on the actual remote format, so force them off for
1153
        # maximum compatibility. XXX: In future these should depend on the
1154
        # remote repository instance, but this is irrelevant until we perform
1155
        # reconcile via an RPC call.
2951.1.5 by Robert Collins
Some work towards including the correct changes for TREE_ROOT in check parameterised tests.
1156
        self._reconcile_does_inventory_gc = False
1157
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
1158
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1159
        self.base = self.bzrdir.transport.base
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1160
        # Additional places to query for data.
1161
        self._fallback_repositories = []
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1162
5158.6.4 by Martin Pool
Repository implements ControlComponent too
1163
    @property
1164
    def user_transport(self):
1165
        return self.bzrdir.user_transport
1166
1167
    @property
1168
    def control_transport(self):
1169
        # XXX: Normally you shouldn't directly get at the remote repository
1170
        # transport, but I'm not sure it's worth making this method
1171
        # optional -- mbp 2010-04-21
1172
        return self.bzrdir.get_repository_transport(None)
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1173
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1174
    def __str__(self):
1175
        return "%s(%s)" % (self.__class__.__name__, self.base)
1176
1177
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1178
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
1179
    def abort_write_group(self, suppress_errors=False):
2617.6.7 by Robert Collins
More review feedback.
1180
        """Complete a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1181
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
1182
        Smart methods perform operations in a single step so this API
2617.6.6 by Robert Collins
Some review feedback.
1183
        is not really applicable except as a compatibility thunk
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1184
        for older plugins that don't use e.g. the CommitBuilder
1185
        facility.
3825.4.6 by Andrew Bennetts
Document the suppress_errors flag in the docstring.
1186
1187
        :param suppress_errors: see Repository.abort_write_group.
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1188
        """
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1189
        if self._real_repository:
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1190
            self._ensure_real()
1191
            return self._real_repository.abort_write_group(
1192
                suppress_errors=suppress_errors)
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1193
        if not self.is_in_write_group():
1194
            if suppress_errors:
1195
                mutter('(suppressed) not in write group')
1196
                return
1197
            raise errors.BzrError("not in write group")
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1198
        path = self.bzrdir._path_for_remote_call(self._client)
1199
        try:
1200
            response = self._call('Repository.abort_write_group', path,
1201
                self._lock_token, self._write_group_tokens)
1202
        except Exception, exc:
1203
            self._write_group = None
1204
            if not suppress_errors:
1205
                raise
1206
            mutter('abort_write_group failed')
1207
            log_exception_quietly()
1208
            note(gettext('bzr: ERROR (ignored): %s'), exc)
1209
        else:
1210
            if response != ('ok', ):
1211
                raise errors.UnexpectedSmartServerResponse(response)
1212
            self._write_group_tokens = None
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1213
4253.1.1 by Robert Collins
Add chk_bytes property to RemoteRepository
1214
    @property
1215
    def chk_bytes(self):
1216
        """Decorate the real repository for now.
1217
1218
        In the long term a full blown network facility is needed to avoid
1219
        creating a real repository object locally.
1220
        """
1221
        self._ensure_real()
1222
        return self._real_repository.chk_bytes
1223
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1224
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
1225
        """Complete a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1226
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
1227
        Smart methods perform operations in a single step so this API
2617.6.6 by Robert Collins
Some review feedback.
1228
        is not really applicable except as a compatibility thunk
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1229
        for older plugins that don't use e.g. the CommitBuilder
1230
        facility.
1231
        """
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1232
        if self._real_repository:
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1233
            self._ensure_real()
1234
            return self._real_repository.commit_write_group()
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1235
        if not self.is_in_write_group():
1236
            raise errors.BzrError("not in write group")
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1237
        path = self.bzrdir._path_for_remote_call(self._client)
1238
        response = self._call('Repository.commit_write_group', path,
1239
            self._lock_token, self._write_group_tokens)
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1240
        if response != ('ok', ):
1241
            raise errors.UnexpectedSmartServerResponse(response)
6280.7.4 by Jelmer Vernooij
pass write group tokens as list/tuple.
1242
        self._write_group_tokens = None
6362.5.3 by Jelmer Vernooij
Add comments.
1243
        # Refresh data after writing to the repository.
6362.5.2 by Jelmer Vernooij
Fix tests.
1244
        self.refresh_data()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1245
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1246
    def resume_write_group(self, tokens):
6280.7.2 by Jelmer Vernooij
Add HPSS calls ``Repository.start_write_group``, ``Repository.abort_write_group`` and ``Repository.commit_write_group``.
1247
        if self._real_repository:
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1248
            return self._real_repository.resume_write_group(tokens)
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1249
        path = self.bzrdir._path_for_remote_call(self._client)
1250
        try:
1251
            response = self._call('Repository.check_write_group', path,
1252
               self._lock_token, tokens)
1253
        except errors.UnknownSmartMethod:
1254
            self._ensure_real()
1255
            return self._real_repository.resume_write_group(tokens)
1256
        if response != ('ok', ):
1257
            raise errors.UnexpectedSmartServerResponse(response)
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1258
        self._write_group_tokens = tokens
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1259
1260
    def suspend_write_group(self):
6280.7.2 by Jelmer Vernooij
Add HPSS calls ``Repository.start_write_group``, ``Repository.abort_write_group`` and ``Repository.commit_write_group``.
1261
        if self._real_repository:
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1262
            return self._real_repository.suspend_write_group()
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1263
        ret = self._write_group_tokens or []
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1264
        self._write_group_tokens = None
1265
        return ret
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1266
4343.3.29 by John Arbash Meinel
Add 'check_for_missing_texts' flag to get_missing_parent_inv..
1267
    def get_missing_parent_inventories(self, check_for_missing_texts=True):
4257.4.6 by Andrew Bennetts
Make get_missing_parent_inventories work for all repo formats (it's a no-op for unstackable formats).
1268
        self._ensure_real()
4343.3.29 by John Arbash Meinel
Add 'check_for_missing_texts' flag to get_missing_parent_inv..
1269
        return self._real_repository.get_missing_parent_inventories(
1270
            check_for_missing_texts=check_for_missing_texts)
4257.4.6 by Andrew Bennetts
Make get_missing_parent_inventories work for all repo formats (it's a no-op for unstackable formats).
1271
4419.2.9 by Andrew Bennetts
Add per_repository_reference test for get_rev_id_for_revno, fix the bugs it revealed.
1272
    def _get_rev_id_for_revno_vfs(self, revno, known_pair):
1273
        self._ensure_real()
1274
        return self._real_repository.get_rev_id_for_revno(
1275
            revno, known_pair)
1276
4419.2.5 by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation.
1277
    def get_rev_id_for_revno(self, revno, known_pair):
1278
        """See Repository.get_rev_id_for_revno."""
1279
        path = self.bzrdir._path_for_remote_call(self._client)
1280
        try:
4476.3.33 by Andrew Bennetts
Revert some accidental s/17/18/ in remote.py.
1281
            if self._client._medium._is_remote_before((1, 17)):
4419.2.9 by Andrew Bennetts
Add per_repository_reference test for get_rev_id_for_revno, fix the bugs it revealed.
1282
                return self._get_rev_id_for_revno_vfs(revno, known_pair)
4419.2.5 by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation.
1283
            response = self._call(
1284
                'Repository.get_rev_id_for_revno', path, revno, known_pair)
1285
        except errors.UnknownSmartMethod:
4476.3.33 by Andrew Bennetts
Revert some accidental s/17/18/ in remote.py.
1286
            self._client._medium._remember_remote_is_before((1, 17))
4419.2.9 by Andrew Bennetts
Add per_repository_reference test for get_rev_id_for_revno, fix the bugs it revealed.
1287
            return self._get_rev_id_for_revno_vfs(revno, known_pair)
4419.2.5 by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation.
1288
        if response[0] == 'ok':
1289
            return True, response[1]
1290
        elif response[0] == 'history-incomplete':
4419.2.8 by Andrew Bennetts
Add unit test for RemoteRepository.get_rev_id_for_revno using fallbacks if it gets a history-incomplete response.
1291
            known_pair = response[1:3]
1292
            for fallback in self._fallback_repositories:
1293
                found, result = fallback.get_rev_id_for_revno(revno, known_pair)
1294
                if found:
1295
                    return True, result
1296
                else:
1297
                    known_pair = result
1298
            # Not found in any fallbacks
1299
            return False, known_pair
4419.2.5 by Andrew Bennetts
Add Repository.get_rev_id_for_revno, and use it both as the _ensure_real fallback and as the server-side implementation.
1300
        else:
1301
            raise errors.UnexpectedSmartServerResponse(response)
1302
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1303
    def _ensure_real(self):
1304
        """Ensure that there is a _real_repository set.
1305
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1306
        Used before calls to self._real_repository.
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1307
1308
        Note that _ensure_real causes many roundtrips to the server which are
1309
        not desirable, and prevents the use of smart one-roundtrip RPC's to
1310
        perform complex operations (such as accessing parent data, streaming
1311
        revisions etc). Adding calls to _ensure_real should only be done when
1312
        bringing up new functionality, adding fallbacks for smart methods that
1313
        require a fallback path, and never to replace an existing smart method
1314
        invocation. If in doubt chat to the bzr network team.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1315
        """
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1316
        if self._real_repository is None:
4509.2.2 by Martin Pool
Use only -Dhpssvfs for tracebacks, and document -Dhpssdetail
1317
            if 'hpssvfs' in debug.debug_flags:
4347.1.1 by Robert Collins
Show a traceback when VFS operations are started on a smart server hosted repository.
1318
                import traceback
1319
                warning('VFS Repository access triggered\n%s',
1320
                    ''.join(traceback.format_stack()))
4307.2.4 by Robert Collins
Enable caching of negative revision lookups in RemoteRepository write locks when no _real_repository has been constructed.
1321
            self._unstacked_provider.missing_keys.clear()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1322
            self.bzrdir._ensure_real()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1323
            self._set_real_repository(
1324
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1325
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1326
    def _translate_error(self, err, **context):
1327
        self.bzrdir._translate_error(err, repository=self, **context)
1328
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
1329
    def find_text_key_references(self):
1330
        """Find the text key references within the repository.
1331
1332
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1333
            to whether they were referred to by the inventory of the
1334
            revision_id that they contain. The inventory texts from all present
1335
            revision ids are assessed to generate this report.
1336
        """
1337
        self._ensure_real()
1338
        return self._real_repository.find_text_key_references()
1339
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
1340
    def _generate_text_key_index(self):
1341
        """Generate a new text key index for the repository.
1342
1343
        This is an expensive function that will take considerable time to run.
1344
1345
        :return: A dict mapping (file_id, revision_id) tuples to a list of
1346
            parents, also (file_id, revision_id) tuples.
1347
        """
1348
        self._ensure_real()
1349
        return self._real_repository._generate_text_key_index()
1350
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1351
    def _get_revision_graph(self, revision_id):
1352
        """Private method for using with old (< 1.2) servers to fallback."""
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1353
        if revision_id is None:
1354
            revision_id = ''
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1355
        elif _mod_revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1356
            return {}
1357
1358
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1359
        response = self._call_expecting_body(
1360
            'Repository.get_revision_graph', path, revision_id)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
1361
        response_tuple, response_handler = response
1362
        if response_tuple[0] != 'ok':
1363
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1364
        coded = response_handler.read_body_bytes()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1365
        if coded == '':
1366
            # no revisions in this repository!
1367
            return {}
1368
        lines = coded.split('\n')
1369
        revision_graph = {}
1370
        for line in lines:
1371
            d = tuple(line.split())
1372
            revision_graph[d[0]] = d[1:]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1373
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1374
        return revision_graph
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1375
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
1376
    def _get_sink(self):
1377
        """See Repository._get_sink()."""
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1378
        return RemoteStreamSink(self)
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
1379
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
1380
    def _get_source(self, to_format):
1381
        """Return a source for streaming from this repository."""
1382
        return RemoteStreamSource(self, to_format)
1383
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
1384
    @needs_read_lock
5815.5.8 by Jelmer Vernooij
Use traditional (fileid, revision) entries in file graph.
1385
    def get_file_graph(self):
1386
        return graph.Graph(self.texts)
5815.5.3 by Jelmer Vernooij
Add basic test for per file graph.
1387
1388
    @needs_read_lock
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
1389
    def has_revision(self, revision_id):
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
1390
        """True if this repository has a copy of the revision."""
1391
        # Copy of bzrlib.repository.Repository.has_revision
1392
        return revision_id in self.has_revisions((revision_id,))
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
1393
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
1394
    @needs_read_lock
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
1395
    def has_revisions(self, revision_ids):
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
1396
        """Probe to find out the presence of multiple revisions.
1397
1398
        :param revision_ids: An iterable of revision_ids.
1399
        :return: A set of the revision_ids that were present.
1400
        """
1401
        # Copy of bzrlib.repository.Repository.has_revisions
1402
        parent_map = self.get_parent_map(revision_ids)
1403
        result = set(parent_map)
1404
        if _mod_revision.NULL_REVISION in revision_ids:
1405
            result.add(_mod_revision.NULL_REVISION)
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
1406
        return result
1407
4509.3.37 by Martin Pool
Remove RepositoryBase; make _has_same_location private
1408
    def _has_same_fallbacks(self, other_repo):
1409
        """Returns true if the repositories have the same fallbacks."""
1410
        # XXX: copied from Repository; it should be unified into a base class
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
1411
        # <https://bugs.launchpad.net/bzr/+bug/401622>
4509.3.37 by Martin Pool
Remove RepositoryBase; make _has_same_location private
1412
        my_fb = self._fallback_repositories
1413
        other_fb = other_repo._fallback_repositories
1414
        if len(my_fb) != len(other_fb):
1415
            return False
1416
        for f, g in zip(my_fb, other_fb):
1417
            if not f.has_same_location(g):
1418
                return False
1419
        return True
1420
2617.6.9 by Robert Collins
Merge bzr.dev.
1421
    def has_same_location(self, other):
4509.3.23 by Martin Pool
Comment on has_same_location variation
1422
        # TODO: Move to RepositoryBase and unify with the regular Repository
1423
        # one; unfortunately the tests rely on slightly different behaviour at
1424
        # present -- mbp 20090710
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
1425
        return (self.__class__ is other.__class__ and
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
1426
                self.bzrdir.transport.base == other.bzrdir.transport.base)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1427
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1428
    def get_graph(self, other_repository=None):
1429
        """Return the graph for this repository format"""
3835.1.17 by Aaron Bentley
Fix stacking bug
1430
        parents_provider = self._make_parents_provider(other_repository)
3441.5.24 by Andrew Bennetts
Remove RemoteGraph experiment.
1431
        return graph.Graph(parents_provider)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
1432
4913.4.2 by Jelmer Vernooij
Add Repository.get_known_graph_ancestry.
1433
    @needs_read_lock
1434
    def get_known_graph_ancestry(self, revision_ids):
1435
        """Return the known graph for a set of revision ids and their ancestors.
1436
        """
1437
        st = static_tuple.StaticTuple
1438
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
1439
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
1440
        return graph.GraphThunkIdsToKeys(known_graph)
1441
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1442
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
1443
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1444
        path = self.bzrdir._path_for_remote_call(self._client)
2948.3.4 by John Arbash Meinel
Repository.gather_stats() validly can get None for the revid.
1445
        # revid can be None to indicate no revisions, not just NULL_REVISION
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1446
        if revid is None or _mod_revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1447
            fmt_revid = ''
1448
        else:
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1449
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1450
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1451
            fmt_committers = 'no'
1452
        else:
1453
            fmt_committers = 'yes'
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1454
        response_tuple, response_handler = self._call_expecting_body(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1455
            'Repository.gather_stats', path, fmt_revid, fmt_committers)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
1456
        if response_tuple[0] != 'ok':
1457
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1458
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
1459
        body = response_handler.read_body_bytes()
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1460
        result = {}
1461
        for line in body.split('\n'):
1462
            if not line:
1463
                continue
1464
            key, val_text = line.split(':')
1465
            if key in ('revisions', 'size', 'committers'):
1466
                result[key] = int(val_text)
1467
            elif key in ('firstrev', 'latestrev'):
1468
                values = val_text.split(' ')[1:]
1469
                result[key] = (float(values[0]), long(values[1]))
1470
1471
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
1472
3140.1.2 by Aaron Bentley
Add ability to find branches inside repositories
1473
    def find_branches(self, using=False):
1474
        """See Repository.find_branches()."""
1475
        # should be an API call to the server.
1476
        self._ensure_real()
1477
        return self._real_repository.find_branches(using=using)
1478
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1479
    def get_physical_lock_status(self):
1480
        """See Repository.get_physical_lock_status()."""
6280.6.1 by Jelmer Vernooij
Implement remote side of {Branch,Repository}.get_physical_lock_status.
1481
        path = self.bzrdir._path_for_remote_call(self._client)
1482
        try:
1483
            response = self._call('Repository.get_physical_lock_status', path)
1484
        except errors.UnknownSmartMethod:
1485
            self._ensure_real()
1486
            return self._real_repository.get_physical_lock_status()
1487
        if response[0] not in ('yes', 'no'):
1488
            raise errors.UnexpectedSmartServerResponse(response)
6280.6.2 by Jelmer Vernooij
Add HPSS calls Repository.get_physical_lock_status and Branch.get_physical_lock_status.
1489
        return (response[0] == 'yes')
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1490
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1491
    def is_in_write_group(self):
1492
        """Return True if there is an open write group.
1493
1494
        write groups are only applicable locally for the smart server..
1495
        """
6280.7.3 by Jelmer Vernooij
Fix RemoteRepository.is_in_write_group.
1496
        if self._write_group_tokens is not None:
1497
            return True
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1498
        if self._real_repository:
1499
            return self._real_repository.is_in_write_group()
1500
1501
    def is_locked(self):
1502
        return self._lock_count >= 1
1503
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1504
    def is_shared(self):
1505
        """See Repository.is_shared()."""
1506
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1507
        response = self._call('Repository.is_shared', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1508
        if response[0] not in ('yes', 'no'):
1509
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1510
        return response[0] == 'yes'
1511
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
1512
    def is_write_locked(self):
1513
        return self._lock_mode == 'w'
1514
5675.2.2 by Jelmer Vernooij
Revert unnecessary bzrlib.remote changes.
1515
    def _warn_if_deprecated(self, branch=None):
1516
        # If we have a real repository, the check will be done there, if we
1517
        # don't the check will be done remotely.
1518
        pass
1519
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1520
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1521
        """Lock the repository for read operations.
1522
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1523
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1524
        """
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1525
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1526
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
1527
            self._note_lock('r')
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1528
            self._lock_mode = 'r'
1529
            self._lock_count = 1
4190.1.1 by Robert Collins
Negatively cache misses during read-locks in RemoteRepository.
1530
            self._unstacked_provider.enable_cache(cache_misses=True)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1531
            if self._real_repository is not None:
1532
                self._real_repository.lock_read()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
1533
            for repo in self._fallback_repositories:
1534
                repo.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1535
        else:
1536
            self._lock_count += 1
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1537
        return lock.LogicalLockResult(self.unlock)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1538
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1539
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1540
        path = self.bzrdir._path_for_remote_call(self._client)
1541
        if token is None:
1542
            token = ''
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1543
        err_context = {'token': token}
1544
        response = self._call('Repository.lock_write', path, token,
1545
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1546
        if response[0] == 'ok':
1547
            ok, token = response
1548
            return token
1549
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1550
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1551
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1552
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1553
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
1554
            self._note_lock('w')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1555
            if _skip_rpc:
1556
                if self._lock_token is not None:
1557
                    if token != self._lock_token:
3695.1.1 by Andrew Bennetts
Remove some unused imports and fix a couple of trivially broken raise statements.
1558
                        raise errors.TokenMismatch(token, self._lock_token)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1559
                self._lock_token = token
1560
            else:
1561
                self._lock_token = self._remote_lock_write(token)
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
1562
            # if self._lock_token is None, then this is something like packs or
1563
            # svn where we don't get to lock the repo, or a weave style repository
1564
            # where we cannot lock it over the wire and attempts to do so will
1565
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1566
            if self._real_repository is not None:
1567
                self._real_repository.lock_write(token=self._lock_token)
1568
            if token is not None:
1569
                self._leave_lock = True
1570
            else:
1571
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1572
            self._lock_mode = 'w'
1573
            self._lock_count = 1
4307.2.4 by Robert Collins
Enable caching of negative revision lookups in RemoteRepository write locks when no _real_repository has been constructed.
1574
            cache_misses = self._real_repository is None
1575
            self._unstacked_provider.enable_cache(cache_misses=cache_misses)
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
1576
            for repo in self._fallback_repositories:
1577
                # Writes don't affect fallback repos
1578
                repo.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1579
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1580
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1581
        else:
1582
            self._lock_count += 1
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1583
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1584
1585
    def leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
1586
        if not self._lock_token:
1587
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1588
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1589
1590
    def dont_leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
1591
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1592
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1593
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1594
1595
    def _set_real_repository(self, repository):
1596
        """Set the _real_repository for this repository.
1597
1598
        :param repository: The repository to fallback to for non-hpss
1599
            implemented operations.
1600
        """
4053.1.5 by Robert Collins
Review feedback on RemoteRepository._set_real_revision.
1601
        if self._real_repository is not None:
1602
            # Replacing an already set real repository.
1603
            # We cannot do this [currently] if the repository is locked -
1604
            # synchronised state might be lost.
1605
            if self.is_locked():
1606
                raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1607
        if isinstance(repository, RemoteRepository):
1608
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1609
        self._real_repository = repository
4226.2.5 by Robert Collins
Fix handling of fallback repositories some more.
1610
        # three code paths happen here:
1611
        # 1) old servers, RemoteBranch.open() calls _ensure_real before setting
1612
        # up stacking. In this case self._fallback_repositories is [], and the
1613
        # real repo is already setup. Preserve the real repo and
1614
        # RemoteRepository.add_fallback_repository will avoid adding
1615
        # duplicates.
1616
        # 2) new servers, RemoteBranch.open() sets up stacking, and when
1617
        # ensure_real is triggered from a branch, the real repository to
1618
        # set already has a matching list with separate instances, but
1619
        # as they are also RemoteRepositories we don't worry about making the
1620
        # lists be identical.
1621
        # 3) new servers, RemoteRepository.ensure_real is triggered before
1622
        # RemoteBranch.ensure real, in this case we get a repo with no fallbacks
1623
        # and need to populate it.
1624
        if (self._fallback_repositories and
1625
            len(self._real_repository._fallback_repositories) !=
4226.2.2 by Robert Collins
Fix setting config options to support unicode values and don't attempt to reset repositories _fallback_repositories as the simple approach fails to work.
1626
            len(self._fallback_repositories)):
1627
            if len(self._real_repository._fallback_repositories):
1628
                raise AssertionError(
1629
                    "cannot cleanly remove existing _fallback_repositories")
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
1630
        for fb in self._fallback_repositories:
1631
            self._real_repository.add_fallback_repository(fb)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1632
        if self._lock_mode == 'w':
1633
            # if we are already locked, the real repository must be able to
1634
            # acquire the lock with our token.
1635
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1636
        elif self._lock_mode == 'r':
1637
            self._real_repository.lock_read()
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1638
        if self._write_group_tokens is not None:
1639
            # if we are already in a write group, resume it
1640
            self._real_repository.resume_write_group(self._write_group_tokens)
1641
            self._write_group_tokens = None
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1642
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1643
    def start_write_group(self):
1644
        """Start a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1645
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
1646
        Smart methods perform operations in a single step so this API
2617.6.6 by Robert Collins
Some review feedback.
1647
        is not really applicable except as a compatibility thunk
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1648
        for older plugins that don't use e.g. the CommitBuilder
1649
        facility.
1650
        """
6280.7.5 by Jelmer Vernooij
Bunch of test fixes.
1651
        if self._real_repository:
1652
            self._ensure_real()
1653
            return self._real_repository.start_write_group()
1654
        if not self.is_write_locked():
1655
            raise errors.NotWriteLocked(self)
1656
        if self._write_group_tokens is not None:
1657
            raise errors.BzrError('already in a write group')
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1658
        path = self.bzrdir._path_for_remote_call(self._client)
1659
        try:
6280.7.2 by Jelmer Vernooij
Add HPSS calls ``Repository.start_write_group``, ``Repository.abort_write_group`` and ``Repository.commit_write_group``.
1660
            response = self._call('Repository.start_write_group', path,
1661
                self._lock_token)
6280.7.8 by Jelmer Vernooij
make sure start_write_group falls back to real_repository if write groups aren't suspendable.
1662
        except (errors.UnknownSmartMethod, errors.UnsuspendableWriteGroup):
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1663
            self._ensure_real()
1664
            return self._real_repository.start_write_group()
6280.7.2 by Jelmer Vernooij
Add HPSS calls ``Repository.start_write_group``, ``Repository.abort_write_group`` and ``Repository.commit_write_group``.
1665
        if response[0] != 'ok':
6280.7.1 by Jelmer Vernooij
Implement RemoteRepository side of write group HPSS methods.
1666
            raise errors.UnexpectedSmartServerResponse(response)
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1667
        self._write_group_tokens = response[1]
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1668
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1669
    def _unlock(self, token):
1670
        path = self.bzrdir._path_for_remote_call(self._client)
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
1671
        if not token:
1672
            # with no token the remote repository is not persistently locked.
1673
            return
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1674
        err_context = {'token': token}
1675
        response = self._call('Repository.unlock', path, token,
1676
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1677
        if response == ('ok',):
1678
            return
1679
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1680
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1681
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
1682
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1683
    def unlock(self):
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1684
        if not self._lock_count:
4509.3.25 by Martin Pool
Add an option for unlock errors to be non-fatal
1685
            return lock.cant_unlock_not_held(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1686
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1687
        if self._lock_count > 0:
1688
            return
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1689
        self._unstacked_provider.disable_cache()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1690
        old_mode = self._lock_mode
1691
        self._lock_mode = None
1692
        try:
1693
            # The real repository is responsible at present for raising an
1694
            # exception if it's in an unfinished write group.  However, it
1695
            # normally will *not* actually remove the lock from disk - that's
1696
            # done by the server on receiving the Repository.unlock call.
1697
            # This is just to let the _real_repository stay up to date.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1698
            if self._real_repository is not None:
1699
                self._real_repository.unlock()
6280.7.6 by Jelmer Vernooij
Fix remaining tests.
1700
            elif self._write_group_tokens is not None:
1701
                self.abort_write_group()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1702
        finally:
1703
            # The rpc-level lock should be released even if there was a
1704
            # problem releasing the vfs-based lock.
1705
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1706
                # Only write-locked repositories need to make a remote method
4031.3.1 by Frank Aspell
Fixing various typos
1707
                # call to perform the unlock.
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1708
                old_token = self._lock_token
1709
                self._lock_token = None
1710
                if not self._leave_lock:
1711
                    self._unlock(old_token)
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
1712
        # Fallbacks are always 'lock_read()' so we don't pay attention to
1713
        # self._leave_lock
1714
        for repo in self._fallback_repositories:
1715
            repo.unlock()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1716
1717
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1718
        # should hand off to the network
6280.4.5 by Jelmer Vernooij
Fix tests.
1719
        path = self.bzrdir._path_for_remote_call(self._client)
6280.4.1 by Jelmer Vernooij
Add remote side of Repository.break_lock.
1720
        try:
6280.4.5 by Jelmer Vernooij
Fix tests.
1721
            response = self._call("Repository.break_lock", path)
6280.4.1 by Jelmer Vernooij
Add remote side of Repository.break_lock.
1722
        except errors.UnknownSmartMethod:
1723
            self._ensure_real()
1724
            return self._real_repository.break_lock()
1725
        if response != ('ok',):
1726
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1727
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1728
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1729
        """Return a TemporaryFile containing a repository tarball.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1730
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1731
        Returns None if the server does not support sending tarballs.
1732
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1733
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1734
        path = self.bzrdir._path_for_remote_call(self._client)
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
1735
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1736
            response, protocol = self._call_expecting_body(
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
1737
                'Repository.tarball', path, compression)
1738
        except errors.UnknownSmartMethod:
1739
            protocol.cancel_read_body()
1740
            return None
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1741
        if response[0] == 'ok':
1742
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1743
            t = tempfile.NamedTemporaryFile()
1744
            # TODO: rpc layer should read directly into it...
1745
            t.write(protocol.read_body_bytes())
1746
            t.seek(0)
1747
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
1748
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1749
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
1750
    @needs_read_lock
2440.1.1 by Martin Pool
Add new Repository.sprout,
1751
    def sprout(self, to_bzrdir, revision_id=None):
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
1752
        """Create a descendent repository for new development.
1753
1754
        Unlike clone, this does not copy the settings of the repository.
1755
        """
1756
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
1757
        dest_repo.fetch(self, revision_id=revision_id)
1758
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
1759
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
1760
    def _create_sprouting_repo(self, a_bzrdir, shared):
1761
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
1762
            # use target default format.
1763
            dest_repo = a_bzrdir.create_repository()
1764
        else:
1765
            # Most control formats need the repository to be specifically
1766
            # created, but on some old all-in-one formats it's not needed
1767
            try:
1768
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
1769
            except errors.UninitializableFormat:
1770
                dest_repo = a_bzrdir.open_repository()
1771
        return dest_repo
1772
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1773
    ### These methods are just thin shims to the VFS object for now.
1774
6267.1.3 by Jelmer Vernooij
Fix tests.
1775
    @needs_read_lock
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1776
    def revision_tree(self, revision_id):
6267.1.3 by Jelmer Vernooij
Fix tests.
1777
        revision_id = _mod_revision.ensure_null(revision_id)
1778
        if revision_id == _mod_revision.NULL_REVISION:
1779
            return InventoryRevisionTree(self,
1780
                Inventory(root_id=None), _mod_revision.NULL_REVISION)
1781
        else:
1782
            return list(self.revision_trees([revision_id]))[0]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1783
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1784
    def get_serializer_format(self):
6280.5.1 by Jelmer Vernooij
Add client side of Repository.get_serializer_format.
1785
        path = self.bzrdir._path_for_remote_call(self._client)
1786
        try:
1787
            response = self._call('VersionedFileRepository.get_serializer_format',
1788
                path)
1789
        except errors.UnknownSmartMethod:
1790
            self._ensure_real()
1791
            return self._real_repository.get_serializer_format()
1792
        if response[0] != 'ok':
1793
            raise errors.UnexpectedSmartServerResponse(response)
6280.5.2 by Jelmer Vernooij
New HPSS call VersionedFileRepository.get_serializer_format.
1794
        return response[1]
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1795
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1796
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1797
                           timezone=None, committer=None, revprops=None,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
1798
                           revision_id=None, lossy=False):
6362.5.1 by Jelmer Vernooij
Implement RemoteRepository.get_commit_builder.
1799
        """Obtain a CommitBuilder for this repository.
1800
1801
        :param branch: Branch to commit to.
1802
        :param parents: Revision ids of the parents of the new revision.
1803
        :param config: Configuration to use.
1804
        :param timestamp: Optional timestamp recorded for commit.
1805
        :param timezone: Optional timezone for timestamp.
1806
        :param committer: Optional committer to set for commit.
1807
        :param revprops: Optional dictionary of revision properties.
1808
        :param revision_id: Optional revision id.
1809
        :param lossy: Whether to discard data that can not be natively
1810
            represented, when pushing to a foreign VCS
1811
        """
1812
        if self._fallback_repositories and not self._format.supports_chks:
1813
            raise errors.BzrError("Cannot commit directly to a stacked branch"
1814
                " in pre-2a formats. See "
1815
                "https://bugs.launchpad.net/bzr/+bug/375013 for details.")
1816
        if self._format.rich_root_data:
1817
            commit_builder_kls = vf_repository.VersionedFileRootCommitBuilder
1818
        else:
1819
            commit_builder_kls = vf_repository.VersionedFileCommitBuilder
1820
        result = commit_builder_kls(self, parents, config,
1821
            timestamp, timezone, committer, revprops, revision_id,
1822
            lossy)
1823
        self.start_write_group()
1824
        return result
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1825
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1826
    def add_fallback_repository(self, repository):
1827
        """Add a repository to use for looking up data not held locally.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1828
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1829
        :param repository: A repository.
1830
        """
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
1831
        if not self._format.supports_external_lookups:
1832
            raise errors.UnstackableRepositoryFormat(
1833
                self._format.network_name(), self.base)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1834
        # We need to accumulate additional repositories here, to pass them in
1835
        # on various RPC's.
4035.2.3 by Robert Collins
Fix trailing whitespace.
1836
        #
5609.54.1 by Gary Poster
repositories should not be locked in add_fallback_repository if they will not be used.
1837
        # Make the check before we lock: this raises an exception.
1838
        self._check_fallback_repository(repository)
4379.2.2 by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly.
1839
        if self.is_locked():
1840
            # We will call fallback.unlock() when we transition to the unlocked
1841
            # state, so always add a lock here. If a caller passes us a locked
1842
            # repository, they are responsible for unlocking it later.
1843
            repository.lock_read()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1844
        self._fallback_repositories.append(repository)
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1845
        # If self._real_repository was parameterised already (e.g. because a
1846
        # _real_branch had its get_stacked_on_url method called), then the
1847
        # repository to be added may already be in the _real_repositories list.
4035.2.1 by Andrew Bennetts
Fix unnecessary get_parent_map calls after insert_stream during push.
1848
        if self._real_repository is not None:
5158.6.7 by Martin Pool
More conversions to using user_url
1849
            fallback_locations = [repo.user_url for repo in
4226.2.5 by Robert Collins
Fix handling of fallback repositories some more.
1850
                self._real_repository._fallback_repositories]
5158.6.7 by Martin Pool
More conversions to using user_url
1851
            if repository.user_url not in fallback_locations:
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1852
                self._real_repository.add_fallback_repository(repository)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1853
5158.4.1 by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats.
1854
    def _check_fallback_repository(self, repository):
1855
        """Check that this repository can fallback to repository safely.
1856
1857
        Raise an error if not.
1858
1859
        :param repository: A repository to fallback to.
1860
        """
1861
        return _mod_repository.InterRepository._assert_same_model(
1862
            self, repository)
1863
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1864
    def add_inventory(self, revid, inv, parents):
1865
        self._ensure_real()
1866
        return self._real_repository.add_inventory(revid, inv, parents)
1867
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1868
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
5076.1.1 by Jelmer Vernooij
Allow additional arguments to RemoteRepository.add_inventory_by_delta().
1869
            parents, basis_inv=None, propagate_caches=False):
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
1870
        self._ensure_real()
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1871
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
5076.1.2 by Jelmer Vernooij
pass the keyword args as keyword args, per Rob's review.
1872
            delta, new_revision_id, parents, basis_inv=basis_inv,
1873
            propagate_caches=propagate_caches)
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
1874
6421.2.1 by Jelmer Vernooij
Move revision signing to CommitBuilder.
1875
    def add_revision(self, revision_id, rev, inv=None):
6362.6.1 by Jelmer Vernooij
Implement RemoteRepository.add_revision.
1876
        _mod_revision.check_not_reserved_id(revision_id)
1877
        key = (revision_id,)
1878
        # check inventory present
1879
        if not self.inventories.get_parent_map([key]):
1880
            if inv is None:
1881
                raise errors.WeaveRevisionNotPresent(revision_id,
1882
                                                     self.inventories)
1883
            else:
1884
                # yes, this is not suitable for adding with ghosts.
1885
                rev.inventory_sha1 = self.add_inventory(revision_id, inv,
1886
                                                        rev.parent_ids)
1887
        else:
1888
            rev.inventory_sha1 = self.inventories.get_sha1s([key])[key]
6421.2.1 by Jelmer Vernooij
Move revision signing to CommitBuilder.
1889
        self._add_revision(rev)
1890
1891
    def _add_revision(self, rev):
6362.6.1 by Jelmer Vernooij
Implement RemoteRepository.add_revision.
1892
        if self._real_repository is not None:
6421.2.1 by Jelmer Vernooij
Move revision signing to CommitBuilder.
1893
            return self._real_repository._add_revision(rev)
6362.6.1 by Jelmer Vernooij
Implement RemoteRepository.add_revision.
1894
        text = self._serializer.write_revision_to_string(rev)
6421.2.1 by Jelmer Vernooij
Move revision signing to CommitBuilder.
1895
        key = (rev.revision_id,)
6362.6.1 by Jelmer Vernooij
Implement RemoteRepository.add_revision.
1896
        parents = tuple((parent,) for parent in rev.parent_ids)
1897
        self._write_group_tokens, missing_keys = self._get_sink().insert_stream(
1898
            [('revisions', [FulltextContentFactory(key, parents, None, text)])],
1899
            self._format, self._write_group_tokens)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1900
1901
    @needs_read_lock
1902
    def get_inventory(self, revision_id):
6280.11.1 by Jelmer Vernooij
Implement RemoteRepository.get_inventory using RemoteRepository.iter_inventories
1903
        return list(self.iter_inventories([revision_id]))[0]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1904
6282.6.9 by Jelmer Vernooij
More tests.
1905
    def _iter_inventories_rpc(self, revision_ids, ordering):
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1906
        if ordering is None:
6282.6.19 by Jelmer Vernooij
More test fixes.
1907
            ordering = 'unordered'
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1908
        path = self.bzrdir._path_for_remote_call(self._client)
6282.6.9 by Jelmer Vernooij
More tests.
1909
        body = "\n".join(revision_ids)
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1910
        response_tuple, response_handler = (
1911
            self._call_with_body_bytes_expecting_body(
6282.6.28 by Jelmer Vernooij
Rename VersionedFileRepository.iter_inventories to VersionedFileRepository.get_inventories.
1912
                "VersionedFileRepository.get_inventories",
6282.6.9 by Jelmer Vernooij
More tests.
1913
                (path, ordering), body))
6282.6.5 by Jelmer Vernooij
Use iter_inventory_deltas.
1914
        if response_tuple[0] != "ok":
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1915
            raise errors.UnexpectedSmartServerResponse(response_tuple)
6282.6.5 by Jelmer Vernooij
Use iter_inventory_deltas.
1916
        deserializer = inventory_delta.InventoryDeltaDeserializer()
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1917
        byte_stream = response_handler.read_streamed_body()
6282.6.37 by Jelmer Vernooij
Cope with empty results.
1918
        decoded = smart_repo._byte_stream_to_stream(byte_stream)
1919
        if decoded is None:
1920
            # no results whatsoever
1921
            return
1922
        src_format, stream = decoded
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1923
        if src_format.network_name() != self._format.network_name():
1924
            raise AssertionError(
1925
                "Mismatched RemoteRepository and stream src %r, %r" % (
1926
                src_format.network_name(), self._format.network_name()))
1927
        # ignore the src format, it's not really relevant
6282.6.9 by Jelmer Vernooij
More tests.
1928
        prev_inv = Inventory(root_id=None,
1929
            revision_id=_mod_revision.NULL_REVISION)
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1930
        # there should be just one substream, with inventory deltas
1931
        substream_kind, substream = stream.next()
6282.6.39 by Jelmer Vernooij
add an extra assertion.
1932
        if substream_kind != "inventory-deltas":
1933
            raise AssertionError(
1934
                 "Unexpected stream %r received" % substream_kind)
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1935
        for record in substream:
6282.6.9 by Jelmer Vernooij
More tests.
1936
            (parent_id, new_id, versioned_root, tree_references, invdelta) = (
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1937
                deserializer.parse_text_bytes(record.get_bytes_as("fulltext")))
6282.6.9 by Jelmer Vernooij
More tests.
1938
            if parent_id != prev_inv.revision_id:
1939
                raise AssertionError("invalid base %r != %r" % (parent_id,
1940
                    prev_inv.revision_id))
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1941
            inv = prev_inv.create_by_apply_delta(invdelta, new_id)
6282.6.18 by Jelmer Vernooij
Fix tests.
1942
            yield inv, inv.revision_id
6282.6.31 by Jelmer Vernooij
Use record streams in get_inventories call.
1943
            prev_inv = inv
6282.6.9 by Jelmer Vernooij
More tests.
1944
1945
    def _iter_inventories_vfs(self, revision_ids, ordering=None):
1946
        self._ensure_real()
6282.6.18 by Jelmer Vernooij
Fix tests.
1947
        return self._real_repository._iter_inventories(revision_ids, ordering)
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1948
4476.3.86 by Andrew Bennetts
Fix bug in declaration of RemoteRepository.iter_inventories that was causing intermittent failures in test_iter_inventories_is_ordered.
1949
    def iter_inventories(self, revision_ids, ordering=None):
6282.6.18 by Jelmer Vernooij
Fix tests.
1950
        """Get many inventories by revision_ids.
1951
1952
        This will buffer some or all of the texts used in constructing the
1953
        inventories in memory, but will only parse a single inventory at a
1954
        time.
1955
1956
        :param revision_ids: The expected revision ids of the inventories.
1957
        :param ordering: optional ordering, e.g. 'topological'.  If not
1958
            specified, the order of revision_ids will be preserved (by
1959
            buffering if necessary).
1960
        :return: An iterator of inventories.
1961
        """
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1962
        if ((None in revision_ids)
1963
            or (_mod_revision.NULL_REVISION in revision_ids)):
1964
            raise ValueError('cannot get null revision inventory')
6282.6.18 by Jelmer Vernooij
Fix tests.
1965
        for inv, revid in self._iter_inventories(revision_ids, ordering):
1966
            if inv is None:
1967
                raise errors.NoSuchRevision(self, revid)
1968
            yield inv
1969
1970
    def _iter_inventories(self, revision_ids, ordering=None):
6282.6.9 by Jelmer Vernooij
More tests.
1971
        if len(revision_ids) == 0:
1972
            return
1973
        missing = set(revision_ids)
1974
        if ordering is None:
1975
            order_as_requested = True
1976
            invs = {}
1977
            order = list(revision_ids)
1978
            order.reverse()
1979
            next_revid = order.pop()
6282.6.10 by Jelmer Vernooij
Fix smart tests.
1980
        else:
6282.6.9 by Jelmer Vernooij
More tests.
1981
            order_as_requested = False
6282.6.10 by Jelmer Vernooij
Fix smart tests.
1982
            if ordering != 'unordered' and self._fallback_repositories:
1983
                raise ValueError('unsupported ordering %r' % ordering)
6282.6.9 by Jelmer Vernooij
More tests.
1984
        iter_inv_fns = [self._iter_inventories_rpc] + [
1985
            fallback._iter_inventories for fallback in
1986
            self._fallback_repositories]
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
1987
        try:
6282.6.9 by Jelmer Vernooij
More tests.
1988
            for iter_inv in iter_inv_fns:
1989
                request = [revid for revid in revision_ids if revid in missing]
6282.6.18 by Jelmer Vernooij
Fix tests.
1990
                for inv, revid in iter_inv(request, ordering):
6282.6.21 by Jelmer Vernooij
Fix nosuchrevision.
1991
                    if inv is None:
1992
                        continue
6282.6.9 by Jelmer Vernooij
More tests.
1993
                    missing.remove(inv.revision_id)
1994
                    if ordering != 'unordered':
6282.6.18 by Jelmer Vernooij
Fix tests.
1995
                        invs[revid] = inv
6282.6.9 by Jelmer Vernooij
More tests.
1996
                    else:
6282.6.18 by Jelmer Vernooij
Fix tests.
1997
                        yield inv, revid
6282.6.9 by Jelmer Vernooij
More tests.
1998
                if order_as_requested:
1999
                    # Yield as many results as we can while preserving order.
2000
                    while next_revid in invs:
2001
                        inv = invs.pop(next_revid)
6282.6.18 by Jelmer Vernooij
Fix tests.
2002
                        yield inv, inv.revision_id
6282.6.9 by Jelmer Vernooij
More tests.
2003
                        try:
2004
                            next_revid = order.pop()
2005
                        except IndexError:
2006
                            # We still want to fully consume the stream, just
2007
                            # in case it is not actually finished at this point
2008
                            next_revid = None
2009
                            break
6282.6.3 by Jelmer Vernooij
Add stub for remote iter inventories.
2010
        except errors.UnknownSmartMethod:
6282.6.26 by Jelmer Vernooij
Fix iteration.
2011
            for inv, revid in self._iter_inventories_vfs(revision_ids, ordering):
2012
                yield inv, revid
6282.6.9 by Jelmer Vernooij
More tests.
2013
            return
6282.6.18 by Jelmer Vernooij
Fix tests.
2014
        # Report missing
2015
        if order_as_requested:
6282.6.21 by Jelmer Vernooij
Fix nosuchrevision.
2016
            if next_revid is not None:
2017
                yield None, next_revid
6282.6.18 by Jelmer Vernooij
Fix tests.
2018
            while order:
6282.6.19 by Jelmer Vernooij
More test fixes.
2019
                revid = order.pop()
2020
                yield invs.get(revid), revid
6282.6.18 by Jelmer Vernooij
Fix tests.
2021
        else:
2022
            while missing:
2023
                yield None, missing.pop()
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
2024
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2025
    @needs_read_lock
2026
    def get_revision(self, revision_id):
6267.1.1 by Jelmer Vernooij
Avoid _ensure_real in a couple more places.
2027
        return self.get_revisions([revision_id])[0]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2028
2029
    def get_transaction(self):
2030
        self._ensure_real()
2031
        return self._real_repository.get_transaction()
2032
2033
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
2034
    def clone(self, a_bzrdir, revision_id=None):
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
2035
        dest_repo = self._create_sprouting_repo(
6267.1.3 by Jelmer Vernooij
Fix tests.
2036
            a_bzrdir, shared=self.is_shared())
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
2037
        self.copy_content_into(dest_repo, revision_id)
2038
        return dest_repo
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2039
2040
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
2041
        """See Repository.make_working_trees"""
6263.2.1 by Jelmer Vernooij
Add hpss call ``Repository.make_working_trees``
2042
        path = self.bzrdir._path_for_remote_call(self._client)
2043
        try:
2044
            response = self._call('Repository.make_working_trees', path)
2045
        except errors.UnknownSmartMethod:
2046
            self._ensure_real()
2047
            return self._real_repository.make_working_trees()
2048
        if response[0] not in ('yes', 'no'):
2049
            raise SmartProtocolError('unexpected response code %s' % (response,))
2050
        return response[0] == 'yes'
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2051
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2052
    def refresh_data(self):
5199.1.3 by Andrew Bennetts
Use Robert's text for the refresh_data docstring.
2053
        """Re-read any data needed to synchronise with disk.
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2054
2055
        This method is intended to be called after another repository instance
2056
        (such as one used by a smart server) has inserted data into the
5199.1.3 by Andrew Bennetts
Use Robert's text for the refresh_data docstring.
2057
        repository. On all repositories this will work outside of write groups.
2058
        Some repository formats (pack and newer for bzrlib native formats)
2059
        support refresh_data inside write groups. If called inside a write
2060
        group on a repository that does not support refreshing in a write group
2061
        IsInWriteGroupError will be raised.
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2062
        """
2063
        if self._real_repository is not None:
2064
            self._real_repository.refresh_data()
6362.5.3 by Jelmer Vernooij
Add comments.
2065
        # Refresh the parents cache for this object
6362.5.2 by Jelmer Vernooij
Fix tests.
2066
        self._unstacked_provider.disable_cache()
2067
        self._unstacked_provider.enable_cache()
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2068
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
2069
    def revision_ids_to_search_result(self, result_set):
2070
        """Convert a set of revision ids to a graph SearchResult."""
2071
        result_parents = set()
2072
        for parents in self.get_graph().get_parent_map(
2073
            result_set).itervalues():
2074
            result_parents.update(parents)
2075
        included_keys = result_set.intersection(result_parents)
2076
        start_keys = result_set.difference(included_keys)
2077
        exclude_keys = result_parents.difference(result_set)
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
2078
        result = vf_search.SearchResult(start_keys, exclude_keys,
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
2079
            len(result_set), result_set)
2080
        return result
2081
2082
    @needs_read_lock
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
2083
    def search_missing_revision_ids(self, other,
2084
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
5852.1.6 by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids.
2085
            find_ghosts=True, revision_ids=None, if_present_ids=None,
2086
            limit=None):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
2087
        """Return the revision ids that other has that this does not.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2088
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
2089
        These are returned in topological order.
2090
2091
        revision_id: only return revision ids included by revision_id.
2092
        """
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
2093
        if symbol_versioning.deprecated_passed(revision_id):
2094
            symbol_versioning.warn(
2095
                'search_missing_revision_ids(revision_id=...) was '
5536.3.3 by Andrew Bennetts
Merge lp:bzr.
2096
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
2097
                DeprecationWarning, stacklevel=2)
2098
            if revision_ids is not None:
2099
                raise AssertionError(
2100
                    'revision_ids is mutually exclusive with revision_id')
2101
            if revision_id is not None:
2102
                revision_ids = [revision_id]
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2103
        inter_repo = _mod_repository.InterRepository.get(other, self)
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
2104
        return inter_repo.search_missing_revision_ids(
5535.3.32 by Andrew Bennetts
Implement if_present_ids behaviour in all implementations and code paths of searching_missing_revision_ids
2105
            find_ghosts=find_ghosts, revision_ids=revision_ids,
5852.1.6 by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids.
2106
            if_present_ids=if_present_ids, limit=limit)
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
2107
5670.1.1 by Jelmer Vernooij
Remove all methods and arguments that were deprecated before bzr 2.0.0.
2108
    def fetch(self, source, revision_id=None, find_ghosts=False,
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
2109
            fetch_spec=None):
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
2110
        # No base implementation to use as RemoteRepository is not a subclass
2111
        # of Repository; so this is a copy of Repository.fetch().
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
2112
        if fetch_spec is not None and revision_id is not None:
2113
            raise AssertionError(
2114
                "fetch_spec and revision_id are mutually exclusive.")
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
2115
        if self.is_in_write_group():
4145.1.3 by Robert Collins
NEWS conflicts.
2116
            raise errors.InternalBzrError(
2117
                "May not fetch while in a write group.")
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
2118
        # fast path same-url fetch operations
4509.3.19 by Martin Pool
RemoteRepository.fetch is not a no-op if there's different stacking
2119
        if (self.has_same_location(source)
2120
            and fetch_spec is None
4509.3.37 by Martin Pool
Remove RepositoryBase; make _has_same_location private
2121
            and self._has_same_fallbacks(source)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
2122
            # check that last_revision is in 'from' and then return a
2123
            # no-operation.
2124
            if (revision_id is not None and
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2125
                not _mod_revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
2126
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
2127
            return 0, []
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
2128
        # if there is no specific appropriate InterRepository, this will get
2129
        # the InterRepository base class, which raises an
2130
        # IncompatibleRepositories when asked to fetch.
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2131
        inter = _mod_repository.InterRepository.get(source, self)
6341.1.2 by Jelmer Vernooij
Update remote, too.
2132
        if (fetch_spec is not None and
2133
            not getattr(inter, "supports_fetch_spec", False)):
2134
            raise errors.UnsupportedOperation(
2135
                "fetch_spec not supported for %r" % inter)
5670.1.1 by Jelmer Vernooij
Remove all methods and arguments that were deprecated before bzr 2.0.0.
2136
        return inter.fetch(revision_id=revision_id,
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
2137
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2138
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
2139
    def create_bundle(self, target, base, fileobj, format=None):
2140
        self._ensure_real()
2141
        self._real_repository.create_bundle(target, base, fileobj, format)
2142
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2143
    @needs_read_lock
5972.3.10 by Jelmer Vernooij
Deprecate Repository.get_ancestry.
2144
    @symbol_versioning.deprecated_method(
2145
        symbol_versioning.deprecated_in((2, 4, 0)))
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
2146
    def get_ancestry(self, revision_id, topo_sorted=True):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2147
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
2148
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2149
2150
    def fileids_altered_by_revision_ids(self, revision_ids):
2151
        self._ensure_real()
2152
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
2153
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
2154
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
2155
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
2156
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
2157
            revisions, revision_versions_cache)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2158
6280.10.12 by Jelmer Vernooij
Handle stacking.
2159
    def _iter_files_bytes_rpc(self, desired_files, absent):
6280.10.7 by Jelmer Vernooij
Fix remote.
2160
        path = self.bzrdir._path_for_remote_call(self._client)
2161
        lines = []
2162
        identifiers = []
2163
        for (file_id, revid, identifier) in desired_files:
6280.10.18 by Jelmer Vernooij
Ensure file ids are always utf8.
2164
            lines.append("%s\0%s" % (
2165
                osutils.safe_file_id(file_id),
2166
                osutils.safe_revision_id(revid)))
6280.10.7 by Jelmer Vernooij
Fix remote.
2167
            identifiers.append(identifier)
2168
        (response_tuple, response_handler) = (
2169
            self._call_with_body_bytes_expecting_body(
6280.10.19 by Jelmer Vernooij
Convert remote side to zlib.
2170
            "Repository.iter_files_bytes", (path, ), "\n".join(lines)))
6280.10.7 by Jelmer Vernooij
Fix remote.
2171
        if response_tuple != ('ok', ):
2172
            response_handler.cancel_read_body()
2173
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2174
        byte_stream = response_handler.read_streamed_body()
6280.10.10 by Jelmer Vernooij
Use streaming.
2175
        def decompress_stream(start, byte_stream, unused):
6280.10.19 by Jelmer Vernooij
Convert remote side to zlib.
2176
            decompressor = zlib.decompressobj()
6280.10.10 by Jelmer Vernooij
Use streaming.
2177
            yield decompressor.decompress(start)
6280.10.8 by Jelmer Vernooij
Fix iterator handling.
2178
            while decompressor.unused_data == "":
2179
                try:
6280.10.9 by Jelmer Vernooij
Works.
2180
                    data = byte_stream.next()
2181
                except StopIteration:
6280.10.8 by Jelmer Vernooij
Fix iterator handling.
2182
                    break
6280.10.22 by Jelmer Vernooij
Simplify code a bit.
2183
                yield decompressor.decompress(data)
2184
            yield decompressor.flush()
6280.10.10 by Jelmer Vernooij
Use streaming.
2185
            unused.append(decompressor.unused_data)
6280.10.8 by Jelmer Vernooij
Fix iterator handling.
2186
        unused = ""
6280.10.7 by Jelmer Vernooij
Fix remote.
2187
        while True:
6280.10.8 by Jelmer Vernooij
Fix iterator handling.
2188
            while not "\n" in unused:
2189
                unused += byte_stream.next()
6280.10.11 by Jelmer Vernooij
mark absent entries.
2190
            header, rest = unused.split("\n", 1)
2191
            args = header.split("\0")
2192
            if args[0] == "absent":
6280.10.12 by Jelmer Vernooij
Handle stacking.
2193
                absent[identifiers[int(args[3])]] = (args[1], args[2])
6280.10.13 by Jelmer Vernooij
Handle absent.
2194
                unused = rest
2195
                continue
6280.10.11 by Jelmer Vernooij
mark absent entries.
2196
            elif args[0] == "ok":
2197
                idx = int(args[1])
2198
            else:
2199
                raise errors.UnexpectedSmartServerResponse(args)
6280.10.22 by Jelmer Vernooij
Simplify code a bit.
2200
            unused_chunks = []
6280.10.11 by Jelmer Vernooij
mark absent entries.
2201
            yield (identifiers[idx],
6280.10.22 by Jelmer Vernooij
Simplify code a bit.
2202
                decompress_stream(rest, byte_stream, unused_chunks))
2203
            unused = "".join(unused_chunks)
6280.10.1 by Jelmer Vernooij
Add remote side of Repository.iter_file_bytes.
2204
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
2205
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
2206
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
2207
        """
6280.10.1 by Jelmer Vernooij
Add remote side of Repository.iter_file_bytes.
2208
        try:
6280.10.12 by Jelmer Vernooij
Handle stacking.
2209
            absent = {}
6280.10.1 by Jelmer Vernooij
Add remote side of Repository.iter_file_bytes.
2210
            for (identifier, bytes_iterator) in self._iter_files_bytes_rpc(
6280.10.12 by Jelmer Vernooij
Handle stacking.
2211
                    desired_files, absent):
6280.10.1 by Jelmer Vernooij
Add remote side of Repository.iter_file_bytes.
2212
                yield identifier, bytes_iterator
6280.10.13 by Jelmer Vernooij
Handle absent.
2213
            for fallback in self._fallback_repositories:
2214
                if not absent:
2215
                    break
2216
                desired_files = [(key[0], key[1], identifier) for
2217
                    (identifier, key) in absent.iteritems()]
6280.10.23 by Jelmer Vernooij
Fix access to fallback repositories.
2218
                for (identifier, bytes_iterator) in fallback.iter_files_bytes(desired_files):
6280.10.13 by Jelmer Vernooij
Handle absent.
2219
                    del absent[identifier]
2220
                    yield identifier, bytes_iterator
2221
            if absent:
2222
                # There may be more missing items, but raise an exception
2223
                # for just one.
2224
                missing_identifier = absent.keys()[0]
2225
                missing_key = absent[missing_identifier]
6280.10.23 by Jelmer Vernooij
Fix access to fallback repositories.
2226
                raise errors.RevisionNotPresent(revision_id=missing_key[1],
2227
                    file_id=missing_key[0])
6280.10.1 by Jelmer Vernooij
Add remote side of Repository.iter_file_bytes.
2228
        except errors.UnknownSmartMethod:
2229
            self._ensure_real()
2230
            for (identifier, bytes_iterator) in (
2231
                self._real_repository.iter_files_bytes(desired_files)):
2232
                yield identifier, bytes_iterator
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
2233
6015.24.4 by John Arbash Meinel
For it to all work properly, we have to expose get_parent_map_cached on RemoteRepository.
2234
    def get_cached_parent_map(self, revision_ids):
2235
        """See bzrlib.CachingParentsProvider.get_cached_parent_map"""
2236
        return self._unstacked_provider.get_cached_parent_map(revision_ids)
2237
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
2238
    def get_parent_map(self, revision_ids):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
2239
        """See bzrlib.Graph.get_parent_map()."""
3835.1.5 by Aaron Bentley
Fix make_parents_provider
2240
        return self._make_parents_provider().get_parent_map(revision_ids)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
2241
2242
    def _get_parent_map_rpc(self, keys):
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2243
        """Helper for get_parent_map that performs the RPC."""
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
2244
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
2245
        if medium._is_remote_before((1, 2)):
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
2246
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
2247
            # Repository.get_parent_map requests, so just fetch the whole
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
2248
            # graph.
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
2249
            #
2250
            # Note that this reads the whole graph, when only some keys are
2251
            # wanted.  On this old server there's no way (?) to get them all
2252
            # in one go, and the user probably will have seen a warning about
2253
            # the server being old anyhow.
2254
            rg = self._get_revision_graph(None)
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
2255
            # There is an API discrepancy between get_parent_map and
3389.1.1 by John Arbash Meinel
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
2256
            # get_revision_graph. Specifically, a "key:()" pair in
2257
            # get_revision_graph just means a node has no parents. For
2258
            # "get_parent_map" it means the node is a ghost. So fix up the
2259
            # graph to correct this.
2260
            #   https://bugs.launchpad.net/bzr/+bug/214894
2261
            # There is one other "bug" which is that ghosts in
2262
            # get_revision_graph() are not returned at all. But we won't worry
2263
            # about that for now.
2264
            for node_id, parent_ids in rg.iteritems():
2265
                if parent_ids == ():
2266
                    rg[node_id] = (NULL_REVISION,)
2267
            rg[NULL_REVISION] = ()
2268
            return rg
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
2269
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2270
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
2271
        if None in keys:
2272
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2273
        if NULL_REVISION in keys:
2274
            keys.discard(NULL_REVISION)
2275
            found_parents = {NULL_REVISION:()}
2276
            if not keys:
2277
                return found_parents
2278
        else:
2279
            found_parents = {}
3211.5.1 by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates.
2280
        # TODO(Needs analysis): We could assume that the keys being requested
2281
        # from get_parent_map are in a breadth first search, so typically they
2282
        # will all be depth N from some common parent, and we don't have to
2283
        # have the server iterate from the root parent, but rather from the
2284
        # keys we're searching; and just tell the server the keyspace we
2285
        # already have; but this may be more traffic again.
2286
2287
        # Transform self._parents_map into a search request recipe.
2288
        # TODO: Manage this incrementally to avoid covering the same path
2289
        # repeatedly. (The server will have to on each request, but the less
2290
        # work done the better).
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
2291
        #
2292
        # Negative caching notes:
2293
        # new server sends missing when a request including the revid
2294
        # 'include-missing:' is present in the request.
2295
        # missing keys are serialised as missing:X, and we then call
2296
        # provider.note_missing(X) for-all X
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
2297
        parents_map = self._unstacked_provider.get_cached_map()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
2298
        if parents_map is None:
2299
            # Repository is not locked, so there's no cache.
2300
            parents_map = {}
6015.23.11 by John Arbash Meinel
allow a bit more flexibilty in how we walk the searches.
2301
        if _DEFAULT_SEARCH_DEPTH <= 0:
2302
            (start_set, stop_keys,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
2303
             key_count) = vf_search.search_result_from_parent_map(
6015.23.11 by John Arbash Meinel
allow a bit more flexibilty in how we walk the searches.
2304
                parents_map, self._unstacked_provider.missing_keys)
2305
        else:
6015.23.8 by John Arbash Meinel
Play around with when to activate how much history searching.
2306
            (start_set, stop_keys,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
2307
             key_count) = vf_search.limited_search_result_from_parent_map(
6015.23.8 by John Arbash Meinel
Play around with when to activate how much history searching.
2308
                parents_map, self._unstacked_provider.missing_keys,
6015.23.11 by John Arbash Meinel
allow a bit more flexibilty in how we walk the searches.
2309
                keys, depth=_DEFAULT_SEARCH_DEPTH)
6015.23.3 by John Arbash Meinel
Start refactoring code into graph.py code for easier testing.
2310
        recipe = ('manual', start_set, stop_keys, key_count)
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2311
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2312
        path = self.bzrdir._path_for_remote_call(self._client)
2313
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
2314
            if type(key) is not str:
2315
                raise ValueError(
2316
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
2317
        verb = 'Repository.get_parent_map'
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
2318
        args = (path, 'include-missing:') + tuple(keys)
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
2319
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2320
            response = self._call_with_body_bytes_expecting_body(
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2321
                verb, args, body)
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
2322
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
2323
            # Server does not support this method, so get the whole graph.
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
2324
            # Worse, we have to force a disconnection, because the server now
2325
            # doesn't realise it has a body on the wire to consume, so the
2326
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
2327
            warning(
2328
                'Server is too old for fast get_parent_map, reconnecting.  '
2329
                '(Upgrade the server to Bazaar 1.2 to avoid this)')
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
2330
            medium.disconnect()
2331
            # To avoid having to disconnect repeatedly, we keep track of the
2332
            # fact the server doesn't understand remote methods added in 1.2.
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
2333
            medium._remember_remote_is_before((1, 2))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
2334
            # Recurse just once and we should use the fallback code.
2335
            return self._get_parent_map_rpc(keys)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
2336
        response_tuple, response_handler = response
2337
        if response_tuple[0] not in ['ok']:
2338
            response_handler.cancel_read_body()
2339
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2340
        if response_tuple[0] == 'ok':
2341
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2342
            if coded == '':
2343
                # no revisions found
2344
                return {}
2345
            lines = coded.split('\n')
2346
            revision_graph = {}
2347
            for line in lines:
2348
                d = tuple(line.split())
2349
                if len(d) > 1:
2350
                    revision_graph[d[0]] = d[1:]
2351
                else:
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
2352
                    # No parents:
2353
                    if d[0].startswith('missing:'):
2354
                        revid = d[0][8:]
2355
                        self._unstacked_provider.note_missing_key(revid)
2356
                    else:
2357
                        # no parents - so give the Graph result
2358
                        # (NULL_REVISION,).
2359
                        revision_graph[d[0]] = (NULL_REVISION,)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
2360
            return revision_graph
2361
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2362
    @needs_read_lock
2363
    def get_signature_text(self, revision_id):
6263.3.2 by Jelmer Vernooij
Add new HPSS call 'Repository.get_revision_signature_text'.
2364
        path = self.bzrdir._path_for_remote_call(self._client)
2365
        try:
2366
            response_tuple, response_handler = self._call_expecting_body(
2367
                'Repository.get_revision_signature_text', path, revision_id)
6263.3.5 by Jelmer Vernooij
Add support for fallback repositories.
2368
        except errors.UnknownSmartMethod:
2369
            self._ensure_real()
2370
            return self._real_repository.get_signature_text(revision_id)
2371
        except errors.NoSuchRevision, err:
2372
            for fallback in self._fallback_repositories:
2373
                try:
2374
                    return fallback.get_signature_text(revision_id)
2375
                except errors.NoSuchRevision:
2376
                    pass
2377
            raise err
2378
        else:
6263.3.2 by Jelmer Vernooij
Add new HPSS call 'Repository.get_revision_signature_text'.
2379
            if response_tuple[0] != 'ok':
2380
                raise errors.UnexpectedSmartServerResponse(response_tuple)
2381
            return response_handler.read_body_bytes()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2382
2383
    @needs_read_lock
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
2384
    def _get_inventory_xml(self, revision_id):
6282.6.1 by Jelmer Vernooij
Add comment about Repository._get_inventory_xml being obsolete.
2385
        # This call is used by older working tree formats,
2386
        # which stored a serialized basis inventory.
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2387
        self._ensure_real()
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
2388
        return self._real_repository._get_inventory_xml(revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2389
6300.1.7 by Jelmer Vernooij
Fix test.
2390
    @needs_write_lock
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2391
    def reconcile(self, other=None, thorough=False):
6300.1.4 by Jelmer Vernooij
Add reconcile results.
2392
        from bzrlib.reconcile import RepoReconciler
6300.1.1 by Jelmer Vernooij
Add remote implementation of RemoteRepository.reconcile.
2393
        path = self.bzrdir._path_for_remote_call(self._client)
2394
        try:
6300.1.4 by Jelmer Vernooij
Add reconcile results.
2395
            response, handler = self._call_expecting_body(
6300.1.7 by Jelmer Vernooij
Fix test.
2396
                'Repository.reconcile', path, self._lock_token)
2397
        except (errors.UnknownSmartMethod, errors.TokenLockingNotSupported):
6300.1.1 by Jelmer Vernooij
Add remote implementation of RemoteRepository.reconcile.
2398
            self._ensure_real()
2399
            return self._real_repository.reconcile(other=other, thorough=thorough)
2400
        if response != ('ok', ):
2401
            raise errors.UnexpectedSmartServerResponse(response)
6300.1.4 by Jelmer Vernooij
Add reconcile results.
2402
        body = handler.read_body_bytes()
2403
        result = RepoReconciler(self)
2404
        for line in body.split('\n'):
2405
            if not line:
2406
                continue
2407
            key, val_text = line.split(':')
2408
            if key == "garbage_inventories":
2409
                result.garbage_inventories = int(val_text)
2410
            elif key == "inconsistent_parents":
2411
                result.inconsistent_parents = int(val_text)
2412
            else:
2413
                mutter("unknown reconcile key %r" % key)
2414
        return result
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2415
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2416
    def all_revision_ids(self):
6280.3.1 by Jelmer Vernooij
Add remote side of Repository.all_revision_ids.
2417
        path = self.bzrdir._path_for_remote_call(self._client)
2418
        try:
2419
            response_tuple, response_handler = self._call_expecting_body(
2420
                "Repository.all_revision_ids", path)
2421
        except errors.UnknownSmartMethod:
2422
            self._ensure_real()
2423
            return self._real_repository.all_revision_ids()
2424
        if response_tuple != ("ok", ):
2425
            raise errors.UnexpectedSmartServerResponse(response_tuple)
6280.3.3 by Jelmer Vernooij
Cope with fallback repositories.
2426
        revids = set(response_handler.read_body_bytes().splitlines())
2427
        for fallback in self._fallback_repositories:
2428
            revids.update(set(fallback.all_revision_ids()))
2429
        return list(revids)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2430
6282.6.16 by Jelmer Vernooij
More tests.
2431
    def _filtered_revision_trees(self, revision_ids, file_ids):
2432
        """Return Tree for a revision on this branch with only some files.
2433
2434
        :param revision_ids: a sequence of revision-ids;
2435
          a revision-id may not be None or 'null:'
2436
        :param file_ids: if not None, the result is filtered
2437
          so that only those file-ids, their parents and their
2438
          children are included.
2439
        """
2440
        inventories = self.iter_inventories(revision_ids)
2441
        for inv in inventories:
2442
            # Should we introduce a FilteredRevisionTree class rather
2443
            # than pre-filter the inventory here?
2444
            filtered_inv = inv.filter(file_ids)
2445
            yield InventoryRevisionTree(self, filtered_inv, filtered_inv.revision_id)
2446
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2447
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
2448
    def get_deltas_for_revisions(self, revisions, specific_fileids=None):
6282.6.15 by Jelmer Vernooij
Fix verbose log.
2449
        medium = self._client._medium
2450
        if medium._is_remote_before((1, 2)):
2451
            self._ensure_real()
6282.6.16 by Jelmer Vernooij
More tests.
2452
            for delta in self._real_repository.get_deltas_for_revisions(
2453
                    revisions, specific_fileids):
2454
                yield delta
2455
            return
6282.6.15 by Jelmer Vernooij
Fix verbose log.
2456
        # Get the revision-ids of interest
2457
        required_trees = set()
2458
        for revision in revisions:
2459
            required_trees.add(revision.revision_id)
2460
            required_trees.update(revision.parent_ids[:1])
2461
2462
        # Get the matching filtered trees. Note that it's more
2463
        # efficient to pass filtered trees to changes_from() rather
2464
        # than doing the filtering afterwards. changes_from() could
2465
        # arguably do the filtering itself but it's path-based, not
2466
        # file-id based, so filtering before or afterwards is
2467
        # currently easier.
2468
        if specific_fileids is None:
2469
            trees = dict((t.get_revision_id(), t) for
2470
                t in self.revision_trees(required_trees))
2471
        else:
2472
            trees = dict((t.get_revision_id(), t) for
2473
                t in self._filtered_revision_trees(required_trees,
2474
                specific_fileids))
2475
2476
        # Calculate the deltas
2477
        for revision in revisions:
2478
            if not revision.parent_ids:
2479
                old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
2480
            else:
2481
                old_tree = trees[revision.parent_ids[0]]
2482
            yield trees[revision.revision_id].changes_from(old_tree)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2483
2484
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
2485
    def get_revision_delta(self, revision_id, specific_fileids=None):
6267.1.2 by Jelmer Vernooij
Avoid _ensure_real in some more calls.
2486
        r = self.get_revision(revision_id)
2487
        return list(self.get_deltas_for_revisions([r],
2488
            specific_fileids=specific_fileids))[0]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2489
2490
    @needs_read_lock
2491
    def revision_trees(self, revision_ids):
6280.11.2 by Jelmer Vernooij
Implement RemoteRepository.revision_trees() using RemoteRepository.iter_inventories()
2492
        inventories = self.iter_inventories(revision_ids)
2493
        for inv in inventories:
2494
            yield InventoryRevisionTree(self, inv, inv.revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2495
2496
    @needs_read_lock
2497
    def get_revision_reconcile(self, revision_id):
2498
        self._ensure_real()
2499
        return self._real_repository.get_revision_reconcile(revision_id)
2500
2501
    @needs_read_lock
4332.3.35 by Robert Collins
Fix failing tests.
2502
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2503
        self._ensure_real()
4332.3.11 by Robert Collins
Move tree and back callbacks into the repository check core.
2504
        return self._real_repository.check(revision_ids=revision_ids,
4332.3.35 by Robert Collins
Fix failing tests.
2505
            callback_refs=callback_refs, check_repo=check_repo)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2506
2018.5.138 by Robert Collins
Merge bzr.dev.
2507
    def copy_content_into(self, destination, revision_id=None):
6267.1.1 by Jelmer Vernooij
Avoid _ensure_real in a couple more places.
2508
        """Make a complete copy of the content in self into destination.
2509
2510
        This is a destructive operation! Do not use it on existing
2511
        repositories.
2512
        """
2513
        interrepo = _mod_repository.InterRepository.get(self, destination)
2514
        return interrepo.copy_content(revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2515
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
2516
    def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
2517
        # get a tarball of the remote repository, and copy from that into the
2518
        # destination
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
2519
        import tarfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
2520
        # TODO: Maybe a progress bar while streaming the tarball?
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
2521
        note(gettext("Copying repository content as tarball..."))
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2522
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
2523
        if tar_file is None:
2524
            return None
2525
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
2526
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2527
            tar = tarfile.open('repository', fileobj=tar_file,
2528
                mode='r|bz2')
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
2529
            tmpdir = osutils.mkdtemp()
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2530
            try:
2531
                _extract_tar(tar, tmpdir)
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2532
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2533
                tmp_repo = tmp_bzrdir.open_repository()
2534
                tmp_repo.copy_content_into(destination, revision_id)
2535
            finally:
2536
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
2537
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2538
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
2539
        return destination
2018.18.23 by Martin Pool
review cleanups
2540
        # TODO: Suggestion from john: using external tar is much faster than
2541
        # python's tarfile library, but it may not work on windows.
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2542
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2543
    @property
2544
    def inventories(self):
2545
        """Decorate the real repository for now.
2546
2547
        In the long term a full blown network facility is needed to
2548
        avoid creating a real repository object locally.
2549
        """
2550
        self._ensure_real()
2551
        return self._real_repository.inventories
2552
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
2553
    @needs_write_lock
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
2554
    def pack(self, hint=None, clean_obsolete_packs=False):
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
2555
        """Compress the data within the repository.
2556
        """
6305.2.3 by Jelmer Vernooij
Store hint in body.
2557
        if hint is None:
2558
            body = ""
2559
        else:
2560
            body = "".join([l+"\n" for l in hint])
6305.2.1 by Jelmer Vernooij
add remote call for Repository.pack.
2561
        path = self.bzrdir._path_for_remote_call(self._client)
2562
        try:
6305.2.3 by Jelmer Vernooij
Store hint in body.
2563
            response, handler = self._call_with_body_bytes_expecting_body(
2564
                'Repository.pack', (path, self._lock_token,
6305.2.4 by Jelmer Vernooij
Fix tests.
2565
                    str(clean_obsolete_packs)), body)
6305.2.1 by Jelmer Vernooij
add remote call for Repository.pack.
2566
        except errors.UnknownSmartMethod:
2567
            self._ensure_real()
2568
            return self._real_repository.pack(hint=hint,
2569
                clean_obsolete_packs=clean_obsolete_packs)
6305.2.3 by Jelmer Vernooij
Store hint in body.
2570
        handler.cancel_read_body()
6305.2.1 by Jelmer Vernooij
add remote call for Repository.pack.
2571
        if response != ('ok', ):
2572
            raise errors.UnexpectedSmartServerResponse(response)
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
2573
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2574
    @property
2575
    def revisions(self):
2576
        """Decorate the real repository for now.
2577
2578
        In the long term a full blown network facility is needed.
2579
        """
2580
        self._ensure_real()
2581
        return self._real_repository.revisions
2582
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2583
    def set_make_working_trees(self, new_value):
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
2584
        if new_value:
2585
            new_value_str = "True"
2586
        else:
2587
            new_value_str = "False"
2588
        path = self.bzrdir._path_for_remote_call(self._client)
2589
        try:
2590
            response = self._call(
2591
                'Repository.set_make_working_trees', path, new_value_str)
2592
        except errors.UnknownSmartMethod:
2593
            self._ensure_real()
2594
            self._real_repository.set_make_working_trees(new_value)
2595
        else:
2596
            if response[0] != 'ok':
2597
                raise errors.UnexpectedSmartServerResponse(response)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2598
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2599
    @property
2600
    def signatures(self):
2601
        """Decorate the real repository for now.
2602
2603
        In the long term a full blown network facility is needed to avoid
2604
        creating a real repository object locally.
2605
        """
2606
        self._ensure_real()
2607
        return self._real_repository.signatures
2608
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2609
    @needs_write_lock
2610
    def sign_revision(self, revision_id, gpg_strategy):
6280.8.1 by Jelmer Vernooij
Avoid _ensure_real in RemoteRepository.verify_revision_signature and RemoteRepository.sign_revision.
2611
        testament = _mod_testament.Testament.from_revision(self, revision_id)
2612
        plaintext = testament.as_short_text()
2613
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2614
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2615
    @property
2616
    def texts(self):
2617
        """Decorate the real repository for now.
2618
2619
        In the long term a full blown network facility is needed to avoid
2620
        creating a real repository object locally.
2621
        """
2622
        self._ensure_real()
2623
        return self._real_repository.texts
2624
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2625
    def _iter_revisions_rpc(self, revision_ids):
2626
        body = "\n".join(revision_ids)
2627
        path = self.bzrdir._path_for_remote_call(self._client)
2628
        response_tuple, response_handler = (
2629
            self._call_with_body_bytes_expecting_body(
2630
            "Repository.iter_revisions", (path, ), body))
2631
        if response_tuple[0] != "ok":
2632
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2633
        serializer_format = response_tuple[1]
2634
        serializer = serializer_format_registry.get(serializer_format)
2635
        byte_stream = response_handler.read_streamed_body()
6280.9.4 by Jelmer Vernooij
use zlib instead.
2636
        decompressor = zlib.decompressobj()
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2637
        chunks = []
2638
        for bytes in byte_stream:
6280.9.4 by Jelmer Vernooij
use zlib instead.
2639
            chunks.append(decompressor.decompress(bytes))
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2640
            if decompressor.unused_data != "":
6280.9.4 by Jelmer Vernooij
use zlib instead.
2641
                chunks.append(decompressor.flush())
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2642
                yield serializer.read_revision_from_string("".join(chunks))
6280.9.4 by Jelmer Vernooij
use zlib instead.
2643
                unused = decompressor.unused_data
2644
                decompressor = zlib.decompressobj()
2645
                chunks = [decompressor.decompress(unused)]
2646
        chunks.append(decompressor.flush())
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2647
        text = "".join(chunks)
2648
        if text != "":
2649
            yield serializer.read_revision_from_string("".join(chunks))
2650
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2651
    @needs_read_lock
2652
    def get_revisions(self, revision_ids):
6280.9.5 by Jelmer Vernooij
Cope with invalid arguments being specified to Repository.get_revisions.
2653
        if revision_ids is None:
2654
            revision_ids = self.all_revision_ids()
2655
        else:
2656
            for rev_id in revision_ids:
2657
                if not rev_id or not isinstance(rev_id, basestring):
2658
                    raise errors.InvalidRevisionId(
2659
                        revision_id=rev_id, branch=self)
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2660
        try:
6280.9.7 by Jelmer Vernooij
Fix compatibility code.
2661
            missing = set(revision_ids)
2662
            revs = {}
2663
            for rev in self._iter_revisions_rpc(revision_ids):
2664
                missing.remove(rev.revision_id)
2665
                revs[rev.revision_id] = rev
6280.9.1 by Jelmer Vernooij
Add remote side of Repository.iter_revisions.
2666
        except errors.UnknownSmartMethod:
2667
            self._ensure_real()
2668
            return self._real_repository.get_revisions(revision_ids)
2669
        for fallback in self._fallback_repositories:
2670
            if not missing:
2671
                break
2672
            for revid in list(missing):
2673
                # XXX JRV 2011-11-20: It would be nice if there was a
2674
                # public method on Repository that could be used to query
2675
                # for revision objects *without* failing completely if one
2676
                # was missing. There is VersionedFileRepository._iter_revisions,
2677
                # but unfortunately that's private and not provided by
2678
                # all repository implementations.
2679
                try:
2680
                    revs[revid] = fallback.get_revision(revid)
2681
                except errors.NoSuchRevision:
2682
                    pass
2683
                else:
2684
                    missing.remove(revid)
2685
        if missing:
2686
            raise errors.NoSuchRevision(self, list(missing)[0])
2687
        return [revs[revid] for revid in revision_ids]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2688
2689
    def supports_rich_root(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2690
        return self._format.rich_root_data
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2691
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
2692
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
2693
    def iter_reverse_revision_history(self, revision_id):
2694
        self._ensure_real()
2695
        return self._real_repository.iter_reverse_revision_history(revision_id)
2696
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
2697
    @property
2698
    def _serializer(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2699
        return self._format._serializer
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
2700
6267.1.1 by Jelmer Vernooij
Avoid _ensure_real in a couple more places.
2701
    @needs_write_lock
2018.5.97 by Andrew Bennetts
Fix more tests.
2702
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
6267.1.1 by Jelmer Vernooij
Avoid _ensure_real in a couple more places.
2703
        signature = gpg_strategy.sign(plaintext)
2704
        self.add_signature_text(revision_id, signature)
2018.5.97 by Andrew Bennetts
Fix more tests.
2705
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
2706
    def add_signature_text(self, revision_id, signature):
6268.1.10 by Jelmer Vernooij
Use real repository if it is already present.
2707
        if self._real_repository:
2708
            # If there is a real repository the write group will
2709
            # be in the real repository as well, so use that:
6268.1.2 by Jelmer Vernooij
Initial work on Repository.add_signature_text.
2710
            self._ensure_real()
2711
            return self._real_repository.add_signature_text(
2712
                revision_id, signature)
6268.1.10 by Jelmer Vernooij
Use real repository if it is already present.
2713
        path = self.bzrdir._path_for_remote_call(self._client)
6280.10.39 by Jelmer Vernooij
Merge bzr.dev.
2714
        response, handler = self._call_with_body_bytes_expecting_body(
6280.10.32 by Jelmer Vernooij
Merge bzr.dev.
2715
            'Repository.add_signature_text', (path, self._lock_token,
2716
                revision_id) + tuple(self._write_group_tokens), signature)
6280.10.39 by Jelmer Vernooij
Merge bzr.dev.
2717
        handler.cancel_read_body()
6268.1.2 by Jelmer Vernooij
Initial work on Repository.add_signature_text.
2718
        self.refresh_data()
2719
        if response[0] != 'ok':
2720
            raise errors.UnexpectedSmartServerResponse(response)
6280.10.36 by Jelmer Vernooij
Use new write group tokens.
2721
        self._write_group_tokens = response[1:]
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
2722
2018.5.97 by Andrew Bennetts
Fix more tests.
2723
    def has_signature_for_revision_id(self, revision_id):
6265.1.1 by Jelmer Vernooij
Add new HPSS call ``Repository.has_signature_for_revision_id``.
2724
        path = self.bzrdir._path_for_remote_call(self._client)
2725
        try:
2726
            response = self._call('Repository.has_signature_for_revision_id',
2727
                path, revision_id)
2728
        except errors.UnknownSmartMethod:
2729
            self._ensure_real()
2730
            return self._real_repository.has_signature_for_revision_id(
2731
                revision_id)
2732
        if response[0] not in ('yes', 'no'):
2733
            raise SmartProtocolError('unexpected response code %s' % (response,))
6263.3.7 by Jelmer Vernooij
Fallback for RemoteRepository.has_signature_for_revision_id.
2734
        if response[0] == 'yes':
2735
            return True
2736
        for fallback in self._fallback_repositories:
2737
            if fallback.has_signature_for_revision_id(revision_id):
2738
                return True
2739
        return False
2018.5.97 by Andrew Bennetts
Fix more tests.
2740
6280.8.5 by Jelmer Vernooij
Add needs_read_lock for verify_revision_signature.
2741
    @needs_read_lock
6257.3.1 by Jelmer Vernooij
Support verifying remote signatures.
2742
    def verify_revision_signature(self, revision_id, gpg_strategy):
6280.8.1 by Jelmer Vernooij
Avoid _ensure_real in RemoteRepository.verify_revision_signature and RemoteRepository.sign_revision.
2743
        if not self.has_signature_for_revision_id(revision_id):
2744
            return gpg.SIGNATURE_NOT_SIGNED, None
2745
        signature = self.get_signature_text(revision_id)
2746
2747
        testament = _mod_testament.Testament.from_revision(self, revision_id)
2748
        plaintext = testament.as_short_text()
2749
2750
        return gpg_strategy.verify(signature, plaintext)
6257.3.1 by Jelmer Vernooij
Support verifying remote signatures.
2751
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
2752
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
2753
        self._ensure_real()
2754
        return self._real_repository.item_keys_introduced_by(revision_ids,
2755
            _files_pb=_files_pb)
2756
4332.3.34 by Robert Collins
Delete obsolete pack tuned find_inconsistent_revisions as the generic code path permits the same optimisation.
2757
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
2758
        self._ensure_real()
4332.3.34 by Robert Collins
Delete obsolete pack tuned find_inconsistent_revisions as the generic code path permits the same optimisation.
2759
        return self._real_repository._find_inconsistent_revision_parents(
2760
            revisions_iterator)
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
2761
2762
    def _check_for_inconsistent_revision_parents(self):
2763
        self._ensure_real()
2764
        return self._real_repository._check_for_inconsistent_revision_parents()
2765
3835.1.17 by Aaron Bentley
Fix stacking bug
2766
    def _make_parents_provider(self, other=None):
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
2767
        providers = [self._unstacked_provider]
3835.1.17 by Aaron Bentley
Fix stacking bug
2768
        if other is not None:
2769
            providers.insert(0, other)
5816.8.3 by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work.
2770
        return graph.StackedParentsProvider(_LazyListJoin(
2771
            providers, self._fallback_repositories))
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
2772
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2773
    def _serialise_search_recipe(self, recipe):
2774
        """Serialise a graph search recipe.
2775
2776
        :param recipe: A search recipe (start, stop, count).
2777
        :return: Serialised bytes.
2778
        """
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2779
        start_keys = ' '.join(recipe[1])
2780
        stop_keys = ' '.join(recipe[2])
2781
        count = str(recipe[3])
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
2782
        return '\n'.join((start_keys, stop_keys, count))
2783
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
2784
    def _serialise_search_result(self, search_result):
5539.2.2 by Andrew Bennetts
Add support for 'everything' fetch spec to RemoteStreamSource.
2785
        parts = search_result.get_network_struct()
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
2786
        return '\n'.join(parts)
2787
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
2788
    def autopack(self):
2789
        path = self.bzrdir._path_for_remote_call(self._client)
2790
        try:
2791
            response = self._call('PackRepository.autopack', path)
2792
        except errors.UnknownSmartMethod:
2793
            self._ensure_real()
2794
            self._real_repository._pack_collection.autopack()
2795
            return
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2796
        self.refresh_data()
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
2797
        if response[0] != 'ok':
2798
            raise errors.UnexpectedSmartServerResponse(response)
2799
2800
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
2801
class RemoteStreamSink(vf_repository.StreamSink):
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
2802
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2803
    def _insert_real(self, stream, src_format, resume_tokens):
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
2804
        self.target_repo._ensure_real()
2805
        sink = self.target_repo._real_repository._get_sink()
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2806
        result = sink.insert_stream(stream, src_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2807
        if not result:
2808
            self.target_repo.autopack()
2809
        return result
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
2810
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2811
    def insert_stream(self, stream, src_format, resume_tokens):
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2812
        target = self.target_repo
4307.2.4 by Robert Collins
Enable caching of negative revision lookups in RemoteRepository write locks when no _real_repository has been constructed.
2813
        target._unstacked_provider.missing_keys.clear()
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
2814
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2815
        if target._lock_token:
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2816
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
2817
            lock_args = (target._lock_token or '',)
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2818
        else:
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2819
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
2820
            lock_args = ()
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2821
        client = target._client
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
2822
        medium = client._medium
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2823
        path = target.bzrdir._path_for_remote_call(client)
4476.3.70 by Andrew Bennetts
Review tweaks.
2824
        # Probe for the verb to use with an empty stream before sending the
2825
        # real stream to it.  We do this both to avoid the risk of sending a
2826
        # large request that is then rejected, and because we don't want to
2827
        # implement a way to buffer, rewind, or restart the stream.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2828
        found_verb = False
2829
        for verb, required_version in candidate_calls:
2830
            if medium._is_remote_before(required_version):
2831
                continue
4476.3.25 by Andrew Bennetts
Reinstate don't-reprobe-with-resume-tokens optimisation, fixing acceptance test.
2832
            if resume_tokens:
2833
                # We've already done the probing (and set _is_remote_before) on
2834
                # a previous insert.
2835
                found_verb = True
2836
                break
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
2837
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2838
            try:
2839
                response = client.call_with_body_stream(
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2840
                    (verb, path, '') + lock_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2841
            except errors.UnknownSmartMethod:
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2842
                medium._remember_remote_is_before(required_version)
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2843
            else:
2844
                found_verb = True
2845
                break
2846
        if not found_verb:
2847
            # Have to use VFS.
2848
            return self._insert_real(stream, src_format, resume_tokens)
2849
        self._last_inv_record = None
2850
        self._last_substream = None
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
2851
        if required_version < (1, 19):
4476.3.35 by Andrew Bennetts
Expand comment.
2852
            # Remote side doesn't support inventory deltas.  Wrap the stream to
2853
            # make sure we don't send any.  If the stream contains inventory
2854
            # deltas we'll interrupt the smart insert_stream request and
2855
            # fallback to VFS.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2856
            stream = self._stop_stream_if_inventory_delta(stream)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
2857
        byte_stream = smart_repo._stream_to_byte_stream(
2858
            stream, src_format)
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2859
        resume_tokens = ' '.join(resume_tokens)
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
2860
        response = client.call_with_body_stream(
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2861
            (verb, path, resume_tokens) + lock_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2862
        if response[0][0] not in ('ok', 'missing-basis'):
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
2863
            raise errors.UnexpectedSmartServerResponse(response)
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
2864
        if self._last_substream is not None:
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2865
            # The stream included an inventory-delta record, but the remote
2866
            # side isn't new enough to support them.  So we need to send the
2867
            # rest of the stream via VFS.
4634.35.15 by Andrew Bennetts
Fix 'fallback to vfs if RPC does not support inventory-deltas' case to refresh the vfs pack names before starting the fallback.
2868
            self.target_repo.refresh_data()
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2869
            return self._resume_stream_with_vfs(response, src_format)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2870
        if response[0][0] == 'missing-basis':
2871
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2872
            resume_tokens = tokens
4257.3.3 by Andrew Bennetts
missing_keys from sink.insert_stream should be a set, not a tuple.
2873
            return resume_tokens, set(missing_keys)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
2874
        else:
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2875
            self.target_repo.refresh_data()
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
2876
            return [], set()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2877
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2878
    def _resume_stream_with_vfs(self, response, src_format):
2879
        """Resume sending a stream via VFS, first resending the record and
2880
        substream that couldn't be sent via an insert_stream verb.
2881
        """
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2882
        if response[0][0] == 'missing-basis':
2883
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
2884
            # Ignore missing_keys, we haven't finished inserting yet
2885
        else:
2886
            tokens = []
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2887
        def resume_substream():
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
2888
            # Yield the substream that was interrupted.
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2889
            for record in self._last_substream:
2890
                yield record
2891
            self._last_substream = None
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2892
        def resume_stream():
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2893
            # Finish sending the interrupted substream
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
2894
            yield ('inventory-deltas', resume_substream())
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2895
            # Then simply continue sending the rest of the stream.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2896
            for substream_kind, substream in self._last_stream:
2897
                yield substream_kind, substream
2898
        return self._insert_real(resume_stream(), src_format, tokens)
2899
2900
    def _stop_stream_if_inventory_delta(self, stream):
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2901
        """Normally this just lets the original stream pass-through unchanged.
2902
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
2903
        However if any 'inventory-deltas' substream occurs it will stop
2904
        streaming, and store the interrupted substream and stream in
2905
        self._last_substream and self._last_stream so that the stream can be
2906
        resumed by _resume_stream_with_vfs.
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
2907
        """
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2908
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2909
        stream_iter = iter(stream)
2910
        for substream_kind, substream in stream_iter:
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
2911
            if substream_kind == 'inventory-deltas':
2912
                self._last_substream = substream
2913
                self._last_stream = stream_iter
2914
                return
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
2915
            else:
2916
                yield substream_kind, substream
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
2917
2918
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
2919
class RemoteStreamSource(vf_repository.StreamSource):
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
2920
    """Stream data from a remote server."""
2921
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
2922
    def get_stream(self, search):
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2923
        if (self.from_repository._fallback_repositories and
2924
            self.to_format._fetch_order == 'topological'):
2925
            return self._real_stream(self.from_repository, search)
4577.1.1 by Robert Collins
Fix fetching from smart servers where there is a chain of stacked repositories rather than a single stacking point. (Robert Collins, bug #406597)
2926
        sources = []
2927
        seen = set()
2928
        repos = [self.from_repository]
2929
        while repos:
2930
            repo = repos.pop(0)
2931
            if repo in seen:
2932
                continue
2933
            seen.add(repo)
2934
            repos.extend(repo._fallback_repositories)
2935
            sources.append(repo)
2936
        return self.missing_parents_chain(search, sources)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2937
4476.3.16 by Andrew Bennetts
Only make inv deltas against bases we've already sent, and other tweaks.
2938
    def get_stream_for_missing_keys(self, missing_keys):
2939
        self.from_repository._ensure_real()
2940
        real_repo = self.from_repository._real_repository
2941
        real_source = real_repo._get_source(self.to_format)
2942
        return real_source.get_stream_for_missing_keys(missing_keys)
2943
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2944
    def _real_stream(self, repo, search):
2945
        """Get a stream for search from repo.
6263.3.1 by Jelmer Vernooij
Some formatting fixes.
2946
2947
        This never called RemoteStreamSource.get_stream, and is a helper
2948
        for RemoteStreamSource._get_stream to allow getting a stream
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2949
        reliably whether fallback back because of old servers or trying
2950
        to stream from a non-RemoteRepository (which the stacked support
2951
        code will do).
2952
        """
2953
        source = repo._get_source(self.to_format)
2954
        if isinstance(source, RemoteStreamSource):
4600.1.1 by Robert Collins
Fix fetching from 2a branches over bzr-v2.
2955
            repo._ensure_real()
2956
            source = repo._real_repository._get_source(self.to_format)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2957
        return source.get_stream(search)
2958
2959
    def _get_stream(self, repo, search):
2960
        """Core worker to get a stream from repo for search.
2961
2962
        This is used by both get_stream and the stacking support logic. It
2963
        deliberately gets a stream for repo which does not need to be
2964
        self.from_repository. In the event that repo is not Remote, or
2965
        cannot do a smart stream, a fallback is made to the generic
2966
        repository._get_stream() interface, via self._real_stream.
2967
2968
        In the event of stacking, streams from _get_stream will not
2969
        contain all the data for search - this is normal (see get_stream).
2970
2971
        :param repo: A repository.
2972
        :param search: A search.
2973
        """
2974
        # Fallbacks may be non-smart
2975
        if not isinstance(repo, RemoteRepository):
2976
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
2977
        client = repo._client
2978
        medium = client._medium
2979
        path = repo.bzrdir._path_for_remote_call(client)
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
2980
        search_bytes = repo._serialise_search_result(search)
2981
        args = (path, self.to_format.network_name())
2982
        candidate_verbs = [
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
2983
            ('Repository.get_stream_1.19', (1, 19)),
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
2984
            ('Repository.get_stream', (1, 13))]
5539.2.2 by Andrew Bennetts
Add support for 'everything' fetch spec to RemoteStreamSource.
2985
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
2986
        found_verb = False
2987
        for verb, version in candidate_verbs:
2988
            if medium._is_remote_before(version):
2989
                continue
2990
            try:
2991
                response = repo._call_with_body_bytes_expecting_body(
2992
                    verb, args, search_bytes)
2993
            except errors.UnknownSmartMethod:
2994
                medium._remember_remote_is_before(version)
5539.2.14 by Andrew Bennetts
Don't add a new verb; instead just teach the client to fallback if it gets a BadSearch error.
2995
            except errors.UnknownErrorFromSmartServer, e:
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
2996
                if isinstance(search, vf_search.EverythingResult):
5539.2.14 by Andrew Bennetts
Don't add a new verb; instead just teach the client to fallback if it gets a BadSearch error.
2997
                    error_verb = e.error_from_smart_server.error_verb
2998
                    if error_verb == 'BadSearch':
5536.3.3 by Andrew Bennetts
Merge lp:bzr.
2999
                        # Pre-2.4 servers don't support this sort of search.
5539.2.14 by Andrew Bennetts
Don't add a new verb; instead just teach the client to fallback if it gets a BadSearch error.
3000
                        # XXX: perhaps falling back to VFS on BadSearch is a
3001
                        # good idea in general?  It might provide a little bit
3002
                        # of protection against client-side bugs.
5536.3.3 by Andrew Bennetts
Merge lp:bzr.
3003
                        medium._remember_remote_is_before((2, 4))
5539.2.14 by Andrew Bennetts
Don't add a new verb; instead just teach the client to fallback if it gets a BadSearch error.
3004
                        break
3005
                raise
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
3006
            else:
3007
                response_tuple, response_handler = response
3008
                found_verb = True
3009
                break
3010
        if not found_verb:
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
3011
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
3012
        if response_tuple[0] != 'ok':
3013
            raise errors.UnexpectedSmartServerResponse(response_tuple)
3014
        byte_stream = response_handler.read_streamed_body()
5195.3.23 by Parth Malwankar
moved progress bar logic to SourceStream.
3015
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
3016
            self._record_counter)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
3017
        if src_format.network_name() != repo._format.network_name():
3018
            raise AssertionError(
3019
                "Mismatched RemoteRepository and stream src %r, %r" % (
3020
                src_format.network_name(), repo._format.network_name()))
3021
        return stream
3022
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
3023
    def missing_parents_chain(self, search, sources):
3024
        """Chain multiple streams together to handle stacking.
3025
3026
        :param search: The overall search to satisfy with streams.
3027
        :param sources: A list of Repository objects to query.
3028
        """
4634.61.2 by Andrew Bennetts
Variable rename suggested by Robert.
3029
        self.from_serialiser = self.from_repository._format._serializer
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
3030
        self.seen_revs = set()
3031
        self.referenced_revs = set()
3032
        # If there are heads in the search, or the key count is > 0, we are not
3033
        # done.
3034
        while not search.is_empty() and len(sources) > 1:
3035
            source = sources.pop(0)
3036
            stream = self._get_stream(source, search)
3037
            for kind, substream in stream:
3038
                if kind != 'revisions':
3039
                    yield kind, substream
3040
                else:
3041
                    yield kind, self.missing_parents_rev_handler(substream)
3042
            search = search.refine(self.seen_revs, self.referenced_revs)
3043
            self.seen_revs = set()
3044
            self.referenced_revs = set()
3045
        if not search.is_empty():
3046
            for kind, stream in self._get_stream(sources[0], search):
3047
                yield kind, stream
3048
3049
    def missing_parents_rev_handler(self, substream):
3050
        for content in substream:
3051
            revision_bytes = content.get_bytes_as('fulltext')
4634.61.2 by Andrew Bennetts
Variable rename suggested by Robert.
3052
            revision = self.from_serialiser.read_revision_from_string(
3053
                revision_bytes)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
3054
            self.seen_revs.add(content.key[-1])
3055
            self.referenced_revs.update(revision.parent_ids)
3056
            yield content
3057
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
3058
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
3059
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
3060
    """A 'LockableFiles' implementation that talks to a smart server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3061
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
3062
    This is not a public interface class.
3063
    """
3064
3065
    def __init__(self, bzrdir, _client):
3066
        self.bzrdir = bzrdir
3067
        self._client = _client
2018.5.135 by Andrew Bennetts
Prevent remote branch clients from determining the 'right' mode for control files, because we don't want clients setting the mode anyway.
3068
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
3069
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
3070
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
3071
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
3072
2018.5.135 by Andrew Bennetts
Prevent remote branch clients from determining the 'right' mode for control files, because we don't want clients setting the mode anyway.
3073
    def _find_modes(self):
3074
        # RemoteBranches don't let the client set the mode of control files.
3075
        self._dir_mode = None
3076
        self._file_mode = None
3077
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
3078
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3079
class RemoteBranchFormat(branch.BranchFormat):
3080
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3081
    def __init__(self, network_name=None):
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
3082
        super(RemoteBranchFormat, self).__init__()
3083
        self._matchingbzrdir = RemoteBzrDirFormat()
3084
        self._matchingbzrdir.set_branch_format(self)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3085
        self._custom_format = None
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3086
        self._network_name = network_name
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
3087
2018.5.124 by Robert Collins
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
3088
    def __eq__(self, other):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3089
        return (isinstance(other, RemoteBranchFormat) and
2018.5.124 by Robert Collins
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
3090
            self.__dict__ == other.__dict__)
3091
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3092
    def _ensure_real(self):
3093
        if self._custom_format is None:
6305.4.1 by Jelmer Vernooij
Print sensible error message when remote format is unknown.
3094
            try:
3095
                self._custom_format = branch.network_format_registry.get(
3096
                    self._network_name)
3097
            except KeyError:
3098
                raise errors.UnknownFormatError(kind='branch',
3099
                    format=self._network_name)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3100
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
3101
    def get_format_description(self):
4792.1.1 by Andrew Bennetts
Show real branch/repo format description in 'info -v' over HPSS.
3102
        self._ensure_real()
3103
        return 'Remote: ' + self._custom_format.get_format_description()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
3104
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
3105
    def network_name(self):
3106
        return self._network_name
3107
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3108
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
3109
        return a_bzrdir.open_branch(name=name, 
3110
            ignore_fallbacks=ignore_fallbacks)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
3111
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3112
    def _vfs_initialize(self, a_bzrdir, name, append_revisions_only):
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3113
        # Initialisation when using a local bzrdir object, or a non-vfs init
3114
        # method is not available on the server.
3115
        # self._custom_format is always set - the start of initialize ensures
3116
        # that.
3117
        if isinstance(a_bzrdir, RemoteBzrDir):
3118
            a_bzrdir._ensure_real()
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3119
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3120
                name, append_revisions_only=append_revisions_only)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3121
        else:
3122
            # We assume the bzrdir is parameterised; it may not be.
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3123
            result = self._custom_format.initialize(a_bzrdir, name,
3124
                append_revisions_only=append_revisions_only)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3125
        if (isinstance(a_bzrdir, RemoteBzrDir) and
3126
            not isinstance(result, RemoteBranch)):
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3127
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
3128
                                  name=name)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3129
        return result
3130
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3131
    def initialize(self, a_bzrdir, name=None, repository=None,
3132
                   append_revisions_only=None):
6436.1.2 by Jelmer Vernooij
Fix some tests.
3133
        if name is None:
3134
            name = a_bzrdir._get_selected_branch()
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3135
        # 1) get the network name to use.
3136
        if self._custom_format:
3137
            network_name = self._custom_format.network_name()
3138
        else:
3139
            # Select the current bzrlib default and ask for that.
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
3140
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3141
            reference_format = reference_bzrdir_format.get_branch_format()
3142
            self._custom_format = reference_format
3143
            network_name = reference_format.network_name()
3144
        # Being asked to create on a non RemoteBzrDir:
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3145
        if not isinstance(a_bzrdir, RemoteBzrDir):
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3146
            return self._vfs_initialize(a_bzrdir, name=name,
3147
                append_revisions_only=append_revisions_only)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3148
        medium = a_bzrdir._client._medium
3149
        if medium._is_remote_before((1, 13)):
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3150
            return self._vfs_initialize(a_bzrdir, name=name,
3151
                append_revisions_only=append_revisions_only)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3152
        # Creating on a remote bzr dir.
3153
        # 2) try direct creation via RPC
3154
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
6436.1.2 by Jelmer Vernooij
Fix some tests.
3155
        if name != "":
5051.3.11 by Jelmer Vernooij
add XXX for creating remote colocated branches.
3156
            # XXX JRV20100304: Support creating colocated branches
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3157
            raise errors.NoColocatedBranchSupport(self)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3158
        verb = 'BzrDir.create_branch'
3159
        try:
3160
            response = a_bzrdir._call(verb, path, network_name)
3161
        except errors.UnknownSmartMethod:
3162
            # Fallback - use vfs methods
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
3163
            medium._remember_remote_is_before((1, 13))
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3164
            return self._vfs_initialize(a_bzrdir, name=name,
3165
                    append_revisions_only=append_revisions_only)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3166
        if response[0] != 'ok':
3167
            raise errors.UnexpectedSmartServerResponse(response)
3168
        # Turn the response into a RemoteRepository object.
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3169
        format = RemoteBranchFormat(network_name=response[1])
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3170
        repo_format = response_tuple_to_repo_format(response[3:])
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
3171
        repo_path = response[2]
3172
        if repository is not None:
5609.21.1 by Andrew Bennetts
Possible fix for #726584, plus drive-by docstring fix.
3173
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
5535.3.7 by Andrew Bennetts
Allow for trailing-slash differences between local url path vs. remote url path for remote branch's repository.
3174
            url_diff = urlutils.relative_url(repository.user_url,
3175
                    remote_repo_url)
3176
            if url_diff != '.':
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
3177
                raise AssertionError(
5536.1.10 by Andrew Bennetts
Give more helpful message in AssertionErrors, just in case.
3178
                    'repository.user_url %r does not match URL from server '
3179
                    'response (%r + %r)'
5609.21.1 by Andrew Bennetts
Possible fix for #726584, plus drive-by docstring fix.
3180
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
3181
            remote_repo = repository
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3182
        else:
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
3183
            if repo_path == '':
3184
                repo_bzrdir = a_bzrdir
3185
            else:
3186
                repo_bzrdir = RemoteBzrDir(
3187
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
3188
                    a_bzrdir._client)
3189
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3190
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3191
            format=format, setup_stacking=False, name=name)
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
3192
        if append_revisions_only:
3193
            remote_branch.set_append_revisions_only(append_revisions_only)
4044.1.4 by Robert Collins
Remove a wasted round trip determining the revno and revid of a newly created branch.
3194
        # XXX: We know this is a new branch, so it must have revno 0, revid
3195
        # NULL_REVISION. Creating the branch locked would make this be unable
3196
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
3197
        remote_branch._last_revision_info_cache = 0, NULL_REVISION
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3198
        return remote_branch
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3199
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3200
    def make_tags(self, branch):
3201
        self._ensure_real()
3202
        return self._custom_format.make_tags(branch)
3203
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
3204
    def supports_tags(self):
3205
        # Remote branches might support tags, but we won't know until we
3206
        # access the real remote branch.
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3207
        self._ensure_real()
3208
        return self._custom_format.supports_tags()
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
3209
4103.2.2 by Andrew Bennetts
Fix RemoteBranchFormat.supports_stacking()
3210
    def supports_stacking(self):
3211
        self._ensure_real()
3212
        return self._custom_format.supports_stacking()
3213
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
3214
    def supports_set_append_revisions_only(self):
3215
        self._ensure_real()
3216
        return self._custom_format.supports_set_append_revisions_only()
3217
5672.1.7 by Andrew Bennetts
Use a more explicit method name.
3218
    def _use_default_local_heads_to_fetch(self):
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3219
        # If the branch format is a metadir format *and* its heads_to_fetch
3220
        # implementation is not overridden vs the base class, we can use the
3221
        # base class logic rather than use the heads_to_fetch RPC.  This is
5672.1.5 by Andrew Bennetts
Add some tests for RemoteBranch.heads_to_fetch, and add release-note.
3222
        # usually cheaper in terms of net round trips, as the last-revision and
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3223
        # tags info fetched is cached and would be fetched anyway.
3224
        self._ensure_real()
3225
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
3226
            branch_class = self._custom_format._branch_class()
3227
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
3228
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
3229
                return True
3230
        return False
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3231
6263.3.1 by Jelmer Vernooij
Some formatting fixes.
3232
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
3233
class RemoteBranchStore(_mod_config.IniFileStore):
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3234
    """Branch store which attempts to use HPSS calls to retrieve branch store.
3235
3236
    Note that this is specific to bzr-based formats.
3237
    """
3238
3239
    def __init__(self, branch):
3240
        super(RemoteBranchStore, self).__init__()
3241
        self.branch = branch
6270.1.14 by Jelmer Vernooij
Set RemoteBranchStore.id.
3242
        self.id = "branch"
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
3243
        self._real_store = None
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3244
3245
    def lock_write(self, token=None):
3246
        return self.branch.lock_write(token)
3247
3248
    def unlock(self):
3249
        return self.branch.unlock()
3250
3251
    @needs_write_lock
3252
    def save(self):
3253
        # We need to be able to override the undecorated implementation
3254
        self.save_without_locking()
3255
3256
    def save_without_locking(self):
3257
        super(RemoteBranchStore, self).save()
3258
3259
    def external_url(self):
6270.1.15 by Jelmer Vernooij
Implement sensible .external_url().
3260
        return self.branch.user_url
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3261
3262
    def _load_content(self):
3263
        path = self.branch._remote_path()
3264
        try:
6270.1.10 by Jelmer Vernooij
Fix testing Branch.set_config_file.
3265
            response, handler = self.branch._call_expecting_body(
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3266
                'Branch.get_config_file', path)
3267
        except errors.UnknownSmartMethod:
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
3268
            self._ensure_real()
3269
            return self._real_store._load_content()
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3270
        if len(response) and response[0] != 'ok':
3271
            raise errors.UnexpectedSmartServerResponse(response)
3272
        return handler.read_body_bytes()
3273
3274
    def _save_content(self, content):
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
3275
        path = self.branch._remote_path()
3276
        try:
6270.1.18 by Jelmer Vernooij
Fix a test.
3277
            response, handler = self.branch._call_with_body_bytes_expecting_body(
6270.1.17 by Jelmer Vernooij
s/set_config_file/put_config_file.
3278
                'Branch.put_config_file', (path,
6270.1.10 by Jelmer Vernooij
Fix testing Branch.set_config_file.
3279
                    self.branch._lock_token, self.branch._repo_lock_token),
3280
                content)
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
3281
        except errors.UnknownSmartMethod:
3282
            self._ensure_real()
3283
            return self._real_store._save_content(content)
6270.1.18 by Jelmer Vernooij
Fix a test.
3284
        handler.cancel_read_body()
6270.1.16 by Jelmer Vernooij
Expect 'ok' response from set_config_file.
3285
        if response != ('ok', ):
6270.1.7 by Jelmer Vernooij
Use _ensure_real.
3286
            raise errors.UnexpectedSmartServerResponse(response)
3287
3288
    def _ensure_real(self):
3289
        self.branch._ensure_real()
6270.1.8 by Jelmer Vernooij
Fix RemoteControlStore.
3290
        if self._real_store is None:
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
3291
            self._real_store = _mod_config.BranchStore(self.branch)
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3292
3293
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
3294
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3295
    """Branch stored on a server accessed by HPSS RPC.
3296
3297
    At the moment most operations are mapped down to simple file operations.
3298
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
3299
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
3300
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
3301
        _client=None, format=None, setup_stacking=True, name=None,
3302
        possible_transports=None):
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
3303
        """Create a RemoteBranch instance.
3304
3305
        :param real_branch: An optional local implementation of the branch
3306
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
3307
        :param _client: Private parameter for testing.
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3308
        :param format: A RemoteBranchFormat object, None to create one
3309
            automatically. If supplied it should have a network_name already
3310
            supplied.
3311
        :param setup_stacking: If True make an RPC call to determine the
3312
            stacked (or not) status of the branch. If False assume the branch
3313
            is not stacked.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3314
        :param name: Colocated branch name
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
3315
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
3316
        # We intentionally don't call the parent class's __init__, because it
3317
        # will try to assign to self.tags, which is a property in this subclass.
3318
        # And the parent's __init__ doesn't do much anyway.
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
3319
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
3320
        if _client is not None:
3321
            self._client = _client
3322
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
3323
            self._client = remote_bzrdir._client
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
3324
        self.repository = remote_repository
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
3325
        if real_branch is not None:
3326
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3327
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
3328
            real_repo = self._real_branch.repository
3329
            if isinstance(real_repo, RemoteRepository):
3330
                real_repo._ensure_real()
3331
                real_repo = real_repo._real_repository
3332
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3333
            # Give the branch the remote repository to let fast-pathing happen.
3334
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3335
        else:
3336
            self._real_branch = None
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
3337
        # Fill out expected attributes of branch for bzrlib API users.
4419.2.2 by Andrew Bennetts
Read lock branch_from in cmd_pull, avoids refetching last_revision_info and so reduces test_pull acceptance ratchet.
3338
        self._clear_cached_state()
5158.6.9 by Martin Pool
Simplify various code to use user_url
3339
        # TODO: deprecate self.base in favor of user_url
3340
        self.base = self.bzrdir.user_url
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3341
        self._name = name
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
3342
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3343
        self._lock_mode = None
3344
        self._lock_token = None
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
3345
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3346
        self._lock_count = 0
3347
        self._leave_lock = False
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3348
        # Setup a format: note that we cannot call _ensure_real until all the
3349
        # attributes above are set: This code cannot be moved higher up in this
3350
        # function.
3351
        if format is None:
3352
            self._format = RemoteBranchFormat()
3353
            if real_branch is not None:
3354
                self._format._network_name = \
3355
                    self._real_branch._format.network_name()
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
3356
        else:
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3357
            self._format = format
4600.2.1 by Robert Collins
Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered.
3358
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
3359
        # branch.open_branch method.
3360
        self._real_ignore_fallbacks = not setup_stacking
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3361
        if not self._format._network_name:
3362
            # Did not get from open_branchV2 - old server.
3363
            self._ensure_real()
3364
            self._format._network_name = \
3365
                self._real_branch._format.network_name()
3366
        self.tags = self._format.make_tags(self)
3681.1.2 by Robert Collins
Adjust for trunk.
3367
        # The base class init is not called, so we duplicate this:
3681.1.1 by Robert Collins
Create a new hook Branch.open. (Robert Collins)
3368
        hooks = branch.Branch.hooks['open']
3369
        for hook in hooks:
3370
            hook(self)
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
3371
        self._is_stacked = False
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3372
        if setup_stacking:
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
3373
            self._setup_stacking(possible_transports)
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
3374
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
3375
    def _setup_stacking(self, possible_transports):
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
3376
        # configure stacking into the remote repository, by reading it from
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
3377
        # the vfs branch.
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
3378
        try:
3379
            fallback_url = self.get_stacked_on_url()
3380
        except (errors.NotStacked, errors.UnstackableBranchFormat,
3381
            errors.UnstackableRepositoryFormat), e:
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
3382
            return
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
3383
        self._is_stacked = True
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
3384
        if possible_transports is None:
3385
            possible_transports = []
3386
        else:
3387
            possible_transports = list(possible_transports)
3388
        possible_transports.append(self.bzrdir.root_transport)
6305.3.3 by Jelmer Vernooij
Fix use of possible_transports.
3389
        self._activate_fallback_location(fallback_url,
6305.3.6 by Jelmer Vernooij
Pass possible_transports along for remote branches.
3390
            possible_transports=possible_transports)
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
3391
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
3392
    def _get_config(self):
3393
        return RemoteBranchConfig(self)
3394
6270.1.19 by Jelmer Vernooij
Some changes discussed with vila on IRC.
3395
    def _get_config_store(self):
3396
        return RemoteBranchStore(self)
6270.1.4 by Jelmer Vernooij
Add Branch.get_config_stack / BzrDir.get_config_stack.
3397
3407.2.17 by Martin Pool
better name: _get_real_transport
3398
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
3399
        # if we try vfs access, return the real branch's vfs transport
3400
        self._ensure_real()
3401
        return self._real_branch._transport
3402
3407.2.17 by Martin Pool
better name: _get_real_transport
3403
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
3404
2477.1.1 by Martin Pool
Add RemoteBranch repr
3405
    def __str__(self):
3406
        return "%s(%s)" % (self.__class__.__name__, self.base)
3407
3408
    __repr__ = __str__
3409
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3410
    def _ensure_real(self):
3411
        """Ensure that there is a _real_branch set.
3412
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
3413
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3414
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
3415
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3416
            if not vfs.vfs_enabled():
3417
                raise AssertionError('smart server vfs must be enabled '
3418
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3419
            self.bzrdir._ensure_real()
4600.2.1 by Robert Collins
Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered.
3420
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
3421
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3422
            if self.repository._real_repository is None:
3423
                # Give the remote repository the matching real repo.
3424
                real_repo = self._real_branch.repository
3425
                if isinstance(real_repo, RemoteRepository):
3426
                    real_repo._ensure_real()
3427
                    real_repo = real_repo._real_repository
3428
                self.repository._set_real_repository(real_repo)
3429
            # Give the real branch the remote repository to let fast-pathing
3430
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3431
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3432
            if self._lock_mode == 'r':
3433
                self._real_branch.lock_read()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3434
            elif self._lock_mode == 'w':
3435
                self._real_branch.lock_write(token=self._lock_token)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
3436
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
3437
    def _translate_error(self, err, **context):
3438
        self.repository._translate_error(err, branch=self, **context)
3439
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3440
    def _clear_cached_state(self):
3441
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
3442
        if self._real_branch is not None:
3443
            self._real_branch._clear_cached_state()
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
3444
3445
    def _clear_cached_state_of_remote_branch_only(self):
3446
        """Like _clear_cached_state, but doesn't clear the cache of
3447
        self._real_branch.
3448
3449
        This is useful when falling back to calling a method of
3450
        self._real_branch that changes state.  In that case the underlying
3451
        branch changes, so we need to invalidate this RemoteBranch's cache of
3452
        it.  However, there's no need to invalidate the _real_branch's cache
3453
        too, in fact doing so might harm performance.
3454
        """
3455
        super(RemoteBranch, self)._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3456
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
3457
    @property
3458
    def control_files(self):
3459
        # Defer actually creating RemoteBranchLockableFiles until its needed,
3460
        # because it triggers an _ensure_real that we otherwise might not need.
3461
        if self._control_files is None:
3462
            self._control_files = RemoteBranchLockableFiles(
3463
                self.bzrdir, self._client)
3464
        return self._control_files
3465
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
3466
    def get_physical_lock_status(self):
3467
        """See Branch.get_physical_lock_status()."""
6280.6.1 by Jelmer Vernooij
Implement remote side of {Branch,Repository}.get_physical_lock_status.
3468
        try:
3469
            response = self._client.call('Branch.get_physical_lock_status',
3470
                self._remote_path())
3471
        except errors.UnknownSmartMethod:
3472
            self._ensure_real()
3473
            return self._real_branch.get_physical_lock_status()
3474
        if response[0] not in ('yes', 'no'):
3475
            raise errors.UnexpectedSmartServerResponse(response)
3476
        return (response[0] == 'yes')
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
3477
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3478
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3479
        """Get the URL this branch is stacked against.
3480
3481
        :raises NotStacked: If the branch is not stacked.
3482
        :raises UnstackableBranchFormat: If the branch does not support
3483
            stacking.
3484
        :raises UnstackableRepositoryFormat: If the repository does not support
3485
            stacking.
3486
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
3487
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3488
            # there may not be a repository yet, so we can't use
3489
            # self._translate_error, so we can't use self._call either.
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
3490
            response = self._client.call('Branch.get_stacked_on_url',
3491
                self._remote_path())
3492
        except errors.ErrorFromSmartServer, err:
3493
            # there may not be a repository yet, so we can't call through
3494
            # its _translate_error
3495
            _translate_error(err, branch=self)
3496
        except errors.UnknownSmartMethod, err:
3497
            self._ensure_real()
3498
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3499
        if response[0] != 'ok':
3500
            raise errors.UnexpectedSmartServerResponse(response)
3501
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3502
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
3503
    def set_stacked_on_url(self, url):
3504
        branch.Branch.set_stacked_on_url(self, url)
3505
        if not url:
3506
            self._is_stacked = False
3507
        else:
3508
            self._is_stacked = True
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
3509
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3510
    def _vfs_get_tags_bytes(self):
3511
        self._ensure_real()
3512
        return self._real_branch._get_tags_bytes()
3513
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
3514
    @needs_read_lock
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3515
    def _get_tags_bytes(self):
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
3516
        if self._tags_bytes is None:
3517
            self._tags_bytes = self._get_tags_bytes_via_hpss()
3518
        return self._tags_bytes
3519
3520
    def _get_tags_bytes_via_hpss(self):
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3521
        medium = self._client._medium
3522
        if medium._is_remote_before((1, 13)):
3523
            return self._vfs_get_tags_bytes()
3524
        try:
3525
            response = self._call('Branch.get_tags_bytes', self._remote_path())
3526
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
3527
            medium._remember_remote_is_before((1, 13))
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
3528
            return self._vfs_get_tags_bytes()
3529
        return response[0]
3530
4556.2.10 by Andrew Bennetts
Fix trivial bug in _vfs_set_tags_bytes.
3531
    def _vfs_set_tags_bytes(self, bytes):
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
3532
        self._ensure_real()
4556.2.10 by Andrew Bennetts
Fix trivial bug in _vfs_set_tags_bytes.
3533
        return self._real_branch._set_tags_bytes(bytes)
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
3534
3535
    def _set_tags_bytes(self, bytes):
5535.2.3 by Andrew Bennetts
Reset cached tags when mutating tags.
3536
        if self.is_locked():
3537
            self._tags_bytes = bytes
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
3538
        medium = self._client._medium
3539
        if medium._is_remote_before((1, 18)):
3540
            self._vfs_set_tags_bytes(bytes)
4634.36.1 by Andrew Bennetts
Fix trivial bug in RemoteBranch._set_tags_bytes, and add some unit tests for it.
3541
            return
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
3542
        try:
3543
            args = (
3544
                self._remote_path(), self._lock_token, self._repo_lock_token)
3545
            response = self._call_with_body_bytes(
3546
                'Branch.set_tags_bytes', args, bytes)
3547
        except errors.UnknownSmartMethod:
3548
            medium._remember_remote_is_before((1, 18))
3549
            self._vfs_set_tags_bytes(bytes)
3550
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3551
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3552
        """Lock the branch for read operations.
3553
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
3554
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3555
        """
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
3556
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3557
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
3558
            self._note_lock('r')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3559
            self._lock_mode = 'r'
3560
            self._lock_count = 1
3561
            if self._real_branch is not None:
3562
                self._real_branch.lock_read()
3563
        else:
3564
            self._lock_count += 1
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
3565
        return lock.LogicalLockResult(self.unlock)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
3566
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3567
    def _remote_lock_write(self, token):
3568
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3569
            branch_token = repo_token = ''
3570
        else:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3571
            branch_token = token
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3572
            repo_token = self.repository.lock_write().repository_token
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3573
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3574
        err_context = {'token': token}
5284.6.1 by Parth Malwankar
initial implementation for better LockContention message.
3575
        try:
3576
            response = self._call(
3577
                'Branch.lock_write', self._remote_path(), branch_token,
3578
                repo_token or '', **err_context)
3579
        except errors.LockContention, e:
5284.6.3 by Parth Malwankar
fixed tests. closed review comments by mgz.
3580
            # The LockContention from the server doesn't have any
3581
            # information about the lock_url. We re-raise LockContention
3582
            # with valid lock_url.
3583
            raise errors.LockContention('(remote lock)',
3584
                self.repository.base.split('.bzr/')[0])
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
3585
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
3586
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
3587
        ok, branch_token, repo_token = response
3588
        return branch_token, repo_token
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3589
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3590
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3591
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
3592
            self._note_lock('w')
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3593
            # Lock the branch and repo in one remote call.
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3594
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3595
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3596
            if not self._lock_token:
3597
                raise SmartProtocolError('Remote server did not return a token!')
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3598
            # Tell the self.repository object that it is locked.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
3599
            self.repository.lock_write(
3600
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
3601
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3602
            if self._real_branch is not None:
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
3603
                self._real_branch.lock_write(token=self._lock_token)
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3604
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3605
                self._leave_lock = True
3606
            else:
3607
                self._leave_lock = False
3608
            self._lock_mode = 'w'
3609
            self._lock_count = 1
3610
        elif self._lock_mode == 'r':
5241.1.1 by Andrew Bennetts
Fix AttributeError in RemoteBranch.lock_write after lock_read.
3611
            raise errors.ReadOnlyError(self)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3612
        else:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3613
            if token is not None:
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3614
                # A token was given to lock_write, and we're relocking, so
3615
                # check that the given token actually matches the one we
3616
                # already have.
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
3617
                if token != self._lock_token:
3618
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3619
            self._lock_count += 1
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
3620
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
3621
            self.repository.lock_write(self._repo_lock_token)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3622
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3623
3624
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3625
        err_context = {'token': str((branch_token, repo_token))}
3626
        response = self._call(
3627
            'Branch.unlock', self._remote_path(), branch_token,
3628
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3629
        if response == ('ok',):
3630
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
3631
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3632
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
3633
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3634
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
3635
        try:
3636
            self._lock_count -= 1
3637
            if not self._lock_count:
3638
                self._clear_cached_state()
3639
                mode = self._lock_mode
3640
                self._lock_mode = None
3641
                if self._real_branch is not None:
3642
                    if (not self._leave_lock and mode == 'w' and
3643
                        self._repo_lock_token):
3644
                        # If this RemoteBranch will remove the physical lock
3645
                        # for the repository, make sure the _real_branch
3646
                        # doesn't do it first.  (Because the _real_branch's
3647
                        # repository is set to be the RemoteRepository.)
3648
                        self._real_branch.repository.leave_lock_in_place()
3649
                    self._real_branch.unlock()
3650
                if mode != 'w':
3651
                    # Only write-locked branched need to make a remote method
4031.3.1 by Frank Aspell
Fixing various typos
3652
                    # call to perform the unlock.
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
3653
                    return
3654
                if not self._lock_token:
3655
                    raise AssertionError('Locked, but no token!')
3656
                branch_token = self._lock_token
3657
                repo_token = self._repo_lock_token
3658
                self._lock_token = None
3659
                self._repo_lock_token = None
3660
                if not self._leave_lock:
3661
                    self._unlock(branch_token, repo_token)
3662
        finally:
3663
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
3664
3665
    def break_lock(self):
6280.4.3 by Jelmer Vernooij
add Branch.break_lock.
3666
        try:
3667
            response = self._call(
3668
                'Branch.break_lock', self._remote_path())
3669
        except errors.UnknownSmartMethod:
3670
            self._ensure_real()
3671
            return self._real_branch.break_lock()
3672
        if response != ('ok',):
3673
            raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
3674
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3675
    def leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
3676
        if not self._lock_token:
3677
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3678
        self._leave_lock = True
3679
3680
    def dont_leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
3681
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
3682
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
3683
        self._leave_lock = False
3684
4634.69.1 by Andrew Bennetts
Apply @needs_read_lock to RemoteBranch.get_rev_id.
3685
    @needs_read_lock
4419.2.4 by Andrew Bennetts
Add Repository.get_rev_id_for_revno RPC, removes VFS calls from 'pull -r 123' case.
3686
    def get_rev_id(self, revno, history=None):
4419.2.17 by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted.
3687
        if revno == 0:
3688
            return _mod_revision.NULL_REVISION
4419.2.4 by Andrew Bennetts
Add Repository.get_rev_id_for_revno RPC, removes VFS calls from 'pull -r 123' case.
3689
        last_revision_info = self.last_revision_info()
4419.2.15 by Andrew Bennetts
Simplify RemoteBranch.get_rev_id a little; get_rev_id_for_revno handles stacking for us.
3690
        ok, result = self.repository.get_rev_id_for_revno(
3691
            revno, last_revision_info)
3692
        if ok:
3693
            return result
3694
        missing_parent = result[1]
4419.2.17 by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted.
3695
        # Either the revision named by the server is missing, or its parent
3696
        # is.  Call get_parent_map to determine which, so that we report a
3697
        # useful error.
3698
        parent_map = self.repository.get_parent_map([missing_parent])
3699
        if missing_parent in parent_map:
3700
            missing_parent = parent_map[missing_parent]
4419.2.4 by Andrew Bennetts
Add Repository.get_rev_id_for_revno RPC, removes VFS calls from 'pull -r 123' case.
3701
        raise errors.RevisionNotPresent(missing_parent, self.repository)
3702
5718.8.3 by Jelmer Vernooij
More branch restructuring.
3703
    def _read_last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3704
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3705
        if response[0] != 'ok':
3706
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
3707
        revno = int(response[1])
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
3708
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
3709
        return (revno, last_revision)
3710
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
3711
    def _gen_revision_history(self):
3712
        """See Branch._gen_revision_history()."""
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
3713
        if self._is_stacked:
3714
            self._ensure_real()
3715
            return self._real_branch._gen_revision_history()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3716
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
3717
            'Branch.revision_history', self._remote_path())
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
3718
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
3719
            raise errors.UnexpectedSmartServerResponse(response_tuple)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
3720
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
3721
        if result == ['']:
3722
            return []
3723
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
3724
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
3725
    def _remote_path(self):
3726
        return self.bzrdir._path_for_remote_call(self._client)
3727
3441.5.18 by Andrew Bennetts
Fix some test failures.
3728
    def _set_last_revision_descendant(self, revision_id, other_branch,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
3729
            allow_diverged=False, allow_overwrite_descendant=False):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3730
        # This performs additional work to meet the hook contract; while its
3731
        # undesirable, we have to synthesise the revno to call the hook, and
3732
        # not calling the hook is worse as it means changes can't be prevented.
3733
        # Having calculated this though, we can't just call into
3734
        # set_last_revision_info as a simple call, because there is a set_rh
3735
        # hook that some folk may still be using.
3736
        old_revno, old_revid = self.last_revision_info()
3737
        history = self._lefthand_history(revision_id)
3738
        self._run_pre_change_branch_tip_hooks(len(history), revision_id)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3739
        err_context = {'other_branch': other_branch}
3740
        response = self._call('Branch.set_last_revision_ex',
3741
            self._remote_path(), self._lock_token, self._repo_lock_token,
3742
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
3743
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3744
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
3745
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3746
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
3747
        new_revno, new_revision_id = response[1:]
3748
        self._last_revision_info_cache = new_revno, new_revision_id
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3749
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
3750
        if self._real_branch is not None:
3751
            cache = new_revno, new_revision_id
3752
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3753
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3754
    def _set_last_revision(self, revision_id):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3755
        old_revno, old_revid = self.last_revision_info()
3756
        # This performs additional work to meet the hook contract; while its
3757
        # undesirable, we have to synthesise the revno to call the hook, and
3758
        # not calling the hook is worse as it means changes can't be prevented.
3759
        # Having calculated this though, we can't just call into
3760
        # set_last_revision_info as a simple call, because there is a set_rh
3761
        # hook that some folk may still be using.
3762
        history = self._lefthand_history(revision_id)
3763
        self._run_pre_change_branch_tip_hooks(len(history), revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3764
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3765
        response = self._call('Branch.set_last_revision',
3766
            self._remote_path(), self._lock_token, self._repo_lock_token,
3767
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3768
        if response != ('ok',):
3769
            raise errors.UnexpectedSmartServerResponse(response)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3770
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3771
5718.7.7 by Jelmer Vernooij
Implement stub RemoteBranch.revision_history.
3772
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
3773
    @needs_write_lock
3774
    def set_revision_history(self, rev_history):
3775
        """See Branch.set_revision_history."""
3776
        self._set_revision_history(rev_history)
3777
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3778
    @needs_write_lock
5718.7.4 by Jelmer Vernooij
Branch.set_revision_history.
3779
    def _set_revision_history(self, rev_history):
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
3780
        # Send just the tip revision of the history; the server will generate
3781
        # the full history from that.  If the revision doesn't exist in this
3782
        # branch, NoSuchRevision will be raised.
3783
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
3784
            rev_id = 'null:'
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
3785
        else:
3786
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3787
        self._set_last_revision(rev_id)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3788
        for hook in branch.Branch.hooks['set_rh']:
3789
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
3790
        self._cache_revision_history(rev_history)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
3791
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
3792
    def _get_parent_location(self):
3793
        medium = self._client._medium
3794
        if medium._is_remote_before((1, 13)):
3795
            return self._vfs_get_parent_location()
3796
        try:
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
3797
            response = self._call('Branch.get_parent', self._remote_path())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
3798
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
3799
            medium._remember_remote_is_before((1, 13))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
3800
            return self._vfs_get_parent_location()
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
3801
        if len(response) != 1:
4083.1.6 by Andrew Bennetts
Fix trivial bug in my trivial bug fix :)
3802
            raise errors.UnexpectedSmartServerResponse(response)
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
3803
        parent_location = response[0]
3804
        if parent_location == '':
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
3805
            return None
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
3806
        return parent_location
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
3807
3808
    def _vfs_get_parent_location(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3809
        self._ensure_real()
4083.1.5 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
3810
        return self._real_branch._get_parent_location()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
3811
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3812
    def _set_parent_location(self, url):
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
3813
        medium = self._client._medium
3814
        if medium._is_remote_before((1, 15)):
3815
            return self._vfs_set_parent_location(url)
3816
        try:
3817
            call_url = url or ''
3818
            if type(call_url) is not str:
3819
                raise AssertionError('url must be a str or None (%s)' % url)
3820
            response = self._call('Branch.set_parent_location',
3821
                self._remote_path(), self._lock_token, self._repo_lock_token,
3822
                call_url)
3823
        except errors.UnknownSmartMethod:
3824
            medium._remember_remote_is_before((1, 15))
3825
            return self._vfs_set_parent_location(url)
3826
        if response != ():
3827
            raise errors.UnexpectedSmartServerResponse(response)
3828
3829
    def _vfs_set_parent_location(self, url):
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
3830
        self._ensure_real()
3831
        return self._real_branch._set_parent_location(url)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
3832
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3833
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
3834
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
3835
             **kwargs):
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
3836
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3837
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
3838
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
3839
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
3840
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
3841
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
3842
    @needs_read_lock
5853.2.3 by Jelmer Vernooij
Fix lossy tests.
3843
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
3844
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
3845
        return self._real_branch.push(
5853.2.3 by Jelmer Vernooij
Fix lossy tests.
3846
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
3847
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
3848
3849
    def is_locked(self):
3850
        return self._lock_count >= 1
3851
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
3852
    @needs_read_lock
6263.1.2 by Jelmer Vernooij
Add ``Branch.revision_id_to_revno`` smart verb.
3853
    def revision_id_to_dotted_revno(self, revision_id):
3854
        """Given a revision id, return its dotted revno.
3855
3856
        :return: a tuple like (1,) or (400,1,3).
3857
        """
3858
        try:
3859
            response = self._call('Branch.revision_id_to_revno',
3860
                self._remote_path(), revision_id)
3861
        except errors.UnknownSmartMethod:
3862
            self._ensure_real()
6305.1.1 by Jelmer Vernooij
Add test for Branch.revision_id_to_dotted_revno fallback.
3863
            return self._real_branch.revision_id_to_dotted_revno(revision_id)
6263.1.2 by Jelmer Vernooij
Add ``Branch.revision_id_to_revno`` smart verb.
3864
        if response[0] == 'ok':
3865
            return tuple([int(x) for x in response[1:]])
3866
        else:
3867
            raise errors.UnexpectedSmartServerResponse(response)
3868
3869
    @needs_read_lock
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
3870
    def revision_id_to_revno(self, revision_id):
6263.1.2 by Jelmer Vernooij
Add ``Branch.revision_id_to_revno`` smart verb.
3871
        """Given a revision id on the branch mainline, return its revno.
3872
3873
        :return: an integer
3874
        """
3875
        try:
3876
            response = self._call('Branch.revision_id_to_revno',
3877
                self._remote_path(), revision_id)
3878
        except errors.UnknownSmartMethod:
3879
            self._ensure_real()
3880
            return self._real_branch.revision_id_to_revno(revision_id)
3881
        if response[0] == 'ok':
3882
            if len(response) == 2:
3883
                return int(response[1])
6263.1.6 by Jelmer Vernooij
Fix another test.
3884
            raise NoSuchRevision(self, revision_id)
6263.1.2 by Jelmer Vernooij
Add ``Branch.revision_id_to_revno`` smart verb.
3885
        else:
3886
            raise errors.UnexpectedSmartServerResponse(response)
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
3887
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
3888
    @needs_write_lock
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
3889
    def set_last_revision_info(self, revno, revision_id):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3890
        # XXX: These should be returned by the set_last_revision_info verb
3891
        old_revno, old_revid = self.last_revision_info()
3892
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
5803.1.1 by Jelmer Vernooij
Raise InvalidRevisionId on Branch.set_last_revision_info.
3893
        if not revision_id or not isinstance(revision_id, basestring):
3894
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
3895
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
3896
            response = self._call('Branch.set_last_revision_info',
3897
                self._remote_path(), self._lock_token, self._repo_lock_token,
3898
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
3899
        except errors.UnknownSmartMethod:
3900
            self._ensure_real()
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
3901
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3902
            self._real_branch.set_last_revision_info(revno, revision_id)
3903
            self._last_revision_info_cache = revno, revision_id
3904
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
3905
        if response == ('ok',):
3906
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
3907
            self._last_revision_info_cache = revno, revision_id
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3908
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
3909
            # Update the _real_branch's cache too.
3910
            if self._real_branch is not None:
3911
                cache = self._last_revision_info_cache
3912
                self._real_branch._last_revision_info_cache = cache
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
3913
        else:
3914
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
3915
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
3916
    @needs_write_lock
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
3917
    def generate_revision_history(self, revision_id, last_rev=None,
3918
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3919
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
3920
        if not medium._is_remote_before((1, 6)):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3921
            # Use a smart method for 1.6 and above servers
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3922
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
3923
                self._set_last_revision_descendant(revision_id, other_branch,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
3924
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
3925
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
3926
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
3927
                medium._remember_remote_is_before((1, 6))
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
3928
        self._clear_cached_state_of_remote_branch_only()
5718.7.4 by Jelmer Vernooij
Branch.set_revision_history.
3929
        self._set_revision_history(self._lefthand_history(revision_id,
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
3930
            last_rev=last_rev,other_branch=other_branch))
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
3931
2018.5.97 by Andrew Bennetts
Fix more tests.
3932
    def set_push_location(self, location):
3933
        self._ensure_real()
3934
        return self._real_branch.set_push_location(location)
3935
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3936
    def heads_to_fetch(self):
5672.1.7 by Andrew Bennetts
Use a more explicit method name.
3937
        if self._format._use_default_local_heads_to_fetch():
5672.1.5 by Andrew Bennetts
Add some tests for RemoteBranch.heads_to_fetch, and add release-note.
3938
            # We recognise this format, and its heads-to-fetch implementation
3939
            # is the default one (tip + tags).  In this case it's cheaper to
3940
            # just use the default implementation rather than a special RPC as
3941
            # the tip and tags data is cached.
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3942
            return branch.Branch.heads_to_fetch(self)
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3943
        medium = self._client._medium
3944
        if medium._is_remote_before((2, 4)):
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3945
            return self._vfs_heads_to_fetch()
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3946
        try:
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3947
            return self._rpc_heads_to_fetch()
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3948
        except errors.UnknownSmartMethod:
3949
            medium._remember_remote_is_before((2, 4))
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3950
            return self._vfs_heads_to_fetch()
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3951
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3952
    def _rpc_heads_to_fetch(self):
3953
        response = self._call('Branch.heads_to_fetch', self._remote_path())
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3954
        if len(response) != 2:
3955
            raise errors.UnexpectedSmartServerResponse(response)
3956
        must_fetch, if_present_fetch = response
3957
        return set(must_fetch), set(if_present_fetch)
3958
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3959
    def _vfs_heads_to_fetch(self):
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3960
        self._ensure_real()
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
3961
        return self._real_branch.heads_to_fetch()
5672.1.4 by Andrew Bennetts
Fix final bzr-loom test by adding RemoteBranch.heads_to_fetch that can ask the remote branch for the heads to fetch (but uses the cheaper default logic if it knows the remote format has an identical heads_to_fetch as Branch.heads_to_fetch).
3962
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
3963
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
3964
class RemoteConfig(object):
3965
    """A Config that reads and writes from smart verbs.
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
3966
3967
    It is a low-level object that considers config data to be name/value pairs
3968
    that may be associated with a section. Assigning meaning to the these
3969
    values is done at higher levels like bzrlib.config.TreeConfig.
3970
    """
3971
3972
    def get_option(self, name, section=None, default=None):
3973
        """Return the value associated with a named option.
3974
3975
        :param name: The name of the value
3976
        :param section: The section the option is in (if any)
3977
        :param default: The value to return if the value is not set
3978
        :return: The value or default value
3979
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
3980
        try:
3981
            configobj = self._get_configobj()
5743.8.17 by Vincent Ladeuil
Add config old_get hook for remote config.
3982
            section_obj = None
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
3983
            if section is None:
3984
                section_obj = configobj
3985
            else:
3986
                try:
3987
                    section_obj = configobj[section]
3988
                except KeyError:
5743.8.17 by Vincent Ladeuil
Add config old_get hook for remote config.
3989
                    pass
3990
            if section_obj is None:
3991
                value = default
3992
            else:
3993
                value = section_obj.get(name, default)
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
3994
        except errors.UnknownSmartMethod:
5743.8.17 by Vincent Ladeuil
Add config old_get hook for remote config.
3995
            value = self._vfs_get_option(name, section, default)
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
3996
        for hook in _mod_config.OldConfigHooks['get']:
5743.8.17 by Vincent Ladeuil
Add config old_get hook for remote config.
3997
            hook(self, name, value)
3998
        return value
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
3999
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4000
    def _response_to_configobj(self, response):
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
4001
        if len(response[0]) and response[0][0] != 'ok':
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
4002
            raise errors.UnexpectedSmartServerResponse(response)
4241.5.1 by Matt Nordhoff
Fix Branch.get_config_file smart verb on multi-line config files. (Bug #354075)
4003
        lines = response[1].read_body_bytes().splitlines()
6362.6.3 by Jelmer Vernooij
Fix compatibility after config stack changes.
4004
        conf = _mod_config.ConfigObj(lines, encoding='utf-8')
4005
        for hook in _mod_config.OldConfigHooks['load']:
5743.8.21 by Vincent Ladeuil
Add test for config load hook for remote configs.
4006
            hook(self)
4007
        return conf
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
4008
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4009
4010
class RemoteBranchConfig(RemoteConfig):
4011
    """A RemoteConfig for Branches."""
4012
4013
    def __init__(self, branch):
4014
        self._branch = branch
4015
4016
    def _get_configobj(self):
4017
        path = self._branch._remote_path()
4018
        response = self._branch._client.call_expecting_body(
4019
            'Branch.get_config_file', path)
4020
        return self._response_to_configobj(response)
4021
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
4022
    def set_option(self, value, name, section=None):
4023
        """Set the value associated with a named option.
4024
4025
        :param value: The value to set
4026
        :param name: The name of the value to set
4027
        :param section: The section the option is in (if any)
4028
        """
4226.2.1 by Robert Collins
Set branch config options via a smart method.
4029
        medium = self._branch._client._medium
4030
        if medium._is_remote_before((1, 14)):
4031
            return self._vfs_set_option(value, name, section)
5227.1.2 by Andrew Bennetts
Add Branch.set_config_option_dict RPC (and VFS fallback), fixes #430382.
4032
        if isinstance(value, dict):
4033
            if medium._is_remote_before((2, 2)):
4034
                return self._vfs_set_option(value, name, section)
4035
            return self._set_config_option_dict(value, name, section)
4036
        else:
4037
            return self._set_config_option(value, name, section)
4038
4039
    def _set_config_option(self, value, name, section):
4226.2.1 by Robert Collins
Set branch config options via a smart method.
4040
        try:
4041
            path = self._branch._remote_path()
4042
            response = self._branch._client.call('Branch.set_config_option',
4043
                path, self._branch._lock_token, self._branch._repo_lock_token,
4226.2.2 by Robert Collins
Fix setting config options to support unicode values and don't attempt to reset repositories _fallback_repositories as the simple approach fails to work.
4044
                value.encode('utf8'), name, section or '')
4226.2.1 by Robert Collins
Set branch config options via a smart method.
4045
        except errors.UnknownSmartMethod:
5227.1.2 by Andrew Bennetts
Add Branch.set_config_option_dict RPC (and VFS fallback), fixes #430382.
4046
            medium = self._branch._client._medium
4226.2.1 by Robert Collins
Set branch config options via a smart method.
4047
            medium._remember_remote_is_before((1, 14))
4048
            return self._vfs_set_option(value, name, section)
4049
        if response != ():
4050
            raise errors.UnexpectedSmartServerResponse(response)
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
4051
5227.1.2 by Andrew Bennetts
Add Branch.set_config_option_dict RPC (and VFS fallback), fixes #430382.
4052
    def _serialize_option_dict(self, option_dict):
4053
        utf8_dict = {}
4054
        for key, value in option_dict.items():
4055
            if isinstance(key, unicode):
4056
                key = key.encode('utf8')
4057
            if isinstance(value, unicode):
4058
                value = value.encode('utf8')
4059
            utf8_dict[key] = value
4060
        return bencode.bencode(utf8_dict)
4061
4062
    def _set_config_option_dict(self, value, name, section):
4063
        try:
4064
            path = self._branch._remote_path()
4065
            serialised_dict = self._serialize_option_dict(value)
4066
            response = self._branch._client.call(
4067
                'Branch.set_config_option_dict',
4068
                path, self._branch._lock_token, self._branch._repo_lock_token,
4069
                serialised_dict, name, section or '')
4070
        except errors.UnknownSmartMethod:
4071
            medium = self._branch._client._medium
4072
            medium._remember_remote_is_before((2, 2))
4073
            return self._vfs_set_option(value, name, section)
4074
        if response != ():
4075
            raise errors.UnexpectedSmartServerResponse(response)
4076
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4077
    def _real_object(self):
4078
        self._branch._ensure_real()
4079
        return self._branch._real_branch
4080
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
4081
    def _vfs_set_option(self, value, name, section=None):
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4082
        return self._real_object()._get_config().set_option(
4083
            value, name, section)
4084
4085
4086
class RemoteBzrDirConfig(RemoteConfig):
4087
    """A RemoteConfig for BzrDirs."""
4088
4089
    def __init__(self, bzrdir):
4090
        self._bzrdir = bzrdir
4091
4092
    def _get_configobj(self):
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
4093
        medium = self._bzrdir._client._medium
4094
        verb = 'BzrDir.get_config_file'
4095
        if medium._is_remote_before((1, 15)):
4096
            raise errors.UnknownSmartMethod(verb)
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4097
        path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
4098
        response = self._bzrdir._call_expecting_body(
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
4099
            verb, path)
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
4100
        return self._response_to_configobj(response)
4101
4102
    def _vfs_get_option(self, name, section, default):
4103
        return self._real_object()._get_config().get_option(
4104
            name, section, default)
4105
4106
    def set_option(self, value, name, section=None):
4107
        """Set the value associated with a named option.
4108
4109
        :param value: The value to set
4110
        :param name: The name of the value to set
4111
        :param section: The section the option is in (if any)
4112
        """
4113
        return self._real_object()._get_config().set_option(
4114
            value, name, section)
4115
4116
    def _real_object(self):
4117
        self._bzrdir._ensure_real()
4118
        return self._bzrdir._real_bzrdir
4119
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
4120
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
4121
def _extract_tar(tar, to_dir):
4122
    """Extract all the contents of a tarfile object.
4123
4124
    A replacement for extractall, which is not present in python2.4
4125
    """
4126
    for tarinfo in tar:
4127
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
4128
4129
6284.1.1 by Jelmer Vernooij
Allow registering custom error handlers in the HPSS client.
4130
error_translators = registry.Registry()
4131
no_context_error_translators = registry.Registry()
4132
4133
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
4134
def _translate_error(err, **context):
4135
    """Translate an ErrorFromSmartServer into a more useful error.
4136
4137
    Possible context keys:
4138
      - branch
4139
      - repository
4140
      - bzrdir
4141
      - token
4142
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4143
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
4144
4145
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
4146
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
4147
    """
4148
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
4149
        try:
4150
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4151
        except KeyError, key_err:
4152
            mutter('Missing key %r in context %r', key_err.args[0], context)
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
4153
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4154
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
4155
        """Get the path from the context if present, otherwise use first error
4156
        arg.
4157
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4158
        try:
4159
            return context['path']
4160
        except KeyError, key_err:
4161
            try:
4162
                return err.error_args[0]
4163
            except IndexError, idx_err:
4164
                mutter(
4165
                    'Missing key %r in context %r', key_err.args[0], context)
4166
                raise err
4167
6284.1.1 by Jelmer Vernooij
Allow registering custom error handlers in the HPSS client.
4168
    try:
4169
        translator = error_translators.get(err.error_verb)
4170
    except KeyError:
4171
        pass
4172
    else:
4173
        raise translator(err, find, get_path)
4174
    try:
4175
        translator = no_context_error_translators.get(err.error_verb)
4176
    except KeyError:
4177
        raise errors.UnknownErrorFromSmartServer(err)
4178
    else:
4179
        raise translator(err)
4180
4181
4182
error_translators.register('NoSuchRevision',
4183
    lambda err, find, get_path: NoSuchRevision(
4184
        find('branch'), err.error_args[0]))
4185
error_translators.register('nosuchrevision',
4186
    lambda err, find, get_path: NoSuchRevision(
4187
        find('repository'), err.error_args[0]))
4188
4189
def _translate_nobranch_error(err, find, get_path):
4190
    if len(err.error_args) >= 1:
4191
        extra = err.error_args[0]
4192
    else:
4193
        extra = None
4194
    return errors.NotBranchError(path=find('bzrdir').root_transport.base,
4195
        detail=extra)
4196
4197
error_translators.register('nobranch', _translate_nobranch_error)
4198
error_translators.register('norepository',
4199
    lambda err, find, get_path: errors.NoRepositoryPresent(
4200
        find('bzrdir')))
4201
error_translators.register('UnlockableTransport',
4202
    lambda err, find, get_path: errors.UnlockableTransport(
4203
        find('bzrdir').root_transport))
4204
error_translators.register('TokenMismatch',
4205
    lambda err, find, get_path: errors.TokenMismatch(
4206
        find('token'), '(remote token)'))
4207
error_translators.register('Diverged',
4208
    lambda err, find, get_path: errors.DivergedBranches(
4209
        find('branch'), find('other_branch')))
4210
error_translators.register('NotStacked',
4211
    lambda err, find, get_path: errors.NotStacked(branch=find('branch')))
4212
4213
def _translate_PermissionDenied(err, find, get_path):
4214
    path = get_path()
4215
    if len(err.error_args) >= 2:
4216
        extra = err.error_args[1]
4217
    else:
4218
        extra = None
4219
    return errors.PermissionDenied(path, extra=extra)
4220
4221
error_translators.register('PermissionDenied', _translate_PermissionDenied)
4222
error_translators.register('ReadError',
4223
    lambda err, find, get_path: errors.ReadError(get_path()))
4224
error_translators.register('NoSuchFile',
4225
    lambda err, find, get_path: errors.NoSuchFile(get_path()))
6300.1.7 by Jelmer Vernooij
Fix test.
4226
error_translators.register('TokenLockingNotSupported',
4227
    lambda err, find, get_path: errors.TokenLockingNotSupported(
4228
        find('repository')))
6280.10.31 by Jelmer Vernooij
Merge bzr.dev.
4229
error_translators.register('UnsuspendableWriteGroup',
4230
    lambda err, find, get_path: errors.UnsuspendableWriteGroup(
4231
        repository=find('repository')))
4232
error_translators.register('UnresumableWriteGroup',
4233
    lambda err, find, get_path: errors.UnresumableWriteGroup(
4234
        repository=find('repository'), write_groups=err.error_args[0],
4235
        reason=err.error_args[1]))
6284.1.1 by Jelmer Vernooij
Allow registering custom error handlers in the HPSS client.
4236
no_context_error_translators.register('IncompatibleRepositories',
4237
    lambda err: errors.IncompatibleRepositories(
4238
        err.error_args[0], err.error_args[1], err.error_args[2]))
4239
no_context_error_translators.register('LockContention',
4240
    lambda err: errors.LockContention('(remote lock)'))
4241
no_context_error_translators.register('LockFailed',
4242
    lambda err: errors.LockFailed(err.error_args[0], err.error_args[1]))
4243
no_context_error_translators.register('TipChangeRejected',
4244
    lambda err: errors.TipChangeRejected(err.error_args[0].decode('utf8')))
4245
no_context_error_translators.register('UnstackableBranchFormat',
4246
    lambda err: errors.UnstackableBranchFormat(*err.error_args))
4247
no_context_error_translators.register('UnstackableRepositoryFormat',
4248
    lambda err: errors.UnstackableRepositoryFormat(*err.error_args))
4249
no_context_error_translators.register('FileExists',
4250
    lambda err: errors.FileExists(err.error_args[0]))
4251
no_context_error_translators.register('DirectoryNotEmpty',
4252
    lambda err: errors.DirectoryNotEmpty(err.error_args[0]))
4253
4254
def _translate_short_readv_error(err):
4255
    args = err.error_args
4256
    return errors.ShortReadvError(args[0], int(args[1]), int(args[2]),
4257
        int(args[3]))
4258
4259
no_context_error_translators.register('ShortReadvError',
4260
    _translate_short_readv_error)
4261
4262
def _translate_unicode_error(err):
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4263
        encoding = str(err.error_args[0]) # encoding must always be a string
4264
        val = err.error_args[1]
4265
        start = int(err.error_args[2])
4266
        end = int(err.error_args[3])
4267
        reason = str(err.error_args[4]) # reason must always be a string
4268
        if val.startswith('u:'):
4269
            val = val[2:].decode('utf-8')
4270
        elif val.startswith('s:'):
4271
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
4272
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4273
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
4274
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
4275
            raise UnicodeEncodeError(encoding, val, start, end, reason)
6284.1.1 by Jelmer Vernooij
Allow registering custom error handlers in the HPSS client.
4276
4277
no_context_error_translators.register('UnicodeEncodeError',
4278
    _translate_unicode_error)
4279
no_context_error_translators.register('UnicodeDecodeError',
4280
    _translate_unicode_error)
4281
no_context_error_translators.register('ReadOnlyError',
4282
    lambda err: errors.TransportNotPossible('readonly transport'))
4283
no_context_error_translators.register('MemoryError',
4284
    lambda err: errors.BzrError("remote server out of memory\n"
4285
        "Retry non-remotely, or contact the server admin for details."))
6280.10.28 by Jelmer Vernooij
merge bzr.dev.
4286
no_context_error_translators.register('RevisionNotPresent',
4287
    lambda err: errors.RevisionNotPresent(err.error_args[0], err.error_args[1]))
4288
6280.7.13 by Jelmer Vernooij
Merge bzr.dev.
4289
no_context_error_translators.register('BzrCheckError',
4290
    lambda err: errors.BzrCheckError(msg=err.error_args[0]))
4291