~bzr-pqm/bzr/bzr.dev

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