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