/brz/remove-bazaar

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