~bzr-pqm/bzr/bzr.dev

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