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