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