/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3407.2.2 by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
17
# TODO: At some point, handle upgrades by just passing the whole request
18
# across to run on the server.
19
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
20
import bz2
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
21
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
22
from bzrlib import (
23
    branch,
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
24
    bzrdir,
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
25
    debug,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
26
    errors,
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
27
    graph,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
28
    lockdir,
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
29
    pack,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
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
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
46
from bzrlib.versionedfile import record_to_fulltext_bytes
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
47
3445.1.5 by John Arbash Meinel
allow passing a 'graph' object into Branch.update_revisions.
48
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
49
class _RpcHelper(object):
50
    """Mixin class that helps with issuing RPCs."""
51
52
    def _call(self, method, *args, **err_context):
53
        try:
54
            return self._client.call(method, *args)
55
        except errors.ErrorFromSmartServer, err:
56
            self._translate_error(err, **err_context)
57
        
58
    def _call_expecting_body(self, method, *args, **err_context):
59
        try:
60
            return self._client.call_expecting_body(method, *args)
61
        except errors.ErrorFromSmartServer, err:
62
            self._translate_error(err, **err_context)
63
        
64
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
65
                                             **err_context):
66
        try:
67
            return self._client.call_with_body_bytes_expecting_body(
68
                method, args, body_bytes)
69
        except errors.ErrorFromSmartServer, err:
70
            self._translate_error(err, **err_context)
71
        
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
72
# Note: RemoteBzrDirFormat is in bzrdir.py
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
73
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
74
class RemoteBzrDir(BzrDir, _RpcHelper):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
75
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
76
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.
77
    def __init__(self, transport, format, _client=None):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
78
        """Construct a RemoteBzrDir.
79
80
        :param _client: Private parameter for testing. Disables probing and the
81
            use of a real bzrdir.
82
        """
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.
83
        BzrDir.__init__(self, transport, format)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
84
        # this object holds a delegated bzrdir that uses file-level operations
85
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
86
        self._real_bzrdir = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
87
88
        if _client is None:
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
89
            medium = transport.get_smart_medium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
90
            self._client = client._SmartClient(medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
91
        else:
92
            self._client = _client
93
            return
94
95
        path = self._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
96
        response = self._call('BzrDir.open', path)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
97
        if response not in [('yes',), ('no',)]:
98
            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.
99
        if response == ('no',):
100
            raise errors.NotBranchError(path=transport.base)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
101
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
102
    def _ensure_real(self):
103
        """Ensure that there is a _real_bzrdir set.
104
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
105
        Used before calls to self._real_bzrdir.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
106
        """
107
        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.
108
            self._real_bzrdir = BzrDir.open_from_transport(
109
                self.root_transport, _server_formats=False)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
110
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
111
    def _translate_error(self, err, **context):
112
        _translate_error(err, bzrdir=self, **context)
113
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
114
    def cloning_metadir(self, stacked=False):
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
115
        self._ensure_real()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
116
        return self._real_bzrdir.cloning_metadir(stacked)
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
117
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
118
    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.
119
        # as per meta1 formats - just delegate to the format object which may
120
        # be parameterised.
121
        result = self._format.repository_format.initialize(self, shared)
122
        if not isinstance(result, RemoteRepository):
123
            return self.open_repository()
124
        else:
125
            return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
126
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
127
    def destroy_repository(self):
128
        """See BzrDir.destroy_repository"""
129
        self._ensure_real()
130
        self._real_bzrdir.destroy_repository()
131
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
132
    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.
133
        # as per meta1 formats - just delegate to the format object which may
134
        # be parameterised.
135
        real_branch = self._format.get_branch_format().initialize(self)
136
        if not isinstance(real_branch, RemoteBranch):
137
            return RemoteBranch(self, self.find_repository(), real_branch)
138
        else:
139
            return real_branch
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
140
2796.2.6 by Aaron Bentley
Implement destroy_branch
141
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
142
        """See BzrDir.destroy_branch"""
2796.2.6 by Aaron Bentley
Implement destroy_branch
143
        self._ensure_real()
144
        self._real_bzrdir.destroy_branch()
145
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
146
    def create_workingtree(self, revision_id=None, from_branch=None):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
147
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
148
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.
149
    def find_branch_format(self):
150
        """Find the branch 'format' for this bzrdir.
151
152
        This might be a synthetic object for e.g. RemoteBranch and SVN.
153
        """
154
        b = self.open_branch()
155
        return b._format
156
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.
157
    def get_branch_reference(self):
158
        """See BzrDir.get_branch_reference()."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
159
        path = self._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
160
        response = self._call('BzrDir.open_branch', path)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
161
        if response[0] == 'ok':
162
            if response[1] == '':
163
                # 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.
164
                return None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
165
            else:
166
                # 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.
167
                return response[1]
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
168
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
169
            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.
170
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
171
    def _get_tree_branch(self):
172
        """See BzrDir._get_tree_branch()."""
173
        return None, self.open_branch()
174
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
175
    def open_branch(self, _unsupported=False):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
176
        if _unsupported:
177
            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.
178
        reference_url = self.get_branch_reference()
179
        if reference_url is None:
180
            # branch at this location.
181
            return RemoteBranch(self, self.find_repository())
182
        else:
183
            # a branch reference, use the existing BranchReference logic.
184
            format = BranchReferenceFormat()
185
            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.
186
                
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
187
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
188
        path = self._path_for_remote_call(self._client)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
189
        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.
190
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
191
            response = self._call(verb, path)
192
        except errors.UnknownSmartMethod:
193
            verb = 'BzrDir.find_repository'
194
            response = self._call(verb, path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
195
        if response[0] != 'ok':
196
            raise errors.UnexpectedSmartServerResponse(response)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
197
        if verb == 'BzrDir.find_repository':
198
            # servers that don't support the V2 method don't support external
199
            # references either.
200
            response = response + ('no', )
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
201
        if not (len(response) == 5):
202
            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.
203
        if response[1] == '':
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
204
            format = RemoteRepositoryFormat()
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
205
            format.rich_root_data = (response[2] == 'yes')
206
            format.supports_tree_reference = (response[3] == 'yes')
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
207
            # No wire format to check this yet.
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
208
            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.
209
            # Used to support creating a real format instance when needed.
210
            format._creating_bzrdir = self
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
211
            remote_repo = RemoteRepository(self, format)
212
            format._creating_repo = remote_repo
213
            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.
214
        else:
215
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
216
2018.5.138 by Robert Collins
Merge bzr.dev.
217
    def open_workingtree(self, recommend_upgrade=True):
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
218
        self._ensure_real()
219
        if self._real_bzrdir.has_workingtree():
220
            raise errors.NotLocalUrl(self.root_transport)
221
        else:
222
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
223
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
224
    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.
225
        """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 :).
226
        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.
227
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
228
    def get_branch_transport(self, branch_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
229
        self._ensure_real()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
230
        return self._real_bzrdir.get_branch_transport(branch_format)
231
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
232
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
233
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
234
        return self._real_bzrdir.get_repository_transport(repository_format)
235
236
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
237
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
238
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
239
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
240
    def can_convert_format(self):
241
        """Upgrading of remote bzrdirs is not supported yet."""
242
        return False
243
244
    def needs_format_conversion(self, format=None):
245
        """Upgrading of remote bzrdirs is not supported yet."""
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
246
        if format is None:
247
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
248
                % 'needs_format_conversion(format=None)')
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
249
        return False
250
3242.3.37 by Aaron Bentley
Updates from reviews
251
    def clone(self, url, revision_id=None, force_new_repo=False,
252
              preserve_stacking=False):
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
253
        self._ensure_real()
254
        return self._real_bzrdir.clone(url, revision_id=revision_id,
3242.3.37 by Aaron Bentley
Updates from reviews
255
            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).
256
3567.1.3 by Michael Hudson
fix problem
257
    def get_config(self):
258
        self._ensure_real()
259
        return self._real_bzrdir.get_config()
260
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
261
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
262
class RemoteRepositoryFormat(repository.RepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
263
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
264
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
265
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
266
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
267
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
268
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
269
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
270
    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.
271
    on a per instance basis, and are not set (and should not be) at
272
    the class level.
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
273
274
    :ivar _custom_format: If set, a specific concrete repository format that 
275
        will be used when initializing a repository with this
276
        RemoteRepositoryFormat.
277
    :ivar _creating_repo: If set, the repository object that this
278
        RemoteRepositoryFormat was created for: it can be called into
3990.5.4 by Robert Collins
Review feedback.
279
        to obtain data like the network name.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
280
    """
281
3543.1.2 by Michael Hudson
the two character fix
282
    _matchingbzrdir = RemoteBzrDirFormat()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
283
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.
284
    def __init__(self):
285
        repository.RepositoryFormat.__init__(self)
286
        self._custom_format = None
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
287
        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.
288
        self._creating_bzrdir = None
289
290
    def _vfs_initialize(self, a_bzrdir, shared):
291
        """Helper for common code in initialize."""
292
        if self._custom_format:
293
            # Custom format requested
294
            result = self._custom_format.initialize(a_bzrdir, shared=shared)
295
        elif self._creating_bzrdir is not None:
296
            # Use the format that the repository we were created to back
297
            # has.
298
            prior_repo = self._creating_bzrdir.open_repository()
299
            prior_repo._ensure_real()
300
            result = prior_repo._real_repository._format.initialize(
301
                a_bzrdir, shared=shared)
302
        else:
303
            # assume that a_bzr is a RemoteBzrDir but the smart server didn't
304
            # support remote initialization.
305
            # We delegate to a real object at this point (as RemoteBzrDir
306
            # delegate to the repository format which would lead to infinite
307
            # recursion if we just called a_bzrdir.create_repository.
308
            a_bzrdir._ensure_real()
309
            result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
310
        if not isinstance(result, RemoteRepository):
311
            return self.open(a_bzrdir)
312
        else:
313
            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.
314
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
315
    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.
316
        # Being asked to create on a non RemoteBzrDir:
317
        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.
318
            return self._vfs_initialize(a_bzrdir, shared)
319
        medium = a_bzrdir._client._medium
320
        if medium._is_remote_before((1, 13)):
321
            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.
322
        # Creating on a remote bzr dir.
323
        # 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.
324
        if self._custom_format:
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
325
            network_name = self._custom_format.network_name()
326
        else:
327
            # Select the current bzrlib default and ask for that.
328
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
329
            reference_format = reference_bzrdir_format.repository_format
330
            network_name = reference_format.network_name()
331
        # 2) try direct creation via RPC
332
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
333
        verb = 'BzrDir.create_repository'
334
        if shared:
335
            shared_str = 'True'
336
        else:
337
            shared_str = 'False'
338
        try:
339
            response = a_bzrdir._call(verb, path, network_name, shared_str)
340
        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.
341
            # Fallback - use vfs methods
342
            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.
343
        else:
344
            # Turn the response into a RemoteRepository object.
345
            format = RemoteRepositoryFormat()
346
            format.rich_root_data = (response[1] == 'yes')
347
            format.supports_tree_reference = (response[2] == 'yes')
348
            format.supports_external_lookups = (response[3] == 'yes')
349
            format._network_name = response[4]
350
            # Used to support creating a real format instance when needed.
351
            format._creating_bzrdir = a_bzrdir
352
            remote_repo = RemoteRepository(a_bzrdir, format)
353
            format._creating_repo = remote_repo
354
            return remote_repo
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
355
    
356
    def open(self, a_bzrdir):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
357
        if not isinstance(a_bzrdir, RemoteBzrDir):
358
            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.
359
        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.
360
361
    def get_format_description(self):
362
        return 'bzr remote repository'
363
364
    def __eq__(self, other):
1752.2.87 by Andrew Bennetts
Make tests pass.
365
        return self.__class__ == other.__class__
366
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
367
    def check_conversion_target(self, target_format):
368
        if self.rich_root_data and not target_format.rich_root_data:
369
            raise errors.BadConversionTarget(
370
                'Does not support rich root data.', target_format)
2018.5.138 by Robert Collins
Merge bzr.dev.
371
        if (self.supports_tree_reference and
372
            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.
373
            raise errors.BadConversionTarget(
374
                '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.
375
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
376
    def network_name(self):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
377
        if self._network_name:
378
            return self._network_name
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
379
        self._creating_repo._ensure_real()
380
        return self._creating_repo._real_repository._format.network_name()
381
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)
382
    @property
383
    def _serializer(self):
384
        # We should only be getting asked for the serializer for
4022.1.3 by Robert Collins
Make a comment easier to read.
385
        # RemoteRepositoryFormat objects when the RemoteRepositoryFormat object
386
        # is a concrete instance for a RemoteRepository. In this case we know
387
        # 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)
388
        self._creating_repo._ensure_real()
389
        return self._creating_repo._real_repository._format._serializer
390
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
391
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
392
class RemoteRepository(_RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
393
    """Repository accessed over rpc.
394
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
395
    For the moment most operations are performed using local transport-backed
396
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
397
    """
398
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
399
    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.
400
        """Create a RemoteRepository instance.
401
        
402
        :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.
403
        :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.
404
        :param real_repository: If not None, a local implementation of the
405
            repository logic for the repository, usually accessing the data
406
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
407
        :param _client: Private testing parameter - override the smart client
408
            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.
409
        """
410
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
411
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
412
        else:
413
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
414
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
415
        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.
416
            self._client = remote_bzrdir._client
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
417
        else:
418
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
419
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
420
        self._lock_mode = None
421
        self._lock_token = None
422
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
423
        self._leave_lock = False
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
424
        self._unstacked_provider = graph.CachingParentsProvider(
3896.1.1 by Andrew Bennetts
Remove broken debugging cruft, and some unused imports.
425
            get_parent_map=self._get_parent_map_rpc)
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
426
        self._unstacked_provider.disable_cache()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
427
        # For tests:
428
        # These depend on the actual remote format, so force them off for
429
        # maximum compatibility. XXX: In future these should depend on the
430
        # remote repository instance, but this is irrelevant until we perform
431
        # 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.
432
        self._reconcile_does_inventory_gc = False
433
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
434
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
435
        self.base = self.bzrdir.transport.base
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
436
        # Additional places to query for data.
437
        self._fallback_repositories = []
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
438
439
    def __str__(self):
440
        return "%s(%s)" % (self.__class__.__name__, self.base)
441
442
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
443
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
444
    def abort_write_group(self, suppress_errors=False):
2617.6.7 by Robert Collins
More review feedback.
445
        """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.
446
        
4031.3.1 by Frank Aspell
Fixing various typos
447
        Smart methods perform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
448
        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.
449
        for older plugins that don't use e.g. the CommitBuilder
450
        facility.
3825.4.6 by Andrew Bennetts
Document the suppress_errors flag in the docstring.
451
452
        :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.
453
        """
454
        self._ensure_real()
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
455
        return self._real_repository.abort_write_group(
456
            suppress_errors=suppress_errors)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
457
458
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
459
        """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.
460
        
4031.3.1 by Frank Aspell
Fixing various typos
461
        Smart methods perform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
462
        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.
463
        for older plugins that don't use e.g. the CommitBuilder
464
        facility.
465
        """
466
        self._ensure_real()
467
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
468
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
469
    def resume_write_group(self, tokens):
470
        self._ensure_real()
471
        return self._real_repository.resume_write_group(tokens)
472
473
    def suspend_write_group(self):
474
        self._ensure_real()
475
        return self._real_repository.suspend_write_group()
476
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
477
    def _ensure_real(self):
478
        """Ensure that there is a _real_repository set.
479
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
480
        Used before calls to self._real_repository.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
481
        """
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.
482
        if self._real_repository is None:
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
483
            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.
484
            self._set_real_repository(
485
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
486
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
487
    def _translate_error(self, err, **context):
488
        self.bzrdir._translate_error(err, repository=self, **context)
489
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
490
    def find_text_key_references(self):
491
        """Find the text key references within the repository.
492
493
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
494
        revision_ids. Each altered file-ids has the exact revision_ids that
495
        altered it listed explicitly.
496
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
497
            to whether they were referred to by the inventory of the
498
            revision_id that they contain. The inventory texts from all present
499
            revision ids are assessed to generate this report.
500
        """
501
        self._ensure_real()
502
        return self._real_repository.find_text_key_references()
503
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
504
    def _generate_text_key_index(self):
505
        """Generate a new text key index for the repository.
506
507
        This is an expensive function that will take considerable time to run.
508
509
        :return: A dict mapping (file_id, revision_id) tuples to a list of
510
            parents, also (file_id, revision_id) tuples.
511
        """
512
        self._ensure_real()
513
        return self._real_repository._generate_text_key_index()
514
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
515
    @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)
516
    def get_revision_graph(self, revision_id=None):
517
        """See Repository.get_revision_graph()."""
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
518
        return self._get_revision_graph(revision_id)
519
520
    def _get_revision_graph(self, revision_id):
521
        """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)
522
        if revision_id is None:
523
            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.
524
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
525
            return {}
526
527
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
528
        response = self._call_expecting_body(
529
            '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.
530
        response_tuple, response_handler = response
531
        if response_tuple[0] != 'ok':
532
            raise errors.UnexpectedSmartServerResponse(response_tuple)
533
        coded = response_handler.read_body_bytes()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
534
        if coded == '':
535
            # no revisions in this repository!
536
            return {}
537
        lines = coded.split('\n')
538
        revision_graph = {}
539
        for line in lines:
540
            d = tuple(line.split())
541
            revision_graph[d[0]] = d[1:]
542
            
543
        return revision_graph
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
544
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)
545
    def _get_sink(self):
546
        """See Repository._get_sink()."""
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
547
        return RemoteStreamSink(self)
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)
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
        
4031.3.1 by Frank Aspell
Fixing various typos
734
        Smart methods perform 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
4031.3.1 by Frank Aspell
Fixing various typos
775
                # call to perform 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()
4031.3.1 by Frank Aspell
Fixing various typos
1009
            # There is an api discrepancy between get_parent_map and
3389.1.1 by John Arbash Meinel
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
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.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1346
class RemoteStreamSink(repository.StreamSink):
1347
1348
    def _insert_real(self, stream, src_format):
1349
        self.target_repo._ensure_real()
1350
        sink = self.target_repo._real_repository._get_sink()
1351
        return sink.insert_stream(stream, src_format)
1352
1353
    def insert_stream(self, stream, src_format):
1354
        repo = self.target_repo
1355
        # Until we can handle deltas in stack repositories we can't hand all
1356
        # the processing off to a remote server.
1357
        if self.target_repo._fallback_repositories:
1358
            return self._insert_real(stream, src_format)
1359
        client = repo._client
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
1360
        medium = client._medium
1361
        if medium._is_remote_before((1,13)):
1362
            # No possible way this can work.
1363
            return self._insert_real(stream, src_format)
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1364
        path = repo.bzrdir._path_for_remote_call(client)
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
1365
        # XXX: Ugly but important for correctness, *will* be fixed during 1.13
1366
        # cycle. Pushing a stream that is interrupted results in a fallback to
1367
        # the _real_repositories sink *with a partial stream*. Thats bad
1368
        # because we insert less data than bzr expected. To avoid this we do a
1369
        # trial push to make sure the verb is accessible, and do not fallback
1370
        # when actually pushing the stream. A cleanup patch is going to look at
1371
        # rewinding/restarting the stream/partial buffering etc.
1372
        byte_stream = self._stream_to_byte_stream([], src_format)
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1373
        try:
1374
            response = client.call_with_body_stream(
1375
                ('Repository.insert_stream', path), byte_stream)
1376
        except errors.UnknownSmartMethod:
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
1377
            medium._remember_remote_is_before((1,13))
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1378
            return self._insert_real(stream, src_format)
4022.1.9 by Robert Collins
Fix critical issue in bzr.dev - pushing to an old bzr:// server fails because the stream being consumed before the fallback code occurs, which makes it fail to do the fetch. (Robert Collins, Andrew Bennetts, #332314)
1379
        byte_stream = self._stream_to_byte_stream(stream, src_format)
1380
        response = client.call_with_body_stream(
1381
            ('Repository.insert_stream', path), byte_stream)
1382
        if response[0][0] not in ('ok', ):
1383
            raise errors.UnexpectedSmartServerResponse(response)
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1384
            
1385
    def _stream_to_byte_stream(self, stream, src_format):
1386
        bytes = []
1387
        pack_writer = pack.ContainerWriter(bytes.append)
1388
        pack_writer.begin()
1389
        pack_writer.add_bytes_record(src_format.network_name(), '')
1390
        adapters = {}
1391
        def get_adapter(adapter_key):
1392
            try:
1393
                return adapters[adapter_key]
1394
            except KeyError:
1395
                adapter_factory = adapter_registry.get(adapter_key)
1396
                adapter = adapter_factory(self)
1397
                adapters[adapter_key] = adapter
1398
                return adapter
1399
        for substream_type, substream in stream:
1400
            for record in substream:
1401
                if record.storage_kind in ('chunked', 'fulltext'):
1402
                    serialised = record_to_fulltext_bytes(record)
1403
                else:
1404
                    serialised = record.get_bytes_as(record.storage_kind)
1405
                pack_writer.add_bytes_record(serialised, [(substream_type,)])
1406
                for b in bytes:
1407
                    yield b
1408
                del bytes[:]
1409
        pack_writer.end()
1410
        for b in bytes:
1411
            yield b
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)
1412
1413
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1414
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1415
    """A 'LockableFiles' implementation that talks to a smart server.
1416
    
1417
    This is not a public interface class.
1418
    """
1419
1420
    def __init__(self, bzrdir, _client):
1421
        self.bzrdir = bzrdir
1422
        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.
1423
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1424
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1425
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1426
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1427
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.
1428
    def _find_modes(self):
1429
        # RemoteBranches don't let the client set the mode of control files.
1430
        self._dir_mode = None
1431
        self._file_mode = None
1432
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1433
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1434
class RemoteBranchFormat(branch.BranchFormat):
1435
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.
1436
    def __init__(self):
1437
        super(RemoteBranchFormat, self).__init__()
1438
        self._matchingbzrdir = RemoteBzrDirFormat()
1439
        self._matchingbzrdir.set_branch_format(self)
1440
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.
1441
    def __eq__(self, other):
1442
        return (isinstance(other, RemoteBranchFormat) and 
1443
            self.__dict__ == other.__dict__)
1444
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1445
    def get_format_description(self):
1446
        return 'Remote BZR Branch'
1447
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1448
    def get_format_string(self):
1449
        return 'Remote BZR Branch'
1450
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1451
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1452
        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.
1453
1454
    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.
1455
        # Delegate to a _real object here - the RemoteBzrDir format now
1456
        # supports delegating to parameterised branch formats and as such
1457
        # this RemoteBranchFormat method is only called when no specific format
1458
        # is selected.
1459
        if not isinstance(a_bzrdir, RemoteBzrDir):
1460
            result = a_bzrdir.create_branch()
1461
        else:
1462
            a_bzrdir._ensure_real()
1463
            result = a_bzrdir._real_bzrdir.create_branch()
1464
        if not isinstance(result, RemoteBranch):
1465
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
1466
        return result
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1467
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1468
    def supports_tags(self):
1469
        # Remote branches might support tags, but we won't know until we
1470
        # access the real remote branch.
1471
        return True
1472
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1473
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1474
class RemoteBranch(branch.Branch, _RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1475
    """Branch stored on a server accessed by HPSS RPC.
1476
1477
    At the moment most operations are mapped down to simple file operations.
1478
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1479
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1480
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1481
        _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.
1482
        """Create a RemoteBranch instance.
1483
1484
        :param real_branch: An optional local implementation of the branch
1485
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1486
        :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.
1487
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1488
        # We intentionally don't call the parent class's __init__, because it
1489
        # will try to assign to self.tags, which is a property in this subclass.
1490
        # 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.
1491
        self._revision_id_to_revno_cache = None
3949.2.6 by Ian Clatworthy
review feedback from jam
1492
        self._partial_revision_id_to_revno_cache = {}
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1493
        self._revision_history_cache = None
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1494
        self._last_revision_info_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
1495
        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.
1496
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1497
        if _client is not None:
1498
            self._client = _client
1499
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1500
            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.
1501
        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.
1502
        if real_branch is not None:
1503
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1504
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1505
            real_repo = self._real_branch.repository
1506
            if isinstance(real_repo, RemoteRepository):
1507
                real_repo._ensure_real()
1508
                real_repo = real_repo._real_repository
1509
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1510
            # Give the branch the remote repository to let fast-pathing happen.
1511
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1512
        else:
1513
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1514
        # 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.
1515
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1516
        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.
1517
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1518
        self._lock_mode = None
1519
        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.
1520
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1521
        self._lock_count = 0
1522
        self._leave_lock = False
3681.1.2 by Robert Collins
Adjust for trunk.
1523
        # 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)
1524
        hooks = branch.Branch.hooks['open']
1525
        for hook in hooks:
1526
            hook(self)
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
1527
        self._setup_stacking()
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1528
1529
    def _setup_stacking(self):
1530
        # 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
1531
        # the vfs branch.
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1532
        try:
1533
            fallback_url = self.get_stacked_on_url()
1534
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1535
            errors.UnstackableRepositoryFormat), e:
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
1536
            return
1537
        # it's relative to this branch...
1538
        fallback_url = urlutils.join(self.base, fallback_url)
1539
        transports = [self.bzrdir.root_transport]
1540
        if self._real_branch is not None:
1541
            transports.append(self._real_branch._transport)
3830.2.1 by Aaron Bentley
Fix HPSS with branch stacked on repository branch
1542
        stacked_on = branch.Branch.open(fallback_url,
1543
                                        possible_transports=transports)
1544
        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.
1545
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1546
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1547
        # if we try vfs access, return the real branch's vfs transport
1548
        self._ensure_real()
1549
        return self._real_branch._transport
1550
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1551
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1552
2477.1.1 by Martin Pool
Add RemoteBranch repr
1553
    def __str__(self):
1554
        return "%s(%s)" % (self.__class__.__name__, self.base)
1555
1556
    __repr__ = __str__
1557
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1558
    def _ensure_real(self):
1559
        """Ensure that there is a _real_branch set.
1560
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1561
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1562
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1563
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1564
            if not vfs.vfs_enabled():
1565
                raise AssertionError('smart server vfs must be enabled '
1566
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1567
            self.bzrdir._ensure_real()
1568
            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.
1569
            if self.repository._real_repository is None:
1570
                # Give the remote repository the matching real repo.
1571
                real_repo = self._real_branch.repository
1572
                if isinstance(real_repo, RemoteRepository):
1573
                    real_repo._ensure_real()
1574
                    real_repo = real_repo._real_repository
1575
                self.repository._set_real_repository(real_repo)
1576
            # Give the real branch the remote repository to let fast-pathing
1577
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1578
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1579
            if self._lock_mode == 'r':
1580
                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.
1581
            elif self._lock_mode == 'w':
1582
                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.
1583
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1584
    def _translate_error(self, err, **context):
1585
        self.repository._translate_error(err, branch=self, **context)
1586
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1587
    def _clear_cached_state(self):
1588
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1589
        if self._real_branch is not None:
1590
            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.
1591
1592
    def _clear_cached_state_of_remote_branch_only(self):
1593
        """Like _clear_cached_state, but doesn't clear the cache of
1594
        self._real_branch.
1595
1596
        This is useful when falling back to calling a method of
1597
        self._real_branch that changes state.  In that case the underlying
1598
        branch changes, so we need to invalidate this RemoteBranch's cache of
1599
        it.  However, there's no need to invalidate the _real_branch's cache
1600
        too, in fact doing so might harm performance.
1601
        """
1602
        super(RemoteBranch, self)._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1603
        
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.
1604
    @property
1605
    def control_files(self):
1606
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1607
        # because it triggers an _ensure_real that we otherwise might not need.
1608
        if self._control_files is None:
1609
            self._control_files = RemoteBranchLockableFiles(
1610
                self.bzrdir, self._client)
1611
        return self._control_files
1612
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1613
    def _get_checkout_format(self):
1614
        self._ensure_real()
1615
        return self._real_branch._get_checkout_format()
1616
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1617
    def get_physical_lock_status(self):
1618
        """See Branch.get_physical_lock_status()."""
1619
        # 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.
1620
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1621
        return self._real_branch.get_physical_lock_status()
1622
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1623
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1624
        """Get the URL this branch is stacked against.
1625
1626
        :raises NotStacked: If the branch is not stacked.
1627
        :raises UnstackableBranchFormat: If the branch does not support
1628
            stacking.
1629
        :raises UnstackableRepositoryFormat: If the repository does not support
1630
            stacking.
1631
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
1632
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1633
            # there may not be a repository yet, so we can't use
1634
            # 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
1635
            response = self._client.call('Branch.get_stacked_on_url',
1636
                self._remote_path())
1637
        except errors.ErrorFromSmartServer, err:
1638
            # there may not be a repository yet, so we can't call through
1639
            # its _translate_error
1640
            _translate_error(err, branch=self)
1641
        except errors.UnknownSmartMethod, err:
1642
            self._ensure_real()
1643
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1644
        if response[0] != 'ok':
1645
            raise errors.UnexpectedSmartServerResponse(response)
1646
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1647
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1648
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1649
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1650
        if not self._lock_mode:
1651
            self._lock_mode = 'r'
1652
            self._lock_count = 1
1653
            if self._real_branch is not None:
1654
                self._real_branch.lock_read()
1655
        else:
1656
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1657
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).
1658
    def _remote_lock_write(self, token):
1659
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1660
            branch_token = repo_token = ''
1661
        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).
1662
            branch_token = token
1663
            repo_token = self.repository.lock_write()
1664
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1665
        err_context = {'token': token}
1666
        response = self._call(
1667
            'Branch.lock_write', self._remote_path(), branch_token,
1668
            repo_token or '', **err_context)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1669
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1670
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1671
        ok, branch_token, repo_token = response
1672
        return branch_token, repo_token
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1673
            
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).
1674
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1675
        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.
1676
            # 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).
1677
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1678
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1679
            if not self._lock_token:
1680
                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.
1681
            # 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.
1682
            self.repository.lock_write(
1683
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1684
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1685
            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.
1686
                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).
1687
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1688
                self._leave_lock = True
1689
            else:
1690
                self._leave_lock = False
1691
            self._lock_mode = 'w'
1692
            self._lock_count = 1
1693
        elif self._lock_mode == 'r':
1694
            raise errors.ReadOnlyTransaction
1695
        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).
1696
            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.
1697
                # A token was given to lock_write, and we're relocking, so
1698
                # check that the given token actually matches the one we
1699
                # 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).
1700
                if token != self._lock_token:
1701
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1702
            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.
1703
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
1704
            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.
1705
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1706
1707
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1708
        err_context = {'token': str((branch_token, repo_token))}
1709
        response = self._call(
1710
            'Branch.unlock', self._remote_path(), branch_token,
1711
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1712
        if response == ('ok',):
1713
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1714
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1715
1716
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1717
        try:
1718
            self._lock_count -= 1
1719
            if not self._lock_count:
1720
                self._clear_cached_state()
1721
                mode = self._lock_mode
1722
                self._lock_mode = None
1723
                if self._real_branch is not None:
1724
                    if (not self._leave_lock and mode == 'w' and
1725
                        self._repo_lock_token):
1726
                        # If this RemoteBranch will remove the physical lock
1727
                        # for the repository, make sure the _real_branch
1728
                        # doesn't do it first.  (Because the _real_branch's
1729
                        # repository is set to be the RemoteRepository.)
1730
                        self._real_branch.repository.leave_lock_in_place()
1731
                    self._real_branch.unlock()
1732
                if mode != 'w':
1733
                    # Only write-locked branched need to make a remote method
4031.3.1 by Frank Aspell
Fixing various typos
1734
                    # call to perform the unlock.
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1735
                    return
1736
                if not self._lock_token:
1737
                    raise AssertionError('Locked, but no token!')
1738
                branch_token = self._lock_token
1739
                repo_token = self._repo_lock_token
1740
                self._lock_token = None
1741
                self._repo_lock_token = None
1742
                if not self._leave_lock:
1743
                    self._unlock(branch_token, repo_token)
1744
        finally:
1745
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1746
1747
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1748
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1749
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1750
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1751
    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.
1752
        if not self._lock_token:
1753
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1754
        self._leave_lock = True
1755
1756
    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.
1757
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1758
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1759
        self._leave_lock = False
1760
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1761
    def _last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1762
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1763
        if response[0] != 'ok':
1764
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1765
        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.
1766
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1767
        return (revno, last_revision)
1768
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1769
    def _gen_revision_history(self):
1770
        """See Branch._gen_revision_history()."""
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1771
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
1772
            '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.
1773
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1774
            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.
1775
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1776
        if result == ['']:
1777
            return []
1778
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1779
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
1780
    def _remote_path(self):
1781
        return self.bzrdir._path_for_remote_call(self._client)
1782
3441.5.18 by Andrew Bennetts
Fix some test failures.
1783
    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.
1784
            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.
1785
        # This performs additional work to meet the hook contract; while its
1786
        # undesirable, we have to synthesise the revno to call the hook, and
1787
        # not calling the hook is worse as it means changes can't be prevented.
1788
        # Having calculated this though, we can't just call into
1789
        # set_last_revision_info as a simple call, because there is a set_rh
1790
        # hook that some folk may still be using.
1791
        old_revno, old_revid = self.last_revision_info()
1792
        history = self._lefthand_history(revision_id)
1793
        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.
1794
        err_context = {'other_branch': other_branch}
1795
        response = self._call('Branch.set_last_revision_ex',
1796
            self._remote_path(), self._lock_token, self._repo_lock_token,
1797
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
1798
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1799
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
1800
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1801
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
1802
        new_revno, new_revision_id = response[1:]
1803
        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.
1804
        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.
1805
        if self._real_branch is not None:
1806
            cache = new_revno, new_revision_id
1807
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1808
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1809
    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.
1810
        old_revno, old_revid = self.last_revision_info()
1811
        # This performs additional work to meet the hook contract; while its
1812
        # undesirable, we have to synthesise the revno to call the hook, and
1813
        # not calling the hook is worse as it means changes can't be prevented.
1814
        # Having calculated this though, we can't just call into
1815
        # set_last_revision_info as a simple call, because there is a set_rh
1816
        # hook that some folk may still be using.
1817
        history = self._lefthand_history(revision_id)
1818
        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.
1819
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1820
        response = self._call('Branch.set_last_revision',
1821
            self._remote_path(), self._lock_token, self._repo_lock_token,
1822
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1823
        if response != ('ok',):
1824
            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.
1825
        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.
1826
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1827
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1828
    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.
1829
        # Send just the tip revision of the history; the server will generate
1830
        # the full history from that.  If the revision doesn't exist in this
1831
        # branch, NoSuchRevision will be raised.
1832
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1833
            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.
1834
        else:
1835
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1836
        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.
1837
        for hook in branch.Branch.hooks['set_rh']:
1838
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1839
        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.
1840
1841
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1842
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1843
        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.
1844
1845
    def _get_parent_location(self):
1846
        # Used by tests, when checking normalisation of given vs stored paths.
1847
        self._ensure_real()
1848
        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.
1849
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1850
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1851
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1852
        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.
1853
1854
    def _set_parent_location(self, url):
1855
        # Used by tests, to poke bad urls into branch configurations
1856
        if url is None:
1857
            self.set_parent(url)
1858
        else:
1859
            self._ensure_real()
1860
            return self._real_branch._set_parent_location(url)
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1861
        
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1862
    def set_stacked_on_url(self, stacked_location):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1863
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1864
1865
        :raises UnstackableBranchFormat: If the branch does not support
1866
            stacking.
1867
        :raises UnstackableRepositoryFormat: If the repository does not support
1868
            stacking.
1869
        """
1870
        self._ensure_real()
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1871
        return self._real_branch.set_stacked_on_url(stacked_location)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1872
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1873
    def sprout(self, to_bzrdir, revision_id=None):
3793.1.1 by Andrew Bennetts
Make RemoteBranch.sprout use Branch.sprout when possible.
1874
        branch_format = to_bzrdir._format._branch_format
1875
        if (branch_format is None or
1876
            isinstance(branch_format, RemoteBranchFormat)):
1877
            # The to_bzrdir specifies RemoteBranchFormat (or no format, which
1878
            # implies the same thing), but RemoteBranches can't be created at
1879
            # arbitrary URLs.  So create a branch in the same format as
1880
            # _real_branch instead.
1881
            # XXX: if to_bzrdir is a RemoteBzrDir, this should perhaps do
1882
            # to_bzrdir.create_branch to create a RemoteBranch after all...
1883
            self._ensure_real()
1884
            result = self._real_branch._format.initialize(to_bzrdir)
1885
            self.copy_content_into(result, revision_id=revision_id)
1886
            result.set_parent(self.bzrdir.root_transport.base)
1887
        else:
1888
            result = branch.Branch.sprout(
1889
                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).
1890
        return result
1891
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1892
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1893
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1894
             **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.
1895
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1896
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
1897
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1898
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1899
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1900
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1901
    @needs_read_lock
1902
    def push(self, target, overwrite=False, stop_revision=None):
1903
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1904
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1905
            target, overwrite=overwrite, stop_revision=stop_revision,
1906
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1907
1908
    def is_locked(self):
1909
        return self._lock_count >= 1
1910
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
1911
    @needs_read_lock
1912
    def revision_id_to_revno(self, revision_id):
1913
        self._ensure_real()
1914
        return self._real_branch.revision_id_to_revno(revision_id)
1915
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1916
    @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.
1917
    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.
1918
        # XXX: These should be returned by the set_last_revision_info verb
1919
        old_revno, old_revid = self.last_revision_info()
1920
        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.
1921
        revision_id = ensure_null(revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1922
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1923
            response = self._call('Branch.set_last_revision_info',
1924
                self._remote_path(), self._lock_token, self._repo_lock_token,
1925
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1926
        except errors.UnknownSmartMethod:
1927
            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.
1928
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1929
            self._real_branch.set_last_revision_info(revno, revision_id)
1930
            self._last_revision_info_cache = revno, revision_id
1931
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1932
        if response == ('ok',):
1933
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1934
            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.
1935
            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.
1936
            # Update the _real_branch's cache too.
1937
            if self._real_branch is not None:
1938
                cache = self._last_revision_info_cache
1939
                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.
1940
        else:
1941
            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.
1942
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.
1943
    @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.
1944
    def generate_revision_history(self, revision_id, last_rev=None,
1945
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1946
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1947
        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.
1948
            # 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.
1949
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1950
                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.
1951
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1952
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
1953
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1954
                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.
1955
        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.
1956
        self.set_revision_history(self._lefthand_history(revision_id,
1957
            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.
1958
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1959
    @property
1960
    def tags(self):
1961
        self._ensure_real()
1962
        return self._real_branch.tags
1963
2018.5.97 by Andrew Bennetts
Fix more tests.
1964
    def set_push_location(self, location):
1965
        self._ensure_real()
1966
        return self._real_branch.set_push_location(location)
1967
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1968
    @needs_write_lock
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1969
    def update_revisions(self, other, stop_revision=None, overwrite=False,
1970
                         graph=None):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1971
        """See Branch.update_revisions."""
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1972
        other.lock_read()
1973
        try:
1974
            if stop_revision is None:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1975
                stop_revision = other.last_revision()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1976
                if revision.is_null(stop_revision):
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1977
                    # if there are no commits, we're done.
1978
                    return
1979
            self.fetch(other, stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1980
1981
            if overwrite:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1982
                # Just unconditionally set the new revision.  We don't care if
1983
                # the branches have diverged.
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1984
                self._set_last_revision(stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1985
            else:
1986
                medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1987
                if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1988
                    try:
1989
                        self._set_last_revision_descendant(stop_revision, other)
1990
                        return
3441.5.7 by Andrew Bennetts
Fix unbound global.
1991
                    except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1992
                        medium._remember_remote_is_before((1, 6))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1993
                # Fallback for pre-1.6 servers: check for divergence
1994
                # client-side, then do _set_last_revision.
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1995
                last_rev = revision.ensure_null(self.last_revision())
3441.5.18 by Andrew Bennetts
Fix some test failures.
1996
                if graph is None:
1997
                    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.
1998
                if self._check_if_descendant_or_diverged(
3441.5.18 by Andrew Bennetts
Fix some test failures.
1999
                        stop_revision, last_rev, graph, other):
2000
                    # stop_revision is a descendant of last_rev, but we aren't
2001
                    # overwriting, so we're done.
2002
                    return
2003
                self._set_last_revision(stop_revision)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2004
        finally:
2005
            other.unlock()
2018.5.97 by Andrew Bennetts
Fix more tests.
2006
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2007
2008
def _extract_tar(tar, to_dir):
2009
    """Extract all the contents of a tarfile object.
2010
2011
    A replacement for extractall, which is not present in python2.4
2012
    """
2013
    for tarinfo in tar:
2014
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2015
2016
2017
def _translate_error(err, **context):
2018
    """Translate an ErrorFromSmartServer into a more useful error.
2019
2020
    Possible context keys:
2021
      - branch
2022
      - repository
2023
      - bzrdir
2024
      - token
2025
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2026
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
2027
2028
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2029
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2030
    """
2031
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2032
        try:
2033
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2034
        except KeyError, key_err:
2035
            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.
2036
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2037
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
2038
        """Get the path from the context if present, otherwise use first error
2039
        arg.
2040
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2041
        try:
2042
            return context['path']
2043
        except KeyError, key_err:
2044
            try:
2045
                return err.error_args[0]
2046
            except IndexError, idx_err:
2047
                mutter(
2048
                    'Missing key %r in context %r', key_err.args[0], context)
2049
                raise err
2050
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2051
    if err.error_verb == 'NoSuchRevision':
2052
        raise NoSuchRevision(find('branch'), err.error_args[0])
2053
    elif err.error_verb == 'nosuchrevision':
2054
        raise NoSuchRevision(find('repository'), err.error_args[0])
2055
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2056
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2057
    elif err.error_verb == 'norepository':
2058
        raise errors.NoRepositoryPresent(find('bzrdir'))
2059
    elif err.error_verb == 'LockContention':
2060
        raise errors.LockContention('(remote lock)')
2061
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2062
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2063
    elif err.error_verb == 'LockFailed':
2064
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
2065
    elif err.error_verb == 'TokenMismatch':
2066
        raise errors.TokenMismatch(find('token'), '(remote token)')
2067
    elif err.error_verb == 'Diverged':
2068
        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.
2069
    elif err.error_verb == 'TipChangeRejected':
2070
        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
2071
    elif err.error_verb == 'UnstackableBranchFormat':
2072
        raise errors.UnstackableBranchFormat(*err.error_args)
2073
    elif err.error_verb == 'UnstackableRepositoryFormat':
2074
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2075
    elif err.error_verb == 'NotStacked':
2076
        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.
2077
    elif err.error_verb == 'PermissionDenied':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2078
        path = get_path()
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2079
        if len(err.error_args) >= 2:
2080
            extra = err.error_args[1]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2081
        else:
2082
            extra = None
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2083
        raise errors.PermissionDenied(path, extra=extra)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2084
    elif err.error_verb == 'ReadError':
2085
        path = get_path()
2086
        raise errors.ReadError(path)
2087
    elif err.error_verb == 'NoSuchFile':
2088
        path = get_path()
2089
        raise errors.NoSuchFile(path)
2090
    elif err.error_verb == 'FileExists':
2091
        raise errors.FileExists(err.error_args[0])
2092
    elif err.error_verb == 'DirectoryNotEmpty':
2093
        raise errors.DirectoryNotEmpty(err.error_args[0])
2094
    elif err.error_verb == 'ShortReadvError':
2095
        args = err.error_args
2096
        raise errors.ShortReadvError(
2097
            args[0], int(args[1]), int(args[2]), int(args[3]))
2098
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
2099
        encoding = str(err.error_args[0]) # encoding must always be a string
2100
        val = err.error_args[1]
2101
        start = int(err.error_args[2])
2102
        end = int(err.error_args[3])
2103
        reason = str(err.error_args[4]) # reason must always be a string
2104
        if val.startswith('u:'):
2105
            val = val[2:].decode('utf-8')
2106
        elif val.startswith('s:'):
2107
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2108
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2109
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2110
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2111
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2112
    elif err.error_verb == 'ReadOnlyError':
2113
        raise errors.TransportNotPossible('readonly transport')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2114
    raise errors.UnknownErrorFromSmartServer(err)