/brz/remove-bazaar

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