/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1
# Copyright (C) 2006, 2007 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
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
20
from cStringIO import StringIO
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
21
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
22
from bzrlib import (
23
    branch,
24
    errors,
3172.5.1 by Robert Collins
Create a RemoteRepository get_graph implementation and delegate get_parents_map to the real repository.
25
    graph,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
26
    lockdir,
27
    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.
28
    revision,
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
29
)
2535.4.27 by Andrew Bennetts
Remove some unused imports.
30
from bzrlib.branch import BranchReferenceFormat
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
31
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
2018.14.2 by Andrew Bennetts
All but one repository_implementation tests for RemoteRepository passing.
32
from bzrlib.config import BranchConfig, TreeConfig
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
33
from bzrlib.decorators import needs_read_lock, needs_write_lock
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
34
from bzrlib.errors import NoSuchRevision
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
35
from bzrlib.lockable_files import LockableFiles
2535.4.20 by Andrew Bennetts
Remove unused import.
36
from bzrlib.pack import ContainerPushParser
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
37
from bzrlib.smart import client, vfs
2697.2.2 by Martin Pool
deprecate Branch.append_revision
38
from bzrlib.symbol_versioning import (
39
    deprecated_method,
40
    zero_ninetyone,
41
    )
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
42
from bzrlib.revision import NULL_REVISION
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
43
from bzrlib.trace import note
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
44
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
45
# Note: RemoteBzrDirFormat is in bzrdir.py
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
46
47
class RemoteBzrDir(BzrDir):
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
48
    """Control directory on a remote server, accessed via bzr:// or similar."""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
49
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
50
    def __init__(self, transport, _client=None):
51
        """Construct a RemoteBzrDir.
52
53
        :param _client: Private parameter for testing. Disables probing and the
54
            use of a real bzrdir.
55
        """
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
56
        BzrDir.__init__(self, transport, RemoteBzrDirFormat())
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
57
        # this object holds a delegated bzrdir that uses file-level operations
58
        # to talk to the other side
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
59
        self._real_bzrdir = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
60
61
        if _client is None:
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
62
            self._shared_medium = transport.get_shared_medium()
63
            self._client = client._SmartClient(self._shared_medium)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
64
        else:
65
            self._client = _client
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
66
            self._shared_medium = None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
67
            return
68
69
        path = self._path_for_remote_call(self._client)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
70
        response = self._client.call('BzrDir.open', path)
71
        if response not in [('yes',), ('no',)]:
72
            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.
73
        if response == ('no',):
74
            raise errors.NotBranchError(path=transport.base)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
75
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
76
    def _ensure_real(self):
77
        """Ensure that there is a _real_bzrdir set.
78
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
79
        Used before calls to self._real_bzrdir.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
80
        """
81
        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.
82
            self._real_bzrdir = BzrDir.open_from_transport(
83
                self.root_transport, _server_formats=False)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
84
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
85
    def create_repository(self, shared=False):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
86
        self._ensure_real()
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
87
        self._real_bzrdir.create_repository(shared=shared)
88
        return self.open_repository()
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
89
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
90
    def destroy_repository(self):
91
        """See BzrDir.destroy_repository"""
92
        self._ensure_real()
93
        self._real_bzrdir.destroy_repository()
94
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
95
    def create_branch(self):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
96
        self._ensure_real()
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
97
        real_branch = self._real_bzrdir.create_branch()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
98
        return RemoteBranch(self, self.find_repository(), real_branch)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
99
2796.2.6 by Aaron Bentley
Implement destroy_branch
100
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
101
        """See BzrDir.destroy_branch"""
2796.2.6 by Aaron Bentley
Implement destroy_branch
102
        self._ensure_real()
103
        self._real_bzrdir.destroy_branch()
104
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
105
    def create_workingtree(self, revision_id=None, from_branch=None):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
106
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
107
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.
108
    def find_branch_format(self):
109
        """Find the branch 'format' for this bzrdir.
110
111
        This might be a synthetic object for e.g. RemoteBranch and SVN.
112
        """
113
        b = self.open_branch()
114
        return b._format
115
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.
116
    def get_branch_reference(self):
117
        """See BzrDir.get_branch_reference()."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
118
        path = self._path_for_remote_call(self._client)
119
        response = self._client.call('BzrDir.open_branch', path)
120
        if response[0] == 'ok':
121
            if response[1] == '':
122
                # 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.
123
                return None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
124
            else:
125
                # 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.
126
                return response[1]
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
127
        elif response == ('nobranch',):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
128
            raise errors.NotBranchError(path=self.root_transport.base)
129
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
130
            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.
131
132
    def open_branch(self, _unsupported=False):
133
        assert _unsupported == False, 'unsupported flag support not implemented yet.'
134
        reference_url = self.get_branch_reference()
135
        if reference_url is None:
136
            # branch at this location.
137
            return RemoteBranch(self, self.find_repository())
138
        else:
139
            # a branch reference, use the existing BranchReference logic.
140
            format = BranchReferenceFormat()
141
            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.
142
                
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
143
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
144
        path = self._path_for_remote_call(self._client)
145
        response = self._client.call('BzrDir.find_repository', path)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
146
        assert response[0] in ('ok', 'norepository'), \
2018.5.52 by Wouter van Heyst
Provide more information when encountering unexpected responses from a smart
147
            'unexpected response code %s' % (response,)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
148
        if response[0] == 'norepository':
149
            raise errors.NoRepositoryPresent(self)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
150
        assert len(response) == 4, '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.
151
        if response[1] == '':
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
152
            format = RemoteRepositoryFormat()
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
153
            format.rich_root_data = (response[2] == 'yes')
154
            format.supports_tree_reference = (response[3] == 'yes')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
155
            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.
156
        else:
157
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
158
2018.5.138 by Robert Collins
Merge bzr.dev.
159
    def open_workingtree(self, recommend_upgrade=True):
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
160
        self._ensure_real()
161
        if self._real_bzrdir.has_workingtree():
162
            raise errors.NotLocalUrl(self.root_transport)
163
        else:
164
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
165
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
166
    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.
167
        """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 :).
168
        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.
169
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
170
    def get_branch_transport(self, branch_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
171
        self._ensure_real()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
172
        return self._real_bzrdir.get_branch_transport(branch_format)
173
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
174
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
175
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
176
        return self._real_bzrdir.get_repository_transport(repository_format)
177
178
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
179
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
180
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
181
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
182
    def can_convert_format(self):
183
        """Upgrading of remote bzrdirs is not supported yet."""
184
        return False
185
186
    def needs_format_conversion(self, format=None):
187
        """Upgrading of remote bzrdirs is not supported yet."""
188
        return False
189
2018.5.138 by Robert Collins
Merge bzr.dev.
190
    def clone(self, url, revision_id=None, force_new_repo=False):
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
191
        self._ensure_real()
192
        return self._real_bzrdir.clone(url, revision_id=revision_id,
2018.5.138 by Robert Collins
Merge bzr.dev.
193
            force_new_repo=force_new_repo)
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
194
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
195
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
196
class RemoteRepositoryFormat(repository.RepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
197
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
198
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
199
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
200
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
201
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
202
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
203
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
204
    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.
205
    on a per instance basis, and are not set (and should not be) at
206
    the class level.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
207
    """
208
209
    _matchingbzrdir = RemoteBzrDirFormat
210
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
211
    def initialize(self, a_bzrdir, shared=False):
2018.5.138 by Robert Collins
Merge bzr.dev.
212
        assert isinstance(a_bzrdir, RemoteBzrDir), \
213
            '%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.
214
        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.
215
    
216
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
217
        assert isinstance(a_bzrdir, RemoteBzrDir)
218
        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.
219
220
    def get_format_description(self):
221
        return 'bzr remote repository'
222
223
    def __eq__(self, other):
1752.2.87 by Andrew Bennetts
Make tests pass.
224
        return self.__class__ == other.__class__
225
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
226
    def check_conversion_target(self, target_format):
227
        if self.rich_root_data and not target_format.rich_root_data:
228
            raise errors.BadConversionTarget(
229
                'Does not support rich root data.', target_format)
2018.5.138 by Robert Collins
Merge bzr.dev.
230
        if (self.supports_tree_reference and
231
            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.
232
            raise errors.BadConversionTarget(
233
                '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.
234
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
235
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
236
class RemoteRepository(object):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
237
    """Repository accessed over rpc.
238
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
239
    For the moment most operations are performed using local transport-backed
240
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
241
    """
242
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
243
    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.
244
        """Create a RemoteRepository instance.
245
        
246
        :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.
247
        :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.
248
        :param real_repository: If not None, a local implementation of the
249
            repository logic for the repository, usually accessing the data
250
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
251
        :param _client: Private testing parameter - override the smart client
252
            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.
253
        """
254
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
255
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
256
        else:
257
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
258
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
259
        if _client is None:
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
260
            self._client = client._SmartClient(self.bzrdir._shared_medium)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
261
        else:
262
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
263
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
264
        self._lock_mode = None
265
        self._lock_token = None
266
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
267
        self._leave_lock = False
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
268
        # A cache of looked up revision parent data; reset at unlock time.
269
        self._parents_map = None
2951.1.10 by Robert Collins
Peer review feedback with Ian.
270
        # For tests:
271
        # These depend on the actual remote format, so force them off for
272
        # maximum compatibility. XXX: In future these should depend on the
273
        # remote repository instance, but this is irrelevant until we perform
274
        # 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.
275
        self._reconcile_does_inventory_gc = False
276
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
277
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
278
        self.base = self.bzrdir.transport.base
279
280
    def __str__(self):
281
        return "%s(%s)" % (self.__class__.__name__, self.base)
282
283
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
284
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
285
    def abort_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
286
        """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.
287
        
288
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
289
        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.
290
        for older plugins that don't use e.g. the CommitBuilder
291
        facility.
292
        """
293
        self._ensure_real()
294
        return self._real_repository.abort_write_group()
295
296
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
297
        """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.
298
        
299
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
300
        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.
301
        for older plugins that don't use e.g. the CommitBuilder
302
        facility.
303
        """
304
        self._ensure_real()
305
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
306
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
307
    def _ensure_real(self):
308
        """Ensure that there is a _real_repository set.
309
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
310
        Used before calls to self._real_repository.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
311
        """
312
        if not self._real_repository:
313
            self.bzrdir._ensure_real()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
314
            #self._real_repository = self.bzrdir._real_bzrdir.open_repository()
315
            self._set_real_repository(self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
316
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
317
    def find_text_key_references(self):
318
        """Find the text key references within the repository.
319
320
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
321
        revision_ids. Each altered file-ids has the exact revision_ids that
322
        altered it listed explicitly.
323
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
324
            to whether they were referred to by the inventory of the
325
            revision_id that they contain. The inventory texts from all present
326
            revision ids are assessed to generate this report.
327
        """
328
        self._ensure_real()
329
        return self._real_repository.find_text_key_references()
330
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
331
    def _generate_text_key_index(self):
332
        """Generate a new text key index for the repository.
333
334
        This is an expensive function that will take considerable time to run.
335
336
        :return: A dict mapping (file_id, revision_id) tuples to a list of
337
            parents, also (file_id, revision_id) tuples.
338
        """
339
        self._ensure_real()
340
        return self._real_repository._generate_text_key_index()
341
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
342
    def get_revision_graph(self, revision_id=None):
343
        """See Repository.get_revision_graph()."""
344
        if revision_id is None:
345
            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.
346
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
347
            return {}
348
349
        path = self.bzrdir._path_for_remote_call(self._client)
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
350
        assert type(revision_id) is str
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
351
        response = self._client.call_expecting_body(
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
352
            'Repository.get_revision_graph', path, revision_id)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
353
        if response[0][0] not in ['ok', 'nosuchrevision']:
354
            raise errors.UnexpectedSmartServerResponse(response[0])
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
355
        if response[0][0] == 'ok':
356
            coded = response[1].read_body_bytes()
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
357
            if coded == '':
358
                # no revisions in this repository!
359
                return {}
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
360
            lines = coded.split('\n')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
361
            revision_graph = {}
362
            for line in lines:
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
363
                d = tuple(line.split())
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
364
                revision_graph[d[0]] = d[1:]
365
                
366
            return revision_graph
367
        else:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
368
            response_body = response[1].read_body_bytes()
369
            assert response_body == ''
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
370
            raise NoSuchRevision(self, revision_id)
371
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
372
    def has_revision(self, revision_id):
373
        """See Repository.has_revision()."""
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
374
        if revision_id == NULL_REVISION:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
375
            # The null revision is always present.
376
            return True
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
377
        path = self.bzrdir._path_for_remote_call(self._client)
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
378
        response = self._client.call('Repository.has_revision', path, revision_id)
2018.5.158 by Andrew Bennetts
Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
379
        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
380
        return response[0] == 'yes'
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
381
3172.3.1 by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence
382
    def has_revisions(self, revision_ids):
383
        """See Repository.has_revisions()."""
384
        result = set()
385
        for revision_id in revision_ids:
386
            if self.has_revision(revision_id):
387
                result.add(revision_id)
388
        return result
389
2617.6.9 by Robert Collins
Merge bzr.dev.
390
    def has_same_location(self, other):
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
391
        return (self.__class__ == other.__class__ and
392
                self.bzrdir.transport.base == other.bzrdir.transport.base)
2617.6.9 by Robert Collins
Merge bzr.dev.
393
        
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
394
    def get_graph(self, other_repository=None):
395
        """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.
396
        parents_provider = self
397
        if (other_repository is not None and
398
            other_repository.bzrdir.transport.base !=
399
            self.bzrdir.transport.base):
400
            parents_provider = graph._StackedParentsProvider(
401
                [parents_provider, other_repository._make_parents_provider()])
402
        return graph.Graph(parents_provider)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
403
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
404
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
405
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
406
        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.
407
        # revid can be None to indicate no revisions, not just NULL_REVISION
408
        if revid is None or revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
409
            fmt_revid = ''
410
        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.
411
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
412
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
413
            fmt_committers = 'no'
414
        else:
415
            fmt_committers = 'yes'
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
416
        response = self._client.call_expecting_body(
417
            'Repository.gather_stats', path, fmt_revid, fmt_committers)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
418
        assert response[0][0] == 'ok', \
419
            'unexpected response code %s' % (response[0],)
420
421
        body = response[1].read_body_bytes()
422
        result = {}
423
        for line in body.split('\n'):
424
            if not line:
425
                continue
426
            key, val_text = line.split(':')
427
            if key in ('revisions', 'size', 'committers'):
428
                result[key] = int(val_text)
429
            elif key in ('firstrev', 'latestrev'):
430
                values = val_text.split(' ')[1:]
431
                result[key] = (float(values[0]), long(values[1]))
432
433
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
434
3140.1.2 by Aaron Bentley
Add ability to find branches inside repositories
435
    def find_branches(self, using=False):
436
        """See Repository.find_branches()."""
437
        # should be an API call to the server.
438
        self._ensure_real()
439
        return self._real_repository.find_branches(using=using)
440
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
441
    def get_physical_lock_status(self):
442
        """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.
443
        # should be an API call to the server.
444
        self._ensure_real()
445
        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.
446
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
447
    def is_in_write_group(self):
448
        """Return True if there is an open write group.
449
450
        write groups are only applicable locally for the smart server..
451
        """
452
        if self._real_repository:
453
            return self._real_repository.is_in_write_group()
454
455
    def is_locked(self):
456
        return self._lock_count >= 1
457
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
458
    def is_shared(self):
459
        """See Repository.is_shared()."""
460
        path = self.bzrdir._path_for_remote_call(self._client)
461
        response = self._client.call('Repository.is_shared', path)
462
        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
463
        return response[0] == 'yes'
464
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
465
    def is_write_locked(self):
466
        return self._lock_mode == 'w'
467
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
468
    def lock_read(self):
469
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
470
        if not self._lock_mode:
471
            self._lock_mode = 'r'
472
            self._lock_count = 1
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
473
            self._parents_map = {}
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
474
            if self._real_repository is not None:
475
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
476
        else:
477
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
478
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
479
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
480
        path = self.bzrdir._path_for_remote_call(self._client)
481
        if token is None:
482
            token = ''
483
        response = self._client.call('Repository.lock_write', path, token)
484
        if response[0] == 'ok':
485
            ok, token = response
486
            return token
487
        elif response[0] == 'LockContention':
488
            raise errors.LockContention('(remote 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.
489
        elif response[0] == 'UnlockableTransport':
490
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
491
        elif response[0] == 'LockFailed':
492
            raise errors.LockFailed(response[1], response[2])
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
493
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
494
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
495
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
496
    def lock_write(self, token=None):
497
        if not self._lock_mode:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
498
            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.
499
            # if self._lock_token is None, then this is something like packs or
500
            # svn where we don't get to lock the repo, or a weave style repository
501
            # where we cannot lock it over the wire and attempts to do so will
502
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
503
            if self._real_repository is not None:
504
                self._real_repository.lock_write(token=self._lock_token)
505
            if token is not None:
506
                self._leave_lock = True
507
            else:
508
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
509
            self._lock_mode = 'w'
510
            self._lock_count = 1
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
511
            self._parents_map = {}
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
512
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
513
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
514
        else:
515
            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.
516
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
517
518
    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.
519
        if not self._lock_token:
520
            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
521
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
522
523
    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.
524
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
525
            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
526
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
527
528
    def _set_real_repository(self, repository):
529
        """Set the _real_repository for this repository.
530
531
        :param repository: The repository to fallback to for non-hpss
532
            implemented operations.
533
        """
2018.5.97 by Andrew Bennetts
Fix more tests.
534
        assert not isinstance(repository, RemoteRepository)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
535
        self._real_repository = repository
536
        if self._lock_mode == 'w':
537
            # if we are already locked, the real repository must be able to
538
            # acquire the lock with our token.
539
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
540
        elif self._lock_mode == 'r':
541
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
542
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
543
    def start_write_group(self):
544
        """Start a write group on the decorated repository.
545
        
546
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
547
        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``
548
        for older plugins that don't use e.g. the CommitBuilder
549
        facility.
550
        """
551
        self._ensure_real()
552
        return self._real_repository.start_write_group()
553
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
554
    def _unlock(self, token):
555
        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.
556
        if not token:
557
            # with no token the remote repository is not persistently locked.
558
            return
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
559
        response = self._client.call('Repository.unlock', path, token)
560
        if response == ('ok',):
561
            return
562
        elif response[0] == 'TokenMismatch':
563
            raise errors.TokenMismatch(token, '(remote token)')
564
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
565
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
566
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
567
    def unlock(self):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
568
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
569
        if self._lock_count > 0:
570
            return
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
571
        self._parents_map = None
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
572
        old_mode = self._lock_mode
573
        self._lock_mode = None
574
        try:
575
            # The real repository is responsible at present for raising an
576
            # exception if it's in an unfinished write group.  However, it
577
            # normally will *not* actually remove the lock from disk - that's
578
            # done by the server on receiving the Repository.unlock call.
579
            # 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
580
            if self._real_repository is not None:
581
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
582
        finally:
583
            # The rpc-level lock should be released even if there was a
584
            # problem releasing the vfs-based lock.
585
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
586
                # Only write-locked repositories need to make a remote method
587
                # 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.
588
                old_token = self._lock_token
589
                self._lock_token = None
590
                if not self._leave_lock:
591
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
592
593
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
594
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
595
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
596
        return self._real_repository.break_lock()
597
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
598
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
599
        """Return a TemporaryFile containing a repository tarball.
600
        
601
        Returns None if the server does not support sending tarballs.
602
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
603
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
604
        path = self.bzrdir._path_for_remote_call(self._client)
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
605
        response, protocol = self._client.call_expecting_body(
606
            'Repository.tarball', path, compression)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
607
        if response[0] == 'ok':
608
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
609
            t = tempfile.NamedTemporaryFile()
610
            # TODO: rpc layer should read directly into it...
611
            t.write(protocol.read_body_bytes())
612
            t.seek(0)
613
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
614
        if (response == ('error', "Generic bzr smart protocol error: "
615
                "bad request 'Repository.tarball'") or
616
              response == ('error', "Generic bzr smart protocol error: "
617
                "bad request u'Repository.tarball'")):
618
            protocol.cancel_read_body()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
619
            return None
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
620
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
621
2440.1.1 by Martin Pool
Add new Repository.sprout,
622
    def sprout(self, to_bzrdir, revision_id=None):
623
        # 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.
624
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
625
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
626
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
627
        dest_repo.fetch(self, revision_id=revision_id)
628
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
629
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
630
    ### These methods are just thin shims to the VFS object for now.
631
632
    def revision_tree(self, revision_id):
633
        self._ensure_real()
634
        return self._real_repository.revision_tree(revision_id)
635
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
636
    def get_serializer_format(self):
637
        self._ensure_real()
638
        return self._real_repository.get_serializer_format()
639
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
640
    def get_commit_builder(self, branch, parents, config, timestamp=None,
641
                           timezone=None, committer=None, revprops=None,
642
                           revision_id=None):
643
        # FIXME: It ought to be possible to call this without immediately
644
        # triggering _ensure_real.  For now it's the easiest thing to do.
645
        self._ensure_real()
646
        builder = self._real_repository.get_commit_builder(branch, parents,
647
                config, timestamp=timestamp, timezone=timezone,
648
                committer=committer, revprops=revprops, revision_id=revision_id)
649
        return builder
650
651
    @needs_write_lock
652
    def add_inventory(self, revid, inv, parents):
653
        self._ensure_real()
654
        return self._real_repository.add_inventory(revid, inv, parents)
655
656
    @needs_write_lock
657
    def add_revision(self, rev_id, rev, inv=None, config=None):
658
        self._ensure_real()
659
        return self._real_repository.add_revision(
660
            rev_id, rev, inv=inv, config=config)
661
662
    @needs_read_lock
663
    def get_inventory(self, revision_id):
664
        self._ensure_real()
665
        return self._real_repository.get_inventory(revision_id)
666
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
667
    def iter_inventories(self, revision_ids):
668
        self._ensure_real()
669
        return self._real_repository.iter_inventories(revision_ids)
670
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
671
    @needs_read_lock
672
    def get_revision(self, revision_id):
673
        self._ensure_real()
674
        return self._real_repository.get_revision(revision_id)
675
676
    @property
677
    def weave_store(self):
678
        self._ensure_real()
679
        return self._real_repository.weave_store
680
681
    def get_transaction(self):
682
        self._ensure_real()
683
        return self._real_repository.get_transaction()
684
685
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
686
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
687
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
688
        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.
689
690
    def make_working_trees(self):
2018.5.120 by Robert Collins
The Repository API ``make_working_trees`` is now permitted to return
691
        """RemoteRepositories never create working trees by default."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
692
        return False
693
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
694
    def revision_ids_to_search_result(self, result_set):
695
        """Convert a set of revision ids to a graph SearchResult."""
696
        result_parents = set()
697
        for parents in self.get_graph().get_parent_map(
698
            result_set).itervalues():
699
            result_parents.update(parents)
700
        included_keys = result_set.intersection(result_parents)
701
        start_keys = result_set.difference(included_keys)
702
        exclude_keys = result_parents.difference(result_set)
703
        result = graph.SearchResult(start_keys, exclude_keys,
704
            len(result_set), result_set)
705
        return result
706
707
    @needs_read_lock
708
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
709
        """Return the revision ids that other has that this does not.
710
        
711
        These are returned in topological order.
712
713
        revision_id: only return revision ids included by revision_id.
714
        """
715
        return repository.InterRepository.get(
716
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
717
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
718
    def fetch(self, source, revision_id=None, pb=None):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
719
        if self.has_same_location(source):
720
            # check that last_revision is in 'from' and then return a
721
            # no-operation.
722
            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.
723
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
724
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
725
            return 0, []
2592.3.119 by Robert Collins
Merge some test fixes from Martin.
726
        self._ensure_real()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
727
        return self._real_repository.fetch(
728
            source, revision_id=revision_id, pb=pb)
729
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
730
    def create_bundle(self, target, base, fileobj, format=None):
731
        self._ensure_real()
732
        self._real_repository.create_bundle(target, base, fileobj, format)
733
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
734
    @property
735
    def control_weaves(self):
736
        self._ensure_real()
737
        return self._real_repository.control_weaves
738
739
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
740
    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.
741
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
742
        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.
743
744
    @needs_read_lock
745
    def get_inventory_weave(self):
746
        self._ensure_real()
747
        return self._real_repository.get_inventory_weave()
748
749
    def fileids_altered_by_revision_ids(self, revision_ids):
750
        self._ensure_real()
751
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
752
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
753
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
754
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
755
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
756
            revisions, revision_versions_cache)
757
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
758
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
759
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
760
        """
761
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
762
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
763
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
764
    def get_parent_map(self, keys):
765
        """See bzrlib.Graph.get_parent_map()."""
766
        # Hack to build up the caching logic.
767
        ancestry = self._parents_map
768
        missing_revisions = set(key for key in keys if key not in ancestry)
769
        if missing_revisions:
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
770
            self._parents_map.update(self._get_parent_map(missing_revisions))
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
771
        return dict((k, ancestry[k]) for k in keys if k in ancestry)
772
3172.5.8 by Robert Collins
Review feedback.
773
    def _response_is_unknown_method(self, response, verb):
774
        """Return True if response is an unknonwn method response to verb.
775
        
776
        :param response: The response from a smart client call_expecting_body
777
            call.
778
        :param verb: The verb used in that call.
779
        :return: True if an unknown method was encountered.
780
        """
781
        # This might live better on
782
        # bzrlib.smart.protocol.SmartClientRequestProtocolOne
783
        if (response[0] == ('error', "Generic bzr smart protocol error: "
784
                "bad request '%s'" % verb) or
785
              response[0] == ('error', "Generic bzr smart protocol error: "
786
                "bad request u'%s'" % verb)):
787
           response[1].cancel_read_body()
788
           return True
789
        return False
790
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
791
    def _get_parent_map(self, keys):
792
        """Helper for get_parent_map that performs the RPC."""
793
        keys = set(keys)
794
        if NULL_REVISION in keys:
795
            keys.discard(NULL_REVISION)
796
            found_parents = {NULL_REVISION:()}
797
            if not keys:
798
                return found_parents
799
        else:
800
            found_parents = {}
801
        path = self.bzrdir._path_for_remote_call(self._client)
802
        for key in keys:
803
            assert type(key) is str
3172.5.8 by Robert Collins
Review feedback.
804
        verb = 'Repository.get_parent_map'
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
805
        response = self._client.call_expecting_body(
3172.5.8 by Robert Collins
Review feedback.
806
            verb, path, *keys)
807
        if self._response_is_unknown_method(response, verb):
808
            # Server that does not support this method, get the whole graph.
809
            response = self._client.call_expecting_body(
810
                'Repository.get_revision_graph', path, '')
811
            if response[0][0] not in ['ok', 'nosuchrevision']:
812
                reponse[1].cancel_read_body()
813
                raise errors.UnexpectedSmartServerResponse(response[0])
814
        elif response[0][0] not in ['ok']:
815
            reponse[1].cancel_read_body()
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
816
            raise errors.UnexpectedSmartServerResponse(response[0])
817
        if response[0][0] == 'ok':
818
            coded = response[1].read_body_bytes()
819
            if coded == '':
820
                # no revisions found
821
                return {}
822
            lines = coded.split('\n')
823
            revision_graph = {}
824
            for line in lines:
825
                d = tuple(line.split())
826
                if len(d) > 1:
827
                    revision_graph[d[0]] = d[1:]
828
                else:
829
                    # No parents - so give the Graph result (NULL_REVISION,).
830
                    revision_graph[d[0]] = (NULL_REVISION,)
831
            return revision_graph
832
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
833
    @needs_read_lock
834
    def get_signature_text(self, revision_id):
835
        self._ensure_real()
836
        return self._real_repository.get_signature_text(revision_id)
837
838
    @needs_read_lock
839
    def get_revision_graph_with_ghosts(self, revision_ids=None):
840
        self._ensure_real()
841
        return self._real_repository.get_revision_graph_with_ghosts(
842
            revision_ids=revision_ids)
843
844
    @needs_read_lock
845
    def get_inventory_xml(self, revision_id):
846
        self._ensure_real()
847
        return self._real_repository.get_inventory_xml(revision_id)
848
849
    def deserialise_inventory(self, revision_id, xml):
850
        self._ensure_real()
851
        return self._real_repository.deserialise_inventory(revision_id, xml)
852
853
    def reconcile(self, other=None, thorough=False):
854
        self._ensure_real()
855
        return self._real_repository.reconcile(other=other, thorough=thorough)
856
        
857
    def all_revision_ids(self):
858
        self._ensure_real()
859
        return self._real_repository.all_revision_ids()
860
    
861
    @needs_read_lock
862
    def get_deltas_for_revisions(self, revisions):
863
        self._ensure_real()
864
        return self._real_repository.get_deltas_for_revisions(revisions)
865
866
    @needs_read_lock
867
    def get_revision_delta(self, revision_id):
868
        self._ensure_real()
869
        return self._real_repository.get_revision_delta(revision_id)
870
871
    @needs_read_lock
872
    def revision_trees(self, revision_ids):
873
        self._ensure_real()
874
        return self._real_repository.revision_trees(revision_ids)
875
876
    @needs_read_lock
877
    def get_revision_reconcile(self, revision_id):
878
        self._ensure_real()
879
        return self._real_repository.get_revision_reconcile(revision_id)
880
881
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
882
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
883
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
884
        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.
885
2018.5.138 by Robert Collins
Merge bzr.dev.
886
    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.
887
        self._ensure_real()
888
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
889
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
890
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
891
    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.
892
        # get a tarball of the remote repository, and copy from that into the
893
        # destination
894
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
895
        import tarfile
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
896
        import tempfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
897
        # TODO: Maybe a progress bar while streaming the tarball?
898
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
899
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
900
        if tar_file is None:
901
            return None
902
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
903
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
904
            tar = tarfile.open('repository', fileobj=tar_file,
905
                mode='r|bz2')
906
            tmpdir = tempfile.mkdtemp()
907
            try:
908
                _extract_tar(tar, tmpdir)
909
                tmp_bzrdir = BzrDir.open(tmpdir)
910
                tmp_repo = tmp_bzrdir.open_repository()
911
                tmp_repo.copy_content_into(destination, revision_id)
912
            finally:
913
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
914
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
915
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
916
        return destination
2018.18.23 by Martin Pool
review cleanups
917
        # TODO: Suggestion from john: using external tar is much faster than
918
        # 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.
919
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
920
    @needs_write_lock
921
    def pack(self):
922
        """Compress the data within the repository.
923
924
        This is not currently implemented within the smart server.
925
        """
926
        self._ensure_real()
927
        return self._real_repository.pack()
928
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
929
    def set_make_working_trees(self, new_value):
930
        raise NotImplementedError(self.set_make_working_trees)
931
932
    @needs_write_lock
933
    def sign_revision(self, revision_id, gpg_strategy):
934
        self._ensure_real()
935
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
936
937
    @needs_read_lock
938
    def get_revisions(self, revision_ids):
939
        self._ensure_real()
940
        return self._real_repository.get_revisions(revision_ids)
941
942
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
943
        self._ensure_real()
944
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
945
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
946
    def iter_reverse_revision_history(self, revision_id):
947
        self._ensure_real()
948
        return self._real_repository.iter_reverse_revision_history(revision_id)
949
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
950
    @property
951
    def _serializer(self):
952
        self._ensure_real()
953
        return self._real_repository._serializer
954
2018.5.97 by Andrew Bennetts
Fix more tests.
955
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
956
        self._ensure_real()
957
        return self._real_repository.store_revision_signature(
958
            gpg_strategy, plaintext, revision_id)
959
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
960
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
961
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
962
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
963
2018.5.97 by Andrew Bennetts
Fix more tests.
964
    def has_signature_for_revision_id(self, revision_id):
965
        self._ensure_real()
966
        return self._real_repository.has_signature_for_revision_id(revision_id)
967
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
968
    def get_data_stream_for_search(self, search):
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
969
        REQUEST_NAME = 'Repository.stream_revisions_chunked'
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
970
        path = self.bzrdir._path_for_remote_call(self._client)
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
971
        recipe = search.get_recipe()
972
        start_keys = ' '.join(recipe[0])
973
        stop_keys = ' '.join(recipe[1])
974
        count = str(recipe[2])
975
        body = '\n'.join((start_keys, stop_keys, count))
976
        response, protocol = self._client.call_with_body_bytes_expecting_body(
977
            REQUEST_NAME, (path,), body)
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
978
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
979
        if response == ('ok',):
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
980
            return self._deserialise_stream(protocol)
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
981
        if response == ('NoSuchRevision', ):
982
            # We cannot easily identify the revision that is missing in this
983
            # situation without doing much more network IO. For now, bail.
984
            raise NoSuchRevision(self, "unknown")
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
985
        elif (response == ('error', "Generic bzr smart protocol error: "
2535.4.21 by Andrew Bennetts
Rename smart request, to avoid confusion with non-chunked version merged into bzr.dev.
986
                "bad request '%s'" % REQUEST_NAME) or
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
987
              response == ('error', "Generic bzr smart protocol error: "
2535.4.21 by Andrew Bennetts
Rename smart request, to avoid confusion with non-chunked version merged into bzr.dev.
988
                "bad request u'%s'" % REQUEST_NAME)):
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
989
            protocol.cancel_read_body()
990
            self._ensure_real()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
991
            return self._real_repository.get_data_stream_for_search(search)
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
992
        else:
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
993
            raise errors.UnexpectedSmartServerResponse(response)
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
994
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
995
    def _deserialise_stream(self, protocol):
2535.4.11 by Andrew Bennetts
Merge from repo-refactor.
996
        stream = protocol.read_streamed_body()
2535.4.15 by Andrew Bennetts
Remove 'PackSource' hack by using the ContainerPushParser.
997
        container_parser = ContainerPushParser()
998
        for bytes in stream:
999
            container_parser.accept_bytes(bytes)
1000
            records = container_parser.read_pending_records()
1001
            for record_names, record_bytes in records:
2535.4.31 by Andrew Bennetts
Tweak in response to review comments.
1002
                if len(record_names) != 1:
2535.4.15 by Andrew Bennetts
Remove 'PackSource' hack by using the ContainerPushParser.
1003
                    # These records should have only one name, and that name
1004
                    # should be a one-element tuple.
1005
                    raise errors.SmartProtocolError(
1006
                        'Repository data stream had invalid record name %r'
1007
                        % (record_names,))
2535.4.31 by Andrew Bennetts
Tweak in response to review comments.
1008
                name_tuple = record_names[0]
2535.4.15 by Andrew Bennetts
Remove 'PackSource' hack by using the ContainerPushParser.
1009
                yield name_tuple, record_bytes
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1010
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
1011
    def insert_data_stream(self, stream):
1012
        self._ensure_real()
1013
        self._real_repository.insert_data_stream(stream)
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
1014
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1015
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1016
        self._ensure_real()
1017
        return self._real_repository.item_keys_introduced_by(revision_ids,
1018
            _files_pb=_files_pb)
1019
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1020
    def revision_graph_can_have_wrong_parents(self):
1021
        # The answer depends on the remote repo format.
1022
        self._ensure_real()
1023
        return self._real_repository.revision_graph_can_have_wrong_parents()
1024
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1025
    def _find_inconsistent_revision_parents(self):
1026
        self._ensure_real()
1027
        return self._real_repository._find_inconsistent_revision_parents()
1028
1029
    def _check_for_inconsistent_revision_parents(self):
1030
        self._ensure_real()
1031
        return self._real_repository._check_for_inconsistent_revision_parents()
1032
3089.2.1 by Andrew Bennetts
Implement RemoteRepository._make_parents_provider.
1033
    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.
1034
        return self
1035
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1036
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1037
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1038
    """A 'LockableFiles' implementation that talks to a smart server.
1039
    
1040
    This is not a public interface class.
1041
    """
1042
1043
    def __init__(self, bzrdir, _client):
1044
        self.bzrdir = bzrdir
1045
        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.
1046
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1047
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1048
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1049
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1050
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.
1051
    def _find_modes(self):
1052
        # RemoteBranches don't let the client set the mode of control files.
1053
        self._dir_mode = None
1054
        self._file_mode = None
1055
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1056
    def get(self, path):
1057
        """'get' a remote path as per the LockableFiles interface.
1058
1059
        :param path: the file to 'get'. If this is 'branch.conf', we do not
1060
             just retrieve a file, instead we ask the smart server to generate
1061
             a configuration for us - which is retrieved as an INI file.
1062
        """
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1063
        if path == 'branch.conf':
1064
            path = self.bzrdir._path_for_remote_call(self._client)
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1065
            response = self._client.call_expecting_body(
1066
                'Branch.get_config_file', path)
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1067
            assert response[0][0] == 'ok', \
1068
                'unexpected response code %s' % (response[0],)
1069
            return StringIO(response[1].read_body_bytes())
1070
        else:
1071
            # VFS fallback.
1072
            return LockableFiles.get(self, path)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1073
1074
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1075
class RemoteBranchFormat(branch.BranchFormat):
1076
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.
1077
    def __eq__(self, other):
1078
        return (isinstance(other, RemoteBranchFormat) and 
1079
            self.__dict__ == other.__dict__)
1080
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1081
    def get_format_description(self):
1082
        return 'Remote BZR Branch'
1083
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1084
    def get_format_string(self):
1085
        return 'Remote BZR Branch'
1086
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1087
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1088
        assert isinstance(a_bzrdir, RemoteBzrDir)
1089
        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.
1090
1091
    def initialize(self, a_bzrdir):
1092
        assert isinstance(a_bzrdir, RemoteBzrDir)
1093
        return a_bzrdir.create_branch()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1094
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1095
    def supports_tags(self):
1096
        # Remote branches might support tags, but we won't know until we
1097
        # access the real remote branch.
1098
        return True
1099
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1100
1101
class RemoteBranch(branch.Branch):
1102
    """Branch stored on a server accessed by HPSS RPC.
1103
1104
    At the moment most operations are mapped down to simple file operations.
1105
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1106
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1107
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1108
        _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.
1109
        """Create a RemoteBranch instance.
1110
1111
        :param real_branch: An optional local implementation of the branch
1112
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1113
        :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.
1114
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1115
        # We intentionally don't call the parent class's __init__, because it
1116
        # will try to assign to self.tags, which is a property in this subclass.
1117
        # 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.
1118
        self._revision_id_to_revno_cache = None
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1119
        self._revision_history_cache = None
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1120
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1121
        if _client is not None:
1122
            self._client = _client
1123
        else:
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1124
            self._client = client._SmartClient(self.bzrdir._shared_medium)
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1125
        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.
1126
        if real_branch is not None:
1127
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1128
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1129
            real_repo = self._real_branch.repository
1130
            if isinstance(real_repo, RemoteRepository):
1131
                real_repo._ensure_real()
1132
                real_repo = real_repo._real_repository
1133
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1134
            # Give the branch the remote repository to let fast-pathing happen.
1135
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1136
        else:
1137
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1138
        # 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.
1139
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1140
        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.
1141
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1142
        self._lock_mode = None
1143
        self._lock_token = None
1144
        self._lock_count = 0
1145
        self._leave_lock = False
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1146
2477.1.1 by Martin Pool
Add RemoteBranch repr
1147
    def __str__(self):
1148
        return "%s(%s)" % (self.__class__.__name__, self.base)
1149
1150
    __repr__ = __str__
1151
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1152
    def _ensure_real(self):
1153
        """Ensure that there is a _real_branch set.
1154
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1155
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1156
        """
1157
        if not self._real_branch:
1158
            assert vfs.vfs_enabled()
1159
            self.bzrdir._ensure_real()
1160
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1161
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1162
            real_repo = self._real_branch.repository
1163
            if isinstance(real_repo, RemoteRepository):
1164
                real_repo._ensure_real()
1165
                real_repo = real_repo._real_repository
1166
            self.repository._set_real_repository(real_repo)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1167
            # Give the branch the remote repository to let fast-pathing happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1168
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1169
            # XXX: deal with _lock_mode == 'w'
1170
            if self._lock_mode == 'r':
1171
                self._real_branch.lock_read()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1172
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.
1173
    @property
1174
    def control_files(self):
1175
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1176
        # because it triggers an _ensure_real that we otherwise might not need.
1177
        if self._control_files is None:
1178
            self._control_files = RemoteBranchLockableFiles(
1179
                self.bzrdir, self._client)
1180
        return self._control_files
1181
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1182
    def _get_checkout_format(self):
1183
        self._ensure_real()
1184
        return self._real_branch._get_checkout_format()
1185
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1186
    def get_physical_lock_status(self):
1187
        """See Branch.get_physical_lock_status()."""
1188
        # 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.
1189
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1190
        return self._real_branch.get_physical_lock_status()
1191
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1192
    def lock_read(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1193
        if not self._lock_mode:
1194
            self._lock_mode = 'r'
1195
            self._lock_count = 1
1196
            if self._real_branch is not None:
1197
                self._real_branch.lock_read()
1198
        else:
1199
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1200
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).
1201
    def _remote_lock_write(self, token):
1202
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1203
            branch_token = repo_token = ''
1204
        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).
1205
            branch_token = token
1206
            repo_token = self.repository.lock_write()
1207
            self.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1208
        path = self.bzrdir._path_for_remote_call(self._client)
1209
        response = self._client.call('Branch.lock_write', path, branch_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.
1210
                                     repo_token or '')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1211
        if response[0] == 'ok':
1212
            ok, branch_token, repo_token = response
1213
            return branch_token, repo_token
1214
        elif response[0] == 'LockContention':
1215
            raise errors.LockContention('(remote lock)')
1216
        elif response[0] == 'TokenMismatch':
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).
1217
            raise errors.TokenMismatch(token, '(remote token)')
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.
1218
        elif response[0] == 'UnlockableTransport':
1219
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2018.5.123 by Robert Collins
Translate ReadOnlyError in RemoteBranch._remote_lock_write.
1220
        elif response[0] == 'ReadOnlyError':
1221
            raise errors.ReadOnlyError(self)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
1222
        elif response[0] == 'LockFailed':
1223
            raise errors.LockFailed(response[1], response[2])
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1224
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1225
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1226
            
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).
1227
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1228
        if not self._lock_mode:
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).
1229
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1230
            self._lock_token, self._repo_lock_token = remote_tokens
1231
            assert self._lock_token, 'Remote server did not return a token!'
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1232
            # TODO: We really, really, really don't want to call _ensure_real
1233
            # here, but it's the easiest way to ensure coherency between the
1234
            # state of the RemoteBranch and RemoteRepository objects and the
1235
            # physical locks.  If we don't materialise the real objects here,
1236
            # then getting everything in the right state later is complex, so
1237
            # for now we just do it the lazy way.
1238
            #   -- Andrew Bennetts, 2007-02-22.
1239
            self._ensure_real()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1240
            if self._real_branch is not None:
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).
1241
                self._real_branch.repository.lock_write(
1242
                    token=self._repo_lock_token)
1243
                try:
1244
                    self._real_branch.lock_write(token=self._lock_token)
1245
                finally:
1246
                    self._real_branch.repository.unlock()
1247
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1248
                self._leave_lock = True
1249
            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).
1250
                # XXX: this case seems to be unreachable; token cannot be None.
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1251
                self._leave_lock = False
1252
            self._lock_mode = 'w'
1253
            self._lock_count = 1
1254
        elif self._lock_mode == 'r':
1255
            raise errors.ReadOnlyTransaction
1256
        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).
1257
            if token is not None:
1258
                # A token was given to lock_write, and we're relocking, so check
1259
                # that the given token actually matches the one we already have.
1260
                if token != self._lock_token:
1261
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1262
            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.
1263
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1264
1265
    def _unlock(self, branch_token, repo_token):
1266
        path = self.bzrdir._path_for_remote_call(self._client)
1267
        response = self._client.call('Branch.unlock', path, branch_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.
1268
                                     repo_token or '')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1269
        if response == ('ok',):
1270
            return
1271
        elif response[0] == 'TokenMismatch':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1272
            raise errors.TokenMismatch(
1273
                str((branch_token, repo_token)), '(remote tokens)')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1274
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1275
            raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1276
1277
    def unlock(self):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1278
        self._lock_count -= 1
1279
        if not self._lock_count:
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1280
            self._clear_cached_state()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1281
            mode = self._lock_mode
1282
            self._lock_mode = None
1283
            if self._real_branch is not None:
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.
1284
                if (not self._leave_lock and mode == 'w' and
1285
                    self._repo_lock_token):
2018.15.1 by Andrew Bennetts
All branch_implementations/test_locking tests passing.
1286
                    # If this RemoteBranch will remove the physical lock for the
1287
                    # repository, make sure the _real_branch doesn't do it
1288
                    # first.  (Because the _real_branch's repository is set to
1289
                    # be the RemoteRepository.)
1290
                    self._real_branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1291
                self._real_branch.unlock()
1292
            if mode != 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1293
                # Only write-locked branched need to make a remote method call
1294
                # to perfom the unlock.
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1295
                return
1296
            assert self._lock_token, 'Locked, but no token!'
1297
            branch_token = self._lock_token
1298
            repo_token = self._repo_lock_token
1299
            self._lock_token = None
1300
            self._repo_lock_token = None
1301
            if not self._leave_lock:
1302
                self._unlock(branch_token, repo_token)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1303
1304
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1305
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1306
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1307
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1308
    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.
1309
        if not self._lock_token:
1310
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1311
        self._leave_lock = True
1312
1313
    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.
1314
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1315
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1316
        self._leave_lock = False
1317
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1318
    def last_revision_info(self):
1319
        """See Branch.last_revision_info()."""
1320
        path = self.bzrdir._path_for_remote_call(self._client)
1321
        response = self._client.call('Branch.last_revision_info', path)
2018.5.52 by Wouter van Heyst
Provide more information when encountering unexpected responses from a smart
1322
        assert response[0] == 'ok', 'unexpected response code %s' % (response,)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1323
        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.
1324
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1325
        return (revno, last_revision)
1326
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1327
    def _gen_revision_history(self):
1328
        """See Branch._gen_revision_history()."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1329
        path = self.bzrdir._path_for_remote_call(self._client)
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1330
        response = self._client.call_expecting_body(
1331
            'Branch.revision_history', path)
1332
        assert response[0][0] == 'ok', ('unexpected response code %s'
1333
                                        % (response[0],))
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1334
        result = response[1].read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1335
        if result == ['']:
1336
            return []
1337
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1338
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1339
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1340
    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.
1341
        # Send just the tip revision of the history; the server will generate
1342
        # the full history from that.  If the revision doesn't exist in this
1343
        # branch, NoSuchRevision will be raised.
1344
        path = self.bzrdir._path_for_remote_call(self._client)
1345
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1346
            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.
1347
        else:
1348
            rev_id = rev_history[-1]
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
1349
        self._clear_cached_state()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1350
        response = self._client.call('Branch.set_last_revision',
1351
            path, self._lock_token, self._repo_lock_token, rev_id)
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
1352
        if response[0] == 'NoSuchRevision':
1353
            raise NoSuchRevision(self, rev_id)
1354
        else:
1355
            assert response == ('ok',), (
1356
                'unexpected response code %r' % (response,))
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1357
        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.
1358
1359
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1360
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1361
        return self._real_branch.get_parent()
1362
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1363
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1364
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1365
        return self._real_branch.set_parent(url)
1366
        
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1367
    def get_config(self):
1368
        return RemoteBranchConfig(self)
1369
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1370
    def sprout(self, to_bzrdir, revision_id=None):
1371
        # Like Branch.sprout, except that it sprouts a branch in the default
1372
        # format, because RemoteBranches can't be created at arbitrary URLs.
1373
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1374
        # to_bzrdir.create_branch...
3047.1.1 by Andrew Bennetts
Fix for bug 164626, add test that Repository.sprout preserves format.
1375
        self._ensure_real()
1376
        result = self._real_branch._format.initialize(to_bzrdir)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1377
        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).
1378
        result.set_parent(self.bzrdir.root_transport.base)
1379
        return result
1380
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1381
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1382
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1383
             **kwargs):
1384
        # FIXME: This asks the real branch to run the hooks, which means
1385
        # they're called with the wrong target branch parameter. 
1386
        # The test suite specifically allows this at present but it should be
1387
        # fixed.  It should get a _override_hook_target branch,
1388
        # as push does.  -- mbp 20070405
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1389
        self._ensure_real()
1390
        self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1391
            source, overwrite=overwrite, stop_revision=stop_revision,
1392
            **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1393
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1394
    @needs_read_lock
1395
    def push(self, target, overwrite=False, stop_revision=None):
1396
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1397
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1398
            target, overwrite=overwrite, stop_revision=stop_revision,
1399
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1400
1401
    def is_locked(self):
1402
        return self._lock_count >= 1
1403
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1404
    def set_last_revision_info(self, revno, revision_id):
1405
        self._ensure_real()
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1406
        self._clear_cached_state()
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1407
        return self._real_branch.set_last_revision_info(revno, revision_id)
1408
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.
1409
    def generate_revision_history(self, revision_id, last_rev=None,
1410
                                  other_branch=None):
1411
        self._ensure_real()
1412
        return self._real_branch.generate_revision_history(
1413
            revision_id, last_rev=last_rev, other_branch=other_branch)
1414
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1415
    @property
1416
    def tags(self):
1417
        self._ensure_real()
1418
        return self._real_branch.tags
1419
2018.5.97 by Andrew Bennetts
Fix more tests.
1420
    def set_push_location(self, location):
1421
        self._ensure_real()
1422
        return self._real_branch.set_push_location(location)
1423
3052.5.4 by John Arbash Meinel
If we are going to overwrite the target, we don't have to do
1424
    def update_revisions(self, other, stop_revision=None, overwrite=False):
2018.5.97 by Andrew Bennetts
Fix more tests.
1425
        self._ensure_real()
1426
        return self._real_branch.update_revisions(
3052.5.4 by John Arbash Meinel
If we are going to overwrite the target, we don't have to do
1427
            other, stop_revision=stop_revision, overwrite=overwrite)
2018.5.97 by Andrew Bennetts
Fix more tests.
1428
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1429
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1430
class RemoteBranchConfig(BranchConfig):
1431
1432
    def username(self):
1433
        self.branch._ensure_real()
1434
        return self.branch._real_branch.get_config().username()
1435
2018.14.2 by Andrew Bennetts
All but one repository_implementation tests for RemoteRepository passing.
1436
    def _get_branch_data_config(self):
1437
        self.branch._ensure_real()
1438
        if self._branch_data_config is None:
1439
            self._branch_data_config = TreeConfig(self.branch._real_branch)
1440
        return self._branch_data_config
1441
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1442
1443
def _extract_tar(tar, to_dir):
1444
    """Extract all the contents of a tarfile object.
1445
1446
    A replacement for extractall, which is not present in python2.4
1447
    """
1448
    for tarinfo in tar:
1449
        tar.extract(tarinfo, to_dir)