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