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