/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
639
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
640
        """Complete a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
641
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
642
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
643
        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.
644
        for older plugins that don't use e.g. the CommitBuilder
645
        facility.
646
        """
647
        self._ensure_real()
648
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
649
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
650
    def resume_write_group(self, tokens):
651
        self._ensure_real()
652
        return self._real_repository.resume_write_group(tokens)
653
654
    def suspend_write_group(self):
655
        self._ensure_real()
656
        return self._real_repository.suspend_write_group()
657
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
658
    def _ensure_real(self):
659
        """Ensure that there is a _real_repository set.
660
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
661
        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.
662
663
        Note that _ensure_real causes many roundtrips to the server which are
664
        not desirable, and prevents the use of smart one-roundtrip RPC's to
665
        perform complex operations (such as accessing parent data, streaming
666
        revisions etc). Adding calls to _ensure_real should only be done when
667
        bringing up new functionality, adding fallbacks for smart methods that
668
        require a fallback path, and never to replace an existing smart method
669
        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.
670
        """
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.
671
        if self._real_repository is None:
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
672
            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.
673
            self._set_real_repository(
674
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
675
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
676
    def _translate_error(self, err, **context):
677
        self.bzrdir._translate_error(err, repository=self, **context)
678
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
679
    def find_text_key_references(self):
680
        """Find the text key references within the repository.
681
682
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
683
        revision_ids. Each altered file-ids has the exact revision_ids that
684
        altered it listed explicitly.
685
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
686
            to whether they were referred to by the inventory of the
687
            revision_id that they contain. The inventory texts from all present
688
            revision ids are assessed to generate this report.
689
        """
690
        self._ensure_real()
691
        return self._real_repository.find_text_key_references()
692
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
693
    def _generate_text_key_index(self):
694
        """Generate a new text key index for the repository.
695
696
        This is an expensive function that will take considerable time to run.
697
698
        :return: A dict mapping (file_id, revision_id) tuples to a list of
699
            parents, also (file_id, revision_id) tuples.
700
        """
701
        self._ensure_real()
702
        return self._real_repository._generate_text_key_index()
703
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
704
    def _get_revision_graph(self, revision_id):
705
        """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)
706
        if revision_id is None:
707
            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.
708
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
709
            return {}
710
711
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
712
        response = self._call_expecting_body(
713
            '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.
714
        response_tuple, response_handler = response
715
        if response_tuple[0] != 'ok':
716
            raise errors.UnexpectedSmartServerResponse(response_tuple)
717
        coded = response_handler.read_body_bytes()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
718
        if coded == '':
719
            # no revisions in this repository!
720
            return {}
721
        lines = coded.split('\n')
722
        revision_graph = {}
723
        for line in lines:
724
            d = tuple(line.split())
725
            revision_graph[d[0]] = d[1:]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
726
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
727
        return revision_graph
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
728
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)
729
    def _get_sink(self):
730
        """See Repository._get_sink()."""
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
731
        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)
732
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
733
    def _get_source(self, to_format):
734
        """Return a source for streaming from this repository."""
735
        return RemoteStreamSource(self, to_format)
736
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
737
    def has_revision(self, revision_id):
738
        """See Repository.has_revision()."""
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
739
        if revision_id == NULL_REVISION:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
740
            # The null revision is always present.
741
            return True
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
742
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
743
        response = self._call('Repository.has_revision', path, revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
744
        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.
745
            raise errors.UnexpectedSmartServerResponse(response)
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
746
        if response[0] == 'yes':
747
            return True
748
        for fallback_repo in self._fallback_repositories:
749
            if fallback_repo.has_revision(revision_id):
750
                return True
751
        return False
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
752
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
753
    def has_revisions(self, revision_ids):
754
        """See Repository.has_revisions()."""
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
755
        # FIXME: This does many roundtrips, particularly when there are
756
        # fallback repositories.  -- mbp 20080905
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
757
        result = set()
758
        for revision_id in revision_ids:
759
            if self.has_revision(revision_id):
760
                result.add(revision_id)
761
        return result
762
2617.6.9 by Robert Collins
Merge bzr.dev.
763
    def has_same_location(self, other):
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
764
        return (self.__class__ is other.__class__ and
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
765
                self.bzrdir.transport.base == other.bzrdir.transport.base)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
766
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
767
    def get_graph(self, other_repository=None):
768
        """Return the graph for this repository format"""
3835.1.17 by Aaron Bentley
Fix stacking bug
769
        parents_provider = self._make_parents_provider(other_repository)
3441.5.24 by Andrew Bennetts
Remove RemoteGraph experiment.
770
        return graph.Graph(parents_provider)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
771
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
772
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
773
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
774
        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.
775
        # revid can be None to indicate no revisions, not just NULL_REVISION
776
        if revid is None or revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
777
            fmt_revid = ''
778
        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.
779
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
780
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
781
            fmt_committers = 'no'
782
        else:
783
            fmt_committers = 'yes'
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
784
        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.
785
            '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.
786
        if response_tuple[0] != 'ok':
787
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
788
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
789
        body = response_handler.read_body_bytes()
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
790
        result = {}
791
        for line in body.split('\n'):
792
            if not line:
793
                continue
794
            key, val_text = line.split(':')
795
            if key in ('revisions', 'size', 'committers'):
796
                result[key] = int(val_text)
797
            elif key in ('firstrev', 'latestrev'):
798
                values = val_text.split(' ')[1:]
799
                result[key] = (float(values[0]), long(values[1]))
800
801
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
802
3140.1.2 by Aaron Bentley
Add ability to find branches inside repositories
803
    def find_branches(self, using=False):
804
        """See Repository.find_branches()."""
805
        # should be an API call to the server.
806
        self._ensure_real()
807
        return self._real_repository.find_branches(using=using)
808
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
809
    def get_physical_lock_status(self):
810
        """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.
811
        # should be an API call to the server.
812
        self._ensure_real()
813
        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.
814
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
815
    def is_in_write_group(self):
816
        """Return True if there is an open write group.
817
818
        write groups are only applicable locally for the smart server..
819
        """
820
        if self._real_repository:
821
            return self._real_repository.is_in_write_group()
822
823
    def is_locked(self):
824
        return self._lock_count >= 1
825
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
826
    def is_shared(self):
827
        """See Repository.is_shared()."""
828
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
829
        response = self._call('Repository.is_shared', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
830
        if response[0] not in ('yes', 'no'):
831
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
832
        return response[0] == 'yes'
833
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
834
    def is_write_locked(self):
835
        return self._lock_mode == 'w'
836
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
837
    def lock_read(self):
838
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
839
        if not self._lock_mode:
840
            self._lock_mode = 'r'
841
            self._lock_count = 1
4190.1.1 by Robert Collins
Negatively cache misses during read-locks in RemoteRepository.
842
            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
843
            if self._real_repository is not None:
844
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
845
        else:
846
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
847
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
848
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
849
        path = self.bzrdir._path_for_remote_call(self._client)
850
        if token is None:
851
            token = ''
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
852
        err_context = {'token': token}
853
        response = self._call('Repository.lock_write', path, token,
854
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
855
        if response[0] == 'ok':
856
            ok, token = response
857
            return token
858
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
859
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
860
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
861
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
862
        if not self._lock_mode:
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
863
            if _skip_rpc:
864
                if self._lock_token is not None:
865
                    if token != self._lock_token:
3695.1.1 by Andrew Bennetts
Remove some unused imports and fix a couple of trivially broken raise statements.
866
                        raise errors.TokenMismatch(token, self._lock_token)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
867
                self._lock_token = token
868
            else:
869
                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.
870
            # if self._lock_token is None, then this is something like packs or
871
            # svn where we don't get to lock the repo, or a weave style repository
872
            # where we cannot lock it over the wire and attempts to do so will
873
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
874
            if self._real_repository is not None:
875
                self._real_repository.lock_write(token=self._lock_token)
876
            if token is not None:
877
                self._leave_lock = True
878
            else:
879
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
880
            self._lock_mode = 'w'
881
            self._lock_count = 1
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
882
            self._unstacked_provider.enable_cache(cache_misses=False)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
883
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
884
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
885
        else:
886
            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.
887
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
888
889
    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.
890
        if not self._lock_token:
891
            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
892
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
893
894
    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.
895
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
896
            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
897
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
898
899
    def _set_real_repository(self, repository):
900
        """Set the _real_repository for this repository.
901
902
        :param repository: The repository to fallback to for non-hpss
903
            implemented operations.
904
        """
4053.1.5 by Robert Collins
Review feedback on RemoteRepository._set_real_revision.
905
        if self._real_repository is not None:
906
            # Replacing an already set real repository.
907
            # We cannot do this [currently] if the repository is locked -
908
            # synchronised state might be lost.
909
            if self.is_locked():
910
                raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
911
        if isinstance(repository, RemoteRepository):
912
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
913
        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.
914
        # If the _real_repository has _fallback_repositories, clear them out,
915
        # because we want it to have the same set as this repository.  This is
916
        # reasonable to do because the fallbacks we clear here are from a
917
        # "real" branch, and we're about to replace them with the equivalents
918
        # from a RemoteBranch.
919
        self._real_repository._fallback_repositories = []
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
920
        for fb in self._fallback_repositories:
921
            self._real_repository.add_fallback_repository(fb)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
922
        if self._lock_mode == 'w':
923
            # if we are already locked, the real repository must be able to
924
            # acquire the lock with our token.
925
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
926
        elif self._lock_mode == 'r':
927
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
928
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
929
    def start_write_group(self):
930
        """Start a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
931
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
932
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
933
        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``
934
        for older plugins that don't use e.g. the CommitBuilder
935
        facility.
936
        """
937
        self._ensure_real()
938
        return self._real_repository.start_write_group()
939
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
940
    def _unlock(self, token):
941
        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.
942
        if not token:
943
            # with no token the remote repository is not persistently locked.
944
            return
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
945
        err_context = {'token': token}
946
        response = self._call('Repository.unlock', path, token,
947
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
948
        if response == ('ok',):
949
            return
950
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
951
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
952
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
953
    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.
954
        if not self._lock_count:
955
            raise errors.LockNotHeld(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
956
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
957
        if self._lock_count > 0:
958
            return
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
959
        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.
960
        old_mode = self._lock_mode
961
        self._lock_mode = None
962
        try:
963
            # The real repository is responsible at present for raising an
964
            # exception if it's in an unfinished write group.  However, it
965
            # normally will *not* actually remove the lock from disk - that's
966
            # done by the server on receiving the Repository.unlock call.
967
            # 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
968
            if self._real_repository is not None:
969
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
970
        finally:
971
            # The rpc-level lock should be released even if there was a
972
            # problem releasing the vfs-based lock.
973
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
974
                # Only write-locked repositories need to make a remote method
975
                # 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.
976
                old_token = self._lock_token
977
                self._lock_token = None
978
                if not self._leave_lock:
979
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
980
981
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
982
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
983
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
984
        return self._real_repository.break_lock()
985
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
986
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
987
        """Return a TemporaryFile containing a repository tarball.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
988
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
989
        Returns None if the server does not support sending tarballs.
990
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
991
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
992
        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.
993
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
994
            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.
995
                'Repository.tarball', path, compression)
996
        except errors.UnknownSmartMethod:
997
            protocol.cancel_read_body()
998
            return None
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
999
        if response[0] == 'ok':
1000
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1001
            t = tempfile.NamedTemporaryFile()
1002
            # TODO: rpc layer should read directly into it...
1003
            t.write(protocol.read_body_bytes())
1004
            t.seek(0)
1005
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
1006
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1007
2440.1.1 by Martin Pool
Add new Repository.sprout,
1008
    def sprout(self, to_bzrdir, revision_id=None):
1009
        # 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.
1010
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
1011
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
1012
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
1013
        dest_repo.fetch(self, revision_id=revision_id)
1014
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
1015
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1016
    ### These methods are just thin shims to the VFS object for now.
1017
1018
    def revision_tree(self, revision_id):
1019
        self._ensure_real()
1020
        return self._real_repository.revision_tree(revision_id)
1021
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1022
    def get_serializer_format(self):
1023
        self._ensure_real()
1024
        return self._real_repository.get_serializer_format()
1025
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1026
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1027
                           timezone=None, committer=None, revprops=None,
1028
                           revision_id=None):
1029
        # FIXME: It ought to be possible to call this without immediately
1030
        # triggering _ensure_real.  For now it's the easiest thing to do.
1031
        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.
1032
        real_repo = self._real_repository
1033
        builder = real_repo.get_commit_builder(branch, parents,
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1034
                config, timestamp=timestamp, timezone=timezone,
1035
                committer=committer, revprops=revprops, revision_id=revision_id)
1036
        return builder
1037
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1038
    def add_fallback_repository(self, repository):
1039
        """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
1040
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1041
        :param repository: A repository.
1042
        """
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
1043
        if not self._format.supports_external_lookups:
1044
            raise errors.UnstackableRepositoryFormat(
1045
                self._format.network_name(), self.base)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1046
        # We need to accumulate additional repositories here, to pass them in
1047
        # on various RPC's.
4035.2.3 by Robert Collins
Fix trailing whitespace.
1048
        #
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1049
        self._fallback_repositories.append(repository)
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1050
        # If self._real_repository was parameterised already (e.g. because a
1051
        # _real_branch had its get_stacked_on_url method called), then the
1052
        # 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.
1053
        if self._real_repository is not None:
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1054
            if repository not in self._real_repository._fallback_repositories:
1055
                self._real_repository.add_fallback_repository(repository)
4035.2.1 by Andrew Bennetts
Fix unnecessary get_parent_map calls after insert_stream during push.
1056
        else:
1057
            # They are also seen by the fallback repository.  If it doesn't
1058
            # exist yet they'll be added then.  This implicitly copies them.
1059
            self._ensure_real()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1060
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1061
    def add_inventory(self, revid, inv, parents):
1062
        self._ensure_real()
1063
        return self._real_repository.add_inventory(revid, inv, parents)
1064
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1065
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1066
                               parents):
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
1067
        self._ensure_real()
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1068
        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.
1069
            delta, new_revision_id, parents)
1070
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1071
    def add_revision(self, rev_id, rev, inv=None, config=None):
1072
        self._ensure_real()
1073
        return self._real_repository.add_revision(
1074
            rev_id, rev, inv=inv, config=config)
1075
1076
    @needs_read_lock
1077
    def get_inventory(self, revision_id):
1078
        self._ensure_real()
1079
        return self._real_repository.get_inventory(revision_id)
1080
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
1081
    def iter_inventories(self, revision_ids):
1082
        self._ensure_real()
1083
        return self._real_repository.iter_inventories(revision_ids)
1084
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1085
    @needs_read_lock
1086
    def get_revision(self, revision_id):
1087
        self._ensure_real()
1088
        return self._real_repository.get_revision(revision_id)
1089
1090
    def get_transaction(self):
1091
        self._ensure_real()
1092
        return self._real_repository.get_transaction()
1093
1094
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
1095
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1096
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
1097
        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.
1098
1099
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1100
        """See Repository.make_working_trees"""
1101
        self._ensure_real()
1102
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1103
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.
1104
    def refresh_data(self):
1105
        """Re-read any data needed to to synchronise with disk.
1106
1107
        This method is intended to be called after another repository instance
1108
        (such as one used by a smart server) has inserted data into the
1109
        repository. It may not be called during a write group, but may be
1110
        called at any other time.
1111
        """
1112
        if self.is_in_write_group():
1113
            raise errors.InternalBzrError(
1114
                "May not refresh_data while in a write group.")
1115
        if self._real_repository is not None:
1116
            self._real_repository.refresh_data()
1117
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1118
    def revision_ids_to_search_result(self, result_set):
1119
        """Convert a set of revision ids to a graph SearchResult."""
1120
        result_parents = set()
1121
        for parents in self.get_graph().get_parent_map(
1122
            result_set).itervalues():
1123
            result_parents.update(parents)
1124
        included_keys = result_set.intersection(result_parents)
1125
        start_keys = result_set.difference(included_keys)
1126
        exclude_keys = result_parents.difference(result_set)
1127
        result = graph.SearchResult(start_keys, exclude_keys,
1128
            len(result_set), result_set)
1129
        return result
1130
1131
    @needs_read_lock
1132
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1133
        """Return the revision ids that other has that this does not.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1134
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1135
        These are returned in topological order.
1136
1137
        revision_id: only return revision ids included by revision_id.
1138
        """
1139
        return repository.InterRepository.get(
1140
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
1141
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1142
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1143
            fetch_spec=None):
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1144
        # No base implementation to use as RemoteRepository is not a subclass
1145
        # 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.
1146
        if fetch_spec is not None and revision_id is not None:
1147
            raise AssertionError(
1148
                "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.
1149
        if self.is_in_write_group():
4145.1.3 by Robert Collins
NEWS conflicts.
1150
            raise errors.InternalBzrError(
1151
                "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.
1152
        # 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.
1153
        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
1154
            # check that last_revision is in 'from' and then return a
1155
            # no-operation.
1156
            if (revision_id is not None and
4145.1.5 by Robert Collins
More fixes from grabbing the Repository implementation of fetch for RemoteRepository.
1157
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
1158
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1159
            return 0, []
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1160
        # if there is no specific appropriate InterRepository, this will get
1161
        # the InterRepository base class, which raises an
1162
        # 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.
1163
        inter = repository.InterRepository.get(source, self)
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1164
        return inter.fetch(revision_id=revision_id, pb=pb,
1165
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1166
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
1167
    def create_bundle(self, target, base, fileobj, format=None):
1168
        self._ensure_real()
1169
        self._real_repository.create_bundle(target, base, fileobj, format)
1170
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1171
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1172
    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.
1173
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1174
        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.
1175
1176
    def fileids_altered_by_revision_ids(self, revision_ids):
1177
        self._ensure_real()
1178
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
1179
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1180
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
1181
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1182
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
1183
            revisions, revision_versions_cache)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1184
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1185
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1186
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1187
        """
1188
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1189
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1190
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1191
    def get_parent_map(self, revision_ids):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1192
        """See bzrlib.Graph.get_parent_map()."""
3835.1.5 by Aaron Bentley
Fix make_parents_provider
1193
        return self._make_parents_provider().get_parent_map(revision_ids)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1194
1195
    def _get_parent_map_rpc(self, keys):
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1196
        """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.
1197
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1198
        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.
1199
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
1200
            # 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.
1201
            # graph.
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1202
            #
1203
            # Note that this reads the whole graph, when only some keys are
1204
            # wanted.  On this old server there's no way (?) to get them all
1205
            # in one go, and the user probably will have seen a warning about
1206
            # the server being old anyhow.
1207
            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
1208
            # There is an api discrepency between get_parent_map and
1209
            # get_revision_graph. Specifically, a "key:()" pair in
1210
            # get_revision_graph just means a node has no parents. For
1211
            # "get_parent_map" it means the node is a ghost. So fix up the
1212
            # graph to correct this.
1213
            #   https://bugs.launchpad.net/bzr/+bug/214894
1214
            # There is one other "bug" which is that ghosts in
1215
            # get_revision_graph() are not returned at all. But we won't worry
1216
            # about that for now.
1217
            for node_id, parent_ids in rg.iteritems():
1218
                if parent_ids == ():
1219
                    rg[node_id] = (NULL_REVISION,)
1220
            rg[NULL_REVISION] = ()
1221
            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.
1222
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1223
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
1224
        if None in keys:
1225
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1226
        if NULL_REVISION in keys:
1227
            keys.discard(NULL_REVISION)
1228
            found_parents = {NULL_REVISION:()}
1229
            if not keys:
1230
                return found_parents
1231
        else:
1232
            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.
1233
        # TODO(Needs analysis): We could assume that the keys being requested
1234
        # from get_parent_map are in a breadth first search, so typically they
1235
        # will all be depth N from some common parent, and we don't have to
1236
        # have the server iterate from the root parent, but rather from the
1237
        # keys we're searching; and just tell the server the keyspace we
1238
        # already have; but this may be more traffic again.
1239
1240
        # Transform self._parents_map into a search request recipe.
1241
        # TODO: Manage this incrementally to avoid covering the same path
1242
        # repeatedly. (The server will have to on each request, but the less
1243
        # work done the better).
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1244
        #
1245
        # Negative caching notes:
1246
        # new server sends missing when a request including the revid
1247
        # 'include-missing:' is present in the request.
1248
        # missing keys are serialised as missing:X, and we then call
1249
        # provider.note_missing(X) for-all X
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1250
        parents_map = self._unstacked_provider.get_cached_map()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1251
        if parents_map is None:
1252
            # Repository is not locked, so there's no cache.
1253
            parents_map = {}
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1254
        # start_set is all the keys in the cache
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1255
        start_set = set(parents_map)
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1256
        # 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.
1257
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1258
        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.
1259
            result_parents.update(parents)
1260
        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.
1261
        # We don't need to send ghosts back to the server as a position to
1262
        # stop either.
1263
        stop_keys.difference_update(self._unstacked_provider.missing_keys)
4214.2.5 by Andrew Bennetts
Fix the bug.
1264
        key_count = len(parents_map)
1265
        if (NULL_REVISION in result_parents
1266
            and NULL_REVISION in self._unstacked_provider.missing_keys):
1267
            # If we pruned NULL_REVISION from the stop_keys because it's also
1268
            # in our cache of "missing" keys we need to increment our key count
1269
            # by 1, because the reconsitituted SearchResult on the server will
1270
            # still consider NULL_REVISION to be an included key.
1271
            key_count += 1
3211.5.1 by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates.
1272
        included_keys = start_set.intersection(result_parents)
1273
        start_set.difference_update(included_keys)
4214.2.5 by Andrew Bennetts
Fix the bug.
1274
        recipe = ('manual', start_set, stop_keys, key_count)
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1275
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1276
        path = self.bzrdir._path_for_remote_call(self._client)
1277
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
1278
            if type(key) is not str:
1279
                raise ValueError(
1280
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
1281
        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.
1282
        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.
1283
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1284
            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.
1285
                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.
1286
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1287
            # 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.
1288
            # Worse, we have to force a disconnection, because the server now
1289
            # doesn't realise it has a body on the wire to consume, so the
1290
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
1291
            warning(
1292
                'Server is too old for fast get_parent_map, reconnecting.  '
1293
                '(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.
1294
            medium.disconnect()
1295
            # To avoid having to disconnect repeatedly, we keep track of the
1296
            # 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.
1297
            medium._remember_remote_is_before((1, 2))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1298
            # Recurse just once and we should use the fallback code.
1299
            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.
1300
        response_tuple, response_handler = response
1301
        if response_tuple[0] not in ['ok']:
1302
            response_handler.cancel_read_body()
1303
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1304
        if response_tuple[0] == 'ok':
1305
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1306
            if coded == '':
1307
                # no revisions found
1308
                return {}
1309
            lines = coded.split('\n')
1310
            revision_graph = {}
1311
            for line in lines:
1312
                d = tuple(line.split())
1313
                if len(d) > 1:
1314
                    revision_graph[d[0]] = d[1:]
1315
                else:
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
1316
                    # No parents:
1317
                    if d[0].startswith('missing:'):
1318
                        revid = d[0][8:]
1319
                        self._unstacked_provider.note_missing_key(revid)
1320
                    else:
1321
                        # no parents - so give the Graph result
1322
                        # (NULL_REVISION,).
1323
                        revision_graph[d[0]] = (NULL_REVISION,)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1324
            return revision_graph
1325
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1326
    @needs_read_lock
1327
    def get_signature_text(self, revision_id):
1328
        self._ensure_real()
1329
        return self._real_repository.get_signature_text(revision_id)
1330
1331
    @needs_read_lock
1332
    def get_inventory_xml(self, revision_id):
1333
        self._ensure_real()
1334
        return self._real_repository.get_inventory_xml(revision_id)
1335
1336
    def deserialise_inventory(self, revision_id, xml):
1337
        self._ensure_real()
1338
        return self._real_repository.deserialise_inventory(revision_id, xml)
1339
1340
    def reconcile(self, other=None, thorough=False):
1341
        self._ensure_real()
1342
        return self._real_repository.reconcile(other=other, thorough=thorough)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1343
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1344
    def all_revision_ids(self):
1345
        self._ensure_real()
1346
        return self._real_repository.all_revision_ids()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1347
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1348
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1349
    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.
1350
        self._ensure_real()
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1351
        return self._real_repository.get_deltas_for_revisions(revisions,
1352
            specific_fileids=specific_fileids)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1353
1354
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1355
    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.
1356
        self._ensure_real()
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1357
        return self._real_repository.get_revision_delta(revision_id,
1358
            specific_fileids=specific_fileids)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1359
1360
    @needs_read_lock
1361
    def revision_trees(self, revision_ids):
1362
        self._ensure_real()
1363
        return self._real_repository.revision_trees(revision_ids)
1364
1365
    @needs_read_lock
1366
    def get_revision_reconcile(self, revision_id):
1367
        self._ensure_real()
1368
        return self._real_repository.get_revision_reconcile(revision_id)
1369
1370
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1371
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1372
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1373
        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.
1374
2018.5.138 by Robert Collins
Merge bzr.dev.
1375
    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.
1376
        self._ensure_real()
1377
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
1378
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1379
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1380
    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.
1381
        # get a tarball of the remote repository, and copy from that into the
1382
        # destination
1383
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1384
        import tarfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1385
        # TODO: Maybe a progress bar while streaming the tarball?
1386
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1387
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1388
        if tar_file is None:
1389
            return None
1390
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1391
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1392
            tar = tarfile.open('repository', fileobj=tar_file,
1393
                mode='r|bz2')
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
1394
            tmpdir = osutils.mkdtemp()
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1395
            try:
1396
                _extract_tar(tar, tmpdir)
1397
                tmp_bzrdir = BzrDir.open(tmpdir)
1398
                tmp_repo = tmp_bzrdir.open_repository()
1399
                tmp_repo.copy_content_into(destination, revision_id)
1400
            finally:
1401
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1402
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1403
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1404
        return destination
2018.18.23 by Martin Pool
review cleanups
1405
        # TODO: Suggestion from john: using external tar is much faster than
1406
        # 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.
1407
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1408
    @property
1409
    def inventories(self):
1410
        """Decorate the real repository for now.
1411
1412
        In the long term a full blown network facility is needed to
1413
        avoid creating a real repository object locally.
1414
        """
1415
        self._ensure_real()
1416
        return self._real_repository.inventories
1417
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1418
    @needs_write_lock
1419
    def pack(self):
1420
        """Compress the data within the repository.
1421
1422
        This is not currently implemented within the smart server.
1423
        """
1424
        self._ensure_real()
1425
        return self._real_repository.pack()
1426
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1427
    @property
1428
    def revisions(self):
1429
        """Decorate the real repository for now.
1430
1431
        In the short term this should become a real object to intercept graph
1432
        lookups.
1433
1434
        In the long term a full blown network facility is needed.
1435
        """
1436
        self._ensure_real()
1437
        return self._real_repository.revisions
1438
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1439
    def set_make_working_trees(self, new_value):
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1440
        if new_value:
1441
            new_value_str = "True"
1442
        else:
1443
            new_value_str = "False"
1444
        path = self.bzrdir._path_for_remote_call(self._client)
1445
        try:
1446
            response = self._call(
1447
                'Repository.set_make_working_trees', path, new_value_str)
1448
        except errors.UnknownSmartMethod:
1449
            self._ensure_real()
1450
            self._real_repository.set_make_working_trees(new_value)
1451
        else:
1452
            if response[0] != 'ok':
1453
                raise errors.UnexpectedSmartServerResponse(response)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1454
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1455
    @property
1456
    def signatures(self):
1457
        """Decorate the real repository for now.
1458
1459
        In the long term a full blown network facility is needed to avoid
1460
        creating a real repository object locally.
1461
        """
1462
        self._ensure_real()
1463
        return self._real_repository.signatures
1464
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1465
    @needs_write_lock
1466
    def sign_revision(self, revision_id, gpg_strategy):
1467
        self._ensure_real()
1468
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
1469
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1470
    @property
1471
    def texts(self):
1472
        """Decorate the real repository for now.
1473
1474
        In the long term a full blown network facility is needed to avoid
1475
        creating a real repository object locally.
1476
        """
1477
        self._ensure_real()
1478
        return self._real_repository.texts
1479
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1480
    @needs_read_lock
1481
    def get_revisions(self, revision_ids):
1482
        self._ensure_real()
1483
        return self._real_repository.get_revisions(revision_ids)
1484
1485
    def supports_rich_root(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1486
        return self._format.rich_root_data
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1487
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1488
    def iter_reverse_revision_history(self, revision_id):
1489
        self._ensure_real()
1490
        return self._real_repository.iter_reverse_revision_history(revision_id)
1491
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1492
    @property
1493
    def _serializer(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1494
        return self._format._serializer
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1495
2018.5.97 by Andrew Bennetts
Fix more tests.
1496
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1497
        self._ensure_real()
1498
        return self._real_repository.store_revision_signature(
1499
            gpg_strategy, plaintext, revision_id)
1500
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1501
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1502
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1503
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1504
2018.5.97 by Andrew Bennetts
Fix more tests.
1505
    def has_signature_for_revision_id(self, revision_id):
1506
        self._ensure_real()
1507
        return self._real_repository.has_signature_for_revision_id(revision_id)
1508
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1509
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1510
        self._ensure_real()
1511
        return self._real_repository.item_keys_introduced_by(revision_ids,
1512
            _files_pb=_files_pb)
1513
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1514
    def revision_graph_can_have_wrong_parents(self):
1515
        # The answer depends on the remote repo format.
1516
        self._ensure_real()
1517
        return self._real_repository.revision_graph_can_have_wrong_parents()
1518
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1519
    def _find_inconsistent_revision_parents(self):
1520
        self._ensure_real()
1521
        return self._real_repository._find_inconsistent_revision_parents()
1522
1523
    def _check_for_inconsistent_revision_parents(self):
1524
        self._ensure_real()
1525
        return self._real_repository._check_for_inconsistent_revision_parents()
1526
3835.1.17 by Aaron Bentley
Fix stacking bug
1527
    def _make_parents_provider(self, other=None):
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1528
        providers = [self._unstacked_provider]
3835.1.17 by Aaron Bentley
Fix stacking bug
1529
        if other is not None:
1530
            providers.insert(0, other)
3835.1.7 by Aaron Bentley
Updates from review
1531
        providers.extend(r._make_parents_provider() for r in
1532
                         self._fallback_repositories)
1533
        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.
1534
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1535
    def _serialise_search_recipe(self, recipe):
1536
        """Serialise a graph search recipe.
1537
1538
        :param recipe: A search recipe (start, stop, count).
1539
        :return: Serialised bytes.
1540
        """
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1541
        start_keys = ' '.join(recipe[1])
1542
        stop_keys = ' '.join(recipe[2])
1543
        count = str(recipe[3])
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1544
        return '\n'.join((start_keys, stop_keys, count))
1545
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1546
    def _serialise_search_result(self, search_result):
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1547
        if isinstance(search_result, graph.PendingAncestryResult):
1548
            parts = ['ancestry-of']
1549
            parts.extend(search_result.heads)
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1550
        else:
1551
            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.
1552
            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.
1553
        return '\n'.join(parts)
1554
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1555
    def autopack(self):
1556
        path = self.bzrdir._path_for_remote_call(self._client)
1557
        try:
1558
            response = self._call('PackRepository.autopack', path)
1559
        except errors.UnknownSmartMethod:
1560
            self._ensure_real()
1561
            self._real_repository._pack_collection.autopack()
1562
            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.
1563
        self.refresh_data()
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1564
        if response[0] != 'ok':
1565
            raise errors.UnexpectedSmartServerResponse(response)
1566
1567
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1568
class RemoteStreamSink(repository.StreamSink):
1569
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.
1570
    def _insert_real(self, stream, src_format, resume_tokens):
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1571
        self.target_repo._ensure_real()
1572
        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.
1573
        result = sink.insert_stream(stream, src_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1574
        if not result:
1575
            self.target_repo.autopack()
1576
        return result
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1577
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.
1578
    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.
1579
        target = self.target_repo
1580
        if target._lock_token:
1581
            verb = 'Repository.insert_stream_locked'
1582
            extra_args = (target._lock_token or '',)
1583
            required_version = (1, 14)
1584
        else:
1585
            verb = 'Repository.insert_stream'
1586
            extra_args = ()
1587
            required_version = (1, 13)
1588
        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)
1589
        medium = client._medium
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
1590
        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)
1591
            # 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.
1592
            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.
1593
        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.
1594
        if not resume_tokens:
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1595
            # XXX: Ugly but important for correctness, *will* be fixed during
1596
            # 1.13 cycle. Pushing a stream that is interrupted results in a
1597
            # fallback to the _real_repositories sink *with a partial stream*.
1598
            # Thats bad because we insert less data than bzr expected. To avoid
1599
            # this we do a trial push to make sure the verb is accessible, and
1600
            # do not fallback when actually pushing the stream. A cleanup patch
1601
            # is going to look at rewinding/restarting the stream/partial
1602
            # buffering etc.
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1603
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1604
            try:
1605
                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.
1606
                    (verb, path, '') + extra_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1607
            except errors.UnknownSmartMethod:
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
1608
                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.
1609
                return self._insert_real(stream, src_format, resume_tokens)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1610
        byte_stream = smart_repo._stream_to_byte_stream(
1611
            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.
1612
        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)
1613
        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.
1614
            (verb, path, resume_tokens) + extra_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1615
        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)
1616
            raise errors.UnexpectedSmartServerResponse(response)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1617
        if response[0][0] == 'missing-basis':
1618
            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.
1619
            resume_tokens = tokens
1620
            return resume_tokens, missing_keys
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1621
        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.
1622
            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.
1623
            return [], set()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1624
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)
1625
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
1626
class RemoteStreamSource(repository.StreamSource):
1627
    """Stream data from a remote server."""
1628
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1629
    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.
1630
        if (self.from_repository._fallback_repositories and
1631
            self.to_format._fetch_order == 'topological'):
1632
            return self._real_stream(self.from_repository, search)
1633
        return self.missing_parents_chain(search, [self.from_repository] +
1634
            self.from_repository._fallback_repositories)
1635
1636
    def _real_stream(self, repo, search):
1637
        """Get a stream for search from repo.
1638
        
1639
        This never called RemoteStreamSource.get_stream, and is a heler
1640
        for RemoteStreamSource._get_stream to allow getting a stream 
1641
        reliably whether fallback back because of old servers or trying
1642
        to stream from a non-RemoteRepository (which the stacked support
1643
        code will do).
1644
        """
1645
        source = repo._get_source(self.to_format)
1646
        if isinstance(source, RemoteStreamSource):
1647
            return repository.StreamSource.get_stream(source, search)
1648
        return source.get_stream(search)
1649
1650
    def _get_stream(self, repo, search):
1651
        """Core worker to get a stream from repo for search.
1652
1653
        This is used by both get_stream and the stacking support logic. It
1654
        deliberately gets a stream for repo which does not need to be
1655
        self.from_repository. In the event that repo is not Remote, or
1656
        cannot do a smart stream, a fallback is made to the generic
1657
        repository._get_stream() interface, via self._real_stream.
1658
1659
        In the event of stacking, streams from _get_stream will not
1660
        contain all the data for search - this is normal (see get_stream).
1661
1662
        :param repo: A repository.
1663
        :param search: A search.
1664
        """
1665
        # Fallbacks may be non-smart
1666
        if not isinstance(repo, RemoteRepository):
1667
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1668
        client = repo._client
1669
        medium = client._medium
1670
        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.
1671
            # streaming was added in 1.13
1672
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1673
        path = repo.bzrdir._path_for_remote_call(client)
1674
        try:
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1675
            search_bytes = repo._serialise_search_result(search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1676
            response = repo._call_with_body_bytes_expecting_body(
4060.1.5 by Robert Collins
Verb change name requested by Andrew.
1677
                'Repository.get_stream',
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1678
                (path, self.to_format.network_name()), search_bytes)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1679
            response_tuple, response_handler = response
1680
        except errors.UnknownSmartMethod:
1681
            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.
1682
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1683
        if response_tuple[0] != 'ok':
1684
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1685
        byte_stream = response_handler.read_streamed_body()
1686
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1687
        if src_format.network_name() != repo._format.network_name():
1688
            raise AssertionError(
1689
                "Mismatched RemoteRepository and stream src %r, %r" % (
1690
                src_format.network_name(), repo._format.network_name()))
1691
        return stream
1692
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1693
    def missing_parents_chain(self, search, sources):
1694
        """Chain multiple streams together to handle stacking.
1695
1696
        :param search: The overall search to satisfy with streams.
1697
        :param sources: A list of Repository objects to query.
1698
        """
1699
        self.serialiser = self.to_format._serializer
1700
        self.seen_revs = set()
1701
        self.referenced_revs = set()
1702
        # If there are heads in the search, or the key count is > 0, we are not
1703
        # done.
1704
        while not search.is_empty() and len(sources) > 1:
1705
            source = sources.pop(0)
1706
            stream = self._get_stream(source, search)
1707
            for kind, substream in stream:
1708
                if kind != 'revisions':
1709
                    yield kind, substream
1710
                else:
1711
                    yield kind, self.missing_parents_rev_handler(substream)
1712
            search = search.refine(self.seen_revs, self.referenced_revs)
1713
            self.seen_revs = set()
1714
            self.referenced_revs = set()
1715
        if not search.is_empty():
1716
            for kind, stream in self._get_stream(sources[0], search):
1717
                yield kind, stream
1718
1719
    def missing_parents_rev_handler(self, substream):
1720
        for content in substream:
1721
            revision_bytes = content.get_bytes_as('fulltext')
1722
            revision = self.serialiser.read_revision_from_string(revision_bytes)
1723
            self.seen_revs.add(content.key[-1])
1724
            self.referenced_revs.update(revision.parent_ids)
1725
            yield content
1726
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
1727
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1728
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1729
    """A 'LockableFiles' implementation that talks to a smart server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1730
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1731
    This is not a public interface class.
1732
    """
1733
1734
    def __init__(self, bzrdir, _client):
1735
        self.bzrdir = bzrdir
1736
        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.
1737
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1738
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1739
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1740
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1741
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.
1742
    def _find_modes(self):
1743
        # RemoteBranches don't let the client set the mode of control files.
1744
        self._dir_mode = None
1745
        self._file_mode = None
1746
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1747
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1748
class RemoteBranchFormat(branch.BranchFormat):
1749
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.
1750
    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.
1751
        super(RemoteBranchFormat, self).__init__()
1752
        self._matchingbzrdir = RemoteBzrDirFormat()
1753
        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.
1754
        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.
1755
        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.
1756
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.
1757
    def __eq__(self, other):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1758
        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.
1759
            self.__dict__ == other.__dict__)
1760
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.
1761
    def _ensure_real(self):
1762
        if self._custom_format is None:
1763
            self._custom_format = branch.network_format_registry.get(
1764
                self._network_name)
1765
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1766
    def get_format_description(self):
1767
        return 'Remote BZR Branch'
1768
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1769
    def network_name(self):
1770
        return self._network_name
1771
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1772
    def open(self, a_bzrdir, ignore_fallbacks=False):
1773
        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.
1774
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1775
    def _vfs_initialize(self, a_bzrdir):
1776
        # Initialisation when using a local bzrdir object, or a non-vfs init
1777
        # method is not available on the server.
1778
        # self._custom_format is always set - the start of initialize ensures
1779
        # that.
1780
        if isinstance(a_bzrdir, RemoteBzrDir):
1781
            a_bzrdir._ensure_real()
1782
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
1783
        else:
1784
            # We assume the bzrdir is parameterised; it may not be.
1785
            result = self._custom_format.initialize(a_bzrdir)
1786
        if (isinstance(a_bzrdir, RemoteBzrDir) and
1787
            not isinstance(result, RemoteBranch)):
1788
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
1789
        return result
1790
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1791
    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.
1792
        # 1) get the network name to use.
1793
        if self._custom_format:
1794
            network_name = self._custom_format.network_name()
1795
        else:
1796
            # Select the current bzrlib default and ask for that.
1797
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
1798
            reference_format = reference_bzrdir_format.get_branch_format()
1799
            self._custom_format = reference_format
1800
            network_name = reference_format.network_name()
1801
        # 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.
1802
        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.
1803
            return self._vfs_initialize(a_bzrdir)
1804
        medium = a_bzrdir._client._medium
1805
        if medium._is_remote_before((1, 13)):
1806
            return self._vfs_initialize(a_bzrdir)
1807
        # Creating on a remote bzr dir.
1808
        # 2) try direct creation via RPC
1809
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
1810
        verb = 'BzrDir.create_branch'
1811
        try:
1812
            response = a_bzrdir._call(verb, path, network_name)
1813
        except errors.UnknownSmartMethod:
1814
            # Fallback - use vfs methods
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
1815
            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.
1816
            return self._vfs_initialize(a_bzrdir)
1817
        if response[0] != 'ok':
1818
            raise errors.UnexpectedSmartServerResponse(response)
1819
        # 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.
1820
        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.
1821
        repo_format = response_tuple_to_repo_format(response[3:])
1822
        if response[2] == '':
1823
            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.
1824
        else:
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1825
            repo_bzrdir = RemoteBzrDir(
1826
                a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
1827
                a_bzrdir._client)
1828
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
1829
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
1830
            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.
1831
        # XXX: We know this is a new branch, so it must have revno 0, revid
1832
        # NULL_REVISION. Creating the branch locked would make this be unable
1833
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
1834
        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.
1835
        return remote_branch
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1836
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.
1837
    def make_tags(self, branch):
1838
        self._ensure_real()
1839
        return self._custom_format.make_tags(branch)
1840
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1841
    def supports_tags(self):
1842
        # Remote branches might support tags, but we won't know until we
1843
        # 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.
1844
        self._ensure_real()
1845
        return self._custom_format.supports_tags()
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1846
4103.2.2 by Andrew Bennetts
Fix RemoteBranchFormat.supports_stacking()
1847
    def supports_stacking(self):
1848
        self._ensure_real()
1849
        return self._custom_format.supports_stacking()
1850
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1851
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1852
class RemoteBranch(branch.Branch, _RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1853
    """Branch stored on a server accessed by HPSS RPC.
1854
1855
    At the moment most operations are mapped down to simple file operations.
1856
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1857
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1858
    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.
1859
        _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.
1860
        """Create a RemoteBranch instance.
1861
1862
        :param real_branch: An optional local implementation of the branch
1863
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1864
        :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.
1865
        :param format: A RemoteBranchFormat object, None to create one
1866
            automatically. If supplied it should have a network_name already
1867
            supplied.
1868
        :param setup_stacking: If True make an RPC call to determine the
1869
            stacked (or not) status of the branch. If False assume the branch
1870
            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.
1871
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1872
        # We intentionally don't call the parent class's __init__, because it
1873
        # will try to assign to self.tags, which is a property in this subclass.
1874
        # 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.
1875
        self._revision_id_to_revno_cache = None
3949.2.6 by Ian Clatworthy
review feedback from jam
1876
        self._partial_revision_id_to_revno_cache = {}
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1877
        self._revision_history_cache = None
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1878
        self._last_revision_info_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
1879
        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.
1880
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1881
        if _client is not None:
1882
            self._client = _client
1883
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1884
            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.
1885
        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.
1886
        if real_branch is not None:
1887
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1888
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1889
            real_repo = self._real_branch.repository
1890
            if isinstance(real_repo, RemoteRepository):
1891
                real_repo._ensure_real()
1892
                real_repo = real_repo._real_repository
1893
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1894
            # Give the branch the remote repository to let fast-pathing happen.
1895
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1896
        else:
1897
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1898
        # 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.
1899
        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.
1900
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1901
        self._lock_mode = None
1902
        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.
1903
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1904
        self._lock_count = 0
1905
        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.
1906
        # Setup a format: note that we cannot call _ensure_real until all the
1907
        # attributes above are set: This code cannot be moved higher up in this
1908
        # function.
1909
        if format is None:
1910
            self._format = RemoteBranchFormat()
1911
            if real_branch is not None:
1912
                self._format._network_name = \
1913
                    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.
1914
        else:
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1915
            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.
1916
        if not self._format._network_name:
1917
            # Did not get from open_branchV2 - old server.
1918
            self._ensure_real()
1919
            self._format._network_name = \
1920
                self._real_branch._format.network_name()
1921
        self.tags = self._format.make_tags(self)
3681.1.2 by Robert Collins
Adjust for trunk.
1922
        # 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)
1923
        hooks = branch.Branch.hooks['open']
1924
        for hook in hooks:
1925
            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.
1926
        if setup_stacking:
1927
            self._setup_stacking()
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1928
1929
    def _setup_stacking(self):
1930
        # 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
1931
        # the vfs branch.
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1932
        try:
1933
            fallback_url = self.get_stacked_on_url()
1934
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1935
            errors.UnstackableRepositoryFormat), e:
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
1936
            return
1937
        # it's relative to this branch...
1938
        fallback_url = urlutils.join(self.base, fallback_url)
1939
        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.
1940
        stacked_on = branch.Branch.open(fallback_url,
1941
                                        possible_transports=transports)
1942
        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.
1943
3407.2.17 by Martin Pool
better name: _get_real_transport
1944
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1945
        # if we try vfs access, return the real branch's vfs transport
1946
        self._ensure_real()
1947
        return self._real_branch._transport
1948
3407.2.17 by Martin Pool
better name: _get_real_transport
1949
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1950
2477.1.1 by Martin Pool
Add RemoteBranch repr
1951
    def __str__(self):
1952
        return "%s(%s)" % (self.__class__.__name__, self.base)
1953
1954
    __repr__ = __str__
1955
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1956
    def _ensure_real(self):
1957
        """Ensure that there is a _real_branch set.
1958
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1959
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1960
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1961
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1962
            if not vfs.vfs_enabled():
1963
                raise AssertionError('smart server vfs must be enabled '
1964
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1965
            self.bzrdir._ensure_real()
1966
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1967
            if self.repository._real_repository is None:
1968
                # Give the remote repository the matching real repo.
1969
                real_repo = self._real_branch.repository
1970
                if isinstance(real_repo, RemoteRepository):
1971
                    real_repo._ensure_real()
1972
                    real_repo = real_repo._real_repository
1973
                self.repository._set_real_repository(real_repo)
1974
            # Give the real branch the remote repository to let fast-pathing
1975
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1976
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1977
            if self._lock_mode == 'r':
1978
                self._real_branch.lock_read()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1979
            elif self._lock_mode == 'w':
1980
                self._real_branch.lock_write(token=self._lock_token)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1981
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1982
    def _translate_error(self, err, **context):
1983
        self.repository._translate_error(err, branch=self, **context)
1984
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1985
    def _clear_cached_state(self):
1986
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1987
        if self._real_branch is not None:
1988
            self._real_branch._clear_cached_state()
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1989
1990
    def _clear_cached_state_of_remote_branch_only(self):
1991
        """Like _clear_cached_state, but doesn't clear the cache of
1992
        self._real_branch.
1993
1994
        This is useful when falling back to calling a method of
1995
        self._real_branch that changes state.  In that case the underlying
1996
        branch changes, so we need to invalidate this RemoteBranch's cache of
1997
        it.  However, there's no need to invalidate the _real_branch's cache
1998
        too, in fact doing so might harm performance.
1999
        """
2000
        super(RemoteBranch, self)._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2001
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
2002
    @property
2003
    def control_files(self):
2004
        # Defer actually creating RemoteBranchLockableFiles until its needed,
2005
        # because it triggers an _ensure_real that we otherwise might not need.
2006
        if self._control_files is None:
2007
            self._control_files = RemoteBranchLockableFiles(
2008
                self.bzrdir, self._client)
2009
        return self._control_files
2010
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
2011
    def _get_checkout_format(self):
2012
        self._ensure_real()
2013
        return self._real_branch._get_checkout_format()
2014
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2015
    def get_physical_lock_status(self):
2016
        """See Branch.get_physical_lock_status()."""
2017
        # should be an API call to the server, as branches must be lockable.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2018
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2019
        return self._real_branch.get_physical_lock_status()
2020
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2021
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2022
        """Get the URL this branch is stacked against.
2023
2024
        :raises NotStacked: If the branch is not stacked.
2025
        :raises UnstackableBranchFormat: If the branch does not support
2026
            stacking.
2027
        :raises UnstackableRepositoryFormat: If the repository does not support
2028
            stacking.
2029
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2030
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2031
            # there may not be a repository yet, so we can't use
2032
            # self._translate_error, so we can't use self._call either.
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2033
            response = self._client.call('Branch.get_stacked_on_url',
2034
                self._remote_path())
2035
        except errors.ErrorFromSmartServer, err:
2036
            # there may not be a repository yet, so we can't call through
2037
            # its _translate_error
2038
            _translate_error(err, branch=self)
2039
        except errors.UnknownSmartMethod, err:
2040
            self._ensure_real()
2041
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2042
        if response[0] != 'ok':
2043
            raise errors.UnexpectedSmartServerResponse(response)
2044
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2045
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2046
    def _vfs_get_tags_bytes(self):
2047
        self._ensure_real()
2048
        return self._real_branch._get_tags_bytes()
2049
2050
    def _get_tags_bytes(self):
2051
        medium = self._client._medium
2052
        if medium._is_remote_before((1, 13)):
2053
            return self._vfs_get_tags_bytes()
2054
        try:
2055
            response = self._call('Branch.get_tags_bytes', self._remote_path())
2056
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2057
            medium._remember_remote_is_before((1, 13))
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2058
            return self._vfs_get_tags_bytes()
2059
        return response[0]
2060
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2061
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2062
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2063
        if not self._lock_mode:
2064
            self._lock_mode = 'r'
2065
            self._lock_count = 1
2066
            if self._real_branch is not None:
2067
                self._real_branch.lock_read()
2068
        else:
2069
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2070
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2071
    def _remote_lock_write(self, token):
2072
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2073
            branch_token = repo_token = ''
2074
        else:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2075
            branch_token = token
2076
            repo_token = self.repository.lock_write()
2077
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2078
        err_context = {'token': token}
2079
        response = self._call(
2080
            'Branch.lock_write', self._remote_path(), branch_token,
2081
            repo_token or '', **err_context)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2082
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
2083
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2084
        ok, branch_token, repo_token = response
2085
        return branch_token, repo_token
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2086
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2087
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2088
        if not self._lock_mode:
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
2089
            # Lock the branch and repo in one remote call.
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2090
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2091
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2092
            if not self._lock_token:
2093
                raise SmartProtocolError('Remote server did not return a token!')
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
2094
            # Tell the self.repository object that it is locked.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
2095
            self.repository.lock_write(
2096
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2097
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2098
            if self._real_branch is not None:
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
2099
                self._real_branch.lock_write(token=self._lock_token)
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2100
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2101
                self._leave_lock = True
2102
            else:
2103
                self._leave_lock = False
2104
            self._lock_mode = 'w'
2105
            self._lock_count = 1
2106
        elif self._lock_mode == 'r':
2107
            raise errors.ReadOnlyTransaction
2108
        else:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2109
            if token is not None:
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
2110
                # A token was given to lock_write, and we're relocking, so
2111
                # check that the given token actually matches the one we
2112
                # already have.
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2113
                if token != self._lock_token:
2114
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2115
            self._lock_count += 1
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
2116
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
2117
            self.repository.lock_write(self._repo_lock_token)
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
2118
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2119
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2120
    def _set_tags_bytes(self, bytes):
2121
        self._ensure_real()
2122
        return self._real_branch._set_tags_bytes(bytes)
2123
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2124
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2125
        err_context = {'token': str((branch_token, repo_token))}
2126
        response = self._call(
2127
            'Branch.unlock', self._remote_path(), branch_token,
2128
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2129
        if response == ('ok',):
2130
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2131
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2132
2133
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2134
        try:
2135
            self._lock_count -= 1
2136
            if not self._lock_count:
2137
                self._clear_cached_state()
2138
                mode = self._lock_mode
2139
                self._lock_mode = None
2140
                if self._real_branch is not None:
2141
                    if (not self._leave_lock and mode == 'w' and
2142
                        self._repo_lock_token):
2143
                        # If this RemoteBranch will remove the physical lock
2144
                        # for the repository, make sure the _real_branch
2145
                        # doesn't do it first.  (Because the _real_branch's
2146
                        # repository is set to be the RemoteRepository.)
2147
                        self._real_branch.repository.leave_lock_in_place()
2148
                    self._real_branch.unlock()
2149
                if mode != 'w':
2150
                    # Only write-locked branched need to make a remote method
2151
                    # call to perfom the unlock.
2152
                    return
2153
                if not self._lock_token:
2154
                    raise AssertionError('Locked, but no token!')
2155
                branch_token = self._lock_token
2156
                repo_token = self._repo_lock_token
2157
                self._lock_token = None
2158
                self._repo_lock_token = None
2159
                if not self._leave_lock:
2160
                    self._unlock(branch_token, repo_token)
2161
        finally:
2162
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2163
2164
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2165
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2166
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2167
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2168
    def leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
2169
        if not self._lock_token:
2170
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2171
        self._leave_lock = True
2172
2173
    def dont_leave_lock_in_place(self):
3015.2.9 by Robert Collins
Handle repositories that do not allow remote locking, like pack repositories, in the client side remote server proxy objects.
2174
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
2175
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2176
        self._leave_lock = False
2177
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2178
    def _last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2179
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2180
        if response[0] != 'ok':
2181
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2182
        revno = int(response[1])
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
2183
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2184
        return (revno, last_revision)
2185
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2186
    def _gen_revision_history(self):
2187
        """See Branch._gen_revision_history()."""
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2188
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2189
            'Branch.revision_history', self._remote_path())
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
2190
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
2191
            raise errors.UnexpectedSmartServerResponse(response_tuple)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
2192
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
2193
        if result == ['']:
2194
            return []
2195
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2196
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2197
    def _remote_path(self):
2198
        return self.bzrdir._path_for_remote_call(self._client)
2199
3441.5.18 by Andrew Bennetts
Fix some test failures.
2200
    def _set_last_revision_descendant(self, revision_id, other_branch,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
2201
            allow_diverged=False, allow_overwrite_descendant=False):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2202
        # This performs additional work to meet the hook contract; while its
2203
        # undesirable, we have to synthesise the revno to call the hook, and
2204
        # not calling the hook is worse as it means changes can't be prevented.
2205
        # Having calculated this though, we can't just call into
2206
        # set_last_revision_info as a simple call, because there is a set_rh
2207
        # hook that some folk may still be using.
2208
        old_revno, old_revid = self.last_revision_info()
2209
        history = self._lefthand_history(revision_id)
2210
        self._run_pre_change_branch_tip_hooks(len(history), revision_id)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2211
        err_context = {'other_branch': other_branch}
2212
        response = self._call('Branch.set_last_revision_ex',
2213
            self._remote_path(), self._lock_token, self._repo_lock_token,
2214
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
2215
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2216
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
2217
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2218
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
2219
        new_revno, new_revision_id = response[1:]
2220
        self._last_revision_info_cache = new_revno, new_revision_id
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2221
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
2222
        if self._real_branch is not None:
2223
            cache = new_revno, new_revision_id
2224
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2225
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2226
    def _set_last_revision(self, revision_id):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2227
        old_revno, old_revid = self.last_revision_info()
2228
        # This performs additional work to meet the hook contract; while its
2229
        # undesirable, we have to synthesise the revno to call the hook, and
2230
        # not calling the hook is worse as it means changes can't be prevented.
2231
        # Having calculated this though, we can't just call into
2232
        # set_last_revision_info as a simple call, because there is a set_rh
2233
        # hook that some folk may still be using.
2234
        history = self._lefthand_history(revision_id)
2235
        self._run_pre_change_branch_tip_hooks(len(history), revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2236
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2237
        response = self._call('Branch.set_last_revision',
2238
            self._remote_path(), self._lock_token, self._repo_lock_token,
2239
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2240
        if response != ('ok',):
2241
            raise errors.UnexpectedSmartServerResponse(response)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2242
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2243
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2244
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2245
    def set_revision_history(self, rev_history):
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
2246
        # Send just the tip revision of the history; the server will generate
2247
        # the full history from that.  If the revision doesn't exist in this
2248
        # branch, NoSuchRevision will be raised.
2249
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
2250
            rev_id = 'null:'
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
2251
        else:
2252
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2253
        self._set_last_revision(rev_id)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2254
        for hook in branch.Branch.hooks['set_rh']:
2255
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2256
        self._cache_revision_history(rev_history)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2257
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2258
    def _get_parent_location(self):
2259
        medium = self._client._medium
2260
        if medium._is_remote_before((1, 13)):
2261
            return self._vfs_get_parent_location()
2262
        try:
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2263
            response = self._call('Branch.get_parent', self._remote_path())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2264
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2265
            medium._remember_remote_is_before((1, 13))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2266
            return self._vfs_get_parent_location()
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2267
        if len(response) != 1:
4083.1.6 by Andrew Bennetts
Fix trivial bug in my trivial bug fix :)
2268
            raise errors.UnexpectedSmartServerResponse(response)
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2269
        parent_location = response[0]
2270
        if parent_location == '':
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2271
            return None
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2272
        return parent_location
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2273
2274
    def _vfs_get_parent_location(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2275
        self._ensure_real()
4083.1.5 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2276
        return self._real_branch._get_parent_location()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2277
1752.2.63 by Andrew Bennetts
Delegate set_parent.
2278
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2279
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
2280
        return self._real_branch.set_parent(url)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2281
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
2282
    def _set_parent_location(self, url):
2283
        # Used by tests, to poke bad urls into branch configurations
2284
        if url is None:
2285
            self.set_parent(url)
2286
        else:
2287
            self._ensure_real()
2288
            return self._real_branch._set_parent_location(url)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2289
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2290
    def set_stacked_on_url(self, stacked_location):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2291
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2292
2293
        :raises UnstackableBranchFormat: If the branch does not support
2294
            stacking.
2295
        :raises UnstackableRepositoryFormat: If the repository does not support
2296
            stacking.
2297
        """
2298
        self._ensure_real()
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2299
        return self._real_branch.set_stacked_on_url(stacked_location)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2300
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2301
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2302
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
2303
             **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.
2304
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2305
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
2306
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2307
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
2308
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2309
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2310
    @needs_read_lock
2311
    def push(self, target, overwrite=False, stop_revision=None):
2312
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
2313
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
2314
            target, overwrite=overwrite, stop_revision=stop_revision,
2315
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2316
2317
    def is_locked(self):
2318
        return self._lock_count >= 1
2319
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
2320
    @needs_read_lock
2321
    def revision_id_to_revno(self, revision_id):
2322
        self._ensure_real()
2323
        return self._real_branch.revision_id_to_revno(revision_id)
2324
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2325
    @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.
2326
    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.
2327
        # XXX: These should be returned by the set_last_revision_info verb
2328
        old_revno, old_revid = self.last_revision_info()
2329
        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.
2330
        revision_id = ensure_null(revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2331
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2332
            response = self._call('Branch.set_last_revision_info',
2333
                self._remote_path(), self._lock_token, self._repo_lock_token,
2334
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2335
        except errors.UnknownSmartMethod:
2336
            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.
2337
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2338
            self._real_branch.set_last_revision_info(revno, revision_id)
2339
            self._last_revision_info_cache = revno, revision_id
2340
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2341
        if response == ('ok',):
2342
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2343
            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.
2344
            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.
2345
            # Update the _real_branch's cache too.
2346
            if self._real_branch is not None:
2347
                cache = self._last_revision_info_cache
2348
                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.
2349
        else:
2350
            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.
2351
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.
2352
    @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.
2353
    def generate_revision_history(self, revision_id, last_rev=None,
2354
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2355
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
2356
        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.
2357
            # 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.
2358
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
2359
                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.
2360
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2361
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
2362
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
2363
                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.
2364
        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.
2365
        self.set_revision_history(self._lefthand_history(revision_id,
2366
            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
2367
2018.5.97 by Andrew Bennetts
Fix more tests.
2368
    def set_push_location(self, location):
2369
        self._ensure_real()
2370
        return self._real_branch.set_push_location(location)
2371
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2372
2373
def _extract_tar(tar, to_dir):
2374
    """Extract all the contents of a tarfile object.
2375
2376
    A replacement for extractall, which is not present in python2.4
2377
    """
2378
    for tarinfo in tar:
2379
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2380
2381
2382
def _translate_error(err, **context):
2383
    """Translate an ErrorFromSmartServer into a more useful error.
2384
2385
    Possible context keys:
2386
      - branch
2387
      - repository
2388
      - bzrdir
2389
      - token
2390
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2391
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
2392
2393
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2394
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2395
    """
2396
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2397
        try:
2398
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2399
        except KeyError, key_err:
2400
            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.
2401
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2402
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
2403
        """Get the path from the context if present, otherwise use first error
2404
        arg.
2405
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2406
        try:
2407
            return context['path']
2408
        except KeyError, key_err:
2409
            try:
2410
                return err.error_args[0]
2411
            except IndexError, idx_err:
2412
                mutter(
2413
                    'Missing key %r in context %r', key_err.args[0], context)
2414
                raise err
2415
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2416
    if err.error_verb == 'NoSuchRevision':
2417
        raise NoSuchRevision(find('branch'), err.error_args[0])
2418
    elif err.error_verb == 'nosuchrevision':
2419
        raise NoSuchRevision(find('repository'), err.error_args[0])
2420
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2421
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2422
    elif err.error_verb == 'norepository':
2423
        raise errors.NoRepositoryPresent(find('bzrdir'))
2424
    elif err.error_verb == 'LockContention':
2425
        raise errors.LockContention('(remote lock)')
2426
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2427
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2428
    elif err.error_verb == 'LockFailed':
2429
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
2430
    elif err.error_verb == 'TokenMismatch':
2431
        raise errors.TokenMismatch(find('token'), '(remote token)')
2432
    elif err.error_verb == 'Diverged':
2433
        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.
2434
    elif err.error_verb == 'TipChangeRejected':
2435
        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
2436
    elif err.error_verb == 'UnstackableBranchFormat':
2437
        raise errors.UnstackableBranchFormat(*err.error_args)
2438
    elif err.error_verb == 'UnstackableRepositoryFormat':
2439
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2440
    elif err.error_verb == 'NotStacked':
2441
        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.
2442
    elif err.error_verb == 'PermissionDenied':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2443
        path = get_path()
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2444
        if len(err.error_args) >= 2:
2445
            extra = err.error_args[1]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2446
        else:
2447
            extra = None
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2448
        raise errors.PermissionDenied(path, extra=extra)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2449
    elif err.error_verb == 'ReadError':
2450
        path = get_path()
2451
        raise errors.ReadError(path)
2452
    elif err.error_verb == 'NoSuchFile':
2453
        path = get_path()
2454
        raise errors.NoSuchFile(path)
2455
    elif err.error_verb == 'FileExists':
2456
        raise errors.FileExists(err.error_args[0])
2457
    elif err.error_verb == 'DirectoryNotEmpty':
2458
        raise errors.DirectoryNotEmpty(err.error_args[0])
2459
    elif err.error_verb == 'ShortReadvError':
2460
        args = err.error_args
2461
        raise errors.ShortReadvError(
2462
            args[0], int(args[1]), int(args[2]), int(args[3]))
2463
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
2464
        encoding = str(err.error_args[0]) # encoding must always be a string
2465
        val = err.error_args[1]
2466
        start = int(err.error_args[2])
2467
        end = int(err.error_args[3])
2468
        reason = str(err.error_args[4]) # reason must always be a string
2469
        if val.startswith('u:'):
2470
            val = val[2:].decode('utf-8')
2471
        elif val.startswith('s:'):
2472
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2473
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2474
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2475
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2476
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2477
    elif err.error_verb == 'ReadOnlyError':
2478
        raise errors.TransportNotPossible('readonly transport')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2479
    raise errors.UnknownErrorFromSmartServer(err)