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