/brz/remove-bazaar

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