/brz/remove-bazaar

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