~bzr-pqm/bzr/bzr.dev

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