/brz/remove-bazaar

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