~bzr-pqm/bzr/bzr.dev

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