/brz/remove-bazaar

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