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