/brz/remove-bazaar

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