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