/brz/remove-bazaar

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