/brz/remove-bazaar

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