/brz/remove-bazaar

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