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