~bzr-pqm/bzr/bzr.dev

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