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