/brz/remove-bazaar

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