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