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