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