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