/brz/remove-bazaar

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