~bzr-pqm/bzr/bzr.dev

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