/brz/remove-bazaar

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