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