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