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