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