~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
200
    The RemoteRepositoryFormat is parameterised during construction
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
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
418
    def get_physical_lock_status(self):
419
        """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.
420
        # should be an API call to the server.
421
        self._ensure_real()
422
        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.
423
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
424
    def is_in_write_group(self):
425
        """Return True if there is an open write group.
426
427
        write groups are only applicable locally for the smart server..
428
        """
429
        if self._real_repository:
430
            return self._real_repository.is_in_write_group()
431
432
    def is_locked(self):
433
        return self._lock_count >= 1
434
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
435
    def is_shared(self):
436
        """See Repository.is_shared()."""
437
        path = self.bzrdir._path_for_remote_call(self._client)
438
        response = self._client.call('Repository.is_shared', path)
439
        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
440
        return response[0] == 'yes'
441
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
442
    def is_write_locked(self):
443
        return self._lock_mode == 'w'
444
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
445
    def lock_read(self):
446
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
447
        if not self._lock_mode:
448
            self._lock_mode = 'r'
449
            self._lock_count = 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
450
            if self._real_repository is not None:
451
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
452
        else:
453
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
454
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
455
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
456
        path = self.bzrdir._path_for_remote_call(self._client)
457
        if token is None:
458
            token = ''
459
        response = self._client.call('Repository.lock_write', path, token)
460
        if response[0] == 'ok':
461
            ok, token = response
462
            return token
463
        elif response[0] == 'LockContention':
464
            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.
465
        elif response[0] == 'UnlockableTransport':
466
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
467
        elif response[0] == 'LockFailed':
468
            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
469
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
470
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
471
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
472
    def lock_write(self, token=None):
473
        if not self._lock_mode:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
474
            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.
475
            # if self._lock_token is None, then this is something like packs or
476
            # svn where we don't get to lock the repo, or a weave style repository
477
            # where we cannot lock it over the wire and attempts to do so will
478
            # fail.
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
479
            if self._real_repository is not None:
480
                self._real_repository.lock_write(token=self._lock_token)
481
            if token is not None:
482
                self._leave_lock = True
483
            else:
484
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
485
            self._lock_mode = 'w'
486
            self._lock_count = 1
487
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
488
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
489
        else:
490
            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.
491
        return self._lock_token or None
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
492
493
    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.
494
        if not self._lock_token:
495
            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
496
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
497
498
    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.
499
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
500
            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
501
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
502
503
    def _set_real_repository(self, repository):
504
        """Set the _real_repository for this repository.
505
506
        :param repository: The repository to fallback to for non-hpss
507
            implemented operations.
508
        """
2018.5.97 by Andrew Bennetts
Fix more tests.
509
        assert not isinstance(repository, RemoteRepository)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
510
        self._real_repository = repository
511
        if self._lock_mode == 'w':
512
            # if we are already locked, the real repository must be able to
513
            # acquire the lock with our token.
514
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
515
        elif self._lock_mode == 'r':
516
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
517
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
518
    def start_write_group(self):
519
        """Start a write group on the decorated repository.
520
        
521
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
522
        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``
523
        for older plugins that don't use e.g. the CommitBuilder
524
        facility.
525
        """
526
        self._ensure_real()
527
        return self._real_repository.start_write_group()
528
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
529
    def _unlock(self, token):
530
        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.
531
        if not token:
532
            # with no token the remote repository is not persistently locked.
533
            return
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
534
        response = self._client.call('Repository.unlock', path, token)
535
        if response == ('ok',):
536
            return
537
        elif response[0] == 'TokenMismatch':
538
            raise errors.TokenMismatch(token, '(remote token)')
539
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
540
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
541
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
542
    def unlock(self):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
543
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
544
        if self._lock_count > 0:
545
            return
546
        old_mode = self._lock_mode
547
        self._lock_mode = None
548
        try:
549
            # The real repository is responsible at present for raising an
550
            # exception if it's in an unfinished write group.  However, it
551
            # normally will *not* actually remove the lock from disk - that's
552
            # done by the server on receiving the Repository.unlock call.
553
            # 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
554
            if self._real_repository is not None:
555
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
556
        finally:
557
            # The rpc-level lock should be released even if there was a
558
            # problem releasing the vfs-based lock.
559
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
560
                # Only write-locked repositories need to make a remote method
561
                # 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.
562
                old_token = self._lock_token
563
                self._lock_token = None
564
                if not self._leave_lock:
565
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
566
567
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
568
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
569
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
570
        return self._real_repository.break_lock()
571
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
572
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
573
        """Return a TemporaryFile containing a repository tarball.
574
        
575
        Returns None if the server does not support sending tarballs.
576
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
577
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
578
        path = self.bzrdir._path_for_remote_call(self._client)
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
579
        response, protocol = self._client.call_expecting_body(
580
            'Repository.tarball', path, compression)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
581
        if response[0] == 'ok':
582
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
583
            t = tempfile.NamedTemporaryFile()
584
            # TODO: rpc layer should read directly into it...
585
            t.write(protocol.read_body_bytes())
586
            t.seek(0)
587
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
588
        if (response == ('error', "Generic bzr smart protocol error: "
589
                "bad request 'Repository.tarball'") or
590
              response == ('error', "Generic bzr smart protocol error: "
591
                "bad request u'Repository.tarball'")):
592
            protocol.cancel_read_body()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
593
            return None
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
594
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
595
2440.1.1 by Martin Pool
Add new Repository.sprout,
596
    def sprout(self, to_bzrdir, revision_id=None):
597
        # 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.
598
        self._ensure_real()
3047.1.4 by Andrew Bennetts
Simplify RemoteRepository.sprout thanks to review comments.
599
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
600
                                                             shared=False)
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
601
        dest_repo.fetch(self, revision_id=revision_id)
602
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
603
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
604
    ### These methods are just thin shims to the VFS object for now.
605
606
    def revision_tree(self, revision_id):
607
        self._ensure_real()
608
        return self._real_repository.revision_tree(revision_id)
609
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
610
    def get_serializer_format(self):
611
        self._ensure_real()
612
        return self._real_repository.get_serializer_format()
613
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
614
    def get_commit_builder(self, branch, parents, config, timestamp=None,
615
                           timezone=None, committer=None, revprops=None,
616
                           revision_id=None):
617
        # FIXME: It ought to be possible to call this without immediately
618
        # triggering _ensure_real.  For now it's the easiest thing to do.
619
        self._ensure_real()
620
        builder = self._real_repository.get_commit_builder(branch, parents,
621
                config, timestamp=timestamp, timezone=timezone,
622
                committer=committer, revprops=revprops, revision_id=revision_id)
623
        return builder
624
625
    @needs_write_lock
626
    def add_inventory(self, revid, inv, parents):
627
        self._ensure_real()
628
        return self._real_repository.add_inventory(revid, inv, parents)
629
630
    @needs_write_lock
631
    def add_revision(self, rev_id, rev, inv=None, config=None):
632
        self._ensure_real()
633
        return self._real_repository.add_revision(
634
            rev_id, rev, inv=inv, config=config)
635
636
    @needs_read_lock
637
    def get_inventory(self, revision_id):
638
        self._ensure_real()
639
        return self._real_repository.get_inventory(revision_id)
640
641
    @needs_read_lock
642
    def get_revision(self, revision_id):
643
        self._ensure_real()
644
        return self._real_repository.get_revision(revision_id)
645
646
    @property
647
    def weave_store(self):
648
        self._ensure_real()
649
        return self._real_repository.weave_store
650
651
    def get_transaction(self):
652
        self._ensure_real()
653
        return self._real_repository.get_transaction()
654
655
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
656
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
657
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
658
        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.
659
660
    def make_working_trees(self):
2018.5.120 by Robert Collins
The Repository API ``make_working_trees`` is now permitted to return
661
        """RemoteRepositories never create working trees by default."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
662
        return False
663
664
    def fetch(self, source, revision_id=None, pb=None):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
665
        if self.has_same_location(source):
666
            # check that last_revision is in 'from' and then return a
667
            # no-operation.
668
            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.
669
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
670
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
671
            return 0, []
2592.3.119 by Robert Collins
Merge some test fixes from Martin.
672
        self._ensure_real()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
673
        return self._real_repository.fetch(
674
            source, revision_id=revision_id, pb=pb)
675
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
676
    def create_bundle(self, target, base, fileobj, format=None):
677
        self._ensure_real()
678
        self._real_repository.create_bundle(target, base, fileobj, format)
679
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
680
    @property
681
    def control_weaves(self):
682
        self._ensure_real()
683
        return self._real_repository.control_weaves
684
685
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
686
    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.
687
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
688
        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.
689
690
    @needs_read_lock
691
    def get_inventory_weave(self):
692
        self._ensure_real()
693
        return self._real_repository.get_inventory_weave()
694
695
    def fileids_altered_by_revision_ids(self, revision_ids):
696
        self._ensure_real()
697
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
698
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
699
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
700
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
701
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
702
            revisions, revision_versions_cache)
703
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
704
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
705
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
706
        """
707
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
708
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
709
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
710
    @needs_read_lock
711
    def get_signature_text(self, revision_id):
712
        self._ensure_real()
713
        return self._real_repository.get_signature_text(revision_id)
714
715
    @needs_read_lock
716
    def get_revision_graph_with_ghosts(self, revision_ids=None):
717
        self._ensure_real()
718
        return self._real_repository.get_revision_graph_with_ghosts(
719
            revision_ids=revision_ids)
720
721
    @needs_read_lock
722
    def get_inventory_xml(self, revision_id):
723
        self._ensure_real()
724
        return self._real_repository.get_inventory_xml(revision_id)
725
726
    def deserialise_inventory(self, revision_id, xml):
727
        self._ensure_real()
728
        return self._real_repository.deserialise_inventory(revision_id, xml)
729
730
    def reconcile(self, other=None, thorough=False):
731
        self._ensure_real()
732
        return self._real_repository.reconcile(other=other, thorough=thorough)
733
        
734
    def all_revision_ids(self):
735
        self._ensure_real()
736
        return self._real_repository.all_revision_ids()
737
    
738
    @needs_read_lock
739
    def get_deltas_for_revisions(self, revisions):
740
        self._ensure_real()
741
        return self._real_repository.get_deltas_for_revisions(revisions)
742
743
    @needs_read_lock
744
    def get_revision_delta(self, revision_id):
745
        self._ensure_real()
746
        return self._real_repository.get_revision_delta(revision_id)
747
748
    @needs_read_lock
749
    def revision_trees(self, revision_ids):
750
        self._ensure_real()
751
        return self._real_repository.revision_trees(revision_ids)
752
753
    @needs_read_lock
754
    def get_revision_reconcile(self, revision_id):
755
        self._ensure_real()
756
        return self._real_repository.get_revision_reconcile(revision_id)
757
758
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
759
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
760
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
761
        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.
762
2018.5.138 by Robert Collins
Merge bzr.dev.
763
    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.
764
        self._ensure_real()
765
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
766
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
767
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
768
    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.
769
        # get a tarball of the remote repository, and copy from that into the
770
        # destination
771
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
772
        import tarfile
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
773
        import tempfile
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
774
        from StringIO import StringIO
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
775
        # TODO: Maybe a progress bar while streaming the tarball?
776
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
777
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
778
        if tar_file is None:
779
            return None
780
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
781
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
782
            tar = tarfile.open('repository', fileobj=tar_file,
783
                mode='r|bz2')
784
            tmpdir = tempfile.mkdtemp()
785
            try:
786
                _extract_tar(tar, tmpdir)
787
                tmp_bzrdir = BzrDir.open(tmpdir)
788
                tmp_repo = tmp_bzrdir.open_repository()
789
                tmp_repo.copy_content_into(destination, revision_id)
790
            finally:
791
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
792
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
793
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
794
        return destination
2018.18.23 by Martin Pool
review cleanups
795
        # TODO: Suggestion from john: using external tar is much faster than
796
        # 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.
797
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
798
    @needs_write_lock
799
    def pack(self):
800
        """Compress the data within the repository.
801
802
        This is not currently implemented within the smart server.
803
        """
804
        self._ensure_real()
805
        return self._real_repository.pack()
806
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
807
    def set_make_working_trees(self, new_value):
808
        raise NotImplementedError(self.set_make_working_trees)
809
810
    @needs_write_lock
811
    def sign_revision(self, revision_id, gpg_strategy):
812
        self._ensure_real()
813
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
814
815
    @needs_read_lock
816
    def get_revisions(self, revision_ids):
817
        self._ensure_real()
818
        return self._real_repository.get_revisions(revision_ids)
819
820
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
821
        self._ensure_real()
822
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
823
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
824
    def iter_reverse_revision_history(self, revision_id):
825
        self._ensure_real()
826
        return self._real_repository.iter_reverse_revision_history(revision_id)
827
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
828
    @property
829
    def _serializer(self):
830
        self._ensure_real()
831
        return self._real_repository._serializer
832
2018.5.97 by Andrew Bennetts
Fix more tests.
833
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
834
        self._ensure_real()
835
        return self._real_repository.store_revision_signature(
836
            gpg_strategy, plaintext, revision_id)
837
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
838
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
839
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
840
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
841
2018.5.97 by Andrew Bennetts
Fix more tests.
842
    def has_signature_for_revision_id(self, revision_id):
843
        self._ensure_real()
844
        return self._real_repository.has_signature_for_revision_id(revision_id)
845
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
846
    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.
847
        path = self.bzrdir._path_for_remote_call(self._client)
848
        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'.
849
            'Repository.stream_knit_data_for_revisions', path, *revision_ids)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
850
        if response == ('ok',):
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
851
            return self._deserialise_stream(protocol)
852
        elif (response == ('error', "Generic bzr smart protocol error: "
853
                "bad request 'Repository.stream_knit_data_for_revisions'") or
854
              response == ('error', "Generic bzr smart protocol error: "
855
                "bad request u'Repository.stream_knit_data_for_revisions'")):
856
            protocol.cancel_read_body()
857
            self._ensure_real()
858
            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.
859
        else:
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
860
            raise errors.UnexpectedSmartServerResponse(response)
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
861
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
862
    def _deserialise_stream(self, protocol):
863
        buffer = StringIO(protocol.read_body_bytes())
864
        reader = ContainerReader(buffer)
865
        for record_names, read_bytes in reader.iter_records():
866
            try:
867
                # These records should have only one name, and that name
868
                # should be a one-element tuple.
869
                [name_tuple] = record_names
870
            except ValueError:
871
                raise errors.SmartProtocolError(
872
                    'Repository data stream had invalid record name %r'
873
                    % (record_names,))
874
            yield name_tuple, read_bytes(None)
875
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
876
    def insert_data_stream(self, stream):
877
        self._ensure_real()
878
        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.
879
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
880
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
881
        self._ensure_real()
882
        return self._real_repository.item_keys_introduced_by(revision_ids,
883
            _files_pb=_files_pb)
884
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
885
    def revision_graph_can_have_wrong_parents(self):
886
        # The answer depends on the remote repo format.
887
        self._ensure_real()
888
        return self._real_repository.revision_graph_can_have_wrong_parents()
889
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
890
    def _find_inconsistent_revision_parents(self):
891
        self._ensure_real()
892
        return self._real_repository._find_inconsistent_revision_parents()
893
894
    def _check_for_inconsistent_revision_parents(self):
895
        self._ensure_real()
896
        return self._real_repository._check_for_inconsistent_revision_parents()
897
3089.2.1 by Andrew Bennetts
Implement RemoteRepository._make_parents_provider.
898
    def _make_parents_provider(self):
899
        self._ensure_real()
900
        return self._real_repository._make_parents_provider()
901
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
902
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
903
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
904
    """A 'LockableFiles' implementation that talks to a smart server.
905
    
906
    This is not a public interface class.
907
    """
908
909
    def __init__(self, bzrdir, _client):
910
        self.bzrdir = bzrdir
911
        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.
912
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
913
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
914
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
915
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
916
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.
917
    def _find_modes(self):
918
        # RemoteBranches don't let the client set the mode of control files.
919
        self._dir_mode = None
920
        self._file_mode = None
921
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
922
    def get(self, path):
923
        """'get' a remote path as per the LockableFiles interface.
924
925
        :param path: the file to 'get'. If this is 'branch.conf', we do not
926
             just retrieve a file, instead we ask the smart server to generate
927
             a configuration for us - which is retrieved as an INI file.
928
        """
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
929
        if path == 'branch.conf':
930
            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.
931
            response = self._client.call_expecting_body(
932
                'Branch.get_config_file', path)
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
933
            assert response[0][0] == 'ok', \
934
                'unexpected response code %s' % (response[0],)
935
            return StringIO(response[1].read_body_bytes())
936
        else:
937
            # VFS fallback.
938
            return LockableFiles.get(self, path)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
939
940
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
941
class RemoteBranchFormat(branch.BranchFormat):
942
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.
943
    def __eq__(self, other):
944
        return (isinstance(other, RemoteBranchFormat) and 
945
            self.__dict__ == other.__dict__)
946
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
947
    def get_format_description(self):
948
        return 'Remote BZR Branch'
949
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
950
    def get_format_string(self):
951
        return 'Remote BZR Branch'
952
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
953
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
954
        assert isinstance(a_bzrdir, RemoteBzrDir)
955
        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.
956
957
    def initialize(self, a_bzrdir):
958
        assert isinstance(a_bzrdir, RemoteBzrDir)
959
        return a_bzrdir.create_branch()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
960
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
961
    def supports_tags(self):
962
        # Remote branches might support tags, but we won't know until we
963
        # access the real remote branch.
964
        return True
965
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
966
967
class RemoteBranch(branch.Branch):
968
    """Branch stored on a server accessed by HPSS RPC.
969
970
    At the moment most operations are mapped down to simple file operations.
971
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
972
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
973
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
974
        _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.
975
        """Create a RemoteBranch instance.
976
977
        :param real_branch: An optional local implementation of the branch
978
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
979
        :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.
980
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
981
        # We intentionally don't call the parent class's __init__, because it
982
        # will try to assign to self.tags, which is a property in this subclass.
983
        # 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.
984
        self._revision_id_to_revno_cache = None
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
985
        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.
986
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
987
        if _client is not None:
988
            self._client = _client
989
        else:
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
990
            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.
991
        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.
992
        if real_branch is not None:
993
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
994
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
995
            real_repo = self._real_branch.repository
996
            if isinstance(real_repo, RemoteRepository):
997
                real_repo._ensure_real()
998
                real_repo = real_repo._real_repository
999
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1000
            # Give the branch the remote repository to let fast-pathing happen.
1001
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1002
        else:
1003
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1004
        # 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.
1005
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1006
        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.
1007
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1008
        self._lock_mode = None
1009
        self._lock_token = None
1010
        self._lock_count = 0
1011
        self._leave_lock = False
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1012
2477.1.1 by Martin Pool
Add RemoteBranch repr
1013
    def __str__(self):
1014
        return "%s(%s)" % (self.__class__.__name__, self.base)
1015
1016
    __repr__ = __str__
1017
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1018
    def _ensure_real(self):
1019
        """Ensure that there is a _real_branch set.
1020
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1021
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1022
        """
1023
        if not self._real_branch:
1024
            assert vfs.vfs_enabled()
1025
            self.bzrdir._ensure_real()
1026
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1027
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1028
            real_repo = self._real_branch.repository
1029
            if isinstance(real_repo, RemoteRepository):
1030
                real_repo._ensure_real()
1031
                real_repo = real_repo._real_repository
1032
            self.repository._set_real_repository(real_repo)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1033
            # 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.
1034
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1035
            # XXX: deal with _lock_mode == 'w'
1036
            if self._lock_mode == 'r':
1037
                self._real_branch.lock_read()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1038
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.
1039
    @property
1040
    def control_files(self):
1041
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1042
        # because it triggers an _ensure_real that we otherwise might not need.
1043
        if self._control_files is None:
1044
            self._control_files = RemoteBranchLockableFiles(
1045
                self.bzrdir, self._client)
1046
        return self._control_files
1047
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1048
    def _get_checkout_format(self):
1049
        self._ensure_real()
1050
        return self._real_branch._get_checkout_format()
1051
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1052
    def get_physical_lock_status(self):
1053
        """See Branch.get_physical_lock_status()."""
1054
        # 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.
1055
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1056
        return self._real_branch.get_physical_lock_status()
1057
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1058
    def lock_read(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1059
        if not self._lock_mode:
1060
            self._lock_mode = 'r'
1061
            self._lock_count = 1
1062
            if self._real_branch is not None:
1063
                self._real_branch.lock_read()
1064
        else:
1065
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1066
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).
1067
    def _remote_lock_write(self, token):
1068
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1069
            branch_token = repo_token = ''
1070
        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).
1071
            branch_token = token
1072
            repo_token = self.repository.lock_write()
1073
            self.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1074
        path = self.bzrdir._path_for_remote_call(self._client)
1075
        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.
1076
                                     repo_token or '')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1077
        if response[0] == 'ok':
1078
            ok, branch_token, repo_token = response
1079
            return branch_token, repo_token
1080
        elif response[0] == 'LockContention':
1081
            raise errors.LockContention('(remote lock)')
1082
        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).
1083
            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.
1084
        elif response[0] == 'UnlockableTransport':
1085
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2018.5.123 by Robert Collins
Translate ReadOnlyError in RemoteBranch._remote_lock_write.
1086
        elif response[0] == 'ReadOnlyError':
1087
            raise errors.ReadOnlyError(self)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
1088
        elif response[0] == 'LockFailed':
1089
            raise errors.LockFailed(response[1], response[2])
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1090
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1091
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1092
            
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).
1093
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1094
        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).
1095
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1096
            self._lock_token, self._repo_lock_token = remote_tokens
1097
            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.
1098
            # TODO: We really, really, really don't want to call _ensure_real
1099
            # here, but it's the easiest way to ensure coherency between the
1100
            # state of the RemoteBranch and RemoteRepository objects and the
1101
            # physical locks.  If we don't materialise the real objects here,
1102
            # then getting everything in the right state later is complex, so
1103
            # for now we just do it the lazy way.
1104
            #   -- Andrew Bennetts, 2007-02-22.
1105
            self._ensure_real()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1106
            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).
1107
                self._real_branch.repository.lock_write(
1108
                    token=self._repo_lock_token)
1109
                try:
1110
                    self._real_branch.lock_write(token=self._lock_token)
1111
                finally:
1112
                    self._real_branch.repository.unlock()
1113
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1114
                self._leave_lock = True
1115
            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).
1116
                # 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.
1117
                self._leave_lock = False
1118
            self._lock_mode = 'w'
1119
            self._lock_count = 1
1120
        elif self._lock_mode == 'r':
1121
            raise errors.ReadOnlyTransaction
1122
        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).
1123
            if token is not None:
1124
                # A token was given to lock_write, and we're relocking, so check
1125
                # that the given token actually matches the one we already have.
1126
                if token != self._lock_token:
1127
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1128
            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.
1129
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1130
1131
    def _unlock(self, branch_token, repo_token):
1132
        path = self.bzrdir._path_for_remote_call(self._client)
1133
        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.
1134
                                     repo_token or '')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1135
        if response == ('ok',):
1136
            return
1137
        elif response[0] == 'TokenMismatch':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1138
            raise errors.TokenMismatch(
1139
                str((branch_token, repo_token)), '(remote tokens)')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1140
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1141
            raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1142
1143
    def unlock(self):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1144
        self._lock_count -= 1
1145
        if not self._lock_count:
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1146
            self._clear_cached_state()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1147
            mode = self._lock_mode
1148
            self._lock_mode = None
1149
            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.
1150
                if (not self._leave_lock and mode == 'w' and
1151
                    self._repo_lock_token):
2018.15.1 by Andrew Bennetts
All branch_implementations/test_locking tests passing.
1152
                    # If this RemoteBranch will remove the physical lock for the
1153
                    # repository, make sure the _real_branch doesn't do it
1154
                    # first.  (Because the _real_branch's repository is set to
1155
                    # be the RemoteRepository.)
1156
                    self._real_branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1157
                self._real_branch.unlock()
1158
            if mode != 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1159
                # Only write-locked branched need to make a remote method call
1160
                # to perfom the unlock.
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1161
                return
1162
            assert self._lock_token, 'Locked, but no token!'
1163
            branch_token = self._lock_token
1164
            repo_token = self._repo_lock_token
1165
            self._lock_token = None
1166
            self._repo_lock_token = None
1167
            if not self._leave_lock:
1168
                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.
1169
1170
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1171
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1172
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1173
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1174
    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.
1175
        if not self._lock_token:
1176
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1177
        self._leave_lock = True
1178
1179
    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.
1180
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1181
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1182
        self._leave_lock = False
1183
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1184
    def last_revision_info(self):
1185
        """See Branch.last_revision_info()."""
1186
        path = self.bzrdir._path_for_remote_call(self._client)
1187
        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
1188
        assert response[0] == 'ok', 'unexpected response code %s' % (response,)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1189
        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.
1190
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1191
        return (revno, last_revision)
1192
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1193
    def _gen_revision_history(self):
1194
        """See Branch._gen_revision_history()."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1195
        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.
1196
        response = self._client.call_expecting_body(
1197
            'Branch.revision_history', path)
1198
        assert response[0][0] == 'ok', ('unexpected response code %s'
1199
                                        % (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.
1200
        result = response[1].read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1201
        if result == ['']:
1202
            return []
1203
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1204
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1205
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1206
    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.
1207
        # Send just the tip revision of the history; the server will generate
1208
        # the full history from that.  If the revision doesn't exist in this
1209
        # branch, NoSuchRevision will be raised.
1210
        path = self.bzrdir._path_for_remote_call(self._client)
1211
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1212
            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.
1213
        else:
1214
            rev_id = rev_history[-1]
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
1215
        self._clear_cached_state()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1216
        response = self._client.call('Branch.set_last_revision',
1217
            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.
1218
        if response[0] == 'NoSuchRevision':
1219
            raise NoSuchRevision(self, rev_id)
1220
        else:
1221
            assert response == ('ok',), (
1222
                'unexpected response code %r' % (response,))
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1223
        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.
1224
1225
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1226
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1227
        return self._real_branch.get_parent()
1228
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1229
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1230
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1231
        return self._real_branch.set_parent(url)
1232
        
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1233
    def get_config(self):
1234
        return RemoteBranchConfig(self)
1235
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1236
    def sprout(self, to_bzrdir, revision_id=None):
1237
        # Like Branch.sprout, except that it sprouts a branch in the default
1238
        # format, because RemoteBranches can't be created at arbitrary URLs.
1239
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1240
        # to_bzrdir.create_branch...
3047.1.1 by Andrew Bennetts
Fix for bug 164626, add test that Repository.sprout preserves format.
1241
        self._ensure_real()
1242
        result = self._real_branch._format.initialize(to_bzrdir)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1243
        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).
1244
        result.set_parent(self.bzrdir.root_transport.base)
1245
        return result
1246
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1247
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1248
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1249
             **kwargs):
1250
        # FIXME: This asks the real branch to run the hooks, which means
1251
        # they're called with the wrong target branch parameter. 
1252
        # The test suite specifically allows this at present but it should be
1253
        # fixed.  It should get a _override_hook_target branch,
1254
        # as push does.  -- mbp 20070405
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1255
        self._ensure_real()
1256
        self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1257
            source, overwrite=overwrite, stop_revision=stop_revision,
1258
            **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1259
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1260
    @needs_read_lock
1261
    def push(self, target, overwrite=False, stop_revision=None):
1262
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1263
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1264
            target, overwrite=overwrite, stop_revision=stop_revision,
1265
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1266
1267
    def is_locked(self):
1268
        return self._lock_count >= 1
1269
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1270
    def set_last_revision_info(self, revno, revision_id):
1271
        self._ensure_real()
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1272
        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.
1273
        return self._real_branch.set_last_revision_info(revno, revision_id)
1274
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.
1275
    def generate_revision_history(self, revision_id, last_rev=None,
1276
                                  other_branch=None):
1277
        self._ensure_real()
1278
        return self._real_branch.generate_revision_history(
1279
            revision_id, last_rev=last_rev, other_branch=other_branch)
1280
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1281
    @property
1282
    def tags(self):
1283
        self._ensure_real()
1284
        return self._real_branch.tags
1285
2018.5.97 by Andrew Bennetts
Fix more tests.
1286
    def set_push_location(self, location):
1287
        self._ensure_real()
1288
        return self._real_branch.set_push_location(location)
1289
3052.5.4 by John Arbash Meinel
If we are going to overwrite the target, we don't have to do
1290
    def update_revisions(self, other, stop_revision=None, overwrite=False):
2018.5.97 by Andrew Bennetts
Fix more tests.
1291
        self._ensure_real()
1292
        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
1293
            other, stop_revision=stop_revision, overwrite=overwrite)
2018.5.97 by Andrew Bennetts
Fix more tests.
1294
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1295
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1296
class RemoteBranchConfig(BranchConfig):
1297
1298
    def username(self):
1299
        self.branch._ensure_real()
1300
        return self.branch._real_branch.get_config().username()
1301
2018.14.2 by Andrew Bennetts
All but one repository_implementation tests for RemoteRepository passing.
1302
    def _get_branch_data_config(self):
1303
        self.branch._ensure_real()
1304
        if self._branch_data_config is None:
1305
            self._branch_data_config = TreeConfig(self.branch._real_branch)
1306
        return self._branch_data_config
1307
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1308
1309
def _extract_tar(tar, to_dir):
1310
    """Extract all the contents of a tarfile object.
1311
1312
    A replacement for extractall, which is not present in python2.4
1313
    """
1314
    for tarinfo in tar:
1315
        tar.extract(tarinfo, to_dir)