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