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