/brz/remove-bazaar

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