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