/brz/remove-bazaar

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