~bzr-pqm/bzr/bzr.dev

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