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