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