/brz/remove-bazaar

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