/brz/remove-bazaar

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