/brz/remove-bazaar

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