/brz/remove-bazaar

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