~bzr-pqm/bzr/bzr.dev

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