/brz/remove-bazaar

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