~bzr-pqm/bzr/bzr.dev

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