~bzr-pqm/bzr/bzr.dev

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