/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4509.3.12 by Martin Pool
RemoteRepository.unlock logs previous exception
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
16
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
17
import bz2
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
18
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
19
from bzrlib import (
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
20
    bencode,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
21
    branch,
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
22
    bzrdir,
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
23
    config,
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
24
    debug,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
25
    errors,
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
26
    graph,
4509.3.28 by Martin Pool
Add missing import
27
    lock,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
28
    lockdir,
29
    repository,
2948.3.1 by John Arbash Meinel
Fix bug #158333, make sure that Repository.fetch(self) is properly a no-op for all Repository implementations.
30
    revision,
4307.2.3 by Robert Collins
Change RemoteRepository.has_revision to use get_parent_map to leverage the caching.
31
    revision as _mod_revision,
3228.4.11 by John Arbash Meinel
Deprecations abound.
32
    symbol_versioning,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
33
)
2535.4.27 by Andrew Bennetts
Remove some unused imports.
34
from bzrlib.branch import BranchReferenceFormat
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
35
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
36
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
37
from bzrlib.errors import (
38
    NoSuchRevision,
39
    SmartProtocolError,
40
    )
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
41
from bzrlib.lockable_files import LockableFiles
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
42
from bzrlib.smart import client, vfs, repository as smart_repo
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
43
from bzrlib.revision import ensure_null, NULL_REVISION
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
44
from bzrlib.trace import mutter, note, warning
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
45
3445.1.5 by John Arbash Meinel
allow passing a 'graph' object into Branch.update_revisions.
46
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
47
class _RpcHelper(object):
48
    """Mixin class that helps with issuing RPCs."""
49
50
    def _call(self, method, *args, **err_context):
51
        try:
52
            return self._client.call(method, *args)
53
        except errors.ErrorFromSmartServer, err:
54
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
55
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
56
    def _call_expecting_body(self, method, *args, **err_context):
57
        try:
58
            return self._client.call_expecting_body(method, *args)
59
        except errors.ErrorFromSmartServer, err:
60
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
61
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
62
    def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
63
        try:
64
            return self._client.call_with_body_bytes(method, args, body_bytes)
65
        except errors.ErrorFromSmartServer, err:
66
            self._translate_error(err, **err_context)
67
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
68
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
69
                                             **err_context):
70
        try:
71
            return self._client.call_with_body_bytes_expecting_body(
72
                method, args, body_bytes)
73
        except errors.ErrorFromSmartServer, err:
74
            self._translate_error(err, **err_context)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
75
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
76
77
def response_tuple_to_repo_format(response):
78
    """Convert a response tuple describing a repository format to a format."""
79
    format = RemoteRepositoryFormat()
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
80
    format._rich_root_data = (response[0] == 'yes')
81
    format._supports_tree_reference = (response[1] == 'yes')
82
    format._supports_external_lookups = (response[2] == 'yes')
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
83
    format._network_name = response[3]
84
    return format
85
86
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
87
# Note: RemoteBzrDirFormat is in bzrdir.py
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
88
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
89
class RemoteBzrDir(BzrDir, _RpcHelper):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
90
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
91
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
92
    def __init__(self, transport, format, _client=None, _force_probe=False):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
93
        """Construct a RemoteBzrDir.
94
95
        :param _client: Private parameter for testing. Disables probing and the
96
            use of a real bzrdir.
97
        """
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
98
        BzrDir.__init__(self, transport, format)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
99
        # this object holds a delegated bzrdir that uses file-level operations
100
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
101
        self._real_bzrdir = None
4634.47.3 by Andrew Bennetts
Add a BzrDir.open_2.1 verb that indicates if there is a workingtree present. Removes the last 2 VFS calls from incremental pushes.
102
        self._has_working_tree = None
4044.1.3 by Robert Collins
Create a one-shot cache of the result of RemoteBzrDir.create_branch, eliminating 3 round trips for nonstacked branches and 5 for stacked.
103
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
104
        # create_branch for details.
105
        self._next_open_branch_result = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
106
107
        if _client is None:
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
108
            medium = transport.get_smart_medium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
109
            self._client = client._SmartClient(medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
110
        else:
111
            self._client = _client
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
112
            if not _force_probe:
113
                return
114
115
        self._probe_bzrdir()
116
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
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
954
    def lock_read(self):
955
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
956
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
957
            self._note_lock('r')
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
958
            self._lock_mode = 'r'
959
            self._lock_count = 1
4190.1.1 by Robert Collins
Negatively cache misses during read-locks in RemoteRepository.
960
            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
961
            if self._real_repository is not None:
962
                self._real_repository.lock_read()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
963
            for repo in self._fallback_repositories:
964
                repo.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
965
        else:
966
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
967
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
968
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
969
        path = self.bzrdir._path_for_remote_call(self._client)
970
        if token is None:
971
            token = ''
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
972
        err_context = {'token': token}
973
        response = self._call('Repository.lock_write', path, token,
974
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
975
        if response[0] == 'ok':
976
            ok, token = response
977
            return token
978
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
979
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
980
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
981
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
982
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
983
            self._note_lock('w')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
984
            if _skip_rpc:
985
                if self._lock_token is not None:
986
                    if token != self._lock_token:
3695.1.1 by Andrew Bennetts
Remove some unused imports and fix a couple of trivially broken raise statements.
987
                        raise errors.TokenMismatch(token, self._lock_token)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
988
                self._lock_token = token
989
            else:
990
                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.
991
            # if self._lock_token is None, then this is something like packs or
992
            # svn where we don't get to lock the repo, or a weave style repository
993
            # where we cannot lock it over the wire and attempts to do so will
994
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
995
            if self._real_repository is not None:
996
                self._real_repository.lock_write(token=self._lock_token)
997
            if token is not None:
998
                self._leave_lock = True
999
            else:
1000
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1001
            self._lock_mode = 'w'
1002
            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.
1003
            cache_misses = self._real_repository is None
1004
            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.
1005
            for repo in self._fallback_repositories:
1006
                # Writes don't affect fallback repos
1007
                repo.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1008
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1009
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1010
        else:
1011
            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.
1012
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1013
1014
    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.
1015
        if not self._lock_token:
1016
            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
1017
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1018
1019
    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.
1020
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1021
            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
1022
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1023
1024
    def _set_real_repository(self, repository):
1025
        """Set the _real_repository for this repository.
1026
1027
        :param repository: The repository to fallback to for non-hpss
1028
            implemented operations.
1029
        """
4053.1.5 by Robert Collins
Review feedback on RemoteRepository._set_real_revision.
1030
        if self._real_repository is not None:
1031
            # Replacing an already set real repository.
1032
            # We cannot do this [currently] if the repository is locked -
1033
            # synchronised state might be lost.
1034
            if self.is_locked():
1035
                raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1036
        if isinstance(repository, RemoteRepository):
1037
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1038
        self._real_repository = repository
4226.2.5 by Robert Collins
Fix handling of fallback repositories some more.
1039
        # three code paths happen here:
1040
        # 1) old servers, RemoteBranch.open() calls _ensure_real before setting
1041
        # up stacking. In this case self._fallback_repositories is [], and the
1042
        # real repo is already setup. Preserve the real repo and
1043
        # RemoteRepository.add_fallback_repository will avoid adding
1044
        # duplicates.
1045
        # 2) new servers, RemoteBranch.open() sets up stacking, and when
1046
        # ensure_real is triggered from a branch, the real repository to
1047
        # set already has a matching list with separate instances, but
1048
        # as they are also RemoteRepositories we don't worry about making the
1049
        # lists be identical.
1050
        # 3) new servers, RemoteRepository.ensure_real is triggered before
1051
        # RemoteBranch.ensure real, in this case we get a repo with no fallbacks
1052
        # and need to populate it.
1053
        if (self._fallback_repositories and
1054
            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.
1055
            len(self._fallback_repositories)):
1056
            if len(self._real_repository._fallback_repositories):
1057
                raise AssertionError(
1058
                    "cannot cleanly remove existing _fallback_repositories")
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
1059
        for fb in self._fallback_repositories:
1060
            self._real_repository.add_fallback_repository(fb)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1061
        if self._lock_mode == 'w':
1062
            # if we are already locked, the real repository must be able to
1063
            # acquire the lock with our token.
1064
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1065
        elif self._lock_mode == 'r':
1066
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1067
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
1068
    def start_write_group(self):
1069
        """Start a write group on the decorated repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1070
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
1071
        Smart methods perform operations in a single step so this API
2617.6.6 by Robert Collins
Some review feedback.
1072
        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``
1073
        for older plugins that don't use e.g. the CommitBuilder
1074
        facility.
1075
        """
1076
        self._ensure_real()
1077
        return self._real_repository.start_write_group()
1078
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1079
    def _unlock(self, token):
1080
        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.
1081
        if not token:
1082
            # with no token the remote repository is not persistently locked.
1083
            return
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1084
        err_context = {'token': token}
1085
        response = self._call('Repository.unlock', path, token,
1086
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1087
        if response == ('ok',):
1088
            return
1089
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1090
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1091
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
1092
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1093
    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.
1094
        if not self._lock_count:
4509.3.25 by Martin Pool
Add an option for unlock errors to be non-fatal
1095
            return lock.cant_unlock_not_held(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1096
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1097
        if self._lock_count > 0:
1098
            return
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1099
        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.
1100
        old_mode = self._lock_mode
1101
        self._lock_mode = None
1102
        try:
1103
            # The real repository is responsible at present for raising an
1104
            # exception if it's in an unfinished write group.  However, it
1105
            # normally will *not* actually remove the lock from disk - that's
1106
            # done by the server on receiving the Repository.unlock call.
1107
            # 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
1108
            if self._real_repository is not None:
1109
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
1110
        finally:
1111
            # The rpc-level lock should be released even if there was a
1112
            # problem releasing the vfs-based lock.
1113
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1114
                # Only write-locked repositories need to make a remote method
4031.3.1 by Frank Aspell
Fixing various typos
1115
                # 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.
1116
                old_token = self._lock_token
1117
                self._lock_token = None
1118
                if not self._leave_lock:
1119
                    self._unlock(old_token)
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
1120
        # Fallbacks are always 'lock_read()' so we don't pay attention to
1121
        # self._leave_lock
1122
        for repo in self._fallback_repositories:
1123
            repo.unlock()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1124
1125
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1126
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1127
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1128
        return self._real_repository.break_lock()
1129
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1130
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1131
        """Return a TemporaryFile containing a repository tarball.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1132
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1133
        Returns None if the server does not support sending tarballs.
1134
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1135
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1136
        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.
1137
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1138
            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.
1139
                'Repository.tarball', path, compression)
1140
        except errors.UnknownSmartMethod:
1141
            protocol.cancel_read_body()
1142
            return None
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1143
        if response[0] == 'ok':
1144
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1145
            t = tempfile.NamedTemporaryFile()
1146
            # TODO: rpc layer should read directly into it...
1147
            t.write(protocol.read_body_bytes())
1148
            t.seek(0)
1149
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
1150
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
1151
2440.1.1 by Martin Pool
Add new Repository.sprout,
1152
    def sprout(self, to_bzrdir, revision_id=None):
1153
        # 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.
1154
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
1155
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
1156
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
1157
        dest_repo.fetch(self, revision_id=revision_id)
1158
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
1159
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1160
    ### These methods are just thin shims to the VFS object for now.
1161
1162
    def revision_tree(self, revision_id):
1163
        self._ensure_real()
1164
        return self._real_repository.revision_tree(revision_id)
1165
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1166
    def get_serializer_format(self):
1167
        self._ensure_real()
1168
        return self._real_repository.get_serializer_format()
1169
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1170
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1171
                           timezone=None, committer=None, revprops=None,
1172
                           revision_id=None):
1173
        # FIXME: It ought to be possible to call this without immediately
1174
        # triggering _ensure_real.  For now it's the easiest thing to do.
1175
        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.
1176
        real_repo = self._real_repository
1177
        builder = real_repo.get_commit_builder(branch, parents,
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1178
                config, timestamp=timestamp, timezone=timezone,
1179
                committer=committer, revprops=revprops, revision_id=revision_id)
1180
        return builder
1181
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1182
    def add_fallback_repository(self, repository):
1183
        """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
1184
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1185
        :param repository: A repository.
1186
        """
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
1187
        if not self._format.supports_external_lookups:
1188
            raise errors.UnstackableRepositoryFormat(
1189
                self._format.network_name(), self.base)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1190
        # We need to accumulate additional repositories here, to pass them in
1191
        # on various RPC's.
4035.2.3 by Robert Collins
Fix trailing whitespace.
1192
        #
4379.2.2 by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly.
1193
        if self.is_locked():
1194
            # We will call fallback.unlock() when we transition to the unlocked
1195
            # state, so always add a lock here. If a caller passes us a locked
1196
            # repository, they are responsible for unlocking it later.
1197
            repository.lock_read()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1198
        self._fallback_repositories.append(repository)
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1199
        # If self._real_repository was parameterised already (e.g. because a
1200
        # _real_branch had its get_stacked_on_url method called), then the
1201
        # 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.
1202
        if self._real_repository is not None:
4226.2.5 by Robert Collins
Fix handling of fallback repositories some more.
1203
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1204
                self._real_repository._fallback_repositories]
1205
            if repository.bzrdir.root_transport.base not in fallback_locations:
4035.2.2 by Robert Collins
Minor tweaks to fix failing tests.
1206
                self._real_repository.add_fallback_repository(repository)
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1207
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1208
    def add_inventory(self, revid, inv, parents):
1209
        self._ensure_real()
1210
        return self._real_repository.add_inventory(revid, inv, parents)
1211
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1212
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1213
                               parents):
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
1214
        self._ensure_real()
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
1215
        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.
1216
            delta, new_revision_id, parents)
1217
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1218
    def add_revision(self, rev_id, rev, inv=None, config=None):
1219
        self._ensure_real()
1220
        return self._real_repository.add_revision(
1221
            rev_id, rev, inv=inv, config=config)
1222
1223
    @needs_read_lock
1224
    def get_inventory(self, revision_id):
1225
        self._ensure_real()
1226
        return self._real_repository.get_inventory(revision_id)
1227
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.
1228
    def iter_inventories(self, revision_ids, ordering=None):
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
1229
        self._ensure_real()
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1230
        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
1231
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1232
    @needs_read_lock
1233
    def get_revision(self, revision_id):
1234
        self._ensure_real()
1235
        return self._real_repository.get_revision(revision_id)
1236
1237
    def get_transaction(self):
1238
        self._ensure_real()
1239
        return self._real_repository.get_transaction()
1240
1241
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
1242
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1243
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
1244
        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.
1245
1246
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1247
        """See Repository.make_working_trees"""
1248
        self._ensure_real()
1249
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1250
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.
1251
    def refresh_data(self):
1252
        """Re-read any data needed to to synchronise with disk.
1253
1254
        This method is intended to be called after another repository instance
1255
        (such as one used by a smart server) has inserted data into the
1256
        repository. It may not be called during a write group, but may be
1257
        called at any other time.
1258
        """
1259
        if self.is_in_write_group():
1260
            raise errors.InternalBzrError(
1261
                "May not refresh_data while in a write group.")
1262
        if self._real_repository is not None:
1263
            self._real_repository.refresh_data()
1264
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1265
    def revision_ids_to_search_result(self, result_set):
1266
        """Convert a set of revision ids to a graph SearchResult."""
1267
        result_parents = set()
1268
        for parents in self.get_graph().get_parent_map(
1269
            result_set).itervalues():
1270
            result_parents.update(parents)
1271
        included_keys = result_set.intersection(result_parents)
1272
        start_keys = result_set.difference(included_keys)
1273
        exclude_keys = result_parents.difference(result_set)
1274
        result = graph.SearchResult(start_keys, exclude_keys,
1275
            len(result_set), result_set)
1276
        return result
1277
1278
    @needs_read_lock
1279
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1280
        """Return the revision ids that other has that this does not.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1281
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1282
        These are returned in topological order.
1283
1284
        revision_id: only return revision ids included by revision_id.
1285
        """
1286
        return repository.InterRepository.get(
1287
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
1288
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1289
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1290
            fetch_spec=None):
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1291
        # No base implementation to use as RemoteRepository is not a subclass
1292
        # 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.
1293
        if fetch_spec is not None and revision_id is not None:
1294
            raise AssertionError(
1295
                "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.
1296
        if self.is_in_write_group():
4145.1.3 by Robert Collins
NEWS conflicts.
1297
            raise errors.InternalBzrError(
1298
                "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.
1299
        # fast path same-url fetch operations
4509.3.19 by Martin Pool
RemoteRepository.fetch is not a no-op if there's different stacking
1300
        if (self.has_same_location(source)
1301
            and fetch_spec is None
4509.3.37 by Martin Pool
Remove RepositoryBase; make _has_same_location private
1302
            and self._has_same_fallbacks(source)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
1303
            # check that last_revision is in 'from' and then return a
1304
            # no-operation.
1305
            if (revision_id is not None and
4145.1.5 by Robert Collins
More fixes from grabbing the Repository implementation of fetch for RemoteRepository.
1306
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
1307
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
1308
            return 0, []
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1309
        # if there is no specific appropriate InterRepository, this will get
1310
        # the InterRepository base class, which raises an
1311
        # 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.
1312
        inter = repository.InterRepository.get(source, self)
4145.1.1 by Robert Collins
Explicitly prevent fetching while the target repository is in a write group.
1313
        return inter.fetch(revision_id=revision_id, pb=pb,
1314
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1315
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
1316
    def create_bundle(self, target, base, fileobj, format=None):
1317
        self._ensure_real()
1318
        self._real_repository.create_bundle(target, base, fileobj, format)
1319
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1320
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1321
    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.
1322
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1323
        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.
1324
1325
    def fileids_altered_by_revision_ids(self, revision_ids):
1326
        self._ensure_real()
1327
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
1328
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1329
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
1330
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
1331
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
1332
            revisions, revision_versions_cache)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1333
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1334
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1335
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1336
        """
1337
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1338
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1339
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1340
    def get_parent_map(self, revision_ids):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1341
        """See bzrlib.Graph.get_parent_map()."""
3835.1.5 by Aaron Bentley
Fix make_parents_provider
1342
        return self._make_parents_provider().get_parent_map(revision_ids)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
1343
1344
    def _get_parent_map_rpc(self, keys):
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1345
        """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.
1346
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1347
        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.
1348
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
1349
            # 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.
1350
            # graph.
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1351
            #
1352
            # Note that this reads the whole graph, when only some keys are
1353
            # wanted.  On this old server there's no way (?) to get them all
1354
            # in one go, and the user probably will have seen a warning about
1355
            # the server being old anyhow.
1356
            rg = self._get_revision_graph(None)
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
1357
            # 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
1358
            # get_revision_graph. Specifically, a "key:()" pair in
1359
            # get_revision_graph just means a node has no parents. For
1360
            # "get_parent_map" it means the node is a ghost. So fix up the
1361
            # graph to correct this.
1362
            #   https://bugs.launchpad.net/bzr/+bug/214894
1363
            # There is one other "bug" which is that ghosts in
1364
            # get_revision_graph() are not returned at all. But we won't worry
1365
            # about that for now.
1366
            for node_id, parent_ids in rg.iteritems():
1367
                if parent_ids == ():
1368
                    rg[node_id] = (NULL_REVISION,)
1369
            rg[NULL_REVISION] = ()
1370
            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.
1371
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1372
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
1373
        if None in keys:
1374
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1375
        if NULL_REVISION in keys:
1376
            keys.discard(NULL_REVISION)
1377
            found_parents = {NULL_REVISION:()}
1378
            if not keys:
1379
                return found_parents
1380
        else:
1381
            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.
1382
        # TODO(Needs analysis): We could assume that the keys being requested
1383
        # from get_parent_map are in a breadth first search, so typically they
1384
        # will all be depth N from some common parent, and we don't have to
1385
        # have the server iterate from the root parent, but rather from the
1386
        # keys we're searching; and just tell the server the keyspace we
1387
        # already have; but this may be more traffic again.
1388
1389
        # Transform self._parents_map into a search request recipe.
1390
        # TODO: Manage this incrementally to avoid covering the same path
1391
        # repeatedly. (The server will have to on each request, but the less
1392
        # work done the better).
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1393
        #
1394
        # Negative caching notes:
1395
        # new server sends missing when a request including the revid
1396
        # 'include-missing:' is present in the request.
1397
        # missing keys are serialised as missing:X, and we then call
1398
        # provider.note_missing(X) for-all X
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1399
        parents_map = self._unstacked_provider.get_cached_map()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1400
        if parents_map is None:
1401
            # Repository is not locked, so there's no cache.
1402
            parents_map = {}
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1403
        # start_set is all the keys in the cache
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1404
        start_set = set(parents_map)
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1405
        # 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.
1406
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1407
        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.
1408
            result_parents.update(parents)
1409
        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.
1410
        # We don't need to send ghosts back to the server as a position to
1411
        # stop either.
1412
        stop_keys.difference_update(self._unstacked_provider.missing_keys)
4214.2.5 by Andrew Bennetts
Fix the bug.
1413
        key_count = len(parents_map)
1414
        if (NULL_REVISION in result_parents
1415
            and NULL_REVISION in self._unstacked_provider.missing_keys):
1416
            # If we pruned NULL_REVISION from the stop_keys because it's also
1417
            # in our cache of "missing" keys we need to increment our key count
1418
            # by 1, because the reconsitituted SearchResult on the server will
1419
            # still consider NULL_REVISION to be an included key.
1420
            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.
1421
        included_keys = start_set.intersection(result_parents)
1422
        start_set.difference_update(included_keys)
4214.2.5 by Andrew Bennetts
Fix the bug.
1423
        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.
1424
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1425
        path = self.bzrdir._path_for_remote_call(self._client)
1426
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
1427
            if type(key) is not str:
1428
                raise ValueError(
1429
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
1430
        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.
1431
        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.
1432
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1433
            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.
1434
                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.
1435
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1436
            # 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.
1437
            # Worse, we have to force a disconnection, because the server now
1438
            # doesn't realise it has a body on the wire to consume, so the
1439
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
1440
            warning(
1441
                'Server is too old for fast get_parent_map, reconnecting.  '
1442
                '(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.
1443
            medium.disconnect()
1444
            # To avoid having to disconnect repeatedly, we keep track of the
1445
            # 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.
1446
            medium._remember_remote_is_before((1, 2))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1447
            # Recurse just once and we should use the fallback code.
1448
            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.
1449
        response_tuple, response_handler = response
1450
        if response_tuple[0] not in ['ok']:
1451
            response_handler.cancel_read_body()
1452
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1453
        if response_tuple[0] == 'ok':
1454
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1455
            if coded == '':
1456
                # no revisions found
1457
                return {}
1458
            lines = coded.split('\n')
1459
            revision_graph = {}
1460
            for line in lines:
1461
                d = tuple(line.split())
1462
                if len(d) > 1:
1463
                    revision_graph[d[0]] = d[1:]
1464
                else:
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
1465
                    # No parents:
1466
                    if d[0].startswith('missing:'):
1467
                        revid = d[0][8:]
1468
                        self._unstacked_provider.note_missing_key(revid)
1469
                    else:
1470
                        # no parents - so give the Graph result
1471
                        # (NULL_REVISION,).
1472
                        revision_graph[d[0]] = (NULL_REVISION,)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1473
            return revision_graph
1474
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1475
    @needs_read_lock
1476
    def get_signature_text(self, revision_id):
1477
        self._ensure_real()
1478
        return self._real_repository.get_signature_text(revision_id)
1479
1480
    @needs_read_lock
1481
    def get_inventory_xml(self, revision_id):
1482
        self._ensure_real()
1483
        return self._real_repository.get_inventory_xml(revision_id)
1484
1485
    def deserialise_inventory(self, revision_id, xml):
1486
        self._ensure_real()
1487
        return self._real_repository.deserialise_inventory(revision_id, xml)
1488
1489
    def reconcile(self, other=None, thorough=False):
1490
        self._ensure_real()
1491
        return self._real_repository.reconcile(other=other, thorough=thorough)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1492
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1493
    def all_revision_ids(self):
1494
        self._ensure_real()
1495
        return self._real_repository.all_revision_ids()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1496
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1497
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1498
    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.
1499
        self._ensure_real()
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1500
        return self._real_repository.get_deltas_for_revisions(revisions,
1501
            specific_fileids=specific_fileids)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1502
1503
    @needs_read_lock
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1504
    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.
1505
        self._ensure_real()
4137.3.2 by Ian Clatworthy
Repository.get_deltas_for_revisions() now supports file-id filtering
1506
        return self._real_repository.get_revision_delta(revision_id,
1507
            specific_fileids=specific_fileids)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1508
1509
    @needs_read_lock
1510
    def revision_trees(self, revision_ids):
1511
        self._ensure_real()
1512
        return self._real_repository.revision_trees(revision_ids)
1513
1514
    @needs_read_lock
1515
    def get_revision_reconcile(self, revision_id):
1516
        self._ensure_real()
1517
        return self._real_repository.get_revision_reconcile(revision_id)
1518
1519
    @needs_read_lock
4332.3.35 by Robert Collins
Fix failing tests.
1520
    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.
1521
        self._ensure_real()
4332.3.11 by Robert Collins
Move tree and back callbacks into the repository check core.
1522
        return self._real_repository.check(revision_ids=revision_ids,
4332.3.35 by Robert Collins
Fix failing tests.
1523
            callback_refs=callback_refs, check_repo=check_repo)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1524
2018.5.138 by Robert Collins
Merge bzr.dev.
1525
    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.
1526
        self._ensure_real()
1527
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
1528
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1529
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1530
    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.
1531
        # get a tarball of the remote repository, and copy from that into the
1532
        # destination
1533
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1534
        import tarfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1535
        # TODO: Maybe a progress bar while streaming the tarball?
1536
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1537
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1538
        if tar_file is None:
1539
            return None
1540
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1541
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1542
            tar = tarfile.open('repository', fileobj=tar_file,
1543
                mode='r|bz2')
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
1544
            tmpdir = osutils.mkdtemp()
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1545
            try:
1546
                _extract_tar(tar, tmpdir)
1547
                tmp_bzrdir = BzrDir.open(tmpdir)
1548
                tmp_repo = tmp_bzrdir.open_repository()
1549
                tmp_repo.copy_content_into(destination, revision_id)
1550
            finally:
1551
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1552
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1553
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1554
        return destination
2018.18.23 by Martin Pool
review cleanups
1555
        # TODO: Suggestion from john: using external tar is much faster than
1556
        # 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.
1557
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1558
    @property
1559
    def inventories(self):
1560
        """Decorate the real repository for now.
1561
1562
        In the long term a full blown network facility is needed to
1563
        avoid creating a real repository object locally.
1564
        """
1565
        self._ensure_real()
1566
        return self._real_repository.inventories
1567
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1568
    @needs_write_lock
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1569
    def pack(self, hint=None):
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1570
        """Compress the data within the repository.
1571
1572
        This is not currently implemented within the smart server.
1573
        """
1574
        self._ensure_real()
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1575
        return self._real_repository.pack(hint=hint)
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1576
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1577
    @property
1578
    def revisions(self):
1579
        """Decorate the real repository for now.
1580
1581
        In the short term this should become a real object to intercept graph
1582
        lookups.
1583
1584
        In the long term a full blown network facility is needed.
1585
        """
1586
        self._ensure_real()
1587
        return self._real_repository.revisions
1588
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1589
    def set_make_working_trees(self, new_value):
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1590
        if new_value:
1591
            new_value_str = "True"
1592
        else:
1593
            new_value_str = "False"
1594
        path = self.bzrdir._path_for_remote_call(self._client)
1595
        try:
1596
            response = self._call(
1597
                'Repository.set_make_working_trees', path, new_value_str)
1598
        except errors.UnknownSmartMethod:
1599
            self._ensure_real()
1600
            self._real_repository.set_make_working_trees(new_value)
1601
        else:
1602
            if response[0] != 'ok':
1603
                raise errors.UnexpectedSmartServerResponse(response)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1604
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1605
    @property
1606
    def signatures(self):
1607
        """Decorate the real repository for now.
1608
1609
        In the long term a full blown network facility is needed to avoid
1610
        creating a real repository object locally.
1611
        """
1612
        self._ensure_real()
1613
        return self._real_repository.signatures
1614
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1615
    @needs_write_lock
1616
    def sign_revision(self, revision_id, gpg_strategy):
1617
        self._ensure_real()
1618
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
1619
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1620
    @property
1621
    def texts(self):
1622
        """Decorate the real repository for now.
1623
1624
        In the long term a full blown network facility is needed to avoid
1625
        creating a real repository object locally.
1626
        """
1627
        self._ensure_real()
1628
        return self._real_repository.texts
1629
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1630
    @needs_read_lock
1631
    def get_revisions(self, revision_ids):
1632
        self._ensure_real()
1633
        return self._real_repository.get_revisions(revision_ids)
1634
1635
    def supports_rich_root(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1636
        return self._format.rich_root_data
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1637
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1638
    def iter_reverse_revision_history(self, revision_id):
1639
        self._ensure_real()
1640
        return self._real_repository.iter_reverse_revision_history(revision_id)
1641
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1642
    @property
1643
    def _serializer(self):
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
1644
        return self._format._serializer
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1645
2018.5.97 by Andrew Bennetts
Fix more tests.
1646
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1647
        self._ensure_real()
1648
        return self._real_repository.store_revision_signature(
1649
            gpg_strategy, plaintext, revision_id)
1650
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1651
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1652
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1653
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1654
2018.5.97 by Andrew Bennetts
Fix more tests.
1655
    def has_signature_for_revision_id(self, revision_id):
1656
        self._ensure_real()
1657
        return self._real_repository.has_signature_for_revision_id(revision_id)
1658
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1659
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1660
        self._ensure_real()
1661
        return self._real_repository.item_keys_introduced_by(revision_ids,
1662
            _files_pb=_files_pb)
1663
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1664
    def revision_graph_can_have_wrong_parents(self):
1665
        # The answer depends on the remote repo format.
1666
        self._ensure_real()
1667
        return self._real_repository.revision_graph_can_have_wrong_parents()
1668
4332.3.34 by Robert Collins
Delete obsolete pack tuned find_inconsistent_revisions as the generic code path permits the same optimisation.
1669
    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.
1670
        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.
1671
        return self._real_repository._find_inconsistent_revision_parents(
1672
            revisions_iterator)
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1673
1674
    def _check_for_inconsistent_revision_parents(self):
1675
        self._ensure_real()
1676
        return self._real_repository._check_for_inconsistent_revision_parents()
1677
3835.1.17 by Aaron Bentley
Fix stacking bug
1678
    def _make_parents_provider(self, other=None):
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1679
        providers = [self._unstacked_provider]
3835.1.17 by Aaron Bentley
Fix stacking bug
1680
        if other is not None:
1681
            providers.insert(0, other)
3835.1.7 by Aaron Bentley
Updates from review
1682
        providers.extend(r._make_parents_provider() for r in
1683
                         self._fallback_repositories)
4379.3.3 by Gary van der Merwe
Rename and add doc string for StackedParentsProvider.
1684
        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.
1685
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1686
    def _serialise_search_recipe(self, recipe):
1687
        """Serialise a graph search recipe.
1688
1689
        :param recipe: A search recipe (start, stop, count).
1690
        :return: Serialised bytes.
1691
        """
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1692
        start_keys = ' '.join(recipe[1])
1693
        stop_keys = ' '.join(recipe[2])
1694
        count = str(recipe[3])
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1695
        return '\n'.join((start_keys, stop_keys, count))
1696
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1697
    def _serialise_search_result(self, search_result):
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1698
        if isinstance(search_result, graph.PendingAncestryResult):
1699
            parts = ['ancestry-of']
1700
            parts.extend(search_result.heads)
4070.9.5 by Andrew Bennetts
Better wire protocol: don't shoehorn MiniSearchResult serialisation into previous serialisation format.
1701
        else:
1702
            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.
1703
            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.
1704
        return '\n'.join(parts)
1705
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1706
    def autopack(self):
1707
        path = self.bzrdir._path_for_remote_call(self._client)
1708
        try:
1709
            response = self._call('PackRepository.autopack', path)
1710
        except errors.UnknownSmartMethod:
1711
            self._ensure_real()
1712
            self._real_repository._pack_collection.autopack()
1713
            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.
1714
        self.refresh_data()
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1715
        if response[0] != 'ok':
1716
            raise errors.UnexpectedSmartServerResponse(response)
1717
1718
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1719
class RemoteStreamSink(repository.StreamSink):
1720
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.
1721
    def _insert_real(self, stream, src_format, resume_tokens):
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1722
        self.target_repo._ensure_real()
1723
        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.
1724
        result = sink.insert_stream(stream, src_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1725
        if not result:
1726
            self.target_repo.autopack()
1727
        return result
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1728
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
1729
    def insert_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.
1730
        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.
1731
        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.
1732
        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.
1733
        if target._lock_token:
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1734
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1735
            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.
1736
        else:
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1737
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1738
            lock_args = ()
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
1739
        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)
1740
        medium = client._medium
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
1741
        path = target.bzrdir._path_for_remote_call(client)
4476.3.70 by Andrew Bennetts
Review tweaks.
1742
        # Probe for the verb to use with an empty stream before sending the
1743
        # real stream to it.  We do this both to avoid the risk of sending a
1744
        # large request that is then rejected, and because we don't want to
1745
        # implement a way to buffer, rewind, or restart the stream.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1746
        found_verb = False
1747
        for verb, required_version in candidate_calls:
1748
            if medium._is_remote_before(required_version):
1749
                continue
4476.3.25 by Andrew Bennetts
Reinstate don't-reprobe-with-resume-tokens optimisation, fixing acceptance test.
1750
            if resume_tokens:
1751
                # We've already done the probing (and set _is_remote_before) on
1752
                # a previous insert.
1753
                found_verb = True
1754
                break
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1755
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1756
            try:
1757
                response = client.call_with_body_stream(
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1758
                    (verb, path, '') + lock_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1759
            except errors.UnknownSmartMethod:
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
1760
                medium._remember_remote_is_before(required_version)
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1761
            else:
1762
                found_verb = True
1763
                break
1764
        if not found_verb:
1765
            # Have to use VFS.
1766
            return self._insert_real(stream, src_format, resume_tokens)
1767
        self._last_inv_record = None
1768
        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.
1769
        if required_version < (1, 19):
4476.3.35 by Andrew Bennetts
Expand comment.
1770
            # Remote side doesn't support inventory deltas.  Wrap the stream to
1771
            # make sure we don't send any.  If the stream contains inventory
1772
            # deltas we'll interrupt the smart insert_stream request and
1773
            # fallback to VFS.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1774
            stream = self._stop_stream_if_inventory_delta(stream)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1775
        byte_stream = smart_repo._stream_to_byte_stream(
1776
            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.
1777
        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)
1778
        response = client.call_with_body_stream(
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1779
            (verb, path, resume_tokens) + lock_args, byte_stream)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1780
        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)
1781
            raise errors.UnexpectedSmartServerResponse(response)
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
1782
        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.
1783
            # The stream included an inventory-delta record, but the remote
1784
            # side isn't new enough to support them.  So we need to send the
1785
            # 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.
1786
            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.
1787
            return self._resume_stream_with_vfs(response, src_format)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1788
        if response[0][0] == 'missing-basis':
1789
            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.
1790
            resume_tokens = tokens
4257.3.3 by Andrew Bennetts
missing_keys from sink.insert_stream should be a set, not a tuple.
1791
            return resume_tokens, set(missing_keys)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
1792
        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.
1793
            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.
1794
            return [], set()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1795
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
1796
    def _resume_stream_with_vfs(self, response, src_format):
1797
        """Resume sending a stream via VFS, first resending the record and
1798
        substream that couldn't be sent via an insert_stream verb.
1799
        """
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1800
        if response[0][0] == 'missing-basis':
1801
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1802
            # Ignore missing_keys, we haven't finished inserting yet
1803
        else:
1804
            tokens = []
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
1805
        def resume_substream():
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
1806
            # 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.
1807
            for record in self._last_substream:
1808
                yield record
1809
            self._last_substream = None
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1810
        def resume_stream():
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
1811
            # Finish sending the interrupted substream
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
1812
            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.
1813
            # Then simply continue sending the rest of the stream.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1814
            for substream_kind, substream in self._last_stream:
1815
                yield substream_kind, substream
1816
        return self._insert_real(resume_stream(), src_format, tokens)
1817
1818
    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.
1819
        """Normally this just lets the original stream pass-through unchanged.
1820
4476.3.54 by Andrew Bennetts
Update fallback-to-VFS in remote.py for the inventory-deltas substream.
1821
        However if any 'inventory-deltas' substream occurs it will stop
1822
        streaming, and store the interrupted substream and stream in
1823
        self._last_substream and self._last_stream so that the stream can be
1824
        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.
1825
        """
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1826
                    
1827
        stream_iter = iter(stream)
1828
        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.
1829
            if substream_kind == 'inventory-deltas':
1830
                self._last_substream = substream
1831
                self._last_stream = stream_iter
1832
                return
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
1833
            else:
1834
                yield substream_kind, substream
1835
            
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)
1836
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
1837
class RemoteStreamSource(repository.StreamSource):
1838
    """Stream data from a remote server."""
1839
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1840
    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.
1841
        if (self.from_repository._fallback_repositories and
1842
            self.to_format._fetch_order == 'topological'):
1843
            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)
1844
        sources = []
1845
        seen = set()
1846
        repos = [self.from_repository]
1847
        while repos:
1848
            repo = repos.pop(0)
1849
            if repo in seen:
1850
                continue
1851
            seen.add(repo)
1852
            repos.extend(repo._fallback_repositories)
1853
            sources.append(repo)
1854
        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.
1855
4476.3.16 by Andrew Bennetts
Only make inv deltas against bases we've already sent, and other tweaks.
1856
    def get_stream_for_missing_keys(self, missing_keys):
1857
        self.from_repository._ensure_real()
1858
        real_repo = self.from_repository._real_repository
1859
        real_source = real_repo._get_source(self.to_format)
1860
        return real_source.get_stream_for_missing_keys(missing_keys)
1861
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1862
    def _real_stream(self, repo, search):
1863
        """Get a stream for search from repo.
1864
        
1865
        This never called RemoteStreamSource.get_stream, and is a heler
1866
        for RemoteStreamSource._get_stream to allow getting a stream 
1867
        reliably whether fallback back because of old servers or trying
1868
        to stream from a non-RemoteRepository (which the stacked support
1869
        code will do).
1870
        """
1871
        source = repo._get_source(self.to_format)
1872
        if isinstance(source, RemoteStreamSource):
4600.1.1 by Robert Collins
Fix fetching from 2a branches over bzr-v2.
1873
            repo._ensure_real()
1874
            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.
1875
        return source.get_stream(search)
1876
1877
    def _get_stream(self, repo, search):
1878
        """Core worker to get a stream from repo for search.
1879
1880
        This is used by both get_stream and the stacking support logic. It
1881
        deliberately gets a stream for repo which does not need to be
1882
        self.from_repository. In the event that repo is not Remote, or
1883
        cannot do a smart stream, a fallback is made to the generic
1884
        repository._get_stream() interface, via self._real_stream.
1885
1886
        In the event of stacking, streams from _get_stream will not
1887
        contain all the data for search - this is normal (see get_stream).
1888
1889
        :param repo: A repository.
1890
        :param search: A search.
1891
        """
1892
        # Fallbacks may be non-smart
1893
        if not isinstance(repo, RemoteRepository):
1894
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1895
        client = repo._client
1896
        medium = client._medium
1897
        path = repo.bzrdir._path_for_remote_call(client)
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
1898
        search_bytes = repo._serialise_search_result(search)
1899
        args = (path, self.to_format.network_name())
1900
        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.
1901
            ('Repository.get_stream_1.19', (1, 19)),
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
1902
            ('Repository.get_stream', (1, 13))]
1903
        found_verb = False
1904
        for verb, version in candidate_verbs:
1905
            if medium._is_remote_before(version):
1906
                continue
1907
            try:
1908
                response = repo._call_with_body_bytes_expecting_body(
1909
                    verb, args, search_bytes)
1910
            except errors.UnknownSmartMethod:
1911
                medium._remember_remote_is_before(version)
1912
            else:
1913
                response_tuple, response_handler = response
1914
                found_verb = True
1915
                break
1916
        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.
1917
            return self._real_stream(repo, search)
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1918
        if response_tuple[0] != 'ok':
1919
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1920
        byte_stream = response_handler.read_streamed_body()
1921
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1922
        if src_format.network_name() != repo._format.network_name():
1923
            raise AssertionError(
1924
                "Mismatched RemoteRepository and stream src %r, %r" % (
1925
                src_format.network_name(), repo._format.network_name()))
1926
        return stream
1927
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1928
    def missing_parents_chain(self, search, sources):
1929
        """Chain multiple streams together to handle stacking.
1930
1931
        :param search: The overall search to satisfy with streams.
1932
        :param sources: A list of Repository objects to query.
1933
        """
4634.61.2 by Andrew Bennetts
Variable rename suggested by Robert.
1934
        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.
1935
        self.seen_revs = set()
1936
        self.referenced_revs = set()
1937
        # If there are heads in the search, or the key count is > 0, we are not
1938
        # done.
1939
        while not search.is_empty() and len(sources) > 1:
1940
            source = sources.pop(0)
1941
            stream = self._get_stream(source, search)
1942
            for kind, substream in stream:
1943
                if kind != 'revisions':
1944
                    yield kind, substream
1945
                else:
1946
                    yield kind, self.missing_parents_rev_handler(substream)
1947
            search = search.refine(self.seen_revs, self.referenced_revs)
1948
            self.seen_revs = set()
1949
            self.referenced_revs = set()
1950
        if not search.is_empty():
1951
            for kind, stream in self._get_stream(sources[0], search):
1952
                yield kind, stream
1953
1954
    def missing_parents_rev_handler(self, substream):
1955
        for content in substream:
1956
            revision_bytes = content.get_bytes_as('fulltext')
4634.61.2 by Andrew Bennetts
Variable rename suggested by Robert.
1957
            revision = self.from_serialiser.read_revision_from_string(
1958
                revision_bytes)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
1959
            self.seen_revs.add(content.key[-1])
1960
            self.referenced_revs.update(revision.parent_ids)
1961
            yield content
1962
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
1963
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1964
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1965
    """A 'LockableFiles' implementation that talks to a smart server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1966
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1967
    This is not a public interface class.
1968
    """
1969
1970
    def __init__(self, bzrdir, _client):
1971
        self.bzrdir = bzrdir
1972
        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.
1973
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1974
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1975
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1976
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1977
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
    def _find_modes(self):
1979
        # RemoteBranches don't let the client set the mode of control files.
1980
        self._dir_mode = None
1981
        self._file_mode = None
1982
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1983
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1984
class RemoteBranchFormat(branch.BranchFormat):
1985
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.
1986
    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.
1987
        super(RemoteBranchFormat, self).__init__()
1988
        self._matchingbzrdir = RemoteBzrDirFormat()
1989
        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.
1990
        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.
1991
        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.
1992
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.
1993
    def __eq__(self, other):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1994
        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.
1995
            self.__dict__ == other.__dict__)
1996
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.
1997
    def _ensure_real(self):
1998
        if self._custom_format is None:
1999
            self._custom_format = branch.network_format_registry.get(
2000
                self._network_name)
2001
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2002
    def get_format_description(self):
4792.1.1 by Andrew Bennetts
Show real branch/repo format description in 'info -v' over HPSS.
2003
        self._ensure_real()
2004
        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.
2005
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2006
    def network_name(self):
2007
        return self._network_name
2008
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2009
    def open(self, a_bzrdir, ignore_fallbacks=False):
2010
        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.
2011
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
2012
    def _vfs_initialize(self, a_bzrdir):
2013
        # Initialisation when using a local bzrdir object, or a non-vfs init
2014
        # method is not available on the server.
2015
        # self._custom_format is always set - the start of initialize ensures
2016
        # that.
2017
        if isinstance(a_bzrdir, RemoteBzrDir):
2018
            a_bzrdir._ensure_real()
2019
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2020
        else:
2021
            # We assume the bzrdir is parameterised; it may not be.
2022
            result = self._custom_format.initialize(a_bzrdir)
2023
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2024
            not isinstance(result, RemoteBranch)):
2025
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2026
        return result
2027
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2028
    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.
2029
        # 1) get the network name to use.
2030
        if self._custom_format:
2031
            network_name = self._custom_format.network_name()
2032
        else:
2033
            # Select the current bzrlib default and ask for that.
2034
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
2035
            reference_format = reference_bzrdir_format.get_branch_format()
2036
            self._custom_format = reference_format
2037
            network_name = reference_format.network_name()
2038
        # 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.
2039
        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.
2040
            return self._vfs_initialize(a_bzrdir)
2041
        medium = a_bzrdir._client._medium
2042
        if medium._is_remote_before((1, 13)):
2043
            return self._vfs_initialize(a_bzrdir)
2044
        # Creating on a remote bzr dir.
2045
        # 2) try direct creation via RPC
2046
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2047
        verb = 'BzrDir.create_branch'
2048
        try:
2049
            response = a_bzrdir._call(verb, path, network_name)
2050
        except errors.UnknownSmartMethod:
2051
            # Fallback - use vfs methods
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2052
            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.
2053
            return self._vfs_initialize(a_bzrdir)
2054
        if response[0] != 'ok':
2055
            raise errors.UnexpectedSmartServerResponse(response)
2056
        # 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.
2057
        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.
2058
        repo_format = response_tuple_to_repo_format(response[3:])
2059
        if response[2] == '':
2060
            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.
2061
        else:
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
2062
            repo_bzrdir = RemoteBzrDir(
2063
                a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2064
                a_bzrdir._client)
2065
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2066
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2067
            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.
2068
        # XXX: We know this is a new branch, so it must have revno 0, revid
2069
        # NULL_REVISION. Creating the branch locked would make this be unable
2070
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2071
        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.
2072
        return remote_branch
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2073
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.
2074
    def make_tags(self, branch):
2075
        self._ensure_real()
2076
        return self._custom_format.make_tags(branch)
2077
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
2078
    def supports_tags(self):
2079
        # Remote branches might support tags, but we won't know until we
2080
        # 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.
2081
        self._ensure_real()
2082
        return self._custom_format.supports_tags()
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
2083
4103.2.2 by Andrew Bennetts
Fix RemoteBranchFormat.supports_stacking()
2084
    def supports_stacking(self):
2085
        self._ensure_real()
2086
        return self._custom_format.supports_stacking()
2087
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.
2088
    def supports_set_append_revisions_only(self):
2089
        self._ensure_real()
2090
        return self._custom_format.supports_set_append_revisions_only()
2091
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2092
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2093
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2094
    """Branch stored on a server accessed by HPSS RPC.
2095
2096
    At the moment most operations are mapped down to simple file operations.
2097
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2098
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2099
    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.
2100
        _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.
2101
        """Create a RemoteBranch instance.
2102
2103
        :param real_branch: An optional local implementation of the branch
2104
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2105
        :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.
2106
        :param format: A RemoteBranchFormat object, None to create one
2107
            automatically. If supplied it should have a network_name already
2108
            supplied.
2109
        :param setup_stacking: If True make an RPC call to determine the
2110
            stacked (or not) status of the branch. If False assume the branch
2111
            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.
2112
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2113
        # We intentionally don't call the parent class's __init__, because it
2114
        # will try to assign to self.tags, which is a property in this subclass.
2115
        # 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.
2116
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2117
        if _client is not None:
2118
            self._client = _client
2119
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
2120
            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.
2121
        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.
2122
        if real_branch is not None:
2123
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2124
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
2125
            real_repo = self._real_branch.repository
2126
            if isinstance(real_repo, RemoteRepository):
2127
                real_repo._ensure_real()
2128
                real_repo = real_repo._real_repository
2129
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2130
            # Give the branch the remote repository to let fast-pathing happen.
2131
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2132
        else:
2133
            self._real_branch = None
4031.3.3 by Matt Nordhoff
Review tweaks from Ben Finney
2134
        # 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.
2135
        self._clear_cached_state()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
2136
        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.
2137
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2138
        self._lock_mode = None
2139
        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.
2140
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2141
        self._lock_count = 0
2142
        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.
2143
        # Setup a format: note that we cannot call _ensure_real until all the
2144
        # attributes above are set: This code cannot be moved higher up in this
2145
        # function.
2146
        if format is None:
2147
            self._format = RemoteBranchFormat()
2148
            if real_branch is not None:
2149
                self._format._network_name = \
2150
                    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.
2151
        else:
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
2152
            self._format = format
4600.2.1 by Robert Collins
Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered.
2153
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
2154
        # branch.open_branch method.
2155
        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.
2156
        if not self._format._network_name:
2157
            # Did not get from open_branchV2 - old server.
2158
            self._ensure_real()
2159
            self._format._network_name = \
2160
                self._real_branch._format.network_name()
2161
        self.tags = self._format.make_tags(self)
3681.1.2 by Robert Collins
Adjust for trunk.
2162
        # 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)
2163
        hooks = branch.Branch.hooks['open']
2164
        for hook in hooks:
2165
            hook(self)
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
2166
        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.
2167
        if setup_stacking:
2168
            self._setup_stacking()
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
2169
2170
    def _setup_stacking(self):
2171
        # 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
2172
        # the vfs branch.
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
2173
        try:
2174
            fallback_url = self.get_stacked_on_url()
2175
        except (errors.NotStacked, errors.UnstackableBranchFormat,
2176
            errors.UnstackableRepositoryFormat), e:
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
2177
            return
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
2178
        self._is_stacked = True
4379.2.2 by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly.
2179
        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.
2180
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2181
    def _get_config(self):
2182
        return RemoteBranchConfig(self)
2183
3407.2.17 by Martin Pool
better name: _get_real_transport
2184
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
2185
        # if we try vfs access, return the real branch's vfs transport
2186
        self._ensure_real()
2187
        return self._real_branch._transport
2188
3407.2.17 by Martin Pool
better name: _get_real_transport
2189
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
2190
2477.1.1 by Martin Pool
Add RemoteBranch repr
2191
    def __str__(self):
2192
        return "%s(%s)" % (self.__class__.__name__, self.base)
2193
2194
    __repr__ = __str__
2195
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2196
    def _ensure_real(self):
2197
        """Ensure that there is a _real_branch set.
2198
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2199
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2200
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
2201
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2202
            if not vfs.vfs_enabled():
2203
                raise AssertionError('smart server vfs must be enabled '
2204
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2205
            self.bzrdir._ensure_real()
4600.2.1 by Robert Collins
Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered.
2206
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2207
                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.
2208
            if self.repository._real_repository is None:
2209
                # Give the remote repository the matching real repo.
2210
                real_repo = self._real_branch.repository
2211
                if isinstance(real_repo, RemoteRepository):
2212
                    real_repo._ensure_real()
2213
                    real_repo = real_repo._real_repository
2214
                self.repository._set_real_repository(real_repo)
2215
            # Give the real branch the remote repository to let fast-pathing
2216
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2217
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2218
            if self._lock_mode == 'r':
2219
                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.
2220
            elif self._lock_mode == 'w':
2221
                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.
2222
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2223
    def _translate_error(self, err, **context):
2224
        self.repository._translate_error(err, branch=self, **context)
2225
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2226
    def _clear_cached_state(self):
2227
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
2228
        if self._real_branch is not None:
2229
            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.
2230
2231
    def _clear_cached_state_of_remote_branch_only(self):
2232
        """Like _clear_cached_state, but doesn't clear the cache of
2233
        self._real_branch.
2234
2235
        This is useful when falling back to calling a method of
2236
        self._real_branch that changes state.  In that case the underlying
2237
        branch changes, so we need to invalidate this RemoteBranch's cache of
2238
        it.  However, there's no need to invalidate the _real_branch's cache
2239
        too, in fact doing so might harm performance.
2240
        """
2241
        super(RemoteBranch, self)._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2242
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.
2243
    @property
2244
    def control_files(self):
2245
        # Defer actually creating RemoteBranchLockableFiles until its needed,
2246
        # because it triggers an _ensure_real that we otherwise might not need.
2247
        if self._control_files is None:
2248
            self._control_files = RemoteBranchLockableFiles(
2249
                self.bzrdir, self._client)
2250
        return self._control_files
2251
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
2252
    def _get_checkout_format(self):
2253
        self._ensure_real()
2254
        return self._real_branch._get_checkout_format()
2255
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2256
    def get_physical_lock_status(self):
2257
        """See Branch.get_physical_lock_status()."""
2258
        # 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.
2259
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
2260
        return self._real_branch.get_physical_lock_status()
2261
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2262
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2263
        """Get the URL this branch is stacked against.
2264
2265
        :raises NotStacked: If the branch is not stacked.
2266
        :raises UnstackableBranchFormat: If the branch does not support
2267
            stacking.
2268
        :raises UnstackableRepositoryFormat: If the repository does not support
2269
            stacking.
2270
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2271
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2272
            # there may not be a repository yet, so we can't use
2273
            # 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
2274
            response = self._client.call('Branch.get_stacked_on_url',
2275
                self._remote_path())
2276
        except errors.ErrorFromSmartServer, err:
2277
            # there may not be a repository yet, so we can't call through
2278
            # its _translate_error
2279
            _translate_error(err, branch=self)
2280
        except errors.UnknownSmartMethod, err:
2281
            self._ensure_real()
2282
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2283
        if response[0] != 'ok':
2284
            raise errors.UnexpectedSmartServerResponse(response)
2285
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2286
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
2287
    def set_stacked_on_url(self, url):
2288
        branch.Branch.set_stacked_on_url(self, url)
2289
        if not url:
2290
            self._is_stacked = False
2291
        else:
2292
            self._is_stacked = True
2293
        
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.
2294
    def _vfs_get_tags_bytes(self):
2295
        self._ensure_real()
2296
        return self._real_branch._get_tags_bytes()
2297
2298
    def _get_tags_bytes(self):
2299
        medium = self._client._medium
2300
        if medium._is_remote_before((1, 13)):
2301
            return self._vfs_get_tags_bytes()
2302
        try:
2303
            response = self._call('Branch.get_tags_bytes', self._remote_path())
2304
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2305
            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.
2306
            return self._vfs_get_tags_bytes()
2307
        return response[0]
2308
4556.2.10 by Andrew Bennetts
Fix trivial bug in _vfs_set_tags_bytes.
2309
    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.
2310
        self._ensure_real()
4556.2.10 by Andrew Bennetts
Fix trivial bug in _vfs_set_tags_bytes.
2311
        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.
2312
2313
    def _set_tags_bytes(self, bytes):
2314
        medium = self._client._medium
2315
        if medium._is_remote_before((1, 18)):
2316
            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.
2317
            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.
2318
        try:
2319
            args = (
2320
                self._remote_path(), self._lock_token, self._repo_lock_token)
2321
            response = self._call_with_body_bytes(
2322
                'Branch.set_tags_bytes', args, bytes)
2323
        except errors.UnknownSmartMethod:
2324
            medium._remember_remote_is_before((1, 18))
2325
            self._vfs_set_tags_bytes(bytes)
2326
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2327
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2328
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2329
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2330
            self._note_lock('r')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2331
            self._lock_mode = 'r'
2332
            self._lock_count = 1
2333
            if self._real_branch is not None:
2334
                self._real_branch.lock_read()
2335
        else:
2336
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2337
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).
2338
    def _remote_lock_write(self, token):
2339
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2340
            branch_token = repo_token = ''
2341
        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).
2342
            branch_token = token
2343
            repo_token = self.repository.lock_write()
2344
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2345
        err_context = {'token': token}
2346
        response = self._call(
2347
            'Branch.lock_write', self._remote_path(), branch_token,
2348
            repo_token or '', **err_context)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2349
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
2350
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2351
        ok, branch_token, repo_token = response
2352
        return branch_token, repo_token
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2353
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).
2354
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2355
        if not self._lock_mode:
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2356
            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.
2357
            # 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).
2358
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2359
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2360
            if not self._lock_token:
2361
                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.
2362
            # 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.
2363
            self.repository.lock_write(
2364
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2365
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2366
            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.
2367
                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).
2368
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2369
                self._leave_lock = True
2370
            else:
2371
                self._leave_lock = False
2372
            self._lock_mode = 'w'
2373
            self._lock_count = 1
2374
        elif self._lock_mode == 'r':
2375
            raise errors.ReadOnlyTransaction
2376
        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).
2377
            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.
2378
                # A token was given to lock_write, and we're relocking, so
2379
                # check that the given token actually matches the one we
2380
                # 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).
2381
                if token != self._lock_token:
2382
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2383
            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.
2384
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
2385
            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.
2386
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2387
2388
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2389
        err_context = {'token': str((branch_token, repo_token))}
2390
        response = self._call(
2391
            'Branch.unlock', self._remote_path(), branch_token,
2392
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2393
        if response == ('ok',):
2394
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2395
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2396
4634.85.9 by Andrew Bennetts
Add some experimental decorators: @only_raises(..) and @cleanup_method.
2397
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2398
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2399
        try:
2400
            self._lock_count -= 1
2401
            if not self._lock_count:
2402
                self._clear_cached_state()
2403
                mode = self._lock_mode
2404
                self._lock_mode = None
2405
                if self._real_branch is not None:
2406
                    if (not self._leave_lock and mode == 'w' and
2407
                        self._repo_lock_token):
2408
                        # If this RemoteBranch will remove the physical lock
2409
                        # for the repository, make sure the _real_branch
2410
                        # doesn't do it first.  (Because the _real_branch's
2411
                        # repository is set to be the RemoteRepository.)
2412
                        self._real_branch.repository.leave_lock_in_place()
2413
                    self._real_branch.unlock()
2414
                if mode != 'w':
2415
                    # Only write-locked branched need to make a remote method
4031.3.1 by Frank Aspell
Fixing various typos
2416
                    # call to perform the unlock.
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
2417
                    return
2418
                if not self._lock_token:
2419
                    raise AssertionError('Locked, but no token!')
2420
                branch_token = self._lock_token
2421
                repo_token = self._repo_lock_token
2422
                self._lock_token = None
2423
                self._repo_lock_token = None
2424
                if not self._leave_lock:
2425
                    self._unlock(branch_token, repo_token)
2426
        finally:
2427
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2428
2429
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
2430
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2431
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
2432
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2433
    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.
2434
        if not self._lock_token:
2435
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2436
        self._leave_lock = True
2437
2438
    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.
2439
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
2440
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
2441
        self._leave_lock = False
2442
4634.69.1 by Andrew Bennetts
Apply @needs_read_lock to RemoteBranch.get_rev_id.
2443
    @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.
2444
    def get_rev_id(self, revno, history=None):
4419.2.17 by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted.
2445
        if revno == 0:
2446
            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.
2447
        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.
2448
        ok, result = self.repository.get_rev_id_for_revno(
2449
            revno, last_revision_info)
2450
        if ok:
2451
            return result
2452
        missing_parent = result[1]
4419.2.17 by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted.
2453
        # Either the revision named by the server is missing, or its parent
2454
        # is.  Call get_parent_map to determine which, so that we report a
2455
        # useful error.
2456
        parent_map = self.repository.get_parent_map([missing_parent])
2457
        if missing_parent in parent_map:
2458
            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.
2459
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2460
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2461
    def _last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2462
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2463
        if response[0] != 'ok':
2464
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2465
        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.
2466
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
2467
        return (revno, last_revision)
2468
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2469
    def _gen_revision_history(self):
2470
        """See Branch._gen_revision_history()."""
4419.1.3 by Andrew Bennetts
Quick fix by using self._ensure_real.
2471
        if self._is_stacked:
2472
            self._ensure_real()
2473
            return self._real_branch._gen_revision_history()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2474
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2475
            '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.
2476
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
2477
            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.
2478
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
2479
        if result == ['']:
2480
            return []
2481
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2482
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
2483
    def _remote_path(self):
2484
        return self.bzrdir._path_for_remote_call(self._client)
2485
3441.5.18 by Andrew Bennetts
Fix some test failures.
2486
    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.
2487
            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.
2488
        # This performs additional work to meet the hook contract; while its
2489
        # undesirable, we have to synthesise the revno to call the hook, and
2490
        # not calling the hook is worse as it means changes can't be prevented.
2491
        # Having calculated this though, we can't just call into
2492
        # set_last_revision_info as a simple call, because there is a set_rh
2493
        # hook that some folk may still be using.
2494
        old_revno, old_revid = self.last_revision_info()
2495
        history = self._lefthand_history(revision_id)
2496
        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.
2497
        err_context = {'other_branch': other_branch}
2498
        response = self._call('Branch.set_last_revision_ex',
2499
            self._remote_path(), self._lock_token, self._repo_lock_token,
2500
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
2501
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2502
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
2503
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2504
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
2505
        new_revno, new_revision_id = response[1:]
2506
        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.
2507
        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.
2508
        if self._real_branch is not None:
2509
            cache = new_revno, new_revision_id
2510
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2511
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2512
    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.
2513
        old_revno, old_revid = self.last_revision_info()
2514
        # This performs additional work to meet the hook contract; while its
2515
        # undesirable, we have to synthesise the revno to call the hook, and
2516
        # not calling the hook is worse as it means changes can't be prevented.
2517
        # Having calculated this though, we can't just call into
2518
        # set_last_revision_info as a simple call, because there is a set_rh
2519
        # hook that some folk may still be using.
2520
        history = self._lefthand_history(revision_id)
2521
        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.
2522
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2523
        response = self._call('Branch.set_last_revision',
2524
            self._remote_path(), self._lock_token, self._repo_lock_token,
2525
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2526
        if response != ('ok',):
2527
            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.
2528
        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.
2529
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2530
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2531
    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.
2532
        # Send just the tip revision of the history; the server will generate
2533
        # the full history from that.  If the revision doesn't exist in this
2534
        # branch, NoSuchRevision will be raised.
2535
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
2536
            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.
2537
        else:
2538
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2539
        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.
2540
        for hook in branch.Branch.hooks['set_rh']:
2541
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
2542
        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.
2543
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2544
    def _get_parent_location(self):
2545
        medium = self._client._medium
2546
        if medium._is_remote_before((1, 13)):
2547
            return self._vfs_get_parent_location()
2548
        try:
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2549
            response = self._call('Branch.get_parent', self._remote_path())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2550
        except errors.UnknownSmartMethod:
4094.1.1 by Andrew Bennetts
Add some medium._remember_is_before((1, 13)) calls.
2551
            medium._remember_remote_is_before((1, 13))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2552
            return self._vfs_get_parent_location()
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2553
        if len(response) != 1:
4083.1.6 by Andrew Bennetts
Fix trivial bug in my trivial bug fix :)
2554
            raise errors.UnexpectedSmartServerResponse(response)
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2555
        parent_location = response[0]
2556
        if parent_location == '':
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2557
            return None
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2558
        return parent_location
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
2559
2560
    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.
2561
        self._ensure_real()
4083.1.5 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
2562
        return self._real_branch._get_parent_location()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2563
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.
2564
    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.
2565
        medium = self._client._medium
2566
        if medium._is_remote_before((1, 15)):
2567
            return self._vfs_set_parent_location(url)
2568
        try:
2569
            call_url = url or ''
2570
            if type(call_url) is not str:
2571
                raise AssertionError('url must be a str or None (%s)' % url)
2572
            response = self._call('Branch.set_parent_location',
2573
                self._remote_path(), self._lock_token, self._repo_lock_token,
2574
                call_url)
2575
        except errors.UnknownSmartMethod:
2576
            medium._remember_remote_is_before((1, 15))
2577
            return self._vfs_set_parent_location(url)
2578
        if response != ():
2579
            raise errors.UnexpectedSmartServerResponse(response)
2580
2581
    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.
2582
        self._ensure_real()
2583
        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.
2584
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2585
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2586
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
2587
             **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.
2588
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2589
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
2590
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
2591
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
2592
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
2593
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2594
    @needs_read_lock
2595
    def push(self, target, overwrite=False, stop_revision=None):
2596
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
2597
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
2598
            target, overwrite=overwrite, stop_revision=stop_revision,
2599
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
2600
2601
    def is_locked(self):
2602
        return self._lock_count >= 1
2603
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
2604
    @needs_read_lock
2605
    def revision_id_to_revno(self, revision_id):
2606
        self._ensure_real()
2607
        return self._real_branch.revision_id_to_revno(revision_id)
2608
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2609
    @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.
2610
    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.
2611
        # XXX: These should be returned by the set_last_revision_info verb
2612
        old_revno, old_revid = self.last_revision_info()
2613
        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.
2614
        revision_id = ensure_null(revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2615
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2616
            response = self._call('Branch.set_last_revision_info',
2617
                self._remote_path(), self._lock_token, self._repo_lock_token,
2618
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
2619
        except errors.UnknownSmartMethod:
2620
            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.
2621
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2622
            self._real_branch.set_last_revision_info(revno, revision_id)
2623
            self._last_revision_info_cache = revno, revision_id
2624
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
2625
        if response == ('ok',):
2626
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
2627
            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.
2628
            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.
2629
            # Update the _real_branch's cache too.
2630
            if self._real_branch is not None:
2631
                cache = self._last_revision_info_cache
2632
                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.
2633
        else:
2634
            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.
2635
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.
2636
    @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.
2637
    def generate_revision_history(self, revision_id, last_rev=None,
2638
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2639
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
2640
        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.
2641
            # 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.
2642
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
2643
                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.
2644
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
2645
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
2646
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
2647
                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.
2648
        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.
2649
        self.set_revision_history(self._lefthand_history(revision_id,
2650
            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
2651
2018.5.97 by Andrew Bennetts
Fix more tests.
2652
    def set_push_location(self, location):
2653
        self._ensure_real()
2654
        return self._real_branch.set_push_location(location)
2655
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2656
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2657
class RemoteConfig(object):
2658
    """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.
2659
2660
    It is a low-level object that considers config data to be name/value pairs
2661
    that may be associated with a section. Assigning meaning to the these
2662
    values is done at higher levels like bzrlib.config.TreeConfig.
2663
    """
2664
2665
    def get_option(self, name, section=None, default=None):
2666
        """Return the value associated with a named option.
2667
2668
        :param name: The name of the value
2669
        :param section: The section the option is in (if any)
2670
        :param default: The value to return if the value is not set
2671
        :return: The value or default value
2672
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2673
        try:
2674
            configobj = self._get_configobj()
2675
            if section is None:
2676
                section_obj = configobj
2677
            else:
2678
                try:
2679
                    section_obj = configobj[section]
2680
                except KeyError:
2681
                    return default
2682
            return section_obj.get(name, default)
2683
        except errors.UnknownSmartMethod:
2684
            return self._vfs_get_option(name, section, default)
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2685
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2686
    def _response_to_configobj(self, response):
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2687
        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.
2688
            raise errors.UnexpectedSmartServerResponse(response)
4241.5.1 by Matt Nordhoff
Fix Branch.get_config_file smart verb on multi-line config files. (Bug #354075)
2689
        lines = response[1].read_body_bytes().splitlines()
2690
        return config.ConfigObj(lines, encoding='utf-8')
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2691
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2692
2693
class RemoteBranchConfig(RemoteConfig):
2694
    """A RemoteConfig for Branches."""
2695
2696
    def __init__(self, branch):
2697
        self._branch = branch
2698
2699
    def _get_configobj(self):
2700
        path = self._branch._remote_path()
2701
        response = self._branch._client.call_expecting_body(
2702
            'Branch.get_config_file', path)
2703
        return self._response_to_configobj(response)
2704
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2705
    def set_option(self, value, name, section=None):
2706
        """Set the value associated with a named option.
2707
2708
        :param value: The value to set
2709
        :param name: The name of the value to set
2710
        :param section: The section the option is in (if any)
2711
        """
4226.2.1 by Robert Collins
Set branch config options via a smart method.
2712
        medium = self._branch._client._medium
2713
        if medium._is_remote_before((1, 14)):
2714
            return self._vfs_set_option(value, name, section)
2715
        try:
2716
            path = self._branch._remote_path()
2717
            response = self._branch._client.call('Branch.set_config_option',
2718
                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.
2719
                value.encode('utf8'), name, section or '')
4226.2.1 by Robert Collins
Set branch config options via a smart method.
2720
        except errors.UnknownSmartMethod:
2721
            medium._remember_remote_is_before((1, 14))
2722
            return self._vfs_set_option(value, name, section)
2723
        if response != ():
2724
            raise errors.UnexpectedSmartServerResponse(response)
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2725
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2726
    def _real_object(self):
2727
        self._branch._ensure_real()
2728
        return self._branch._real_branch
2729
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2730
    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.
2731
        return self._real_object()._get_config().set_option(
2732
            value, name, section)
2733
2734
2735
class RemoteBzrDirConfig(RemoteConfig):
2736
    """A RemoteConfig for BzrDirs."""
2737
2738
    def __init__(self, bzrdir):
2739
        self._bzrdir = bzrdir
2740
2741
    def _get_configobj(self):
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
2742
        medium = self._bzrdir._client._medium
2743
        verb = 'BzrDir.get_config_file'
2744
        if medium._is_remote_before((1, 15)):
2745
            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.
2746
        path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2747
        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.
2748
            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.
2749
        return self._response_to_configobj(response)
2750
2751
    def _vfs_get_option(self, name, section, default):
2752
        return self._real_object()._get_config().get_option(
2753
            name, section, default)
2754
2755
    def set_option(self, value, name, section=None):
2756
        """Set the value associated with a named option.
2757
2758
        :param value: The value to set
2759
        :param name: The name of the value to set
2760
        :param section: The section the option is in (if any)
2761
        """
2762
        return self._real_object()._get_config().set_option(
2763
            value, name, section)
2764
2765
    def _real_object(self):
2766
        self._bzrdir._ensure_real()
2767
        return self._bzrdir._real_bzrdir
2768
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2769
2770
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2771
def _extract_tar(tar, to_dir):
2772
    """Extract all the contents of a tarfile object.
2773
2774
    A replacement for extractall, which is not present in python2.4
2775
    """
2776
    for tarinfo in tar:
2777
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2778
2779
2780
def _translate_error(err, **context):
2781
    """Translate an ErrorFromSmartServer into a more useful error.
2782
2783
    Possible context keys:
2784
      - branch
2785
      - repository
2786
      - bzrdir
2787
      - token
2788
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2789
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
2790
2791
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2792
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2793
    """
2794
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2795
        try:
2796
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2797
        except KeyError, key_err:
2798
            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.
2799
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2800
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
2801
        """Get the path from the context if present, otherwise use first error
2802
        arg.
2803
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2804
        try:
2805
            return context['path']
2806
        except KeyError, key_err:
2807
            try:
2808
                return err.error_args[0]
2809
            except IndexError, idx_err:
2810
                mutter(
2811
                    'Missing key %r in context %r', key_err.args[0], context)
2812
                raise err
2813
4650.2.1 by Robert Collins
Deserialise IncompatibleRepositories errors in the client, generating
2814
    if err.error_verb == 'IncompatibleRepositories':
2815
        raise errors.IncompatibleRepositories(err.error_args[0],
2816
            err.error_args[1], err.error_args[2])
2817
    elif err.error_verb == 'NoSuchRevision':
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2818
        raise NoSuchRevision(find('branch'), err.error_args[0])
2819
    elif err.error_verb == 'nosuchrevision':
2820
        raise NoSuchRevision(find('repository'), err.error_args[0])
2821
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2822
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2823
    elif err.error_verb == 'norepository':
2824
        raise errors.NoRepositoryPresent(find('bzrdir'))
2825
    elif err.error_verb == 'LockContention':
2826
        raise errors.LockContention('(remote lock)')
2827
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2828
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
2829
    elif err.error_verb == 'LockFailed':
2830
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
2831
    elif err.error_verb == 'TokenMismatch':
2832
        raise errors.TokenMismatch(find('token'), '(remote token)')
2833
    elif err.error_verb == 'Diverged':
2834
        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.
2835
    elif err.error_verb == 'TipChangeRejected':
2836
        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
2837
    elif err.error_verb == 'UnstackableBranchFormat':
2838
        raise errors.UnstackableBranchFormat(*err.error_args)
2839
    elif err.error_verb == 'UnstackableRepositoryFormat':
2840
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2841
    elif err.error_verb == 'NotStacked':
2842
        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.
2843
    elif err.error_verb == 'PermissionDenied':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2844
        path = get_path()
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2845
        if len(err.error_args) >= 2:
2846
            extra = err.error_args[1]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2847
        else:
2848
            extra = None
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
2849
        raise errors.PermissionDenied(path, extra=extra)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2850
    elif err.error_verb == 'ReadError':
2851
        path = get_path()
2852
        raise errors.ReadError(path)
2853
    elif err.error_verb == 'NoSuchFile':
2854
        path = get_path()
2855
        raise errors.NoSuchFile(path)
2856
    elif err.error_verb == 'FileExists':
2857
        raise errors.FileExists(err.error_args[0])
2858
    elif err.error_verb == 'DirectoryNotEmpty':
2859
        raise errors.DirectoryNotEmpty(err.error_args[0])
2860
    elif err.error_verb == 'ShortReadvError':
2861
        args = err.error_args
2862
        raise errors.ShortReadvError(
2863
            args[0], int(args[1]), int(args[2]), int(args[3]))
2864
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
2865
        encoding = str(err.error_args[0]) # encoding must always be a string
2866
        val = err.error_args[1]
2867
        start = int(err.error_args[2])
2868
        end = int(err.error_args[3])
2869
        reason = str(err.error_args[4]) # reason must always be a string
2870
        if val.startswith('u:'):
2871
            val = val[2:].decode('utf-8')
2872
        elif val.startswith('s:'):
2873
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2874
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2875
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
2876
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
2877
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2878
    elif err.error_verb == 'ReadOnlyError':
2879
        raise errors.TransportNotPossible('readonly transport')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2880
    raise errors.UnknownErrorFromSmartServer(err)