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