/brz/remove-bazaar

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