/brz/remove-bazaar

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