~bzr-pqm/bzr/bzr.dev

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