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