/brz/remove-bazaar

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