/brz/remove-bazaar

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