/brz/remove-bazaar

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