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