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