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