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