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