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