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