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