~bzr-pqm/bzr/bzr.dev

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