/brz/remove-bazaar

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