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