/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3407.2.2 by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf
1
# Copyright (C) 2006, 2007, 2008 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
17
# TODO: At some point, handle upgrades by just passing the whole request
18
# across to run on the server.
19
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
20
import bz2
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
21
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
22
from bzrlib import (
23
    branch,
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,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
27
    lockdir,
28
    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.
29
    revision,
3228.4.11 by John Arbash Meinel
Deprecations abound.
30
    symbol_versioning,
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
31
    urlutils,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
32
)
2535.4.27 by Andrew Bennetts
Remove some unused imports.
33
from bzrlib.branch import BranchReferenceFormat
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
34
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
35
from bzrlib.decorators import needs_read_lock, needs_write_lock
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
36
from bzrlib.errors import (
37
    NoSuchRevision,
38
    SmartProtocolError,
39
    )
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
40
from bzrlib.lockable_files import LockableFiles
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
41
from bzrlib.smart import client, vfs
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
42
from bzrlib.revision import ensure_null, NULL_REVISION
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
43
from bzrlib.trace import mutter, note, warning
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
44
3445.1.5 by John Arbash Meinel
allow passing a 'graph' object into Branch.update_revisions.
45
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
46
class _RpcHelper(object):
47
    """Mixin class that helps with issuing RPCs."""
48
49
    def _call(self, method, *args, **err_context):
50
        try:
51
            return self._client.call(method, *args)
52
        except errors.ErrorFromSmartServer, err:
53
            self._translate_error(err, **err_context)
54
        
55
    def _call_expecting_body(self, method, *args, **err_context):
56
        try:
57
            return self._client.call_expecting_body(method, *args)
58
        except errors.ErrorFromSmartServer, err:
59
            self._translate_error(err, **err_context)
60
        
61
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
62
                                             **err_context):
63
        try:
64
            return self._client.call_with_body_bytes_expecting_body(
65
                method, args, body_bytes)
66
        except errors.ErrorFromSmartServer, err:
67
            self._translate_error(err, **err_context)
68
        
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
69
# Note: RemoteBzrDirFormat is in bzrdir.py
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
70
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
71
class RemoteBzrDir(BzrDir, _RpcHelper):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
72
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
73
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.
74
    def __init__(self, transport, format, _client=None):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
75
        """Construct a RemoteBzrDir.
76
77
        :param _client: Private parameter for testing. Disables probing and the
78
            use of a real bzrdir.
79
        """
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.
80
        BzrDir.__init__(self, transport, format)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
81
        # this object holds a delegated bzrdir that uses file-level operations
82
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
83
        self._real_bzrdir = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
84
85
        if _client is None:
3313.2.3 by Andrew Bennetts
Deprecate Transport.get_shared_medium.
86
            medium = transport.get_smart_medium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
87
            self._client = client._SmartClient(medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
88
        else:
89
            self._client = _client
90
            return
91
92
        path = self._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
93
        response = self._call('BzrDir.open', path)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
94
        if response not in [('yes',), ('no',)]:
95
            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.
96
        if response == ('no',):
97
            raise errors.NotBranchError(path=transport.base)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
98
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
99
    def _ensure_real(self):
100
        """Ensure that there is a _real_bzrdir set.
101
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
102
        Used before calls to self._real_bzrdir.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
103
        """
104
        if not self._real_bzrdir:
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.
105
            self._real_bzrdir = BzrDir.open_from_transport(
106
                self.root_transport, _server_formats=False)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
107
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
108
    def _translate_error(self, err, **context):
109
        _translate_error(err, bzrdir=self, **context)
110
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
111
    def cloning_metadir(self, stacked=False):
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
112
        self._ensure_real()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
113
        return self._real_bzrdir.cloning_metadir(stacked)
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
114
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
115
    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.
116
        # as per meta1 formats - just delegate to the format object which may
117
        # be parameterised.
118
        result = self._format.repository_format.initialize(self, shared)
119
        if not isinstance(result, RemoteRepository):
120
            return self.open_repository()
121
        else:
122
            return result
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
123
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
124
    def destroy_repository(self):
125
        """See BzrDir.destroy_repository"""
126
        self._ensure_real()
127
        self._real_bzrdir.destroy_repository()
128
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
129
    def create_branch(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.
130
        # as per meta1 formats - just delegate to the format object which may
131
        # be parameterised.
132
        real_branch = self._format.get_branch_format().initialize(self)
133
        if not isinstance(real_branch, RemoteBranch):
134
            return RemoteBranch(self, self.find_repository(), real_branch)
135
        else:
136
            return real_branch
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
137
2796.2.6 by Aaron Bentley
Implement destroy_branch
138
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
139
        """See BzrDir.destroy_branch"""
2796.2.6 by Aaron Bentley
Implement destroy_branch
140
        self._ensure_real()
141
        self._real_bzrdir.destroy_branch()
142
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
143
    def create_workingtree(self, revision_id=None, from_branch=None):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
144
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
145
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.
146
    def find_branch_format(self):
147
        """Find the branch 'format' for this bzrdir.
148
149
        This might be a synthetic object for e.g. RemoteBranch and SVN.
150
        """
151
        b = self.open_branch()
152
        return b._format
153
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.
154
    def get_branch_reference(self):
155
        """See BzrDir.get_branch_reference()."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
156
        path = self._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
157
        response = self._call('BzrDir.open_branch', path)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
158
        if response[0] == 'ok':
159
            if response[1] == '':
160
                # branch at this location.
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.
161
                return None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
162
            else:
163
                # a branch reference, use the existing BranchReference logic.
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.
164
                return response[1]
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
165
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
166
            raise errors.UnexpectedSmartServerResponse(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.
167
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
168
    def _get_tree_branch(self):
169
        """See BzrDir._get_tree_branch()."""
170
        return None, self.open_branch()
171
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.
172
    def open_branch(self, _unsupported=False):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
173
        if _unsupported:
174
            raise NotImplementedError('unsupported flag support not implemented yet.')
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.
175
        reference_url = self.get_branch_reference()
176
        if reference_url is None:
177
            # branch at this location.
178
            return RemoteBranch(self, self.find_repository())
179
        else:
180
            # a branch reference, use the existing BranchReference logic.
181
            format = BranchReferenceFormat()
182
            return format.open(self, _found=True, location=reference_url)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
183
                
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
184
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
185
        path = self._path_for_remote_call(self._client)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
186
        verb = 'BzrDir.find_repositoryV2'
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.
187
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
188
            response = self._call(verb, path)
189
        except errors.UnknownSmartMethod:
190
            verb = 'BzrDir.find_repository'
191
            response = self._call(verb, path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
192
        if response[0] != 'ok':
193
            raise errors.UnexpectedSmartServerResponse(response)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
194
        if verb == 'BzrDir.find_repository':
195
            # servers that don't support the V2 method don't support external
196
            # references either.
197
            response = response + ('no', )
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
198
        if not (len(response) == 5):
199
            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.
200
        if response[1] == '':
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
201
            format = RemoteRepositoryFormat()
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
202
            format.rich_root_data = (response[2] == 'yes')
203
            format.supports_tree_reference = (response[3] == 'yes')
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
204
            # No wire format to check this yet.
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
205
            format.supports_external_lookups = (response[4] == 'yes')
3221.15.10 by Robert Collins
Add test that we can stack on a smart server from Jonathan Lange.
206
            # Used to support creating a real format instance when needed.
207
            format._creating_bzrdir = self
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
208
            remote_repo = RemoteRepository(self, format)
209
            format._creating_repo = remote_repo
210
            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.
211
        else:
212
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
213
2018.5.138 by Robert Collins
Merge bzr.dev.
214
    def open_workingtree(self, recommend_upgrade=True):
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
215
        self._ensure_real()
216
        if self._real_bzrdir.has_workingtree():
217
            raise errors.NotLocalUrl(self.root_transport)
218
        else:
219
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
220
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
221
    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.
222
        """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 :).
223
        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.
224
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
225
    def get_branch_transport(self, branch_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
226
        self._ensure_real()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
227
        return self._real_bzrdir.get_branch_transport(branch_format)
228
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
229
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
230
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
231
        return self._real_bzrdir.get_repository_transport(repository_format)
232
233
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
234
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
235
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
236
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
237
    def can_convert_format(self):
238
        """Upgrading of remote bzrdirs is not supported yet."""
239
        return False
240
241
    def needs_format_conversion(self, format=None):
242
        """Upgrading of remote bzrdirs is not supported yet."""
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
243
        if format is None:
244
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
245
                % 'needs_format_conversion(format=None)')
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
246
        return False
247
3242.3.37 by Aaron Bentley
Updates from reviews
248
    def clone(self, url, revision_id=None, force_new_repo=False,
249
              preserve_stacking=False):
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
250
        self._ensure_real()
251
        return self._real_bzrdir.clone(url, revision_id=revision_id,
3242.3.37 by Aaron Bentley
Updates from reviews
252
            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).
253
3567.1.3 by Michael Hudson
fix problem
254
    def get_config(self):
255
        self._ensure_real()
256
        return self._real_bzrdir.get_config()
257
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
258
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
259
class RemoteRepositoryFormat(repository.RepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
260
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
261
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
262
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
263
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
264
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
265
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
266
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
267
    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.
268
    on a per instance basis, and are not set (and should not be) at
269
    the class level.
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
270
271
    :ivar _custom_format: If set, a specific concrete repository format that 
272
        will be used when initializing a repository with this
273
        RemoteRepositoryFormat.
274
    :ivar _creating_repo: If set, the repository object that this
275
        RemoteRepositoryFormat was created for: it can be called into
3990.5.4 by Robert Collins
Review feedback.
276
        to obtain data like the network name.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
277
    """
278
3543.1.2 by Michael Hudson
the two character fix
279
    _matchingbzrdir = RemoteBzrDirFormat()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
280
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.
281
    def __init__(self):
282
        repository.RepositoryFormat.__init__(self)
283
        self._custom_format = None
284
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
285
    def initialize(self, a_bzrdir, 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.
286
        if self._custom_format:
287
            # This returns a custom instance - e.g. a pack repo, not a remote
288
            # repo.
289
            return self._custom_format.initialize(a_bzrdir, shared=shared)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
290
        if not isinstance(a_bzrdir, RemoteBzrDir):
3221.15.10 by Robert Collins
Add test that we can stack on a smart server from Jonathan Lange.
291
            prior_repo = self._creating_bzrdir.open_repository()
292
            prior_repo._ensure_real()
293
            return prior_repo._real_repository._format.initialize(
294
                a_bzrdir, shared=shared)
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.
295
        # delegate to a real object at this point (remoteBzrDir delegate to the
296
        # repository format which would lead to infinite recursion).
297
        a_bzrdir._ensure_real()
298
        result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
299
        if not isinstance(result, RemoteRepository):
300
            return self.open(a_bzrdir)
301
        else:
302
            return result
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
303
    
304
    def open(self, a_bzrdir):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
305
        if not isinstance(a_bzrdir, RemoteBzrDir):
306
            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.
307
        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.
308
309
    def get_format_description(self):
310
        return 'bzr remote repository'
311
312
    def __eq__(self, other):
1752.2.87 by Andrew Bennetts
Make tests pass.
313
        return self.__class__ == other.__class__
314
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
315
    def check_conversion_target(self, target_format):
316
        if self.rich_root_data and not target_format.rich_root_data:
317
            raise errors.BadConversionTarget(
318
                'Does not support rich root data.', target_format)
2018.5.138 by Robert Collins
Merge bzr.dev.
319
        if (self.supports_tree_reference and
320
            not getattr(target_format, 'supports_tree_reference', False)):
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
321
            raise errors.BadConversionTarget(
322
                'Does not support nested trees', target_format)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
323
3990.5.1 by Andrew Bennetts
Add network_name() to RepositoryFormat.
324
    def network_name(self):
325
        self._creating_repo._ensure_real()
326
        return self._creating_repo._real_repository._format.network_name()
327
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
328
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
329
class RemoteRepository(_RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
330
    """Repository accessed over rpc.
331
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
332
    For the moment most operations are performed using local transport-backed
333
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
334
    """
335
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
336
    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.
337
        """Create a RemoteRepository instance.
338
        
339
        :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.
340
        :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.
341
        :param real_repository: If not None, a local implementation of the
342
            repository logic for the repository, usually accessing the data
343
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
344
        :param _client: Private testing parameter - override the smart client
345
            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.
346
        """
347
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
348
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
349
        else:
350
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
351
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
352
        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.
353
            self._client = remote_bzrdir._client
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
354
        else:
355
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
356
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
357
        self._lock_mode = None
358
        self._lock_token = None
359
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
360
        self._leave_lock = False
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
361
        self._unstacked_provider = graph.CachingParentsProvider(
3896.1.1 by Andrew Bennetts
Remove broken debugging cruft, and some unused imports.
362
            get_parent_map=self._get_parent_map_rpc)
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
363
        self._unstacked_provider.disable_cache()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
364
        # For tests:
365
        # These depend on the actual remote format, so force them off for
366
        # maximum compatibility. XXX: In future these should depend on the
367
        # remote repository instance, but this is irrelevant until we perform
368
        # 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.
369
        self._reconcile_does_inventory_gc = False
370
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
371
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
372
        self.base = self.bzrdir.transport.base
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
373
        # Additional places to query for data.
374
        self._fallback_repositories = []
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
375
376
    def __str__(self):
377
        return "%s(%s)" % (self.__class__.__name__, self.base)
378
379
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
380
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
381
    def abort_write_group(self, suppress_errors=False):
2617.6.7 by Robert Collins
More review feedback.
382
        """Complete a write group on the decorated repository.
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
383
        
384
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
385
        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.
386
        for older plugins that don't use e.g. the CommitBuilder
387
        facility.
3825.4.6 by Andrew Bennetts
Document the suppress_errors flag in the docstring.
388
389
        :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.
390
        """
391
        self._ensure_real()
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
392
        return self._real_repository.abort_write_group(
393
            suppress_errors=suppress_errors)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
394
395
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
396
        """Complete a write group on the decorated repository.
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
397
        
398
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
399
        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.
400
        for older plugins that don't use e.g. the CommitBuilder
401
        facility.
402
        """
403
        self._ensure_real()
404
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
405
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
406
    def _ensure_real(self):
407
        """Ensure that there is a _real_repository set.
408
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
409
        Used before calls to self._real_repository.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
410
        """
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.
411
        if self._real_repository is None:
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
412
            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.
413
            self._set_real_repository(
414
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
415
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
416
    def _translate_error(self, err, **context):
417
        self.bzrdir._translate_error(err, repository=self, **context)
418
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
419
    def find_text_key_references(self):
420
        """Find the text key references within the repository.
421
422
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
423
        revision_ids. Each altered file-ids has the exact revision_ids that
424
        altered it listed explicitly.
425
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
426
            to whether they were referred to by the inventory of the
427
            revision_id that they contain. The inventory texts from all present
428
            revision ids are assessed to generate this report.
429
        """
430
        self._ensure_real()
431
        return self._real_repository.find_text_key_references()
432
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
433
    def _generate_text_key_index(self):
434
        """Generate a new text key index for the repository.
435
436
        This is an expensive function that will take considerable time to run.
437
438
        :return: A dict mapping (file_id, revision_id) tuples to a list of
439
            parents, also (file_id, revision_id) tuples.
440
        """
441
        self._ensure_real()
442
        return self._real_repository._generate_text_key_index()
443
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
444
    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
445
    def get_revision_graph(self, revision_id=None):
446
        """See Repository.get_revision_graph()."""
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
447
        return self._get_revision_graph(revision_id)
448
449
    def _get_revision_graph(self, revision_id):
450
        """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)
451
        if revision_id is None:
452
            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.
453
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
454
            return {}
455
456
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
457
        response = self._call_expecting_body(
458
            '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.
459
        response_tuple, response_handler = response
460
        if response_tuple[0] != 'ok':
461
            raise errors.UnexpectedSmartServerResponse(response_tuple)
462
        coded = response_handler.read_body_bytes()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
463
        if coded == '':
464
            # no revisions in this repository!
465
            return {}
466
        lines = coded.split('\n')
467
        revision_graph = {}
468
        for line in lines:
469
            d = tuple(line.split())
470
            revision_graph[d[0]] = d[1:]
471
            
472
        return revision_graph
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
473
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
474
    def has_revision(self, revision_id):
475
        """See Repository.has_revision()."""
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
476
        if revision_id == NULL_REVISION:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
477
            # The null revision is always present.
478
            return True
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
479
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
480
        response = self._call('Repository.has_revision', path, revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
481
        if response[0] not in ('yes', 'no'):
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
482
            raise errors.UnexpectedSmartServerResponse(response)
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
483
        if response[0] == 'yes':
484
            return True
485
        for fallback_repo in self._fallback_repositories:
486
            if fallback_repo.has_revision(revision_id):
487
                return True
488
        return False
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
489
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
490
    def has_revisions(self, revision_ids):
491
        """See Repository.has_revisions()."""
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
492
        # FIXME: This does many roundtrips, particularly when there are
493
        # fallback repositories.  -- mbp 20080905
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
494
        result = set()
495
        for revision_id in revision_ids:
496
            if self.has_revision(revision_id):
497
                result.add(revision_id)
498
        return result
499
2617.6.9 by Robert Collins
Merge bzr.dev.
500
    def has_same_location(self, other):
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
501
        return (self.__class__ == other.__class__ and
502
                self.bzrdir.transport.base == other.bzrdir.transport.base)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
503
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
504
    def get_graph(self, other_repository=None):
505
        """Return the graph for this repository format"""
3835.1.17 by Aaron Bentley
Fix stacking bug
506
        parents_provider = self._make_parents_provider(other_repository)
3441.5.24 by Andrew Bennetts
Remove RemoteGraph experiment.
507
        return graph.Graph(parents_provider)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
508
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
509
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
510
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
511
        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.
512
        # revid can be None to indicate no revisions, not just NULL_REVISION
513
        if revid is None or revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
514
            fmt_revid = ''
515
        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.
516
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
517
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
518
            fmt_committers = 'no'
519
        else:
520
            fmt_committers = 'yes'
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
521
        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.
522
            '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.
523
        if response_tuple[0] != 'ok':
524
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
525
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
526
        body = response_handler.read_body_bytes()
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
527
        result = {}
528
        for line in body.split('\n'):
529
            if not line:
530
                continue
531
            key, val_text = line.split(':')
532
            if key in ('revisions', 'size', 'committers'):
533
                result[key] = int(val_text)
534
            elif key in ('firstrev', 'latestrev'):
535
                values = val_text.split(' ')[1:]
536
                result[key] = (float(values[0]), long(values[1]))
537
538
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
539
3140.1.2 by Aaron Bentley
Add ability to find branches inside repositories
540
    def find_branches(self, using=False):
541
        """See Repository.find_branches()."""
542
        # should be an API call to the server.
543
        self._ensure_real()
544
        return self._real_repository.find_branches(using=using)
545
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
546
    def get_physical_lock_status(self):
547
        """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.
548
        # should be an API call to the server.
549
        self._ensure_real()
550
        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.
551
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
552
    def is_in_write_group(self):
553
        """Return True if there is an open write group.
554
555
        write groups are only applicable locally for the smart server..
556
        """
557
        if self._real_repository:
558
            return self._real_repository.is_in_write_group()
559
560
    def is_locked(self):
561
        return self._lock_count >= 1
562
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
563
    def is_shared(self):
564
        """See Repository.is_shared()."""
565
        path = self.bzrdir._path_for_remote_call(self._client)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
566
        response = self._call('Repository.is_shared', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
567
        if response[0] not in ('yes', 'no'):
568
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
569
        return response[0] == 'yes'
570
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
571
    def is_write_locked(self):
572
        return self._lock_mode == 'w'
573
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
574
    def lock_read(self):
575
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
576
        if not self._lock_mode:
577
            self._lock_mode = 'r'
578
            self._lock_count = 1
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
579
            self._unstacked_provider.enable_cache(cache_misses=False)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
580
            if self._real_repository is not None:
581
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
582
        else:
583
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
584
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
585
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
586
        path = self.bzrdir._path_for_remote_call(self._client)
587
        if token is None:
588
            token = ''
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
589
        err_context = {'token': token}
590
        response = self._call('Repository.lock_write', path, token,
591
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
592
        if response[0] == 'ok':
593
            ok, token = response
594
            return token
595
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
596
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
597
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
598
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
599
        if not self._lock_mode:
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
600
            if _skip_rpc:
601
                if self._lock_token is not None:
602
                    if token != self._lock_token:
3695.1.1 by Andrew Bennetts
Remove some unused imports and fix a couple of trivially broken raise statements.
603
                        raise errors.TokenMismatch(token, self._lock_token)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
604
                self._lock_token = token
605
            else:
606
                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.
607
            # if self._lock_token is None, then this is something like packs or
608
            # svn where we don't get to lock the repo, or a weave style repository
609
            # where we cannot lock it over the wire and attempts to do so will
610
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
611
            if self._real_repository is not None:
612
                self._real_repository.lock_write(token=self._lock_token)
613
            if token is not None:
614
                self._leave_lock = True
615
            else:
616
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
617
            self._lock_mode = 'w'
618
            self._lock_count = 1
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
619
            self._unstacked_provider.enable_cache(cache_misses=False)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
620
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
621
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
622
        else:
623
            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.
624
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
625
626
    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.
627
        if not self._lock_token:
628
            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
629
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
630
631
    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.
632
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
633
            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
634
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
635
636
    def _set_real_repository(self, repository):
637
        """Set the _real_repository for this repository.
638
639
        :param repository: The repository to fallback to for non-hpss
640
            implemented operations.
641
        """
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.
642
        if self._real_repository is not None:
643
            raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
644
        if isinstance(repository, RemoteRepository):
645
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
646
        self._real_repository = repository
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
647
        for fb in self._fallback_repositories:
648
            self._real_repository.add_fallback_repository(fb)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
649
        if self._lock_mode == 'w':
650
            # if we are already locked, the real repository must be able to
651
            # acquire the lock with our token.
652
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
653
        elif self._lock_mode == 'r':
654
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
655
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
656
    def start_write_group(self):
657
        """Start a write group on the decorated repository.
658
        
659
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
660
        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``
661
        for older plugins that don't use e.g. the CommitBuilder
662
        facility.
663
        """
664
        self._ensure_real()
665
        return self._real_repository.start_write_group()
666
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
667
    def _unlock(self, token):
668
        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.
669
        if not token:
670
            # with no token the remote repository is not persistently locked.
671
            return
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
672
        err_context = {'token': token}
673
        response = self._call('Repository.unlock', path, token,
674
                              **err_context)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
675
        if response == ('ok',):
676
            return
677
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
678
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
679
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
680
    def unlock(self):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
681
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
682
        if self._lock_count > 0:
683
            return
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
684
        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.
685
        old_mode = self._lock_mode
686
        self._lock_mode = None
687
        try:
688
            # The real repository is responsible at present for raising an
689
            # exception if it's in an unfinished write group.  However, it
690
            # normally will *not* actually remove the lock from disk - that's
691
            # done by the server on receiving the Repository.unlock call.
692
            # 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
693
            if self._real_repository is not None:
694
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
695
        finally:
696
            # The rpc-level lock should be released even if there was a
697
            # problem releasing the vfs-based lock.
698
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
699
                # Only write-locked repositories need to make a remote method
700
                # call to perfom the unlock.
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
701
                old_token = self._lock_token
702
                self._lock_token = None
703
                if not self._leave_lock:
704
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
705
706
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
707
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
708
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
709
        return self._real_repository.break_lock()
710
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
711
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
712
        """Return a TemporaryFile containing a repository tarball.
713
        
714
        Returns None if the server does not support sending tarballs.
715
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
716
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
717
        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.
718
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
719
            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.
720
                'Repository.tarball', path, compression)
721
        except errors.UnknownSmartMethod:
722
            protocol.cancel_read_body()
723
            return None
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
724
        if response[0] == 'ok':
725
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
726
            t = tempfile.NamedTemporaryFile()
727
            # TODO: rpc layer should read directly into it...
728
            t.write(protocol.read_body_bytes())
729
            t.seek(0)
730
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
731
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
732
2440.1.1 by Martin Pool
Add new Repository.sprout,
733
    def sprout(self, to_bzrdir, revision_id=None):
734
        # 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.
735
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
736
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
737
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
738
        dest_repo.fetch(self, revision_id=revision_id)
739
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
740
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
741
    ### These methods are just thin shims to the VFS object for now.
742
743
    def revision_tree(self, revision_id):
744
        self._ensure_real()
745
        return self._real_repository.revision_tree(revision_id)
746
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
747
    def get_serializer_format(self):
748
        self._ensure_real()
749
        return self._real_repository.get_serializer_format()
750
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
751
    def get_commit_builder(self, branch, parents, config, timestamp=None,
752
                           timezone=None, committer=None, revprops=None,
753
                           revision_id=None):
754
        # FIXME: It ought to be possible to call this without immediately
755
        # triggering _ensure_real.  For now it's the easiest thing to do.
756
        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.
757
        real_repo = self._real_repository
758
        builder = real_repo.get_commit_builder(branch, parents,
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
759
                config, timestamp=timestamp, timezone=timezone,
760
                committer=committer, revprops=revprops, revision_id=revision_id)
761
        return builder
762
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
763
    def add_fallback_repository(self, repository):
764
        """Add a repository to use for looking up data not held locally.
765
        
766
        :param repository: A repository.
767
        """
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
768
        # XXX: At the moment the RemoteRepository will allow fallbacks
769
        # unconditionally - however, a _real_repository will usually exist,
770
        # and may raise an error if it's not accommodated by the underlying
771
        # format.  Eventually we should check when opening the repository
772
        # whether it's willing to allow them or not.
773
        #
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
774
        # We need to accumulate additional repositories here, to pass them in
775
        # on various RPC's.
776
        self._fallback_repositories.append(repository)
3691.2.6 by Martin Pool
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
777
        # They are also seen by the fallback repository.  If it doesn't exist
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
778
        # yet they'll be added then.  This implicitly copies them.
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
779
        self._ensure_real()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
780
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
781
    def add_inventory(self, revid, inv, parents):
782
        self._ensure_real()
783
        return self._real_repository.add_inventory(revid, inv, parents)
784
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
785
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
786
                               parents):
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
787
        self._ensure_real()
3879.2.2 by John Arbash Meinel
Rename add_inventory_delta to add_inventory_by_delta.
788
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
3775.2.1 by Robert Collins
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
789
            delta, new_revision_id, parents)
790
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
791
    def add_revision(self, rev_id, rev, inv=None, config=None):
792
        self._ensure_real()
793
        return self._real_repository.add_revision(
794
            rev_id, rev, inv=inv, config=config)
795
796
    @needs_read_lock
797
    def get_inventory(self, revision_id):
798
        self._ensure_real()
799
        return self._real_repository.get_inventory(revision_id)
800
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
801
    def iter_inventories(self, revision_ids):
802
        self._ensure_real()
803
        return self._real_repository.iter_inventories(revision_ids)
804
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
805
    @needs_read_lock
806
    def get_revision(self, revision_id):
807
        self._ensure_real()
808
        return self._real_repository.get_revision(revision_id)
809
810
    def get_transaction(self):
811
        self._ensure_real()
812
        return self._real_repository.get_transaction()
813
814
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
815
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
816
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
817
        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.
818
819
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
820
        """See Repository.make_working_trees"""
821
        self._ensure_real()
822
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
823
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
824
    def revision_ids_to_search_result(self, result_set):
825
        """Convert a set of revision ids to a graph SearchResult."""
826
        result_parents = set()
827
        for parents in self.get_graph().get_parent_map(
828
            result_set).itervalues():
829
            result_parents.update(parents)
830
        included_keys = result_set.intersection(result_parents)
831
        start_keys = result_set.difference(included_keys)
832
        exclude_keys = result_parents.difference(result_set)
833
        result = graph.SearchResult(start_keys, exclude_keys,
834
            len(result_set), result_set)
835
        return result
836
837
    @needs_read_lock
838
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
839
        """Return the revision ids that other has that this does not.
840
        
841
        These are returned in topological order.
842
843
        revision_id: only return revision ids included by revision_id.
844
        """
845
        return repository.InterRepository.get(
846
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
847
3452.2.1 by Andrew Bennetts
An experimental InterRepo for remote packs.
848
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
849
        # Not delegated to _real_repository so that InterRepository.get has a
850
        # chance to find an InterRepository specialised for RemoteRepository.
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
851
        if self.has_same_location(source):
852
            # check that last_revision is in 'from' and then return a
853
            # no-operation.
854
            if (revision_id is not None and
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.
855
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
856
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
857
            return 0, []
3709.5.1 by Andrew Bennetts
Allow pushing to a pack repo over HPSS use the get_parent_map RPC, and teach the get_parent_map client to cache missing revisions.
858
        inter = repository.InterRepository.get(source, self)
3452.2.1 by Andrew Bennetts
An experimental InterRepo for remote packs.
859
        try:
860
            return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
861
        except NotImplementedError:
862
            raise errors.IncompatibleRepositories(source, self)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
863
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
864
    def create_bundle(self, target, base, fileobj, format=None):
865
        self._ensure_real()
866
        self._real_repository.create_bundle(target, base, fileobj, format)
867
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
868
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
869
    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.
870
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
871
        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.
872
873
    def fileids_altered_by_revision_ids(self, revision_ids):
874
        self._ensure_real()
875
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
876
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
877
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
878
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
879
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
880
            revisions, revision_versions_cache)
881
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
882
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
883
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
884
        """
885
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
886
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
887
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
888
    @property
889
    def _fetch_order(self):
890
        """Decorate the real repository for now.
891
892
        In the long term getting this back from the remote repository as part
893
        of open would be more efficient.
894
        """
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
895
        self._ensure_real()
896
        return self._real_repository._fetch_order
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
897
898
    @property
899
    def _fetch_uses_deltas(self):
900
        """Decorate the real repository for now.
901
902
        In the long term getting this back from the remote repository as part
903
        of open would be more efficient.
904
        """
905
        self._ensure_real()
906
        return self._real_repository._fetch_uses_deltas
907
3565.3.4 by Robert Collins
Defer decision to reconcile to the repository being fetched into.
908
    @property
909
    def _fetch_reconcile(self):
910
        """Decorate the real repository for now.
911
912
        In the long term getting this back from the remote repository as part
913
        of open would be more efficient.
914
        """
915
        self._ensure_real()
916
        return self._real_repository._fetch_reconcile
917
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
918
    def get_parent_map(self, revision_ids):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
919
        """See bzrlib.Graph.get_parent_map()."""
3835.1.5 by Aaron Bentley
Fix make_parents_provider
920
        return self._make_parents_provider().get_parent_map(revision_ids)
3835.1.1 by Aaron Bentley
Stack get_parent_map on fallback repos
921
922
    def _get_parent_map_rpc(self, keys):
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
923
        """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.
924
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
925
        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.
926
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
927
            # 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.
928
            # graph.
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
929
            # XXX: Note that this will issue a deprecation warning. This is ok
930
            # :- its because we're working with a deprecated server anyway, and
931
            # the user will almost certainly have seen a warning about the
932
            # server version already.
3389.1.1 by John Arbash Meinel
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
933
            rg = self.get_revision_graph()
934
            # There is an api discrepency between get_parent_map and
935
            # get_revision_graph. Specifically, a "key:()" pair in
936
            # get_revision_graph just means a node has no parents. For
937
            # "get_parent_map" it means the node is a ghost. So fix up the
938
            # graph to correct this.
939
            #   https://bugs.launchpad.net/bzr/+bug/214894
940
            # There is one other "bug" which is that ghosts in
941
            # get_revision_graph() are not returned at all. But we won't worry
942
            # about that for now.
943
            for node_id, parent_ids in rg.iteritems():
944
                if parent_ids == ():
945
                    rg[node_id] = (NULL_REVISION,)
946
            rg[NULL_REVISION] = ()
947
            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.
948
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
949
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
950
        if None in keys:
951
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
952
        if NULL_REVISION in keys:
953
            keys.discard(NULL_REVISION)
954
            found_parents = {NULL_REVISION:()}
955
            if not keys:
956
                return found_parents
957
        else:
958
            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.
959
        # TODO(Needs analysis): We could assume that the keys being requested
960
        # from get_parent_map are in a breadth first search, so typically they
961
        # will all be depth N from some common parent, and we don't have to
962
        # have the server iterate from the root parent, but rather from the
963
        # keys we're searching; and just tell the server the keyspace we
964
        # already have; but this may be more traffic again.
965
966
        # Transform self._parents_map into a search request recipe.
967
        # TODO: Manage this incrementally to avoid covering the same path
968
        # repeatedly. (The server will have to on each request, but the less
969
        # work done the better).
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
970
        parents_map = self._unstacked_provider.get_cached_map()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
971
        if parents_map is None:
972
            # Repository is not locked, so there's no cache.
973
            parents_map = {}
974
        start_set = set(parents_map)
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.
975
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
976
        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.
977
            result_parents.update(parents)
978
        stop_keys = result_parents.difference(start_set)
979
        included_keys = start_set.intersection(result_parents)
980
        start_set.difference_update(included_keys)
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
981
        recipe = (start_set, stop_keys, len(parents_map))
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
982
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
983
        path = self.bzrdir._path_for_remote_call(self._client)
984
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
985
            if type(key) is not str:
986
                raise ValueError(
987
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
988
        verb = 'Repository.get_parent_map'
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.
989
        args = (path,) + 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.
990
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
991
            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.
992
                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.
993
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
994
            # 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.
995
            # Worse, we have to force a disconnection, because the server now
996
            # doesn't realise it has a body on the wire to consume, so the
997
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
998
            warning(
999
                'Server is too old for fast get_parent_map, reconnecting.  '
1000
                '(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.
1001
            medium.disconnect()
1002
            # To avoid having to disconnect repeatedly, we keep track of the
1003
            # 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.
1004
            medium._remember_remote_is_before((1, 2))
3297.3.4 by Andrew Bennetts
Merge from bzr.dev.
1005
            return self.get_revision_graph(None)
3245.4.58 by Andrew Bennetts
Unpack call_expecting_body's return value into variables, to avoid lots of ugly subscripting.
1006
        response_tuple, response_handler = response
1007
        if response_tuple[0] not in ['ok']:
1008
            response_handler.cancel_read_body()
1009
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1010
        if response_tuple[0] == 'ok':
1011
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1012
            if coded == '':
1013
                # no revisions found
1014
                return {}
1015
            lines = coded.split('\n')
1016
            revision_graph = {}
1017
            for line in lines:
1018
                d = tuple(line.split())
1019
                if len(d) > 1:
1020
                    revision_graph[d[0]] = d[1:]
1021
                else:
1022
                    # No parents - so give the Graph result (NULL_REVISION,).
1023
                    revision_graph[d[0]] = (NULL_REVISION,)
1024
            return revision_graph
1025
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1026
    @needs_read_lock
1027
    def get_signature_text(self, revision_id):
1028
        self._ensure_real()
1029
        return self._real_repository.get_signature_text(revision_id)
1030
1031
    @needs_read_lock
3228.4.11 by John Arbash Meinel
Deprecations abound.
1032
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1033
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1034
        self._ensure_real()
1035
        return self._real_repository.get_revision_graph_with_ghosts(
1036
            revision_ids=revision_ids)
1037
1038
    @needs_read_lock
1039
    def get_inventory_xml(self, revision_id):
1040
        self._ensure_real()
1041
        return self._real_repository.get_inventory_xml(revision_id)
1042
1043
    def deserialise_inventory(self, revision_id, xml):
1044
        self._ensure_real()
1045
        return self._real_repository.deserialise_inventory(revision_id, xml)
1046
1047
    def reconcile(self, other=None, thorough=False):
1048
        self._ensure_real()
1049
        return self._real_repository.reconcile(other=other, thorough=thorough)
1050
        
1051
    def all_revision_ids(self):
1052
        self._ensure_real()
1053
        return self._real_repository.all_revision_ids()
1054
    
1055
    @needs_read_lock
1056
    def get_deltas_for_revisions(self, revisions):
1057
        self._ensure_real()
1058
        return self._real_repository.get_deltas_for_revisions(revisions)
1059
1060
    @needs_read_lock
1061
    def get_revision_delta(self, revision_id):
1062
        self._ensure_real()
1063
        return self._real_repository.get_revision_delta(revision_id)
1064
1065
    @needs_read_lock
1066
    def revision_trees(self, revision_ids):
1067
        self._ensure_real()
1068
        return self._real_repository.revision_trees(revision_ids)
1069
1070
    @needs_read_lock
1071
    def get_revision_reconcile(self, revision_id):
1072
        self._ensure_real()
1073
        return self._real_repository.get_revision_reconcile(revision_id)
1074
1075
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1076
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1077
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1078
        return self._real_repository.check(revision_ids=revision_ids)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1079
2018.5.138 by Robert Collins
Merge bzr.dev.
1080
    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.
1081
        self._ensure_real()
1082
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
1083
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1084
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1085
    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.
1086
        # get a tarball of the remote repository, and copy from that into the
1087
        # destination
1088
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1089
        import tarfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1090
        # TODO: Maybe a progress bar while streaming the tarball?
1091
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1092
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1093
        if tar_file is None:
1094
            return None
1095
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1096
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1097
            tar = tarfile.open('repository', fileobj=tar_file,
1098
                mode='r|bz2')
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
1099
            tmpdir = osutils.mkdtemp()
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1100
            try:
1101
                _extract_tar(tar, tmpdir)
1102
                tmp_bzrdir = BzrDir.open(tmpdir)
1103
                tmp_repo = tmp_bzrdir.open_repository()
1104
                tmp_repo.copy_content_into(destination, revision_id)
1105
            finally:
1106
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1107
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1108
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1109
        return destination
2018.18.23 by Martin Pool
review cleanups
1110
        # TODO: Suggestion from john: using external tar is much faster than
1111
        # 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.
1112
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1113
    @property
1114
    def inventories(self):
1115
        """Decorate the real repository for now.
1116
1117
        In the long term a full blown network facility is needed to
1118
        avoid creating a real repository object locally.
1119
        """
1120
        self._ensure_real()
1121
        return self._real_repository.inventories
1122
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1123
    @needs_write_lock
1124
    def pack(self):
1125
        """Compress the data within the repository.
1126
1127
        This is not currently implemented within the smart server.
1128
        """
1129
        self._ensure_real()
1130
        return self._real_repository.pack()
1131
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1132
    @property
1133
    def revisions(self):
1134
        """Decorate the real repository for now.
1135
1136
        In the short term this should become a real object to intercept graph
1137
        lookups.
1138
1139
        In the long term a full blown network facility is needed.
1140
        """
1141
        self._ensure_real()
1142
        return self._real_repository.revisions
1143
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1144
    def set_make_working_trees(self, new_value):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1145
        self._ensure_real()
1146
        self._real_repository.set_make_working_trees(new_value)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1147
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1148
    @property
1149
    def signatures(self):
1150
        """Decorate the real repository for now.
1151
1152
        In the long term a full blown network facility is needed to avoid
1153
        creating a real repository object locally.
1154
        """
1155
        self._ensure_real()
1156
        return self._real_repository.signatures
1157
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1158
    @needs_write_lock
1159
    def sign_revision(self, revision_id, gpg_strategy):
1160
        self._ensure_real()
1161
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
1162
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1163
    @property
1164
    def texts(self):
1165
        """Decorate the real repository for now.
1166
1167
        In the long term a full blown network facility is needed to avoid
1168
        creating a real repository object locally.
1169
        """
1170
        self._ensure_real()
1171
        return self._real_repository.texts
1172
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1173
    @needs_read_lock
1174
    def get_revisions(self, revision_ids):
1175
        self._ensure_real()
1176
        return self._real_repository.get_revisions(revision_ids)
1177
1178
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
1179
        self._ensure_real()
1180
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1181
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1182
    def iter_reverse_revision_history(self, revision_id):
1183
        self._ensure_real()
1184
        return self._real_repository.iter_reverse_revision_history(revision_id)
1185
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1186
    @property
1187
    def _serializer(self):
1188
        self._ensure_real()
1189
        return self._real_repository._serializer
1190
2018.5.97 by Andrew Bennetts
Fix more tests.
1191
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1192
        self._ensure_real()
1193
        return self._real_repository.store_revision_signature(
1194
            gpg_strategy, plaintext, revision_id)
1195
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1196
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1197
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1198
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1199
2018.5.97 by Andrew Bennetts
Fix more tests.
1200
    def has_signature_for_revision_id(self, revision_id):
1201
        self._ensure_real()
1202
        return self._real_repository.has_signature_for_revision_id(revision_id)
1203
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1204
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1205
        self._ensure_real()
1206
        return self._real_repository.item_keys_introduced_by(revision_ids,
1207
            _files_pb=_files_pb)
1208
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1209
    def revision_graph_can_have_wrong_parents(self):
1210
        # The answer depends on the remote repo format.
1211
        self._ensure_real()
1212
        return self._real_repository.revision_graph_can_have_wrong_parents()
1213
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1214
    def _find_inconsistent_revision_parents(self):
1215
        self._ensure_real()
1216
        return self._real_repository._find_inconsistent_revision_parents()
1217
1218
    def _check_for_inconsistent_revision_parents(self):
1219
        self._ensure_real()
1220
        return self._real_repository._check_for_inconsistent_revision_parents()
1221
3835.1.17 by Aaron Bentley
Fix stacking bug
1222
    def _make_parents_provider(self, other=None):
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
1223
        providers = [self._unstacked_provider]
3835.1.17 by Aaron Bentley
Fix stacking bug
1224
        if other is not None:
1225
            providers.insert(0, other)
3835.1.7 by Aaron Bentley
Updates from review
1226
        providers.extend(r._make_parents_provider() for r in
1227
                         self._fallback_repositories)
1228
        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.
1229
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1230
    def _serialise_search_recipe(self, recipe):
1231
        """Serialise a graph search recipe.
1232
1233
        :param recipe: A search recipe (start, stop, count).
1234
        :return: Serialised bytes.
1235
        """
1236
        start_keys = ' '.join(recipe[0])
1237
        stop_keys = ' '.join(recipe[1])
1238
        count = str(recipe[2])
1239
        return '\n'.join((start_keys, stop_keys, count))
1240
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1241
    def autopack(self):
1242
        path = self.bzrdir._path_for_remote_call(self._client)
1243
        try:
1244
            response = self._call('PackRepository.autopack', path)
1245
        except errors.UnknownSmartMethod:
1246
            self._ensure_real()
1247
            self._real_repository._pack_collection.autopack()
1248
            return
1249
        if self._real_repository is not None:
1250
            # Reset the real repository's cache of pack names.
1251
            # XXX: At some point we may be able to skip this and just rely on
1252
            # the automatic retry logic to do the right thing, but for now we
1253
            # err on the side of being correct rather than being optimal.
1254
            self._real_repository._pack_collection.reload_pack_names()
1255
        if response[0] != 'ok':
1256
            raise errors.UnexpectedSmartServerResponse(response)
1257
1258
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1259
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1260
    """A 'LockableFiles' implementation that talks to a smart server.
1261
    
1262
    This is not a public interface class.
1263
    """
1264
1265
    def __init__(self, bzrdir, _client):
1266
        self.bzrdir = bzrdir
1267
        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.
1268
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1269
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1270
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1271
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1272
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.
1273
    def _find_modes(self):
1274
        # RemoteBranches don't let the client set the mode of control files.
1275
        self._dir_mode = None
1276
        self._file_mode = None
1277
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1278
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1279
class RemoteBranchFormat(branch.BranchFormat):
1280
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.
1281
    def __init__(self):
1282
        super(RemoteBranchFormat, self).__init__()
1283
        self._matchingbzrdir = RemoteBzrDirFormat()
1284
        self._matchingbzrdir.set_branch_format(self)
1285
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.
1286
    def __eq__(self, other):
1287
        return (isinstance(other, RemoteBranchFormat) and 
1288
            self.__dict__ == other.__dict__)
1289
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1290
    def get_format_description(self):
1291
        return 'Remote BZR Branch'
1292
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1293
    def get_format_string(self):
1294
        return 'Remote BZR Branch'
1295
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1296
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1297
        return a_bzrdir.open_branch()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1298
1299
    def initialize(self, 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.
1300
        # Delegate to a _real object here - the RemoteBzrDir format now
1301
        # supports delegating to parameterised branch formats and as such
1302
        # this RemoteBranchFormat method is only called when no specific format
1303
        # is selected.
1304
        if not isinstance(a_bzrdir, RemoteBzrDir):
1305
            result = a_bzrdir.create_branch()
1306
        else:
1307
            a_bzrdir._ensure_real()
1308
            result = a_bzrdir._real_bzrdir.create_branch()
1309
        if not isinstance(result, RemoteBranch):
1310
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
1311
        return result
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1312
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1313
    def supports_tags(self):
1314
        # Remote branches might support tags, but we won't know until we
1315
        # access the real remote branch.
1316
        return True
1317
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1318
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1319
class RemoteBranch(branch.Branch, _RpcHelper):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1320
    """Branch stored on a server accessed by HPSS RPC.
1321
1322
    At the moment most operations are mapped down to simple file operations.
1323
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1324
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1325
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1326
        _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.
1327
        """Create a RemoteBranch instance.
1328
1329
        :param real_branch: An optional local implementation of the branch
1330
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1331
        :param _client: Private parameter for testing.
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1332
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1333
        # We intentionally don't call the parent class's __init__, because it
1334
        # will try to assign to self.tags, which is a property in this subclass.
1335
        # And the parent's __init__ doesn't do much anyway.
2978.7.1 by John Arbash Meinel
Fix bug #162486, by having RemoteBranch properly initialize self._revision_id_to_revno_map.
1336
        self._revision_id_to_revno_cache = None
3949.2.6 by Ian Clatworthy
review feedback from jam
1337
        self._partial_revision_id_to_revno_cache = {}
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1338
        self._revision_history_cache = None
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1339
        self._last_revision_info_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
1340
        self._merge_sorted_revisions_cache = None
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1341
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1342
        if _client is not None:
1343
            self._client = _client
1344
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1345
            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.
1346
        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.
1347
        if real_branch is not None:
1348
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1349
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1350
            real_repo = self._real_branch.repository
1351
            if isinstance(real_repo, RemoteRepository):
1352
                real_repo._ensure_real()
1353
                real_repo = real_repo._real_repository
1354
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1355
            # Give the branch the remote repository to let fast-pathing happen.
1356
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1357
        else:
1358
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1359
        # Fill out expected attributes of branch for bzrlib api users.
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1360
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1361
        self.base = self.bzrdir.root_transport.base
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.
1362
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1363
        self._lock_mode = None
1364
        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.
1365
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1366
        self._lock_count = 0
1367
        self._leave_lock = False
3681.1.2 by Robert Collins
Adjust for trunk.
1368
        # 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)
1369
        hooks = branch.Branch.hooks['open']
1370
        for hook in hooks:
1371
            hook(self)
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
1372
        self._setup_stacking()
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1373
1374
    def _setup_stacking(self):
1375
        # 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
1376
        # the vfs branch.
3691.2.1 by Martin Pool
RemoteBranch must configure stacking into the repository
1377
        try:
1378
            fallback_url = self.get_stacked_on_url()
1379
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1380
            errors.UnstackableRepositoryFormat), e:
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
1381
            return
1382
        # it's relative to this branch...
1383
        fallback_url = urlutils.join(self.base, fallback_url)
1384
        transports = [self.bzrdir.root_transport]
1385
        if self._real_branch is not None:
1386
            transports.append(self._real_branch._transport)
3830.2.1 by Aaron Bentley
Fix HPSS with branch stacked on repository branch
1387
        stacked_on = branch.Branch.open(fallback_url,
1388
                                        possible_transports=transports)
1389
        self.repository.add_fallback_repository(stacked_on.repository)
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1390
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1391
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1392
        # if we try vfs access, return the real branch's vfs transport
1393
        self._ensure_real()
1394
        return self._real_branch._transport
1395
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1396
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1397
2477.1.1 by Martin Pool
Add RemoteBranch repr
1398
    def __str__(self):
1399
        return "%s(%s)" % (self.__class__.__name__, self.base)
1400
1401
    __repr__ = __str__
1402
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1403
    def _ensure_real(self):
1404
        """Ensure that there is a _real_branch set.
1405
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1406
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1407
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1408
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1409
            if not vfs.vfs_enabled():
1410
                raise AssertionError('smart server vfs must be enabled '
1411
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1412
            self.bzrdir._ensure_real()
1413
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
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.
1414
            if self.repository._real_repository is None:
1415
                # Give the remote repository the matching real repo.
1416
                real_repo = self._real_branch.repository
1417
                if isinstance(real_repo, RemoteRepository):
1418
                    real_repo._ensure_real()
1419
                    real_repo = real_repo._real_repository
1420
                self.repository._set_real_repository(real_repo)
1421
            # Give the real branch the remote repository to let fast-pathing
1422
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1423
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1424
            if self._lock_mode == 'r':
1425
                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.
1426
            elif self._lock_mode == 'w':
1427
                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.
1428
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1429
    def _translate_error(self, err, **context):
1430
        self.repository._translate_error(err, branch=self, **context)
1431
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1432
    def _clear_cached_state(self):
1433
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1434
        if self._real_branch is not None:
1435
            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.
1436
1437
    def _clear_cached_state_of_remote_branch_only(self):
1438
        """Like _clear_cached_state, but doesn't clear the cache of
1439
        self._real_branch.
1440
1441
        This is useful when falling back to calling a method of
1442
        self._real_branch that changes state.  In that case the underlying
1443
        branch changes, so we need to invalidate this RemoteBranch's cache of
1444
        it.  However, there's no need to invalidate the _real_branch's cache
1445
        too, in fact doing so might harm performance.
1446
        """
1447
        super(RemoteBranch, self)._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1448
        
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.
1449
    @property
1450
    def control_files(self):
1451
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1452
        # because it triggers an _ensure_real that we otherwise might not need.
1453
        if self._control_files is None:
1454
            self._control_files = RemoteBranchLockableFiles(
1455
                self.bzrdir, self._client)
1456
        return self._control_files
1457
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1458
    def _get_checkout_format(self):
1459
        self._ensure_real()
1460
        return self._real_branch._get_checkout_format()
1461
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1462
    def get_physical_lock_status(self):
1463
        """See Branch.get_physical_lock_status()."""
1464
        # 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.
1465
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1466
        return self._real_branch.get_physical_lock_status()
1467
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1468
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1469
        """Get the URL this branch is stacked against.
1470
1471
        :raises NotStacked: If the branch is not stacked.
1472
        :raises UnstackableBranchFormat: If the branch does not support
1473
            stacking.
1474
        :raises UnstackableRepositoryFormat: If the repository does not support
1475
            stacking.
1476
        """
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
1477
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1478
            # there may not be a repository yet, so we can't use
1479
            # 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
1480
            response = self._client.call('Branch.get_stacked_on_url',
1481
                self._remote_path())
1482
        except errors.ErrorFromSmartServer, err:
1483
            # there may not be a repository yet, so we can't call through
1484
            # its _translate_error
1485
            _translate_error(err, branch=self)
1486
        except errors.UnknownSmartMethod, err:
1487
            self._ensure_real()
1488
            return self._real_branch.get_stacked_on_url()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1489
        if response[0] != 'ok':
1490
            raise errors.UnexpectedSmartServerResponse(response)
1491
        return response[1]
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1492
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1493
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1494
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1495
        if not self._lock_mode:
1496
            self._lock_mode = 'r'
1497
            self._lock_count = 1
1498
            if self._real_branch is not None:
1499
                self._real_branch.lock_read()
1500
        else:
1501
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1502
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).
1503
    def _remote_lock_write(self, token):
1504
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1505
            branch_token = repo_token = ''
1506
        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).
1507
            branch_token = token
1508
            repo_token = self.repository.lock_write()
1509
            self.repository.unlock()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1510
        err_context = {'token': token}
1511
        response = self._call(
1512
            'Branch.lock_write', self._remote_path(), branch_token,
1513
            repo_token or '', **err_context)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1514
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1515
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1516
        ok, branch_token, repo_token = response
1517
        return branch_token, repo_token
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1518
            
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).
1519
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1520
        if not self._lock_mode:
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.
1521
            # 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).
1522
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1523
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1524
            if not self._lock_token:
1525
                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.
1526
            # 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.
1527
            self.repository.lock_write(
1528
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1529
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1530
            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.
1531
                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).
1532
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1533
                self._leave_lock = True
1534
            else:
1535
                self._leave_lock = False
1536
            self._lock_mode = 'w'
1537
            self._lock_count = 1
1538
        elif self._lock_mode == 'r':
1539
            raise errors.ReadOnlyTransaction
1540
        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).
1541
            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.
1542
                # A token was given to lock_write, and we're relocking, so
1543
                # check that the given token actually matches the one we
1544
                # 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).
1545
                if token != self._lock_token:
1546
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1547
            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.
1548
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
1549
            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.
1550
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1551
1552
    def _unlock(self, branch_token, repo_token):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1553
        err_context = {'token': str((branch_token, repo_token))}
1554
        response = self._call(
1555
            'Branch.unlock', self._remote_path(), branch_token,
1556
            repo_token or '', **err_context)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1557
        if response == ('ok',):
1558
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1559
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1560
1561
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1562
        try:
1563
            self._lock_count -= 1
1564
            if not self._lock_count:
1565
                self._clear_cached_state()
1566
                mode = self._lock_mode
1567
                self._lock_mode = None
1568
                if self._real_branch is not None:
1569
                    if (not self._leave_lock and mode == 'w' and
1570
                        self._repo_lock_token):
1571
                        # If this RemoteBranch will remove the physical lock
1572
                        # for the repository, make sure the _real_branch
1573
                        # doesn't do it first.  (Because the _real_branch's
1574
                        # repository is set to be the RemoteRepository.)
1575
                        self._real_branch.repository.leave_lock_in_place()
1576
                    self._real_branch.unlock()
1577
                if mode != 'w':
1578
                    # Only write-locked branched need to make a remote method
1579
                    # call to perfom the unlock.
1580
                    return
1581
                if not self._lock_token:
1582
                    raise AssertionError('Locked, but no token!')
1583
                branch_token = self._lock_token
1584
                repo_token = self._repo_lock_token
1585
                self._lock_token = None
1586
                self._repo_lock_token = None
1587
                if not self._leave_lock:
1588
                    self._unlock(branch_token, repo_token)
1589
        finally:
1590
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1591
1592
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1593
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1594
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1595
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1596
    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.
1597
        if not self._lock_token:
1598
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1599
        self._leave_lock = True
1600
1601
    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.
1602
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1603
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1604
        self._leave_lock = False
1605
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1606
    def _last_revision_info(self):
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1607
        response = self._call('Branch.last_revision_info', self._remote_path())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1608
        if response[0] != 'ok':
1609
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1610
        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.
1611
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1612
        return (revno, last_revision)
1613
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1614
    def _gen_revision_history(self):
1615
        """See Branch._gen_revision_history()."""
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1616
        response_tuple, response_handler = self._call_expecting_body(
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
1617
            '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.
1618
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1619
            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.
1620
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1621
        if result == ['']:
1622
            return []
1623
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1624
3691.2.3 by Martin Pool
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
1625
    def _remote_path(self):
1626
        return self.bzrdir._path_for_remote_call(self._client)
1627
3441.5.18 by Andrew Bennetts
Fix some test failures.
1628
    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.
1629
            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.
1630
        # This performs additional work to meet the hook contract; while its
1631
        # undesirable, we have to synthesise the revno to call the hook, and
1632
        # not calling the hook is worse as it means changes can't be prevented.
1633
        # Having calculated this though, we can't just call into
1634
        # set_last_revision_info as a simple call, because there is a set_rh
1635
        # hook that some folk may still be using.
1636
        old_revno, old_revid = self.last_revision_info()
1637
        history = self._lefthand_history(revision_id)
1638
        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.
1639
        err_context = {'other_branch': other_branch}
1640
        response = self._call('Branch.set_last_revision_ex',
1641
            self._remote_path(), self._lock_token, self._repo_lock_token,
1642
            revision_id, int(allow_diverged), int(allow_overwrite_descendant),
1643
            **err_context)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1644
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
1645
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1646
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
1647
        new_revno, new_revision_id = response[1:]
1648
        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.
1649
        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.
1650
        if self._real_branch is not None:
1651
            cache = new_revno, new_revision_id
1652
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1653
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1654
    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.
1655
        old_revno, old_revid = self.last_revision_info()
1656
        # This performs additional work to meet the hook contract; while its
1657
        # undesirable, we have to synthesise the revno to call the hook, and
1658
        # not calling the hook is worse as it means changes can't be prevented.
1659
        # Having calculated this though, we can't just call into
1660
        # set_last_revision_info as a simple call, because there is a set_rh
1661
        # hook that some folk may still be using.
1662
        history = self._lefthand_history(revision_id)
1663
        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.
1664
        self._clear_cached_state()
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1665
        response = self._call('Branch.set_last_revision',
1666
            self._remote_path(), self._lock_token, self._repo_lock_token,
1667
            revision_id)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1668
        if response != ('ok',):
1669
            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.
1670
        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.
1671
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1672
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1673
    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.
1674
        # Send just the tip revision of the history; the server will generate
1675
        # the full history from that.  If the revision doesn't exist in this
1676
        # branch, NoSuchRevision will be raised.
1677
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1678
            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.
1679
        else:
1680
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1681
        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.
1682
        for hook in branch.Branch.hooks['set_rh']:
1683
            hook(self, rev_history)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1684
        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.
1685
1686
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1687
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1688
        return self._real_branch.get_parent()
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.
1689
1690
    def _get_parent_location(self):
1691
        # Used by tests, when checking normalisation of given vs stored paths.
1692
        self._ensure_real()
1693
        return self._real_branch._get_parent_location()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1694
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1695
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1696
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1697
        return self._real_branch.set_parent(url)
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.
1698
1699
    def _set_parent_location(self, url):
1700
        # Used by tests, to poke bad urls into branch configurations
1701
        if url is None:
1702
            self.set_parent(url)
1703
        else:
1704
            self._ensure_real()
1705
            return self._real_branch._set_parent_location(url)
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1706
        
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1707
    def set_stacked_on_url(self, stacked_location):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1708
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1709
1710
        :raises UnstackableBranchFormat: If the branch does not support
1711
            stacking.
1712
        :raises UnstackableRepositoryFormat: If the repository does not support
1713
            stacking.
1714
        """
1715
        self._ensure_real()
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1716
        return self._real_branch.set_stacked_on_url(stacked_location)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1717
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1718
    def sprout(self, to_bzrdir, revision_id=None):
3793.1.1 by Andrew Bennetts
Make RemoteBranch.sprout use Branch.sprout when possible.
1719
        branch_format = to_bzrdir._format._branch_format
1720
        if (branch_format is None or
1721
            isinstance(branch_format, RemoteBranchFormat)):
1722
            # The to_bzrdir specifies RemoteBranchFormat (or no format, which
1723
            # implies the same thing), but RemoteBranches can't be created at
1724
            # arbitrary URLs.  So create a branch in the same format as
1725
            # _real_branch instead.
1726
            # XXX: if to_bzrdir is a RemoteBzrDir, this should perhaps do
1727
            # to_bzrdir.create_branch to create a RemoteBranch after all...
1728
            self._ensure_real()
1729
            result = self._real_branch._format.initialize(to_bzrdir)
1730
            self.copy_content_into(result, revision_id=revision_id)
1731
            result.set_parent(self.bzrdir.root_transport.base)
1732
        else:
1733
            result = branch.Branch.sprout(
1734
                self, to_bzrdir, revision_id=revision_id)
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1735
        return result
1736
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1737
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1738
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1739
             **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.
1740
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1741
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
1742
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1743
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1744
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1745
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1746
    @needs_read_lock
1747
    def push(self, target, overwrite=False, stop_revision=None):
1748
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1749
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1750
            target, overwrite=overwrite, stop_revision=stop_revision,
1751
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1752
1753
    def is_locked(self):
1754
        return self._lock_count >= 1
1755
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
1756
    @needs_read_lock
1757
    def revision_id_to_revno(self, revision_id):
1758
        self._ensure_real()
1759
        return self._real_branch.revision_id_to_revno(revision_id)
1760
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1761
    @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.
1762
    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.
1763
        # XXX: These should be returned by the set_last_revision_info verb
1764
        old_revno, old_revid = self.last_revision_info()
1765
        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.
1766
        revision_id = ensure_null(revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1767
        try:
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1768
            response = self._call('Branch.set_last_revision_info',
1769
                self._remote_path(), self._lock_token, self._repo_lock_token,
1770
                str(revno), revision_id)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1771
        except errors.UnknownSmartMethod:
1772
            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.
1773
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1774
            self._real_branch.set_last_revision_info(revno, revision_id)
1775
            self._last_revision_info_cache = revno, revision_id
1776
            return
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1777
        if response == ('ok',):
1778
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1779
            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.
1780
            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.
1781
            # Update the _real_branch's cache too.
1782
            if self._real_branch is not None:
1783
                cache = self._last_revision_info_cache
1784
                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.
1785
        else:
1786
            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.
1787
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.
1788
    @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.
1789
    def generate_revision_history(self, revision_id, last_rev=None,
1790
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1791
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1792
        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.
1793
            # 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.
1794
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1795
                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.
1796
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1797
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
1798
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1799
                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.
1800
        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.
1801
        self.set_revision_history(self._lefthand_history(revision_id,
1802
            last_rev=last_rev,other_branch=other_branch))
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.
1803
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1804
    @property
1805
    def tags(self):
1806
        self._ensure_real()
1807
        return self._real_branch.tags
1808
2018.5.97 by Andrew Bennetts
Fix more tests.
1809
    def set_push_location(self, location):
1810
        self._ensure_real()
1811
        return self._real_branch.set_push_location(location)
1812
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1813
    @needs_write_lock
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1814
    def update_revisions(self, other, stop_revision=None, overwrite=False,
1815
                         graph=None):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1816
        """See Branch.update_revisions."""
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1817
        other.lock_read()
1818
        try:
1819
            if stop_revision is None:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1820
                stop_revision = other.last_revision()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1821
                if revision.is_null(stop_revision):
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1822
                    # if there are no commits, we're done.
1823
                    return
1824
            self.fetch(other, stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1825
1826
            if overwrite:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1827
                # Just unconditionally set the new revision.  We don't care if
1828
                # the branches have diverged.
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1829
                self._set_last_revision(stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1830
            else:
1831
                medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1832
                if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1833
                    try:
1834
                        self._set_last_revision_descendant(stop_revision, other)
1835
                        return
3441.5.7 by Andrew Bennetts
Fix unbound global.
1836
                    except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1837
                        medium._remember_remote_is_before((1, 6))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1838
                # Fallback for pre-1.6 servers: check for divergence
1839
                # client-side, then do _set_last_revision.
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1840
                last_rev = revision.ensure_null(self.last_revision())
3441.5.18 by Andrew Bennetts
Fix some test failures.
1841
                if graph is None:
1842
                    graph = self.repository.get_graph()
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.
1843
                if self._check_if_descendant_or_diverged(
3441.5.18 by Andrew Bennetts
Fix some test failures.
1844
                        stop_revision, last_rev, graph, other):
1845
                    # stop_revision is a descendant of last_rev, but we aren't
1846
                    # overwriting, so we're done.
1847
                    return
1848
                self._set_last_revision(stop_revision)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1849
        finally:
1850
            other.unlock()
2018.5.97 by Andrew Bennetts
Fix more tests.
1851
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1852
1853
def _extract_tar(tar, to_dir):
1854
    """Extract all the contents of a tarfile object.
1855
1856
    A replacement for extractall, which is not present in python2.4
1857
    """
1858
    for tarinfo in tar:
1859
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1860
1861
1862
def _translate_error(err, **context):
1863
    """Translate an ErrorFromSmartServer into a more useful error.
1864
1865
    Possible context keys:
1866
      - branch
1867
      - repository
1868
      - bzrdir
1869
      - token
1870
      - other_branch
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1871
      - path
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
1872
1873
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1874
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1875
    """
1876
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1877
        try:
1878
            return context[name]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1879
        except KeyError, key_err:
1880
            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.
1881
            raise err
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1882
    def get_path():
3779.3.3 by Andrew Bennetts
Add a docstring.
1883
        """Get the path from the context if present, otherwise use first error
1884
        arg.
1885
        """
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1886
        try:
1887
            return context['path']
1888
        except KeyError, key_err:
1889
            try:
1890
                return err.error_args[0]
1891
            except IndexError, idx_err:
1892
                mutter(
1893
                    'Missing key %r in context %r', key_err.args[0], context)
1894
                raise err
1895
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1896
    if err.error_verb == 'NoSuchRevision':
1897
        raise NoSuchRevision(find('branch'), err.error_args[0])
1898
    elif err.error_verb == 'nosuchrevision':
1899
        raise NoSuchRevision(find('repository'), err.error_args[0])
1900
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1901
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1902
    elif err.error_verb == 'norepository':
1903
        raise errors.NoRepositoryPresent(find('bzrdir'))
1904
    elif err.error_verb == 'LockContention':
1905
        raise errors.LockContention('(remote lock)')
1906
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1907
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1908
    elif err.error_verb == 'LockFailed':
1909
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
1910
    elif err.error_verb == 'TokenMismatch':
1911
        raise errors.TokenMismatch(find('token'), '(remote token)')
1912
    elif err.error_verb == 'Diverged':
1913
        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.
1914
    elif err.error_verb == 'TipChangeRejected':
1915
        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
1916
    elif err.error_verb == 'UnstackableBranchFormat':
1917
        raise errors.UnstackableBranchFormat(*err.error_args)
1918
    elif err.error_verb == 'UnstackableRepositoryFormat':
1919
        raise errors.UnstackableRepositoryFormat(*err.error_args)
1920
    elif err.error_verb == 'NotStacked':
1921
        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.
1922
    elif err.error_verb == 'PermissionDenied':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1923
        path = get_path()
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
1924
        if len(err.error_args) >= 2:
1925
            extra = err.error_args[1]
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1926
        else:
1927
            extra = None
3779.3.1 by Andrew Bennetts
Move encoding/decoding logic of PermissionDenied and ReadError so that it happens for all RPCs.
1928
        raise errors.PermissionDenied(path, extra=extra)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1929
    elif err.error_verb == 'ReadError':
1930
        path = get_path()
1931
        raise errors.ReadError(path)
1932
    elif err.error_verb == 'NoSuchFile':
1933
        path = get_path()
1934
        raise errors.NoSuchFile(path)
1935
    elif err.error_verb == 'FileExists':
1936
        raise errors.FileExists(err.error_args[0])
1937
    elif err.error_verb == 'DirectoryNotEmpty':
1938
        raise errors.DirectoryNotEmpty(err.error_args[0])
1939
    elif err.error_verb == 'ShortReadvError':
1940
        args = err.error_args
1941
        raise errors.ShortReadvError(
1942
            args[0], int(args[1]), int(args[2]), int(args[3]))
1943
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
1944
        encoding = str(err.error_args[0]) # encoding must always be a string
1945
        val = err.error_args[1]
1946
        start = int(err.error_args[2])
1947
        end = int(err.error_args[3])
1948
        reason = str(err.error_args[4]) # reason must always be a string
1949
        if val.startswith('u:'):
1950
            val = val[2:].decode('utf-8')
1951
        elif val.startswith('s:'):
1952
            val = val[2:].decode('base64')
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1953
        if err.error_verb == 'UnicodeDecodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1954
            raise UnicodeDecodeError(encoding, val, start, end, reason)
3786.2.3 by Andrew Bennetts
Remove duplicated 'call & translate errors' code in bzrlib.remote.
1955
        elif err.error_verb == 'UnicodeEncodeError':
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1956
            raise UnicodeEncodeError(encoding, val, start, end, reason)
1957
    elif err.error_verb == 'ReadOnlyError':
1958
        raise errors.TransportNotPossible('readonly transport')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1959
    raise errors.UnknownErrorFromSmartServer(err)