/brz/remove-bazaar

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