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