/brz/remove-bazaar

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