/brz/remove-bazaar

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