/brz/remove-bazaar

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