/brz/remove-bazaar

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