/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
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
308
    def get_revision_graph(self, revision_id=None):
309
        """See Repository.get_revision_graph()."""
310
        if revision_id is None:
311
            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.
312
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
313
            return {}
314
315
        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.
316
        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.
317
        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.
318
            'Repository.get_revision_graph', path, revision_id)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
319
        if response[0][0] not in ['ok', 'nosuchrevision']:
320
            raise errors.UnexpectedSmartServerResponse(response[0])
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
321
        if response[0][0] == 'ok':
322
            coded = response[1].read_body_bytes()
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
323
            if coded == '':
324
                # no revisions in this repository!
325
                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.
326
            lines = coded.split('\n')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
327
            revision_graph = {}
328
            for line in lines:
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
329
                d = tuple(line.split())
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
330
                revision_graph[d[0]] = d[1:]
331
                
332
            return revision_graph
333
        else:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
334
            response_body = response[1].read_body_bytes()
335
            assert response_body == ''
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
336
            raise NoSuchRevision(self, revision_id)
337
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
338
    def has_revision(self, revision_id):
339
        """See Repository.has_revision()."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
340
        if revision_id is None:
341
            # The null revision is always present.
342
            return True
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
343
        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.
344
        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.
345
        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
346
        return response[0] == 'yes'
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
347
2617.6.9 by Robert Collins
Merge bzr.dev.
348
    def has_same_location(self, other):
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
349
        return (self.__class__ == other.__class__ and
350
                self.bzrdir.transport.base == other.bzrdir.transport.base)
2617.6.9 by Robert Collins
Merge bzr.dev.
351
        
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
352
    def get_graph(self, other_repository=None):
353
        """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.
354
        self._ensure_real()
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
355
        return self._real_repository.get_graph(other_repository)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
356
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
357
    def gather_stats(self, revid=None, committers=None):
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
358
        """See Repository.gather_stats()."""
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
359
        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.
360
        # revid can be None to indicate no revisions, not just NULL_REVISION
361
        if revid is None or revision.is_null(revid):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
362
            fmt_revid = ''
363
        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.
364
            fmt_revid = revid
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
365
        if committers is None or not committers:
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
366
            fmt_committers = 'no'
367
        else:
368
            fmt_committers = 'yes'
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
369
        response = self._client.call_expecting_body(
370
            'Repository.gather_stats', path, fmt_revid, fmt_committers)
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
371
        assert response[0][0] == 'ok', \
372
            'unexpected response code %s' % (response[0],)
373
374
        body = response[1].read_body_bytes()
375
        result = {}
376
        for line in body.split('\n'):
377
            if not line:
378
                continue
379
            key, val_text = line.split(':')
380
            if key in ('revisions', 'size', 'committers'):
381
                result[key] = int(val_text)
382
            elif key in ('firstrev', 'latestrev'):
383
                values = val_text.split(' ')[1:]
384
                result[key] = (float(values[0]), long(values[1]))
385
386
        return result
2018.5.62 by Robert Collins
Stub out RemoteRepository.gather_stats while its implemented in parallel.
387
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
388
    def get_physical_lock_status(self):
389
        """See Repository.get_physical_lock_status()."""
390
        return False
391
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
392
    def is_in_write_group(self):
393
        """Return True if there is an open write group.
394
395
        write groups are only applicable locally for the smart server..
396
        """
397
        if self._real_repository:
398
            return self._real_repository.is_in_write_group()
399
400
    def is_locked(self):
401
        return self._lock_count >= 1
402
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
403
    def is_shared(self):
404
        """See Repository.is_shared()."""
405
        path = self.bzrdir._path_for_remote_call(self._client)
406
        response = self._client.call('Repository.is_shared', path)
407
        assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
408
        return response[0] == 'yes'
409
2904.1.1 by Robert Collins
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
410
    def is_write_locked(self):
411
        return self._lock_mode == 'w'
412
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
413
    def lock_read(self):
414
        # wrong eventually - want a local lock cache context
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
415
        if not self._lock_mode:
416
            self._lock_mode = 'r'
417
            self._lock_count = 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
418
            if self._real_repository is not None:
419
                self._real_repository.lock_read()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
420
        else:
421
            self._lock_count += 1
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
422
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
423
    def _remote_lock_write(self, token):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
424
        path = self.bzrdir._path_for_remote_call(self._client)
425
        if token is None:
426
            token = ''
427
        response = self._client.call('Repository.lock_write', path, token)
428
        if response[0] == 'ok':
429
            ok, token = response
430
            return token
431
        elif response[0] == 'LockContention':
432
            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.
433
        elif response[0] == 'UnlockableTransport':
434
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
435
        elif response[0] == 'LockFailed':
436
            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
437
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
438
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
439
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
440
    def lock_write(self, token=None):
441
        if not self._lock_mode:
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
442
            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
443
            assert self._lock_token, 'Remote server did not return a token!'
444
            if self._real_repository is not None:
445
                self._real_repository.lock_write(token=self._lock_token)
446
            if token is not None:
447
                self._leave_lock = True
448
            else:
449
                self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
450
            self._lock_mode = 'w'
451
            self._lock_count = 1
452
        elif self._lock_mode == 'r':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
453
            raise errors.ReadOnlyError(self)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
454
        else:
455
            self._lock_count += 1
456
        return self._lock_token
457
458
    def leave_lock_in_place(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
459
        self._leave_lock = True
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
460
461
    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
462
        self._leave_lock = False
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
463
464
    def _set_real_repository(self, repository):
465
        """Set the _real_repository for this repository.
466
467
        :param repository: The repository to fallback to for non-hpss
468
            implemented operations.
469
        """
2018.5.97 by Andrew Bennetts
Fix more tests.
470
        assert not isinstance(repository, RemoteRepository)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
471
        self._real_repository = repository
472
        if self._lock_mode == 'w':
473
            # if we are already locked, the real repository must be able to
474
            # acquire the lock with our token.
475
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
476
        elif self._lock_mode == 'r':
477
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
478
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
479
    def start_write_group(self):
480
        """Start a write group on the decorated repository.
481
        
482
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
483
        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``
484
        for older plugins that don't use e.g. the CommitBuilder
485
        facility.
486
        """
487
        self._ensure_real()
488
        return self._real_repository.start_write_group()
489
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
490
    def _unlock(self, token):
491
        path = self.bzrdir._path_for_remote_call(self._client)
492
        response = self._client.call('Repository.unlock', path, token)
493
        if response == ('ok',):
494
            return
495
        elif response[0] == 'TokenMismatch':
496
            raise errors.TokenMismatch(token, '(remote token)')
497
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
498
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
499
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
500
    def unlock(self):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
501
        self._lock_count -= 1
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
502
        if self._lock_count > 0:
503
            return
504
        old_mode = self._lock_mode
505
        self._lock_mode = None
506
        try:
507
            # The real repository is responsible at present for raising an
508
            # exception if it's in an unfinished write group.  However, it
509
            # normally will *not* actually remove the lock from disk - that's
510
            # done by the server on receiving the Repository.unlock call.
511
            # 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
512
            if self._real_repository is not None:
513
                self._real_repository.unlock()
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
514
        finally:
515
            # The rpc-level lock should be released even if there was a
516
            # problem releasing the vfs-based lock.
517
            if old_mode == 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
518
                # Only write-locked repositories need to make a remote method
519
                # 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.
520
                assert self._lock_token, \
521
                    '%s is locked, but has no token' \
522
                    % self
523
                old_token = self._lock_token
524
                self._lock_token = None
525
                if not self._leave_lock:
526
                    self._unlock(old_token)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
527
528
    def break_lock(self):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
529
        # should hand off to the network
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
530
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
531
        return self._real_repository.break_lock()
532
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
533
    def _get_tarball(self, compression):
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
534
        """Return a TemporaryFile containing a repository tarball.
535
        
536
        Returns None if the server does not support sending tarballs.
537
        """
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
538
        import tempfile
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
539
        path = self.bzrdir._path_for_remote_call(self._client)
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
540
        response, protocol = self._client.call_expecting_body(
541
            'Repository.tarball', path, compression)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
542
        if response[0] == 'ok':
543
            # Extract the tarball and return it
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
544
            t = tempfile.NamedTemporaryFile()
545
            # TODO: rpc layer should read directly into it...
546
            t.write(protocol.read_body_bytes())
547
            t.seek(0)
548
            return t
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
549
        if (response == ('error', "Generic bzr smart protocol error: "
550
                "bad request 'Repository.tarball'") or
551
              response == ('error', "Generic bzr smart protocol error: "
552
                "bad request u'Repository.tarball'")):
553
            protocol.cancel_read_body()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
554
            return None
2814.10.1 by Andrew Bennetts
Cope gracefully if the server doesn't support the Repository.tarball smart request.
555
        raise errors.UnexpectedSmartServerResponse(response)
2018.18.8 by Ian Clatworthy
Tarball proxy code & tests
556
2440.1.1 by Martin Pool
Add new Repository.sprout,
557
    def sprout(self, to_bzrdir, revision_id=None):
558
        # TODO: Option to control what format is created?
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
559
        dest_repo = to_bzrdir.create_repository()
560
        dest_repo.fetch(self, revision_id=revision_id)
561
        return dest_repo
2440.1.1 by Martin Pool
Add new Repository.sprout,
562
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
563
    ### These methods are just thin shims to the VFS object for now.
564
565
    def revision_tree(self, revision_id):
566
        self._ensure_real()
567
        return self._real_repository.revision_tree(revision_id)
568
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
569
    def get_serializer_format(self):
570
        self._ensure_real()
571
        return self._real_repository.get_serializer_format()
572
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
573
    def get_commit_builder(self, branch, parents, config, timestamp=None,
574
                           timezone=None, committer=None, revprops=None,
575
                           revision_id=None):
576
        # FIXME: It ought to be possible to call this without immediately
577
        # triggering _ensure_real.  For now it's the easiest thing to do.
578
        self._ensure_real()
579
        builder = self._real_repository.get_commit_builder(branch, parents,
580
                config, timestamp=timestamp, timezone=timezone,
581
                committer=committer, revprops=revprops, revision_id=revision_id)
582
        # Make the builder use this RemoteRepository rather than the real one.
583
        builder.repository = self
584
        return builder
585
586
    @needs_write_lock
587
    def add_inventory(self, revid, inv, parents):
588
        self._ensure_real()
589
        return self._real_repository.add_inventory(revid, inv, parents)
590
591
    @needs_write_lock
592
    def add_revision(self, rev_id, rev, inv=None, config=None):
593
        self._ensure_real()
594
        return self._real_repository.add_revision(
595
            rev_id, rev, inv=inv, config=config)
596
597
    @needs_read_lock
598
    def get_inventory(self, revision_id):
599
        self._ensure_real()
600
        return self._real_repository.get_inventory(revision_id)
601
602
    @needs_read_lock
603
    def get_revision(self, revision_id):
604
        self._ensure_real()
605
        return self._real_repository.get_revision(revision_id)
606
607
    @property
608
    def weave_store(self):
609
        self._ensure_real()
610
        return self._real_repository.weave_store
611
612
    def get_transaction(self):
613
        self._ensure_real()
614
        return self._real_repository.get_transaction()
615
616
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
617
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
618
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
619
        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.
620
621
    def make_working_trees(self):
2018.5.120 by Robert Collins
The Repository API ``make_working_trees`` is now permitted to return
622
        """RemoteRepositories never create working trees by default."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
623
        return False
624
625
    def fetch(self, source, revision_id=None, pb=None):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
626
        if self.has_same_location(source):
627
            # check that last_revision is in 'from' and then return a
628
            # no-operation.
629
            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.
630
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
631
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
632
            return 0, []
2592.3.119 by Robert Collins
Merge some test fixes from Martin.
633
        self._ensure_real()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
634
        return self._real_repository.fetch(
635
            source, revision_id=revision_id, pb=pb)
636
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
637
    def create_bundle(self, target, base, fileobj, format=None):
638
        self._ensure_real()
639
        self._real_repository.create_bundle(target, base, fileobj, format)
640
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
641
    @property
642
    def control_weaves(self):
643
        self._ensure_real()
644
        return self._real_repository.control_weaves
645
646
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
647
    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.
648
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
649
        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.
650
651
    @needs_read_lock
652
    def get_inventory_weave(self):
653
        self._ensure_real()
654
        return self._real_repository.get_inventory_weave()
655
656
    def fileids_altered_by_revision_ids(self, revision_ids):
657
        self._ensure_real()
658
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
659
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
660
    def get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
661
        self._ensure_real()
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
662
        return self._real_repository.get_versioned_file_checker(
663
            revisions, revision_versions_cache)
664
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
665
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
666
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
667
        """
668
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
669
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
670
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
671
    @needs_read_lock
672
    def get_signature_text(self, revision_id):
673
        self._ensure_real()
674
        return self._real_repository.get_signature_text(revision_id)
675
676
    @needs_read_lock
677
    def get_revision_graph_with_ghosts(self, revision_ids=None):
678
        self._ensure_real()
679
        return self._real_repository.get_revision_graph_with_ghosts(
680
            revision_ids=revision_ids)
681
682
    @needs_read_lock
683
    def get_inventory_xml(self, revision_id):
684
        self._ensure_real()
685
        return self._real_repository.get_inventory_xml(revision_id)
686
687
    def deserialise_inventory(self, revision_id, xml):
688
        self._ensure_real()
689
        return self._real_repository.deserialise_inventory(revision_id, xml)
690
691
    def reconcile(self, other=None, thorough=False):
692
        self._ensure_real()
693
        return self._real_repository.reconcile(other=other, thorough=thorough)
694
        
695
    def all_revision_ids(self):
696
        self._ensure_real()
697
        return self._real_repository.all_revision_ids()
698
    
699
    @needs_read_lock
700
    def get_deltas_for_revisions(self, revisions):
701
        self._ensure_real()
702
        return self._real_repository.get_deltas_for_revisions(revisions)
703
704
    @needs_read_lock
705
    def get_revision_delta(self, revision_id):
706
        self._ensure_real()
707
        return self._real_repository.get_revision_delta(revision_id)
708
709
    @needs_read_lock
710
    def revision_trees(self, revision_ids):
711
        self._ensure_real()
712
        return self._real_repository.revision_trees(revision_ids)
713
714
    @needs_read_lock
715
    def get_revision_reconcile(self, revision_id):
716
        self._ensure_real()
717
        return self._real_repository.get_revision_reconcile(revision_id)
718
719
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
720
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
721
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
722
        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.
723
2018.5.138 by Robert Collins
Merge bzr.dev.
724
    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.
725
        self._ensure_real()
726
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
727
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
728
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
729
    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.
730
        # get a tarball of the remote repository, and copy from that into the
731
        # destination
732
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
733
        import tarfile
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
734
        import tempfile
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
735
        from StringIO import StringIO
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
736
        # TODO: Maybe a progress bar while streaming the tarball?
737
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
738
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
739
        if tar_file is None:
740
            return None
741
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
742
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
743
            tar = tarfile.open('repository', fileobj=tar_file,
744
                mode='r|bz2')
745
            tmpdir = tempfile.mkdtemp()
746
            try:
747
                _extract_tar(tar, tmpdir)
748
                tmp_bzrdir = BzrDir.open(tmpdir)
749
                tmp_repo = tmp_bzrdir.open_repository()
750
                tmp_repo.copy_content_into(destination, revision_id)
751
            finally:
752
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
753
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
754
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
755
        return destination
2018.18.23 by Martin Pool
review cleanups
756
        # TODO: Suggestion from john: using external tar is much faster than
757
        # 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.
758
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
759
    @needs_write_lock
760
    def pack(self):
761
        """Compress the data within the repository.
762
763
        This is not currently implemented within the smart server.
764
        """
765
        self._ensure_real()
766
        return self._real_repository.pack()
767
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
768
    def set_make_working_trees(self, new_value):
769
        raise NotImplementedError(self.set_make_working_trees)
770
771
    @needs_write_lock
772
    def sign_revision(self, revision_id, gpg_strategy):
773
        self._ensure_real()
774
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
775
776
    @needs_read_lock
777
    def get_revisions(self, revision_ids):
778
        self._ensure_real()
779
        return self._real_repository.get_revisions(revision_ids)
780
781
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
782
        self._ensure_real()
783
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
784
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
785
    def iter_reverse_revision_history(self, revision_id):
786
        self._ensure_real()
787
        return self._real_repository.iter_reverse_revision_history(revision_id)
788
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
789
    @property
790
    def _serializer(self):
791
        self._ensure_real()
792
        return self._real_repository._serializer
793
2018.5.97 by Andrew Bennetts
Fix more tests.
794
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
795
        self._ensure_real()
796
        return self._real_repository.store_revision_signature(
797
            gpg_strategy, plaintext, revision_id)
798
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
799
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
800
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
801
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
802
2018.5.97 by Andrew Bennetts
Fix more tests.
803
    def has_signature_for_revision_id(self, revision_id):
804
        self._ensure_real()
805
        return self._real_repository.has_signature_for_revision_id(revision_id)
806
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
807
    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.
808
        path = self.bzrdir._path_for_remote_call(self._client)
809
        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'.
810
            'Repository.stream_knit_data_for_revisions', path, *revision_ids)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
811
        if response == ('ok',):
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
812
            return self._deserialise_stream(protocol)
813
        elif (response == ('error', "Generic bzr smart protocol error: "
814
                "bad request 'Repository.stream_knit_data_for_revisions'") or
815
              response == ('error', "Generic bzr smart protocol error: "
816
                "bad request u'Repository.stream_knit_data_for_revisions'")):
817
            protocol.cancel_read_body()
818
            self._ensure_real()
819
            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.
820
        else:
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
821
            raise errors.UnexpectedSmartServerResponse(response)
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
822
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
823
    def _deserialise_stream(self, protocol):
824
        buffer = StringIO(protocol.read_body_bytes())
825
        reader = ContainerReader(buffer)
826
        for record_names, read_bytes in reader.iter_records():
827
            try:
828
                # These records should have only one name, and that name
829
                # should be a one-element tuple.
830
                [name_tuple] = record_names
831
            except ValueError:
832
                raise errors.SmartProtocolError(
833
                    'Repository data stream had invalid record name %r'
834
                    % (record_names,))
835
            yield name_tuple, read_bytes(None)
836
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
837
    def insert_data_stream(self, stream):
838
        self._ensure_real()
839
        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.
840
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
841
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
842
        self._ensure_real()
843
        return self._real_repository.item_keys_introduced_by(revision_ids,
844
            _files_pb=_files_pb)
845
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
846
    def revision_graph_can_have_wrong_parents(self):
847
        # The answer depends on the remote repo format.
848
        self._ensure_real()
849
        return self._real_repository.revision_graph_can_have_wrong_parents()
850
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
851
    def _find_inconsistent_revision_parents(self):
852
        self._ensure_real()
853
        return self._real_repository._find_inconsistent_revision_parents()
854
855
    def _check_for_inconsistent_revision_parents(self):
856
        self._ensure_real()
857
        return self._real_repository._check_for_inconsistent_revision_parents()
858
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
859
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
860
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
861
    """A 'LockableFiles' implementation that talks to a smart server.
862
    
863
    This is not a public interface class.
864
    """
865
866
    def __init__(self, bzrdir, _client):
867
        self.bzrdir = bzrdir
868
        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.
869
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
870
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
871
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
872
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
873
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.
874
    def _find_modes(self):
875
        # RemoteBranches don't let the client set the mode of control files.
876
        self._dir_mode = None
877
        self._file_mode = None
878
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
879
    def get(self, path):
880
        """'get' a remote path as per the LockableFiles interface.
881
882
        :param path: the file to 'get'. If this is 'branch.conf', we do not
883
             just retrieve a file, instead we ask the smart server to generate
884
             a configuration for us - which is retrieved as an INI file.
885
        """
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
886
        if path == 'branch.conf':
887
            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.
888
            response = self._client.call_expecting_body(
889
                'Branch.get_config_file', path)
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
890
            assert response[0][0] == 'ok', \
891
                'unexpected response code %s' % (response[0],)
892
            return StringIO(response[1].read_body_bytes())
893
        else:
894
            # VFS fallback.
895
            return LockableFiles.get(self, path)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
896
897
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
898
class RemoteBranchFormat(branch.BranchFormat):
899
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.
900
    def __eq__(self, other):
901
        return (isinstance(other, RemoteBranchFormat) and 
902
            self.__dict__ == other.__dict__)
903
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
904
    def get_format_description(self):
905
        return 'Remote BZR Branch'
906
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
907
    def get_format_string(self):
908
        return 'Remote BZR Branch'
909
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
910
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
911
        assert isinstance(a_bzrdir, RemoteBzrDir)
912
        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.
913
914
    def initialize(self, a_bzrdir):
915
        assert isinstance(a_bzrdir, RemoteBzrDir)
916
        return a_bzrdir.create_branch()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
917
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
918
    def supports_tags(self):
919
        # Remote branches might support tags, but we won't know until we
920
        # access the real remote branch.
921
        return True
922
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
923
924
class RemoteBranch(branch.Branch):
925
    """Branch stored on a server accessed by HPSS RPC.
926
927
    At the moment most operations are mapped down to simple file operations.
928
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
929
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
930
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
931
        _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.
932
        """Create a RemoteBranch instance.
933
934
        :param real_branch: An optional local implementation of the branch
935
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
936
        :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.
937
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
938
        # We intentionally don't call the parent class's __init__, because it
939
        # will try to assign to self.tags, which is a property in this subclass.
940
        # 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.
941
        self._revision_id_to_revno_cache = None
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
942
        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.
943
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
944
        if _client is not None:
945
            self._client = _client
946
        else:
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
947
            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.
948
        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.
949
        if real_branch is not None:
950
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
951
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
952
            real_repo = self._real_branch.repository
953
            if isinstance(real_repo, RemoteRepository):
954
                real_repo._ensure_real()
955
                real_repo = real_repo._real_repository
956
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
957
            # Give the branch the remote repository to let fast-pathing happen.
958
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
959
        else:
960
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
961
        # 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.
962
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
963
        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.
964
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
965
        self._lock_mode = None
966
        self._lock_token = None
967
        self._lock_count = 0
968
        self._leave_lock = False
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
969
2477.1.1 by Martin Pool
Add RemoteBranch repr
970
    def __str__(self):
971
        return "%s(%s)" % (self.__class__.__name__, self.base)
972
973
    __repr__ = __str__
974
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
975
    def _ensure_real(self):
976
        """Ensure that there is a _real_branch set.
977
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
978
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
979
        """
980
        if not self._real_branch:
981
            assert vfs.vfs_enabled()
982
            self.bzrdir._ensure_real()
983
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
984
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
985
            real_repo = self._real_branch.repository
986
            if isinstance(real_repo, RemoteRepository):
987
                real_repo._ensure_real()
988
                real_repo = real_repo._real_repository
989
            self.repository._set_real_repository(real_repo)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
990
            # 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.
991
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
992
            # XXX: deal with _lock_mode == 'w'
993
            if self._lock_mode == 'r':
994
                self._real_branch.lock_read()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
995
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.
996
    @property
997
    def control_files(self):
998
        # Defer actually creating RemoteBranchLockableFiles until its needed,
999
        # because it triggers an _ensure_real that we otherwise might not need.
1000
        if self._control_files is None:
1001
            self._control_files = RemoteBranchLockableFiles(
1002
                self.bzrdir, self._client)
1003
        return self._control_files
1004
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1005
    def _get_checkout_format(self):
1006
        self._ensure_real()
1007
        return self._real_branch._get_checkout_format()
1008
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1009
    def get_physical_lock_status(self):
1010
        """See Branch.get_physical_lock_status()."""
1011
        # 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.
1012
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1013
        return self._real_branch.get_physical_lock_status()
1014
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1015
    def lock_read(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1016
        if not self._lock_mode:
1017
            self._lock_mode = 'r'
1018
            self._lock_count = 1
1019
            if self._real_branch is not None:
1020
                self._real_branch.lock_read()
1021
        else:
1022
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1023
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).
1024
    def _remote_lock_write(self, token):
1025
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1026
            branch_token = repo_token = ''
1027
        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).
1028
            branch_token = token
1029
            repo_token = self.repository.lock_write()
1030
            self.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1031
        path = self.bzrdir._path_for_remote_call(self._client)
1032
        response = self._client.call('Branch.lock_write', path, branch_token,
1033
                                     repo_token)
1034
        if response[0] == 'ok':
1035
            ok, branch_token, repo_token = response
1036
            return branch_token, repo_token
1037
        elif response[0] == 'LockContention':
1038
            raise errors.LockContention('(remote lock)')
1039
        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).
1040
            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.
1041
        elif response[0] == 'UnlockableTransport':
1042
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
2018.5.123 by Robert Collins
Translate ReadOnlyError in RemoteBranch._remote_lock_write.
1043
        elif response[0] == 'ReadOnlyError':
1044
            raise errors.ReadOnlyError(self)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
1045
        elif response[0] == 'LockFailed':
1046
            raise errors.LockFailed(response[1], response[2])
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1047
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1048
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1049
            
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).
1050
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1051
        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).
1052
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1053
            self._lock_token, self._repo_lock_token = remote_tokens
1054
            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.
1055
            # TODO: We really, really, really don't want to call _ensure_real
1056
            # here, but it's the easiest way to ensure coherency between the
1057
            # state of the RemoteBranch and RemoteRepository objects and the
1058
            # physical locks.  If we don't materialise the real objects here,
1059
            # then getting everything in the right state later is complex, so
1060
            # for now we just do it the lazy way.
1061
            #   -- Andrew Bennetts, 2007-02-22.
1062
            self._ensure_real()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1063
            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).
1064
                self._real_branch.repository.lock_write(
1065
                    token=self._repo_lock_token)
1066
                try:
1067
                    self._real_branch.lock_write(token=self._lock_token)
1068
                finally:
1069
                    self._real_branch.repository.unlock()
1070
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1071
                self._leave_lock = True
1072
            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).
1073
                # 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.
1074
                self._leave_lock = False
1075
            self._lock_mode = 'w'
1076
            self._lock_count = 1
1077
        elif self._lock_mode == 'r':
1078
            raise errors.ReadOnlyTransaction
1079
        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).
1080
            if token is not None:
1081
                # A token was given to lock_write, and we're relocking, so check
1082
                # that the given token actually matches the one we already have.
1083
                if token != self._lock_token:
1084
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1085
            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).
1086
        return self._lock_token
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1087
1088
    def _unlock(self, branch_token, repo_token):
1089
        path = self.bzrdir._path_for_remote_call(self._client)
1090
        response = self._client.call('Branch.unlock', path, branch_token,
1091
                                     repo_token)
1092
        if response == ('ok',):
1093
            return
1094
        elif response[0] == 'TokenMismatch':
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1095
            raise errors.TokenMismatch(
1096
                str((branch_token, repo_token)), '(remote tokens)')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1097
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1098
            raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1099
1100
    def unlock(self):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1101
        self._lock_count -= 1
1102
        if not self._lock_count:
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1103
            self._clear_cached_state()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1104
            mode = self._lock_mode
1105
            self._lock_mode = None
1106
            if self._real_branch is not None:
2018.15.1 by Andrew Bennetts
All branch_implementations/test_locking tests passing.
1107
                if not self._leave_lock:
1108
                    # If this RemoteBranch will remove the physical lock for the
1109
                    # repository, make sure the _real_branch doesn't do it
1110
                    # first.  (Because the _real_branch's repository is set to
1111
                    # be the RemoteRepository.)
1112
                    self._real_branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1113
                self._real_branch.unlock()
1114
            if mode != 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1115
                # Only write-locked branched need to make a remote method call
1116
                # to perfom the unlock.
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1117
                return
1118
            assert self._lock_token, 'Locked, but no token!'
1119
            branch_token = self._lock_token
1120
            repo_token = self._repo_lock_token
1121
            self._lock_token = None
1122
            self._repo_lock_token = None
1123
            if not self._leave_lock:
1124
                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.
1125
1126
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1127
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1128
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1129
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1130
    def leave_lock_in_place(self):
1131
        self._leave_lock = True
1132
1133
    def dont_leave_lock_in_place(self):
1134
        self._leave_lock = False
1135
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1136
    def last_revision_info(self):
1137
        """See Branch.last_revision_info()."""
1138
        path = self.bzrdir._path_for_remote_call(self._client)
1139
        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
1140
        assert response[0] == 'ok', 'unexpected response code %s' % (response,)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1141
        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.
1142
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1143
        return (revno, last_revision)
1144
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1145
    def _gen_revision_history(self):
1146
        """See Branch._gen_revision_history()."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1147
        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.
1148
        response = self._client.call_expecting_body(
1149
            'Branch.revision_history', path)
1150
        assert response[0][0] == 'ok', ('unexpected response code %s'
1151
                                        % (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.
1152
        result = response[1].read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1153
        if result == ['']:
1154
            return []
1155
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1156
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1157
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1158
    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.
1159
        # Send just the tip revision of the history; the server will generate
1160
        # the full history from that.  If the revision doesn't exist in this
1161
        # branch, NoSuchRevision will be raised.
1162
        path = self.bzrdir._path_for_remote_call(self._client)
1163
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1164
            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.
1165
        else:
1166
            rev_id = rev_history[-1]
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
1167
        self._clear_cached_state()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1168
        response = self._client.call('Branch.set_last_revision',
1169
            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.
1170
        if response[0] == 'NoSuchRevision':
1171
            raise NoSuchRevision(self, rev_id)
1172
        else:
1173
            assert response == ('ok',), (
1174
                'unexpected response code %r' % (response,))
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1175
        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.
1176
1177
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1178
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1179
        return self._real_branch.get_parent()
1180
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1181
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1182
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1183
        return self._real_branch.set_parent(url)
1184
        
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1185
    def get_config(self):
1186
        return RemoteBranchConfig(self)
1187
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1188
    def sprout(self, to_bzrdir, revision_id=None):
1189
        # Like Branch.sprout, except that it sprouts a branch in the default
1190
        # format, because RemoteBranches can't be created at arbitrary URLs.
1191
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1192
        # to_bzrdir.create_branch...
1193
        result = branch.BranchFormat.get_default_format().initialize(to_bzrdir)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1194
        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).
1195
        result.set_parent(self.bzrdir.root_transport.base)
1196
        return result
1197
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1198
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1199
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1200
             **kwargs):
1201
        # FIXME: This asks the real branch to run the hooks, which means
1202
        # they're called with the wrong target branch parameter. 
1203
        # The test suite specifically allows this at present but it should be
1204
        # fixed.  It should get a _override_hook_target branch,
1205
        # as push does.  -- mbp 20070405
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1206
        self._ensure_real()
1207
        self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1208
            source, overwrite=overwrite, stop_revision=stop_revision,
1209
            **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1210
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1211
    @needs_read_lock
1212
    def push(self, target, overwrite=False, stop_revision=None):
1213
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1214
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1215
            target, overwrite=overwrite, stop_revision=stop_revision,
1216
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1217
1218
    def is_locked(self):
1219
        return self._lock_count >= 1
1220
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1221
    def set_last_revision_info(self, revno, revision_id):
1222
        self._ensure_real()
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1223
        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.
1224
        return self._real_branch.set_last_revision_info(revno, revision_id)
1225
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
1226
    def generate_revision_history(self, revision_id, last_rev=None,
1227
                                  other_branch=None):
1228
        self._ensure_real()
1229
        return self._real_branch.generate_revision_history(
1230
            revision_id, last_rev=last_rev, other_branch=other_branch)
1231
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1232
    @property
1233
    def tags(self):
1234
        self._ensure_real()
1235
        return self._real_branch.tags
1236
2018.5.97 by Andrew Bennetts
Fix more tests.
1237
    def set_push_location(self, location):
1238
        self._ensure_real()
1239
        return self._real_branch.set_push_location(location)
1240
1241
    def update_revisions(self, other, stop_revision=None):
1242
        self._ensure_real()
1243
        return self._real_branch.update_revisions(
1244
            other, stop_revision=stop_revision)
1245
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1246
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1247
class RemoteBranchConfig(BranchConfig):
1248
1249
    def username(self):
1250
        self.branch._ensure_real()
1251
        return self.branch._real_branch.get_config().username()
1252
2018.14.2 by Andrew Bennetts
All but one repository_implementation tests for RemoteRepository passing.
1253
    def _get_branch_data_config(self):
1254
        self.branch._ensure_real()
1255
        if self._branch_data_config is None:
1256
            self._branch_data_config = TreeConfig(self.branch._real_branch)
1257
        return self._branch_data_config
1258
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1259
1260
def _extract_tar(tar, to_dir):
1261
    """Extract all the contents of a tarfile object.
1262
1263
    A replacement for extractall, which is not present in python2.4
1264
    """
1265
    for tarinfo in tar:
1266
        tar.extract(tarinfo, to_dir)