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