/brz/remove-bazaar

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