/brz/remove-bazaar

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