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