/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,
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
25
    debug,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
26
    errors,
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
27
    graph,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
28
    lockdir,
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
29
    pack,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
30
    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.
31
    revision,
3228.4.11 by John Arbash Meinel
Deprecations abound.
32
    symbol_versioning,
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
33
    urlutils,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
34
)
2535.4.27 by Andrew Bennetts
Remove some unused imports.
35
from bzrlib.branch import BranchReferenceFormat
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
36
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
37
from bzrlib.decorators import needs_read_lock, needs_write_lock
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
38
from bzrlib.errors import (
39
    NoSuchRevision,
40
    SmartProtocolError,
41
    )
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
42
from bzrlib.lockable_files import LockableFiles
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
43
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'.
44
from bzrlib.revision import ensure_null, NULL_REVISION
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
45
from bzrlib.trace import mutter, note, warning
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
46
from bzrlib.util import bencode
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
47
3445.1.5 by John Arbash Meinel
allow passing a 'graph' object into Branch.update_revisions.
48
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
49
class _RpcHelper(object):
50
    """Mixin class that helps with issuing RPCs."""
51
52
    def _call(self, method, *args, **err_context):
53
        try:
54
            return self._client.call(method, *args)
55
        except errors.ErrorFromSmartServer, err:
56
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
57
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
58
    def _call_expecting_body(self, method, *args, **err_context):
59
        try:
60
            return self._client.call_expecting_body(method, *args)
61
        except errors.ErrorFromSmartServer, err:
62
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
63
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
64
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
65
                                             **err_context):
66
        try:
67
            return self._client.call_with_body_bytes_expecting_body(
68
                method, args, body_bytes)
69
        except errors.ErrorFromSmartServer, err:
70
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
71
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
72
73
def response_tuple_to_repo_format(response):
74
    """Convert a response tuple describing a repository format to a format."""
75
    format = RemoteRepositoryFormat()
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
76
    format._rich_root_data = (response[0] == 'yes')
77
    format._supports_tree_reference = (response[1] == 'yes')
78
    format._supports_external_lookups = (response[2] == 'yes')
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
79
    format._network_name = response[3]
80
    return format
81
82
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
83
# Note: RemoteBzrDirFormat is in bzrdir.py
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
84
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
85
class RemoteBzrDir(BzrDir, _RpcHelper):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
86
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
87
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
88
    def __init__(self, transport, format, _client=None):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
89
        """Construct a RemoteBzrDir.
90
91
        :param _client: Private parameter for testing. Disables probing and the
92
            use of a real bzrdir.
93
        """
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
94
        BzrDir.__init__(self, transport, format)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
95
        # this object holds a delegated bzrdir that uses file-level operations
96
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
97
        self._real_bzrdir = None
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
98
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
99
        # create_branch for details.
100
        self._next_open_branch_result = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
101
102
        if _client is None:
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
103
            medium = transport.get_smart_medium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
104
            self._client = client._SmartClient(medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
105
        else:
106
            self._client = _client
107
            return
108
109
        path = self._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
110
        response = self._call('BzrDir.open', path)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
111
        if response not in [('yes',), ('no',)]:
112
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.26 by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
113
        if response == ('no',):
114
            raise errors.NotBranchError(path=transport.base)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
115
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
116
    def _ensure_real(self):
117
        """Ensure that there is a _real_bzrdir set.
118
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
119
        Used before calls to self._real_bzrdir.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
120
        """
121
        if not self._real_bzrdir:
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
122
            self._real_bzrdir = BzrDir.open_from_transport(
123
                self.root_transport, _server_formats=False)
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
124
            self._format._network_name = \
125
                self._real_bzrdir._format.network_name()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
126
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
127
    def _translate_error(self, err, **context):
128
        _translate_error(err, bzrdir=self, **context)
129
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
130
    def break_lock(self):
131
        # Prevent aliasing problems in the next_open_branch_result cache.
132
        # See create_branch for rationale.
133
        self._next_open_branch_result = None
134
        return BzrDir.break_lock(self)
135
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
136
    def _vfs_cloning_metadir(self, require_stacking=False):
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
137
        self._ensure_real()
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
138
        return self._real_bzrdir.cloning_metadir(
139
            require_stacking=require_stacking)
140
141
    def cloning_metadir(self, require_stacking=False):
142
        medium = self._client._medium
143
        if medium._is_remote_before((1, 13)):
144
            return self._vfs_cloning_metadir(require_stacking=require_stacking)
145
        verb = 'BzrDir.cloning_metadir'
146
        if require_stacking:
147
            stacking = 'True'
148
        else:
149
            stacking = 'False'
150
        path = self._path_for_remote_call(self._client)
151
        try:
152
            response = self._call(verb, path, stacking)
153
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
154
            medium._remember_remote_is_before((1, 13))
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
155
            return self._vfs_cloning_metadir(require_stacking=require_stacking)
4160.2.9 by Andrew Bennetts
Fix BzrDir.cloning_metadir RPC to fail on branch references, and make
156
        except errors.UnknownErrorFromSmartServer, err:
157
            if err.error_tuple != ('BranchReference',):
158
                raise
159
            # We need to resolve the branch reference to determine the
160
            # cloning_metadir.  This causes unnecessary RPCs to open the
161
            # referenced branch (and bzrdir, etc) but only when the caller
162
            # didn't already resolve the branch reference.
163
            referenced_branch = self.open_branch()
164
            return referenced_branch.bzrdir.cloning_metadir()
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
165
        if len(response) != 3:
166
            raise errors.UnexpectedSmartServerResponse(response)
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
167
        control_name, repo_name, branch_info = response
168
        if len(branch_info) != 2:
169
            raise errors.UnexpectedSmartServerResponse(response)
170
        branch_ref, branch_name = branch_info
4075.2.1 by Robert Collins
Audit and make sure we are registering network_name's as factories, not instances.
171
        format = bzrdir.network_format_registry.get(control_name)
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
172
        if repo_name:
173
            format.repository_format = repository.network_format_registry.get(
174
                repo_name)
4084.2.2 by Robert Collins
Review feedback.
175
        if branch_ref == 'ref':
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
176
            # XXX: we need possible_transports here to avoid reopening the
4070.7.5 by Andrew Bennetts
Tweak comment.
177
            # connection to the referenced location
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
178
            ref_bzrdir = BzrDir.open(branch_name)
179
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
180
            format.set_branch_format(branch_format)
4084.2.2 by Robert Collins
Review feedback.
181
        elif branch_ref == 'branch':
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
182
            if branch_name:
183
                format.set_branch_format(
184
                    branch.network_format_registry.get(branch_name))
185
        else:
186
            raise errors.UnexpectedSmartServerResponse(response)
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
187
        return format
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
188
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
189
    def create_repository(self, shared=False):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
190
        # as per meta1 formats - just delegate to the format object which may
191
        # be parameterised.
192
        result = self._format.repository_format.initialize(self, shared)
193
        if not isinstance(result, RemoteRepository):
194
            return self.open_repository()
195
        else:
196
            return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
197
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
198
    def destroy_repository(self):
199
        """See BzrDir.destroy_repository"""
200
        self._ensure_real()
201
        self._real_bzrdir.destroy_repository()
202
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
203
    def create_branch(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
204
        # as per meta1 formats - just delegate to the format object which may
205
        # be parameterised.
206
        real_branch = self._format.get_branch_format().initialize(self)
207
        if not isinstance(real_branch, RemoteBranch):
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
208
            result = RemoteBranch(self, self.find_repository(), real_branch)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
209
        else:
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
210
            result = real_branch
211
        # BzrDir.clone_on_transport() uses the result of create_branch but does
212
        # not return it to its callers; we save approximately 8% of our round
213
        # trips by handing the branch we created back to the first caller to
214
        # open_branch rather than probing anew. Long term we need a API in
215
        # bzrdir that doesn't discard result objects (like result_branch).
216
        # RBC 20090225
217
        self._next_open_branch_result = result
218
        return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
219
2796.2.6 by Aaron Bentley
Implement destroy_branch
220
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
221
        """See BzrDir.destroy_branch"""
2796.2.6 by Aaron Bentley
Implement destroy_branch
222
        self._ensure_real()
223
        self._real_bzrdir.destroy_branch()
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
224
        self._next_open_branch_result = None
2796.2.6 by Aaron Bentley
Implement destroy_branch
225
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
226
    def create_workingtree(self, revision_id=None, from_branch=None):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
227
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
228
2018.5.124 by Robert Collins
Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
229
    def find_branch_format(self):
230
        """Find the branch 'format' for this bzrdir.
231
232
        This might be a synthetic object for e.g. RemoteBranch and SVN.
233
        """
234
        b = self.open_branch()
235
        return b._format
236
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
237
    def get_branch_reference(self):
238
        """See BzrDir.get_branch_reference()."""
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
239
        response = self._get_branch_reference()
240
        if response[0] == 'ref':
241
            return response[1]
242
        else:
243
            return None
244
245
    def _get_branch_reference(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
246
        path = self._path_for_remote_call(self._client)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
247
        medium = self._client._medium
248
        if not medium._is_remote_before((1, 13)):
249
            try:
250
                response = self._call('BzrDir.open_branchV2', path)
251
                if response[0] not in ('ref', 'branch'):
252
                    raise errors.UnexpectedSmartServerResponse(response)
253
                return response
254
            except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
255
                medium._remember_remote_is_before((1, 13))
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
256
        response = self._call('BzrDir.open_branch', path)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
257
        if response[0] != 'ok':
258
            raise errors.UnexpectedSmartServerResponse(response)
259
        if response[1] != '':
260
            return ('ref', response[1])
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
261
        else:
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
262
            return ('branch', '')
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
263
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
264
    def _get_tree_branch(self):
265
        """See BzrDir._get_tree_branch()."""
266
        return None, self.open_branch()
267
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
268
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
269
        if _unsupported:
270
            raise NotImplementedError('unsupported flag support not implemented yet.')
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
271
        if self._next_open_branch_result is not None:
272
            # See create_branch for details.
273
            result = self._next_open_branch_result
274
            self._next_open_branch_result = None
275
            return result
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
276
        response = self._get_branch_reference()
277
        if response[0] == 'ref':
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
278
            # a branch reference, use the existing BranchReference logic.
279
            format = BranchReferenceFormat()
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
280
            return format.open(self, _found=True, location=response[1],
281
                ignore_fallbacks=ignore_fallbacks)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
282
        branch_format_name = response[1]
283
        if not branch_format_name:
284
            branch_format_name = None
285
        format = RemoteBranchFormat(network_name=branch_format_name)
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
286
        return RemoteBranch(self, self.find_repository(), format=format,
287
            setup_stacking=not ignore_fallbacks)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
289
    def _open_repo_v1(self, path):
290
        verb = 'BzrDir.find_repository'
291
        response = self._call(verb, path)
292
        if response[0] != 'ok':
293
            raise errors.UnexpectedSmartServerResponse(response)
294
        # servers that only support the v1 method don't support external
295
        # references either.
296
        self._ensure_real()
297
        repo = self._real_bzrdir.open_repository()
298
        response = response + ('no', repo._format.network_name())
299
        return response, repo
300
301
    def _open_repo_v2(self, path):
302
        verb = 'BzrDir.find_repositoryV2'
303
        response = self._call(verb, path)
304
        if response[0] != 'ok':
305
            raise errors.UnexpectedSmartServerResponse(response)
306
        self._ensure_real()
307
        repo = self._real_bzrdir.open_repository()
308
        response = response + (repo._format.network_name(),)
309
        return response, repo
310
311
    def _open_repo_v3(self, path):
312
        verb = 'BzrDir.find_repositoryV3'
4053.1.2 by Robert Collins
Actually make this branch work.
313
        medium = self._client._medium
314
        if medium._is_remote_before((1, 13)):
315
            raise errors.UnknownSmartMethod(verb)
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
316
        try:
317
            response = self._call(verb, path)
318
        except errors.UnknownSmartMethod:
319
            medium._remember_remote_is_before((1, 13))
320
            raise
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
321
        if response[0] != 'ok':
322
            raise errors.UnexpectedSmartServerResponse(response)
323
        return response, None
324
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
325
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
326
        path = self._path_for_remote_call(self._client)
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
327
        response = None
328
        for probe in [self._open_repo_v3, self._open_repo_v2,
329
            self._open_repo_v1]:
330
            try:
331
                response, real_repo = probe(path)
332
                break
333
            except errors.UnknownSmartMethod:
334
                pass
335
        if response is None:
336
            raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
337
        if response[0] != 'ok':
338
            raise errors.UnexpectedSmartServerResponse(response)
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
339
        if len(response) != 6:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
340
            raise SmartProtocolError('incorrect response length %s' % (response,))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
341
        if response[1] == '':
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
342
            # repo is at this dir.
343
            format = response_tuple_to_repo_format(response[2:])
3221.15.10 by Robert Collins
Add test that we can stack on a smart server from Jonathan Lange.
344
            # Used to support creating a real format instance when needed.
345
            format._creating_bzrdir = self
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
346
            remote_repo = RemoteRepository(self, format)
347
            format._creating_repo = remote_repo
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
348
            if real_repo is not None:
349
                remote_repo._set_real_repository(real_repo)
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
350
            return remote_repo
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
351
        else:
352
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
353
2018.5.138 by Robert Collins
Merge bzr.dev.
354
    def open_workingtree(self, recommend_upgrade=True):
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
355
        self._ensure_real()
356
        if self._real_bzrdir.has_workingtree():
357
            raise errors.NotLocalUrl(self.root_transport)
358
        else:
359
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
360
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
361
    def _path_for_remote_call(self, client):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
362
        """Return the path to be used for this bzrdir in a remote call."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
363
        return client.remote_path_from_transport(self.root_transport)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
364
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
365
    def get_branch_transport(self, branch_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
366
        self._ensure_real()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
367
        return self._real_bzrdir.get_branch_transport(branch_format)
368
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
369
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
370
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
371
        return self._real_bzrdir.get_repository_transport(repository_format)
372
373
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
374
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
375
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
376
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
377
    def can_convert_format(self):
378
        """Upgrading of remote bzrdirs is not supported yet."""
379
        return False
380
381
    def needs_format_conversion(self, format=None):
382
        """Upgrading of remote bzrdirs is not supported yet."""
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
383
        if format is None:
384
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
385
                % 'needs_format_conversion(format=None)')
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
386
        return False
387
3242.3.37 by Aaron Bentley
Updates from reviews
388
    def clone(self, url, revision_id=None, force_new_repo=False,
389
              preserve_stacking=False):
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
390
        self._ensure_real()
391
        return self._real_bzrdir.clone(url, revision_id=revision_id,
3242.3.37 by Aaron Bentley
Updates from reviews
392
            force_new_repo=force_new_repo, preserve_stacking=preserve_stacking)
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
393
3567.1.3 by Michael Hudson
fix problem
394
    def get_config(self):
395
        self._ensure_real()
396
        return self._real_bzrdir.get_config()
397
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
398
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
399
class RemoteRepositoryFormat(repository.RepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
400
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
401
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
402
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
403
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
404
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
405
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
406
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
407
    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.
408
    on a per instance basis, and are not set (and should not be) at
409
    the class level.
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
410
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
411
    :ivar _custom_format: If set, a specific concrete repository format that
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
412
        will be used when initializing a repository with this
413
        RemoteRepositoryFormat.
414
    :ivar _creating_repo: If set, the repository object that this
415
        RemoteRepositoryFormat was created for: it can be called into
3990.5.4 by Robert Collins
Review feedback.
416
        to obtain data like the network name.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
417
    """
418
3543.1.2 by Michael Hudson
the two character fix
419
    _matchingbzrdir = RemoteBzrDirFormat()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
420
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.
421
    def __init__(self):
422
        repository.RepositoryFormat.__init__(self)
423
        self._custom_format = None
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
424
        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.
425
        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.
426
        self._supports_external_lookups = None
427
        self._supports_tree_reference = None
428
        self._rich_root_data = None
429
430
    @property
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
431
    def fast_deltas(self):
432
        self._ensure_real()
433
        return self._custom_format.fast_deltas
434
435
    @property
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
436
    def rich_root_data(self):
437
        if self._rich_root_data is None:
438
            self._ensure_real()
439
            self._rich_root_data = self._custom_format.rich_root_data
440
        return self._rich_root_data
441
442
    @property
443
    def supports_external_lookups(self):
444
        if self._supports_external_lookups is None:
445
            self._ensure_real()
446
            self._supports_external_lookups = \
4104.4.2 by Robert Collins
Fix test_source for 1.13 landing.
447
                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.
448
        return self._supports_external_lookups
449
450
    @property
451
    def supports_tree_reference(self):
452
        if self._supports_tree_reference is None:
453
            self._ensure_real()
454
            self._supports_tree_reference = \
455
                self._custom_format.supports_tree_reference
456
        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.
457
458
    def _vfs_initialize(self, a_bzrdir, shared):
459
        """Helper for common code in initialize."""
460
        if self._custom_format:
461
            # Custom format requested
462
            result = self._custom_format.initialize(a_bzrdir, shared=shared)
463
        elif self._creating_bzrdir is not None:
464
            # Use the format that the repository we were created to back
465
            # has.
466
            prior_repo = self._creating_bzrdir.open_repository()
467
            prior_repo._ensure_real()
468
            result = prior_repo._real_repository._format.initialize(
469
                a_bzrdir, shared=shared)
470
        else:
471
            # assume that a_bzr is a RemoteBzrDir but the smart server didn't
472
            # support remote initialization.
473
            # We delegate to a real object at this point (as RemoteBzrDir
474
            # delegate to the repository format which would lead to infinite
475
            # recursion if we just called a_bzrdir.create_repository.
476
            a_bzrdir._ensure_real()
477
            result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
478
        if not isinstance(result, RemoteRepository):
479
            return self.open(a_bzrdir)
480
        else:
481
            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.
482
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
483
    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.
484
        # Being asked to create on a non RemoteBzrDir:
485
        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.
486
            return self._vfs_initialize(a_bzrdir, shared)
487
        medium = a_bzrdir._client._medium
488
        if medium._is_remote_before((1, 13)):
489
            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.
490
        # Creating on a remote bzr dir.
491
        # 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.
492
        if self._custom_format:
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
493
            network_name = self._custom_format.network_name()
494
        else:
495
            # Select the current bzrlib default and ask for that.
496
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
497
            reference_format = reference_bzrdir_format.repository_format
498
            network_name = reference_format.network_name()
499
        # 2) try direct creation via RPC
500
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
501
        verb = 'BzrDir.create_repository'
502
        if shared:
503
            shared_str = 'True'
504
        else:
505
            shared_str = 'False'
506
        try:
507
            response = a_bzrdir._call(verb, path, network_name, shared_str)
508
        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.
509
            # Fallback - use vfs methods
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
510
            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.
511
            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.
512
        else:
513
            # 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.
514
            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.
515
            # Used to support creating a real format instance when needed.
516
            format._creating_bzrdir = a_bzrdir
517
            remote_repo = RemoteRepository(a_bzrdir, format)
518
            format._creating_repo = remote_repo
519
            return remote_repo
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
520
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
521
    def open(self, a_bzrdir):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
522
        if not isinstance(a_bzrdir, RemoteBzrDir):
523
            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.
524
        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.
525
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
526
    def _ensure_real(self):
527
        if self._custom_format is None:
528
            self._custom_format = repository.network_format_registry.get(
529
                self._network_name)
530
531
    @property
532
    def _fetch_order(self):
533
        self._ensure_real()
534
        return self._custom_format._fetch_order
535
536
    @property
537
    def _fetch_uses_deltas(self):
538
        self._ensure_real()
539
        return self._custom_format._fetch_uses_deltas
540
541
    @property
542
    def _fetch_reconcile(self):
543
        self._ensure_real()
544
        return self._custom_format._fetch_reconcile
545
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
546
    def get_format_description(self):
547
        return 'bzr remote repository'
548
549
    def __eq__(self, other):
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
550
        return self.__class__ is other.__class__
1752.2.87 by Andrew Bennetts
Make tests pass.
551
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
552
    def check_conversion_target(self, target_format):
553
        if self.rich_root_data and not target_format.rich_root_data:
554
            raise errors.BadConversionTarget(
555
                'Does not support rich root data.', target_format)
2018.5.138 by Robert Collins
Merge bzr.dev.
556
        if (self.supports_tree_reference and
557
            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.
558
            raise errors.BadConversionTarget(
559
                '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.
560
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
561
    def network_name(self):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
562
        if self._network_name:
563
            return self._network_name
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
564
        self._creating_repo._ensure_real()
565
        return self._creating_repo._real_repository._format.network_name()
566
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)
567
    @property
568
    def _serializer(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
569
        self._ensure_real()
570
        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)
571
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
572
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
573
class RemoteRepository(_RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
574
    """Repository accessed over rpc.
575
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
576
    For the moment most operations are performed using local transport-backed
577
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
578
    """
579
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
580
    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.
581
        """Create a RemoteRepository instance.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
582
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
583
        :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.
584
        :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.
585
        :param real_repository: If not None, a local implementation of the
586
            repository logic for the repository, usually accessing the data
587
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
588
        :param _client: Private testing parameter - override the smart client
589
            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.
590
        """
591
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
592
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
593
        else:
594
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
595
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
596
        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.
597
            self._client = remote_bzrdir._client
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
598
        else:
599
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
600
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
601
        self._lock_mode = None
602
        self._lock_token = None
603
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
604
        self._leave_lock = False
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
605
        self._unstacked_provider = graph.CachingParentsProvider(
3896.1.1 by Andrew Bennetts
Remove broken debugging cruft, and some unused imports.
606
            get_parent_map=self._get_parent_map_rpc)
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
607
        self._unstacked_provider.disable_cache()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
608
        # For tests:
609
        # These depend on the actual remote format, so force them off for
610
        # maximum compatibility. XXX: In future these should depend on the
611
        # remote repository instance, but this is irrelevant until we perform
612
        # 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.
613
        self._reconcile_does_inventory_gc = False
614
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
615
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
616
        self.base = self.bzrdir.transport.base
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
617
        # Additional places to query for data.
618
        self._fallback_repositories = []
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
619
620
    def __str__(self):
621
        return "%s(%s)" % (self.__class__.__name__, self.base)
622
623
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
624
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
625
    def abort_write_group(self, suppress_errors=False):
2617.6.7 by Robert Collins
More review feedback.
626
        """Complete a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
627
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
628
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
629
        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.
630
        for older plugins that don't use e.g. the CommitBuilder
631
        facility.
3825.4.6 by Andrew Bennetts
Document the suppress_errors flag in the docstring.
632
633
        :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.
634
        """
635
        self._ensure_real()
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
636
        return self._real_repository.abort_write_group(
637
            suppress_errors=suppress_errors)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
638
3735.2.1 by Robert Collins
Add the concept of CHK lookups to Repository.
639
    @property
640
    def chk_bytes(self):
641
        """Decorate the real repository for now.
642
643
        In the long term a full blown network facility is needed to avoid
644
        creating a real repository object locally.
645
        """
646
        self._ensure_real()
647
        return self._real_repository.chk_bytes
648
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
649
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
650
        """Complete a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
651
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
652
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
653
        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.
654
        for older plugins that don't use e.g. the CommitBuilder
655
        facility.
656
        """
657
        self._ensure_real()
658
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
659
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
660
    def resume_write_group(self, tokens):
661
        self._ensure_real()
662
        return self._real_repository.resume_write_group(tokens)
663
664
    def suspend_write_group(self):
665
        self._ensure_real()
666
        return self._real_repository.suspend_write_group()
667
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
668
    def _ensure_real(self):
669
        """Ensure that there is a _real_repository set.
670
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
671
        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.
672
673
        Note that _ensure_real causes many roundtrips to the server which are
674
        not desirable, and prevents the use of smart one-roundtrip RPC's to
675
        perform complex operations (such as accessing parent data, streaming
676
        revisions etc). Adding calls to _ensure_real should only be done when
677
        bringing up new functionality, adding fallbacks for smart methods that
678
        require a fallback path, and never to replace an existing smart method
679
        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.
680
        """
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.
681
        if self._real_repository is None:
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
682
            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.
683
            self._set_real_repository(
684
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
685
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
686
    def _translate_error(self, err, **context):
687
        self.bzrdir._translate_error(err, repository=self, **context)
688
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
689
    def find_text_key_references(self):
690
        """Find the text key references within the repository.
691
692
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
693
        revision_ids. Each altered file-ids has the exact revision_ids that
694
        altered it listed explicitly.
695
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
696
            to whether they were referred to by the inventory of the
697
            revision_id that they contain. The inventory texts from all present
698
            revision ids are assessed to generate this report.
699
        """
700
        self._ensure_real()
701
        return self._real_repository.find_text_key_references()
702
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
703
    def _generate_text_key_index(self):
704
        """Generate a new text key index for the repository.
705
706
        This is an expensive function that will take considerable time to run.
707
708
        :return: A dict mapping (file_id, revision_id) tuples to a list of
709
            parents, also (file_id, revision_id) tuples.
710
        """
711
        self._ensure_real()
712
        return self._real_repository._generate_text_key_index()
713
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
714
    def _get_revision_graph(self, revision_id):
715
        """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)
716
        if revision_id is None:
717
            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.
718
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
719
            return {}
720
721
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
722
        response = self._call_expecting_body(
723
            '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.
724
        response_tuple, response_handler = response
725
        if response_tuple[0] != 'ok':
726
            raise errors.UnexpectedSmartServerResponse(response_tuple)
727
        coded = response_handler.read_body_bytes()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
728
        if coded == '':
729
            # no revisions in this repository!
730
            return {}
731
        lines = coded.split('\n')
732
        revision_graph = {}
733
        for line in lines:
734
            d = tuple(line.split())
735
            revision_graph[d[0]] = d[1:]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
736
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
737
        return revision_graph
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
738
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)
739
    def _get_sink(self):
740
        """See Repository._get_sink()."""
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
741
        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)
742
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
743
    def _get_source(self, to_format):
744
        """Return a source for streaming from this repository."""
745
        return RemoteStreamSource(self, to_format)
746
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
747
    def has_revision(self, revision_id):
748
        """See Repository.has_revision()."""
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
749
        if revision_id == NULL_REVISION:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
750
            # The null revision is always present.
751
            return True
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
752
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
753
        response = self._call('Repository.has_revision', path, revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
754
        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.
755
            raise errors.UnexpectedSmartServerResponse(response)
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
756
        if response[0] == 'yes':
757
            return True
758
        for fallback_repo in self._fallback_repositories:
759
            if fallback_repo.has_revision(revision_id):
760
                return True
761
        return False
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
762
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
763
    def has_revisions(self, revision_ids):
764
        """See Repository.has_revisions()."""
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
765
        # FIXME: This does many roundtrips, particularly when there are
766
        # fallback repositories.  -- mbp 20080905
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
767
        result = set()
768
        for revision_id in revision_ids:
769
            if self.has_revision(revision_id):
770
                result.add(revision_id)
771
        return result
772
2617.6.9 by Robert Collins
Merge bzr.dev.
773
    def has_same_location(self, other):
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
774
        return (self.__class__ is other.__class__ and
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
775
                self.bzrdir.transport.base == other.bzrdir.transport.base)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
776
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
777
    def get_graph(self, other_repository=None):
778
        """Return the graph for this repository format"""
3835.1.17 by Aaron Bentley
Fix stacking bug
779
        parents_provider = self._make_parents_provider(other_repository)
3441.5.24 by Andrew Bennetts
Remove RemoteGraph experiment.
780
        return graph.Graph(parents_provider)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
781
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
782
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
783
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
784
        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.
785
        # revid can be None to indicate no revisions, not just NULL_REVISION
786
        if revid is None or revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
787
            fmt_revid = ''
788
        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.
789
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
790
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
791
            fmt_committers = 'no'
792
        else:
793
            fmt_committers = 'yes'
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
794
        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.
795
            '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.
796
        if response_tuple[0] != 'ok':
797
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
798
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
799
        body = response_handler.read_body_bytes()
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
800
        result = {}
801
        for line in body.split('\n'):
802
            if not line:
803
                continue
804
            key, val_text = line.split(':')
805
            if key in ('revisions', 'size', 'committers'):
806
                result[key] = int(val_text)
807
            elif key in ('firstrev', 'latestrev'):
808
                values = val_text.split(' ')[1:]
809
                result[key] = (float(values[0]), long(values[1]))
810
811
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
812
3140.1.2 by Aaron Bentley
Add ability to find branches inside repositories
813
    def find_branches(self, using=False):
814
        """See Repository.find_branches()."""
815
        # should be an API call to the server.
816
        self._ensure_real()
817
        return self._real_repository.find_branches(using=using)
818
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
819
    def get_physical_lock_status(self):
820
        """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.
821
        # should be an API call to the server.
822
        self._ensure_real()
823
        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.
824
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
825
    def is_in_write_group(self):
826
        """Return True if there is an open write group.
827
828
        write groups are only applicable locally for the smart server..
829
        """
830
        if self._real_repository:
831
            return self._real_repository.is_in_write_group()
832
833
    def is_locked(self):
834
        return self._lock_count >= 1
835
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
836
    def is_shared(self):
837
        """See Repository.is_shared()."""
838
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
839
        response = self._call('Repository.is_shared', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
840
        if response[0] not in ('yes', 'no'):
841
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
842
        return response[0] == 'yes'
843
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
844
    def is_write_locked(self):
845
        return self._lock_mode == 'w'
846
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
847
    def lock_read(self):
848
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
849
        if not self._lock_mode:
850
            self._lock_mode = 'r'
851
            self._lock_count = 1
4190.1.1 by Robert Collins
Negatively cache misses during read-locks in RemoteRepository.
852
            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
853
            if self._real_repository is not None:
854
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
855
        else:
856
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
857
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
858
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
859
        path = self.bzrdir._path_for_remote_call(self._client)
860
        if token is None:
861
            token = ''
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
862
        err_context = {'token': token}
863
        response = self._call('Repository.lock_write', path, token,
864
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
865
        if response[0] == 'ok':
866
            ok, token = response
867
            return token
868
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
869
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
870
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
871
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
872
        if not self._lock_mode:
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
873
            if _skip_rpc:
874
                if self._lock_token is not None:
875
                    if token != self._lock_token:
3695.1.1 by Andrew Bennetts
Remove some unused imports and fix a couple of trivially broken raise statements.
876
                        raise errors.TokenMismatch(token, self._lock_token)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
877
                self._lock_token = token
878
            else:
879
                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.
880
            # if self._lock_token is None, then this is something like packs or
881
            # svn where we don't get to lock the repo, or a weave style repository
882
            # where we cannot lock it over the wire and attempts to do so will
883
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
884
            if self._real_repository is not None:
885
                self._real_repository.lock_write(token=self._lock_token)
886
            if token is not None:
887
                self._leave_lock = True
888
            else:
889
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
890
            self._lock_mode = 'w'
891
            self._lock_count = 1
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
892
            self._unstacked_provider.enable_cache(cache_misses=False)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
893
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
894
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
895
        else:
896
            self._lock_count += 1
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
897
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
898
899
    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.
900
        if not self._lock_token:
901
            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
902
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
903
904
    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.
905
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
906
            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
907
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
908
909
    def _set_real_repository(self, repository):
910
        """Set the _real_repository for this repository.
911
912
        :param repository: The repository to fallback to for non-hpss
913
            implemented operations.
914
        """
4053.1.5 by Robert Collins
Review feedback on RemoteRepository._set_real_revision.
915
        if self._real_repository is not None:
916
            # Replacing an already set real repository.
917
            # We cannot do this [currently] if the repository is locked -
918
            # synchronised state might be lost.
919
            if self.is_locked():
920
                raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
921
        if isinstance(repository, RemoteRepository):
922
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
923
        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.
924
        # If the _real_repository has _fallback_repositories, clear them out,
925
        # because we want it to have the same set as this repository.  This is
926
        # reasonable to do because the fallbacks we clear here are from a
927
        # "real" branch, and we're about to replace them with the equivalents
928
        # from a RemoteBranch.
929
        self._real_repository._fallback_repositories = []
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
930
        for fb in self._fallback_repositories:
931
            self._real_repository.add_fallback_repository(fb)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
932
        if self._lock_mode == 'w':
933
            # if we are already locked, the real repository must be able to
934
            # acquire the lock with our token.
935
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
936
        elif self._lock_mode == 'r':
937
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
938
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
939
    def start_write_group(self):
940
        """Start a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
941
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
942
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
943
        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``
944
        for older plugins that don't use e.g. the CommitBuilder
945
        facility.
946
        """
947
        self._ensure_real()
948
        return self._real_repository.start_write_group()
949
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
950
    def _unlock(self, token):
951
        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.
952
        if not token:
953
            # with no token the remote repository is not persistently locked.
954
            return
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
955
        err_context = {'token': token}
956
        response = self._call('Repository.unlock', path, token,
957
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
958
        if response == ('ok',):
959
            return
960
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
961
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
962
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
963
    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.
964
        if not self._lock_count:
965
            raise errors.LockNotHeld(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
966
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
967
        if self._lock_count > 0:
968
            return
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
969
        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.
970
        old_mode = self._lock_mode
971
        self._lock_mode = None
972
        try:
973
            # The real repository is responsible at present for raising an
974
            # exception if it's in an unfinished write group.  However, it
975
            # normally will *not* actually remove the lock from disk - that's
976
            # done by the server on receiving the Repository.unlock call.
977
            # 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
978
            if self._real_repository is not None:
979
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
980
        finally:
981
            # The rpc-level lock should be released even if there was a
982
            # problem releasing the vfs-based lock.
983
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
984
                # Only write-locked repositories need to make a remote method
985
                # 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.
986
                old_token = self._lock_token
987
                self._lock_token = None
988
                if not self._leave_lock:
989
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
990
991
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
992
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
993
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
994
        return self._real_repository.break_lock()
995
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
996
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
997
        """Return a TemporaryFile containing a repository tarball.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
998
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
999
        Returns None if the server does not support sending tarballs.
1000
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1001
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1002
        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.
1003
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1004
            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.
1005
                'Repository.tarball', path, compression)
1006
        except errors.UnknownSmartMethod:
1007
            protocol.cancel_read_body()
1008
            return None
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1009
        if response[0] == 'ok':
1010
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1011
            t = tempfile.NamedTemporaryFile()
1012
            # TODO: rpc layer should read directly into it...
1013
            t.write(protocol.read_body_bytes())
1014
            t.seek(0)
1015
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
1016
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1017
2440.1.1 by Martin Pool
Add new Repository.sprout,
1018
    def sprout(self, to_bzrdir, revision_id=None):
1019
        # 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.
1020
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
1021
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
1022
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
1023
        dest_repo.fetch(self, revision_id=revision_id)
1024
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
1025
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1026
    ### These methods are just thin shims to the VFS object for now.
1027
1028
    def revision_tree(self, revision_id):
1029
        self._ensure_real()
1030
        return self._real_repository.revision_tree(revision_id)
1031
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1032
    def get_serializer_format(self):
1033
        self._ensure_real()
1034
        return self._real_repository.get_serializer_format()
1035
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1036
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1037
                           timezone=None, committer=None, revprops=None,
1038
                           revision_id=None):
1039
        # FIXME: It ought to be possible to call this without immediately
1040
        # triggering _ensure_real.  For now it's the easiest thing to do.
1041
        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.
1042
        real_repo = self._real_repository
1043
        builder = real_repo.get_commit_builder(branch, parents,
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1044
                config, timestamp=timestamp, timezone=timezone,
1045
                committer=committer, revprops=revprops, revision_id=revision_id)
1046
        return builder
1047
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1048
    def add_fallback_repository(self, repository):
1049
        """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
1050
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1051
        :param repository: A repository.
1052
        """
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
1053
        if not self._format.supports_external_lookups:
1054
            raise errors.UnstackableRepositoryFormat(
1055
                self._format.network_name(), self.base)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1056
        # We need to accumulate additional repositories here, to pass them in
1057
        # on various RPC's.
4035.2.3 by Robert Collins
Fix trailing whitespace.
1058
        #
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1059
        self._fallback_repositories.append(repository)
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1060
        # If self._real_repository was parameterised already (e.g. because a
1061
        # _real_branch had its get_stacked_on_url method called), then the
1062
        # 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.
1063
        if self._real_repository is not None:
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1064
            if repository not in self._real_repository._fallback_repositories:
1065
                self._real_repository.add_fallback_repository(repository)
4035.2.1 by Andrew Bennetts
Fix unnecessary get_parent_map calls after insert_stream during push.
1066
        else:
1067
            # They are also seen by the fallback repository.  If it doesn't
1068
            # exist yet they'll be added then.  This implicitly copies them.
1069
            self._ensure_real()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1070
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1071
    def add_inventory(self, revid, inv, parents):
1072
        self._ensure_real()
1073
        return self._real_repository.add_inventory(revid, inv, parents)
1074
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1075
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1076
                               parents):
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
1077
        self._ensure_real()
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1078
        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.
1079
            delta, new_revision_id, parents)
1080
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1081
    def add_revision(self, rev_id, rev, inv=None, config=None):
1082
        self._ensure_real()
1083
        return self._real_repository.add_revision(
1084
            rev_id, rev, inv=inv, config=config)
1085
1086
    @needs_read_lock
1087
    def get_inventory(self, revision_id):
1088
        self._ensure_real()
1089
        return self._real_repository.get_inventory(revision_id)
1090
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
1091
    def iter_inventories(self, revision_ids):
1092
        self._ensure_real()
1093
        return self._real_repository.iter_inventories(revision_ids)
1094
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1095
    @needs_read_lock
1096
    def get_revision(self, revision_id):
1097
        self._ensure_real()
1098
        return self._real_repository.get_revision(revision_id)
1099
1100
    def get_transaction(self):
1101
        self._ensure_real()
1102
        return self._real_repository.get_transaction()
1103
1104
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
1105
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1106
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
1107
        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.
1108
1109
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1110
        """See Repository.make_working_trees"""
1111
        self._ensure_real()
1112
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1113
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.
1114
    def refresh_data(self):
1115
        """Re-read any data needed to to synchronise with disk.
1116
1117
        This method is intended to be called after another repository instance
1118
        (such as one used by a smart server) has inserted data into the
1119
        repository. It may not be called during a write group, but may be
1120
        called at any other time.
1121
        """
1122
        if self.is_in_write_group():
1123
            raise errors.InternalBzrError(
1124
                "May not refresh_data while in a write group.")
1125
        if self._real_repository is not None:
1126
            self._real_repository.refresh_data()
1127
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1128
    def revision_ids_to_search_result(self, result_set):
1129
        """Convert a set of revision ids to a graph SearchResult."""
1130
        result_parents = set()
1131
        for parents in self.get_graph().get_parent_map(
1132
            result_set).itervalues():
1133
            result_parents.update(parents)
1134
        included_keys = result_set.intersection(result_parents)
1135
        start_keys = result_set.difference(included_keys)
1136
        exclude_keys = result_parents.difference(result_set)
1137
        result = graph.SearchResult(start_keys, exclude_keys,
1138
            len(result_set), result_set)
1139
        return result
1140
1141
    @needs_read_lock
1142
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1143
        """Return the revision ids that other has that this does not.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1144
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1145
        These are returned in topological order.
1146
1147
        revision_id: only return revision ids included by revision_id.
1148
        """
1149
        return repository.InterRepository.get(
1150
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
1151
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1152
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1153
            fetch_spec=None):
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1154
        # No base implementation to use as RemoteRepository is not a subclass
1155
        # 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.
1156
        if fetch_spec is not None and revision_id is not None:
1157
            raise AssertionError(
1158
                "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.
1159
        if self.is_in_write_group():
4145.1.3 by Robert Collins
NEWS conflicts.
1160
            raise errors.InternalBzrError(
1161
                "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.
1162
        # 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.
1163
        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
1164
            # check that last_revision is in 'from' and then return a
1165
            # no-operation.
1166
            if (revision_id is not None and
4145.1.5 by Robert Collins
More fixes from grabbing the Repository implementation of fetch for RemoteRepository.
1167
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
1168
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1169
            return 0, []
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1170
        # if there is no specific appropriate InterRepository, this will get
1171
        # the InterRepository base class, which raises an
1172
        # 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.
1173
        inter = repository.InterRepository.get(source, self)
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1174
        return inter.fetch(revision_id=revision_id, pb=pb,
1175
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1176
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
1177
    def create_bundle(self, target, base, fileobj, format=None):
1178
        self._ensure_real()
1179
        self._real_repository.create_bundle(target, base, fileobj, format)
1180
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1181
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1182
    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.
1183
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1184
        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.
1185
1186
    def fileids_altered_by_revision_ids(self, revision_ids):
1187
        self._ensure_real()
1188
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
1189
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1190
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
1191
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1192
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
1193
            revisions, revision_versions_cache)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1194
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1195
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1196
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1197
        """
1198
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1199
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1200
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1201
    def get_parent_map(self, revision_ids):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1202
        """See bzrlib.Graph.get_parent_map()."""
3835.1.5 by Aaron Bentley
Fix make_parents_provider
1203
        return self._make_parents_provider().get_parent_map(revision_ids)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1204
1205
    def _get_parent_map_rpc(self, keys):
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1206
        """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.
1207
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1208
        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.
1209
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
1210
            # 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.
1211
            # graph.
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1212
            #
1213
            # Note that this reads the whole graph, when only some keys are
1214
            # wanted.  On this old server there's no way (?) to get them all
1215
            # in one go, and the user probably will have seen a warning about
1216
            # the server being old anyhow.
1217
            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
1218
            # There is an api discrepency between get_parent_map and
1219
            # get_revision_graph. Specifically, a "key:()" pair in
1220
            # get_revision_graph just means a node has no parents. For
1221
            # "get_parent_map" it means the node is a ghost. So fix up the
1222
            # graph to correct this.
1223
            #   https://bugs.launchpad.net/bzr/+bug/214894
1224
            # There is one other "bug" which is that ghosts in
1225
            # get_revision_graph() are not returned at all. But we won't worry
1226
            # about that for now.
1227
            for node_id, parent_ids in rg.iteritems():
1228
                if parent_ids == ():
1229
                    rg[node_id] = (NULL_REVISION,)
1230
            rg[NULL_REVISION] = ()
1231
            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.
1232
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1233
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
1234
        if None in keys:
1235
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1236
        if NULL_REVISION in keys:
1237
            keys.discard(NULL_REVISION)
1238
            found_parents = {NULL_REVISION:()}
1239
            if not keys:
1240
                return found_parents
1241
        else:
1242
            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.
1243
        # TODO(Needs analysis): We could assume that the keys being requested
1244
        # from get_parent_map are in a breadth first search, so typically they
1245
        # will all be depth N from some common parent, and we don't have to
1246
        # have the server iterate from the root parent, but rather from the
1247
        # keys we're searching; and just tell the server the keyspace we
1248
        # already have; but this may be more traffic again.
1249
1250
        # Transform self._parents_map into a search request recipe.
1251
        # TODO: Manage this incrementally to avoid covering the same path
1252
        # repeatedly. (The server will have to on each request, but the less
1253
        # work done the better).
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1254
        #
1255
        # Negative caching notes:
1256
        # new server sends missing when a request including the revid
1257
        # 'include-missing:' is present in the request.
1258
        # missing keys are serialised as missing:X, and we then call
1259
        # provider.note_missing(X) for-all X
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1260
        parents_map = self._unstacked_provider.get_cached_map()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1261
        if parents_map is None:
1262
            # Repository is not locked, so there's no cache.
1263
            parents_map = {}
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1264
        # start_set is all the keys in the cache
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1265
        start_set = set(parents_map)
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1266
        # 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.
1267
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1268
        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.
1269
            result_parents.update(parents)
1270
        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.
1271
        # We don't need to send ghosts back to the server as a position to
1272
        # stop either.
1273
        stop_keys.difference_update(self._unstacked_provider.missing_keys)
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)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1276
        recipe = ('manual', start_set, stop_keys, len(parents_map))
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
1939
        # it's relative to this branch...
1940
        fallback_url = urlutils.join(self.base, fallback_url)
1941
        transports = [self.bzrdir.root_transport]
4084.2.4 by Andrew Bennetts
Reset the _real_repository's _fallback_repository's when setting it as RemoteRepo's real repo.
1942
        stacked_on = branch.Branch.open(fallback_url,
1943
                                        possible_transports=transports)
1944
        self.repository.add_fallback_repository(stacked_on.repository)
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1945
3407.2.17 by Martin Pool
better name: _get_real_transport
1946
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1947
        # if we try vfs access, return the real branch's vfs transport
1948
        self._ensure_real()
1949
        return self._real_branch._transport
1950
3407.2.17 by Martin Pool
better name: _get_real_transport
1951
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1952
2477.1.1 by Martin Pool
Add RemoteBranch repr
1953
    def __str__(self):
1954
        return "%s(%s)" % (self.__class__.__name__, self.base)
1955
1956
    __repr__ = __str__
1957
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1958
    def _ensure_real(self):
1959
        """Ensure that there is a _real_branch set.
1960
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1961
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1962
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1963
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1964
            if not vfs.vfs_enabled():
1965
                raise AssertionError('smart server vfs must be enabled '
1966
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1967
            self.bzrdir._ensure_real()
1968
            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.
1969
            if self.repository._real_repository is None:
1970
                # Give the remote repository the matching real repo.
1971
                real_repo = self._real_branch.repository
1972
                if isinstance(real_repo, RemoteRepository):
1973
                    real_repo._ensure_real()
1974
                    real_repo = real_repo._real_repository
1975
                self.repository._set_real_repository(real_repo)
1976
            # Give the real branch the remote repository to let fast-pathing
1977
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1978
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1979
            if self._lock_mode == 'r':
1980
                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.
1981
            elif self._lock_mode == 'w':
1982
                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.
1983
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1984
    def _translate_error(self, err, **context):
1985
        self.repository._translate_error(err, branch=self, **context)
1986
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1987
    def _clear_cached_state(self):
1988
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1989
        if self._real_branch is not None:
1990
            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.
1991
1992
    def _clear_cached_state_of_remote_branch_only(self):
1993
        """Like _clear_cached_state, but doesn't clear the cache of
1994
        self._real_branch.
1995
1996
        This is useful when falling back to calling a method of
1997
        self._real_branch that changes state.  In that case the underlying
1998
        branch changes, so we need to invalidate this RemoteBranch's cache of
1999
        it.  However, there's no need to invalidate the _real_branch's cache
2000
        too, in fact doing so might harm performance.
2001
        """
2002
        super(RemoteBranch, self)._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2003
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.
2004
    @property
2005
    def control_files(self):
2006
        # Defer actually creating RemoteBranchLockableFiles until its needed,
2007
        # because it triggers an _ensure_real that we otherwise might not need.
2008
        if self._control_files is None:
2009
            self._control_files = RemoteBranchLockableFiles(
2010
                self.bzrdir, self._client)
2011
        return self._control_files
2012
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
2013
    def _get_checkout_format(self):
2014
        self._ensure_real()
2015
        return self._real_branch._get_checkout_format()
2016
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2017
    def get_physical_lock_status(self):
2018
        """See Branch.get_physical_lock_status()."""
2019
        # 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.
2020
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2021
        return self._real_branch.get_physical_lock_status()
2022
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2023
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2024
        """Get the URL this branch is stacked against.
2025
2026
        :raises NotStacked: If the branch is not stacked.
2027
        :raises UnstackableBranchFormat: If the branch does not support
2028
            stacking.
2029
        :raises UnstackableRepositoryFormat: If the repository does not support
2030
            stacking.
2031
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2032
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2033
            # there may not be a repository yet, so we can't use
2034
            # 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
2035
            response = self._client.call('Branch.get_stacked_on_url',
2036
                self._remote_path())
2037
        except errors.ErrorFromSmartServer, err:
2038
            # there may not be a repository yet, so we can't call through
2039
            # its _translate_error
2040
            _translate_error(err, branch=self)
2041
        except errors.UnknownSmartMethod, err:
2042
            self._ensure_real()
2043
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2044
        if response[0] != 'ok':
2045
            raise errors.UnexpectedSmartServerResponse(response)
2046
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2047
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.
2048
    def _vfs_get_tags_bytes(self):
2049
        self._ensure_real()
2050
        return self._real_branch._get_tags_bytes()
2051
2052
    def _get_tags_bytes(self):
2053
        medium = self._client._medium
2054
        if medium._is_remote_before((1, 13)):
2055
            return self._vfs_get_tags_bytes()
2056
        try:
2057
            response = self._call('Branch.get_tags_bytes', self._remote_path())
2058
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2059
            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.
2060
            return self._vfs_get_tags_bytes()
2061
        return response[0]
2062
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2063
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2064
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2065
        if not self._lock_mode:
2066
            self._lock_mode = 'r'
2067
            self._lock_count = 1
2068
            if self._real_branch is not None:
2069
                self._real_branch.lock_read()
2070
        else:
2071
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2072
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).
2073
    def _remote_lock_write(self, token):
2074
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2075
            branch_token = repo_token = ''
2076
        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).
2077
            branch_token = token
2078
            repo_token = self.repository.lock_write()
2079
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2080
        err_context = {'token': token}
2081
        response = self._call(
2082
            'Branch.lock_write', self._remote_path(), branch_token,
2083
            repo_token or '', **err_context)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2084
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
2085
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2086
        ok, branch_token, repo_token = response
2087
        return branch_token, repo_token
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2088
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).
2089
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2090
        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.
2091
            # 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).
2092
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2093
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2094
            if not self._lock_token:
2095
                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.
2096
            # 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.
2097
            self.repository.lock_write(
2098
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2099
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2100
            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.
2101
                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).
2102
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2103
                self._leave_lock = True
2104
            else:
2105
                self._leave_lock = False
2106
            self._lock_mode = 'w'
2107
            self._lock_count = 1
2108
        elif self._lock_mode == 'r':
2109
            raise errors.ReadOnlyTransaction
2110
        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).
2111
            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.
2112
                # A token was given to lock_write, and we're relocking, so
2113
                # check that the given token actually matches the one we
2114
                # 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).
2115
                if token != self._lock_token:
2116
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2117
            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.
2118
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
2119
            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.
2120
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2121
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.
2122
    def _set_tags_bytes(self, bytes):
2123
        self._ensure_real()
2124
        return self._real_branch._set_tags_bytes(bytes)
2125
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2126
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2127
        err_context = {'token': str((branch_token, repo_token))}
2128
        response = self._call(
2129
            'Branch.unlock', self._remote_path(), branch_token,
2130
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2131
        if response == ('ok',):
2132
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2133
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2134
2135
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2136
        try:
2137
            self._lock_count -= 1
2138
            if not self._lock_count:
2139
                self._clear_cached_state()
2140
                mode = self._lock_mode
2141
                self._lock_mode = None
2142
                if self._real_branch is not None:
2143
                    if (not self._leave_lock and mode == 'w' and
2144
                        self._repo_lock_token):
2145
                        # If this RemoteBranch will remove the physical lock
2146
                        # for the repository, make sure the _real_branch
2147
                        # doesn't do it first.  (Because the _real_branch's
2148
                        # repository is set to be the RemoteRepository.)
2149
                        self._real_branch.repository.leave_lock_in_place()
2150
                    self._real_branch.unlock()
2151
                if mode != 'w':
2152
                    # Only write-locked branched need to make a remote method
2153
                    # call to perfom the unlock.
2154
                    return
2155
                if not self._lock_token:
2156
                    raise AssertionError('Locked, but no token!')
2157
                branch_token = self._lock_token
2158
                repo_token = self._repo_lock_token
2159
                self._lock_token = None
2160
                self._repo_lock_token = None
2161
                if not self._leave_lock:
2162
                    self._unlock(branch_token, repo_token)
2163
        finally:
2164
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2165
2166
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2167
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2168
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2169
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2170
    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.
2171
        if not self._lock_token:
2172
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2173
        self._leave_lock = True
2174
2175
    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.
2176
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
2177
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2178
        self._leave_lock = False
2179
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2180
    def _last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2181
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2182
        if response[0] != 'ok':
2183
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2184
        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.
2185
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2186
        return (revno, last_revision)
2187
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2188
    def _gen_revision_history(self):
2189
        """See Branch._gen_revision_history()."""
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2190
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2191
            '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.
2192
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
2193
            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.
2194
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
2195
        if result == ['']:
2196
            return []
2197
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2198
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2199
    def _remote_path(self):
2200
        return self.bzrdir._path_for_remote_call(self._client)
2201
3441.5.18 by Andrew Bennetts
Fix some test failures.
2202
    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.
2203
            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.
2204
        # This performs additional work to meet the hook contract; while its
2205
        # undesirable, we have to synthesise the revno to call the hook, and
2206
        # not calling the hook is worse as it means changes can't be prevented.
2207
        # Having calculated this though, we can't just call into
2208
        # set_last_revision_info as a simple call, because there is a set_rh
2209
        # hook that some folk may still be using.
2210
        old_revno, old_revid = self.last_revision_info()
2211
        history = self._lefthand_history(revision_id)
2212
        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.
2213
        err_context = {'other_branch': other_branch}
2214
        response = self._call('Branch.set_last_revision_ex',
2215
            self._remote_path(), self._lock_token, self._repo_lock_token,
2216
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
2217
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2218
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
2219
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2220
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
2221
        new_revno, new_revision_id = response[1:]
2222
        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.
2223
        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.
2224
        if self._real_branch is not None:
2225
            cache = new_revno, new_revision_id
2226
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2227
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2228
    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.
2229
        old_revno, old_revid = self.last_revision_info()
2230
        # This performs additional work to meet the hook contract; while its
2231
        # undesirable, we have to synthesise the revno to call the hook, and
2232
        # not calling the hook is worse as it means changes can't be prevented.
2233
        # Having calculated this though, we can't just call into
2234
        # set_last_revision_info as a simple call, because there is a set_rh
2235
        # hook that some folk may still be using.
2236
        history = self._lefthand_history(revision_id)
2237
        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.
2238
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2239
        response = self._call('Branch.set_last_revision',
2240
            self._remote_path(), self._lock_token, self._repo_lock_token,
2241
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2242
        if response != ('ok',):
2243
            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.
2244
        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.
2245
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2246
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2247
    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.
2248
        # Send just the tip revision of the history; the server will generate
2249
        # the full history from that.  If the revision doesn't exist in this
2250
        # branch, NoSuchRevision will be raised.
2251
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
2252
            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.
2253
        else:
2254
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2255
        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.
2256
        for hook in branch.Branch.hooks['set_rh']:
2257
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2258
        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.
2259
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2260
    def _get_parent_location(self):
2261
        medium = self._client._medium
2262
        if medium._is_remote_before((1, 13)):
2263
            return self._vfs_get_parent_location()
2264
        try:
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2265
            response = self._call('Branch.get_parent', self._remote_path())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2266
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2267
            medium._remember_remote_is_before((1, 13))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2268
            return self._vfs_get_parent_location()
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2269
        if len(response) != 1:
4083.1.6 by Andrew Bennetts
Fix trivial bug in my trivial bug fix :)
2270
            raise errors.UnexpectedSmartServerResponse(response)
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2271
        parent_location = response[0]
2272
        if parent_location == '':
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2273
            return None
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2274
        return parent_location
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2275
2276
    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.
2277
        self._ensure_real()
4083.1.5 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2278
        return self._real_branch._get_parent_location()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2279
1752.2.63 by Andrew Bennetts
Delegate set_parent.
2280
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2281
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
2282
        return self._real_branch.set_parent(url)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2283
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.
2284
    def _set_parent_location(self, url):
2285
        # Used by tests, to poke bad urls into branch configurations
2286
        if url is None:
2287
            self.set_parent(url)
2288
        else:
2289
            self._ensure_real()
2290
            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.
2291
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2292
    def set_stacked_on_url(self, stacked_location):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2293
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2294
2295
        :raises UnstackableBranchFormat: If the branch does not support
2296
            stacking.
2297
        :raises UnstackableRepositoryFormat: If the repository does not support
2298
            stacking.
2299
        """
2300
        self._ensure_real()
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2301
        return self._real_branch.set_stacked_on_url(stacked_location)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2302
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2303
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2304
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
2305
             **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.
2306
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2307
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
2308
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2309
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
2310
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2311
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2312
    @needs_read_lock
2313
    def push(self, target, overwrite=False, stop_revision=None):
2314
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
2315
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
2316
            target, overwrite=overwrite, stop_revision=stop_revision,
2317
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2318
2319
    def is_locked(self):
2320
        return self._lock_count >= 1
2321
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
2322
    @needs_read_lock
2323
    def revision_id_to_revno(self, revision_id):
2324
        self._ensure_real()
2325
        return self._real_branch.revision_id_to_revno(revision_id)
2326
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2327
    @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.
2328
    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.
2329
        # XXX: These should be returned by the set_last_revision_info verb
2330
        old_revno, old_revid = self.last_revision_info()
2331
        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.
2332
        revision_id = ensure_null(revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2333
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2334
            response = self._call('Branch.set_last_revision_info',
2335
                self._remote_path(), self._lock_token, self._repo_lock_token,
2336
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2337
        except errors.UnknownSmartMethod:
2338
            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.
2339
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2340
            self._real_branch.set_last_revision_info(revno, revision_id)
2341
            self._last_revision_info_cache = revno, revision_id
2342
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2343
        if response == ('ok',):
2344
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2345
            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.
2346
            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.
2347
            # Update the _real_branch's cache too.
2348
            if self._real_branch is not None:
2349
                cache = self._last_revision_info_cache
2350
                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.
2351
        else:
2352
            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.
2353
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.
2354
    @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.
2355
    def generate_revision_history(self, revision_id, last_rev=None,
2356
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2357
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
2358
        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.
2359
            # 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.
2360
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
2361
                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.
2362
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2363
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
2364
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
2365
                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.
2366
        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.
2367
        self.set_revision_history(self._lefthand_history(revision_id,
2368
            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
2369
2018.5.97 by Andrew Bennetts
Fix more tests.
2370
    def set_push_location(self, location):
2371
        self._ensure_real()
2372
        return self._real_branch.set_push_location(location)
2373
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2374
2375
def _extract_tar(tar, to_dir):
2376
    """Extract all the contents of a tarfile object.
2377
2378
    A replacement for extractall, which is not present in python2.4
2379
    """
2380
    for tarinfo in tar:
2381
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2382
2383
2384
def _translate_error(err, **context):
2385
    """Translate an ErrorFromSmartServer into a more useful error.
2386
2387
    Possible context keys:
2388
      - branch
2389
      - repository
2390
      - bzrdir
2391
      - token
2392
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2393
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
2394
2395
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2396
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2397
    """
2398
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2399
        try:
2400
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2401
        except KeyError, key_err:
2402
            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.
2403
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2404
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
2405
        """Get the path from the context if present, otherwise use first error
2406
        arg.
2407
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2408
        try:
2409
            return context['path']
2410
        except KeyError, key_err:
2411
            try:
2412
                return err.error_args[0]
2413
            except IndexError, idx_err:
2414
                mutter(
2415
                    'Missing key %r in context %r', key_err.args[0], context)
2416
                raise err
2417
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2418
    if err.error_verb == 'NoSuchRevision':
2419
        raise NoSuchRevision(find('branch'), err.error_args[0])
2420
    elif err.error_verb == 'nosuchrevision':
2421
        raise NoSuchRevision(find('repository'), err.error_args[0])
2422
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2423
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2424
    elif err.error_verb == 'norepository':
2425
        raise errors.NoRepositoryPresent(find('bzrdir'))
2426
    elif err.error_verb == 'LockContention':
2427
        raise errors.LockContention('(remote lock)')
2428
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2429
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2430
    elif err.error_verb == 'LockFailed':
2431
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
2432
    elif err.error_verb == 'TokenMismatch':
2433
        raise errors.TokenMismatch(find('token'), '(remote token)')
2434
    elif err.error_verb == 'Diverged':
2435
        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.
2436
    elif err.error_verb == 'TipChangeRejected':
2437
        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
2438
    elif err.error_verb == 'UnstackableBranchFormat':
2439
        raise errors.UnstackableBranchFormat(*err.error_args)
2440
    elif err.error_verb == 'UnstackableRepositoryFormat':
2441
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2442
    elif err.error_verb == 'NotStacked':
2443
        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.
2444
    elif err.error_verb == 'PermissionDenied':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2445
        path = get_path()
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2446
        if len(err.error_args) >= 2:
2447
            extra = err.error_args[1]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2448
        else:
2449
            extra = None
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2450
        raise errors.PermissionDenied(path, extra=extra)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2451
    elif err.error_verb == 'ReadError':
2452
        path = get_path()
2453
        raise errors.ReadError(path)
2454
    elif err.error_verb == 'NoSuchFile':
2455
        path = get_path()
2456
        raise errors.NoSuchFile(path)
2457
    elif err.error_verb == 'FileExists':
2458
        raise errors.FileExists(err.error_args[0])
2459
    elif err.error_verb == 'DirectoryNotEmpty':
2460
        raise errors.DirectoryNotEmpty(err.error_args[0])
2461
    elif err.error_verb == 'ShortReadvError':
2462
        args = err.error_args
2463
        raise errors.ShortReadvError(
2464
            args[0], int(args[1]), int(args[2]), int(args[3]))
2465
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
2466
        encoding = str(err.error_args[0]) # encoding must always be a string
2467
        val = err.error_args[1]
2468
        start = int(err.error_args[2])
2469
        end = int(err.error_args[3])
2470
        reason = str(err.error_args[4]) # reason must always be a string
2471
        if val.startswith('u:'):
2472
            val = val[2:].decode('utf-8')
2473
        elif val.startswith('s:'):
2474
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2475
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2476
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2477
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2478
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2479
    elif err.error_verb == 'ReadOnlyError':
2480
        raise errors.TransportNotPossible('readonly transport')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2481
    raise errors.UnknownErrorFromSmartServer(err)