/brz/remove-bazaar

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