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