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