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