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