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