/brz/remove-bazaar

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