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