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