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