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