/brz/remove-bazaar

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