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