/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
    def get_transaction(self):
723
        self._ensure_real()
724
        return self._real_repository.get_transaction()
725
726
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
727
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
728
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
729
        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.
730
731
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
732
        """See Repository.make_working_trees"""
733
        self._ensure_real()
734
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
735
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
736
    def revision_ids_to_search_result(self, result_set):
737
        """Convert a set of revision ids to a graph SearchResult."""
738
        result_parents = set()
739
        for parents in self.get_graph().get_parent_map(
740
            result_set).itervalues():
741
            result_parents.update(parents)
742
        included_keys = result_set.intersection(result_parents)
743
        start_keys = result_set.difference(included_keys)
744
        exclude_keys = result_parents.difference(result_set)
745
        result = graph.SearchResult(start_keys, exclude_keys,
746
            len(result_set), result_set)
747
        return result
748
749
    @needs_read_lock
750
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
751
        """Return the revision ids that other has that this does not.
752
        
753
        These are returned in topological order.
754
755
        revision_id: only return revision ids included by revision_id.
756
        """
757
        return repository.InterRepository.get(
758
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
759
3452.2.1 by Andrew Bennetts
An experimental InterRepo for remote packs.
760
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
761
        # Not delegated to _real_repository so that InterRepository.get has a
762
        # chance to find an InterRepository specialised for RemoteRepository.
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
763
        if self.has_same_location(source):
764
            # check that last_revision is in 'from' and then return a
765
            # no-operation.
766
            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.
767
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
768
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
769
            return 0, []
3452.2.1 by Andrew Bennetts
An experimental InterRepo for remote packs.
770
        inter = InterRepository.get(source, self)
771
        try:
772
            return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
773
        except NotImplementedError:
774
            raise errors.IncompatibleRepositories(source, self)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
775
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
776
    def create_bundle(self, target, base, fileobj, format=None):
777
        self._ensure_real()
778
        self._real_repository.create_bundle(target, base, fileobj, format)
779
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
780
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
781
    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.
782
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
783
        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.
784
785
    def fileids_altered_by_revision_ids(self, revision_ids):
786
        self._ensure_real()
787
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
788
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
789
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
790
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
791
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
792
            revisions, revision_versions_cache)
793
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
794
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
795
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
796
        """
797
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
798
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
799
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
800
    def get_parent_map(self, keys):
801
        """See bzrlib.Graph.get_parent_map()."""
802
        # Hack to build up the caching logic.
803
        ancestry = self._parents_map
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
804
        if ancestry is None:
805
            # Repository is not locked, so there's no cache.
806
            missing_revisions = set(keys)
807
            ancestry = {}
808
        else:
809
            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.
810
        if missing_revisions:
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
811
            parent_map = self._get_parent_map(missing_revisions)
812
            if 'hpss' in debug.debug_flags:
813
                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.
814
                        len(set(ancestry).intersection(parent_map)),
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
815
                        len(parent_map))
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
816
            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.
817
        present_keys = [k for k in keys if k in ancestry]
3452.2.10 by Andrew Bennetts
Remove and False.
818
        if 'hpss' in debug.debug_flags:
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
819
            if self._requested_parents is not None and len(ancestry) != 0:
820
                self._requested_parents.update(present_keys)
821
                mutter('Current RemoteRepository graph hit rate: %d%%',
822
                    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.
823
        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.
824
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
825
    def _get_parent_map(self, keys):
826
        """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.
827
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
828
        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.
829
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
830
            # 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.
831
            # graph.
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
832
            # XXX: Note that this will issue a deprecation warning. This is ok
833
            # :- its because we're working with a deprecated server anyway, and
834
            # the user will almost certainly have seen a warning about the
835
            # server version already.
3389.1.1 by John Arbash Meinel
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
836
            rg = self.get_revision_graph()
837
            # There is an api discrepency between get_parent_map and
838
            # get_revision_graph. Specifically, a "key:()" pair in
839
            # get_revision_graph just means a node has no parents. For
840
            # "get_parent_map" it means the node is a ghost. So fix up the
841
            # graph to correct this.
842
            #   https://bugs.launchpad.net/bzr/+bug/214894
843
            # There is one other "bug" which is that ghosts in
844
            # get_revision_graph() are not returned at all. But we won't worry
845
            # about that for now.
846
            for node_id, parent_ids in rg.iteritems():
847
                if parent_ids == ():
848
                    rg[node_id] = (NULL_REVISION,)
849
            rg[NULL_REVISION] = ()
850
            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.
851
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
852
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
853
        if None in keys:
854
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
855
        if NULL_REVISION in keys:
856
            keys.discard(NULL_REVISION)
857
            found_parents = {NULL_REVISION:()}
858
            if not keys:
859
                return found_parents
860
        else:
861
            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.
862
        # TODO(Needs analysis): We could assume that the keys being requested
863
        # from get_parent_map are in a breadth first search, so typically they
864
        # will all be depth N from some common parent, and we don't have to
865
        # have the server iterate from the root parent, but rather from the
866
        # keys we're searching; and just tell the server the keyspace we
867
        # already have; but this may be more traffic again.
868
869
        # Transform self._parents_map into a search request recipe.
870
        # TODO: Manage this incrementally to avoid covering the same path
871
        # repeatedly. (The server will have to on each request, but the less
872
        # work done the better).
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
873
        parents_map = self._parents_map
874
        if parents_map is None:
875
            # Repository is not locked, so there's no cache.
876
            parents_map = {}
877
        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.
878
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
879
        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.
880
            result_parents.update(parents)
881
        stop_keys = result_parents.difference(start_set)
882
        included_keys = start_set.intersection(result_parents)
883
        start_set.difference_update(included_keys)
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
884
        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.
885
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
886
        path = self.bzrdir._path_for_remote_call(self._client)
887
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
888
            if type(key) is not str:
889
                raise ValueError(
890
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
891
        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.
892
        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.
893
        try:
894
            response = self._client.call_with_body_bytes_expecting_body(
895
                verb, args, self._serialise_search_recipe(recipe))
896
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
897
            # 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.
898
            # Worse, we have to force a disconnection, because the server now
899
            # doesn't realise it has a body on the wire to consume, so the
900
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
901
            warning(
902
                'Server is too old for fast get_parent_map, reconnecting.  '
903
                '(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.
904
            medium.disconnect()
905
            # To avoid having to disconnect repeatedly, we keep track of the
906
            # 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.
907
            medium._remember_remote_is_before((1, 2))
3297.3.4 by Andrew Bennetts
Merge from bzr.dev.
908
            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.
909
        response_tuple, response_handler = response
910
        if response_tuple[0] not in ['ok']:
911
            response_handler.cancel_read_body()
912
            raise errors.UnexpectedSmartServerResponse(response_tuple)
913
        if response_tuple[0] == 'ok':
914
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
915
            if coded == '':
916
                # no revisions found
917
                return {}
918
            lines = coded.split('\n')
919
            revision_graph = {}
920
            for line in lines:
921
                d = tuple(line.split())
922
                if len(d) > 1:
923
                    revision_graph[d[0]] = d[1:]
924
                else:
925
                    # No parents - so give the Graph result (NULL_REVISION,).
926
                    revision_graph[d[0]] = (NULL_REVISION,)
927
            return revision_graph
928
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
929
    @needs_read_lock
930
    def get_signature_text(self, revision_id):
931
        self._ensure_real()
932
        return self._real_repository.get_signature_text(revision_id)
933
934
    @needs_read_lock
3228.4.11 by John Arbash Meinel
Deprecations abound.
935
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
936
    def get_revision_graph_with_ghosts(self, revision_ids=None):
937
        self._ensure_real()
938
        return self._real_repository.get_revision_graph_with_ghosts(
939
            revision_ids=revision_ids)
940
941
    @needs_read_lock
942
    def get_inventory_xml(self, revision_id):
943
        self._ensure_real()
944
        return self._real_repository.get_inventory_xml(revision_id)
945
946
    def deserialise_inventory(self, revision_id, xml):
947
        self._ensure_real()
948
        return self._real_repository.deserialise_inventory(revision_id, xml)
949
950
    def reconcile(self, other=None, thorough=False):
951
        self._ensure_real()
952
        return self._real_repository.reconcile(other=other, thorough=thorough)
953
        
954
    def all_revision_ids(self):
955
        self._ensure_real()
956
        return self._real_repository.all_revision_ids()
957
    
958
    @needs_read_lock
959
    def get_deltas_for_revisions(self, revisions):
960
        self._ensure_real()
961
        return self._real_repository.get_deltas_for_revisions(revisions)
962
963
    @needs_read_lock
964
    def get_revision_delta(self, revision_id):
965
        self._ensure_real()
966
        return self._real_repository.get_revision_delta(revision_id)
967
968
    @needs_read_lock
969
    def revision_trees(self, revision_ids):
970
        self._ensure_real()
971
        return self._real_repository.revision_trees(revision_ids)
972
973
    @needs_read_lock
974
    def get_revision_reconcile(self, revision_id):
975
        self._ensure_real()
976
        return self._real_repository.get_revision_reconcile(revision_id)
977
978
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
979
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
980
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
981
        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.
982
2018.5.138 by Robert Collins
Merge bzr.dev.
983
    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.
984
        self._ensure_real()
985
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
986
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
987
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
988
    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.
989
        # get a tarball of the remote repository, and copy from that into the
990
        # destination
991
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
992
        import tarfile
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
993
        import tempfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
994
        # TODO: Maybe a progress bar while streaming the tarball?
995
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
996
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
997
        if tar_file is None:
998
            return None
999
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1000
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1001
            tar = tarfile.open('repository', fileobj=tar_file,
1002
                mode='r|bz2')
1003
            tmpdir = tempfile.mkdtemp()
1004
            try:
1005
                _extract_tar(tar, tmpdir)
1006
                tmp_bzrdir = BzrDir.open(tmpdir)
1007
                tmp_repo = tmp_bzrdir.open_repository()
1008
                tmp_repo.copy_content_into(destination, revision_id)
1009
            finally:
1010
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1011
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1012
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1013
        return destination
2018.18.23 by Martin Pool
review cleanups
1014
        # TODO: Suggestion from john: using external tar is much faster than
1015
        # 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.
1016
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1017
    @property
1018
    def inventories(self):
1019
        """Decorate the real repository for now.
1020
1021
        In the long term a full blown network facility is needed to
1022
        avoid creating a real repository object locally.
1023
        """
1024
        self._ensure_real()
1025
        return self._real_repository.inventories
1026
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1027
    @needs_write_lock
1028
    def pack(self):
1029
        """Compress the data within the repository.
1030
1031
        This is not currently implemented within the smart server.
1032
        """
1033
        self._ensure_real()
1034
        return self._real_repository.pack()
1035
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1036
    @property
1037
    def revisions(self):
1038
        """Decorate the real repository for now.
1039
1040
        In the short term this should become a real object to intercept graph
1041
        lookups.
1042
1043
        In the long term a full blown network facility is needed.
1044
        """
1045
        self._ensure_real()
1046
        return self._real_repository.revisions
1047
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1048
    def set_make_working_trees(self, new_value):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1049
        self._ensure_real()
1050
        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.
1051
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1052
    @property
1053
    def signatures(self):
1054
        """Decorate the real repository for now.
1055
1056
        In the long term a full blown network facility is needed to avoid
1057
        creating a real repository object locally.
1058
        """
1059
        self._ensure_real()
1060
        return self._real_repository.signatures
1061
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1062
    @needs_write_lock
1063
    def sign_revision(self, revision_id, gpg_strategy):
1064
        self._ensure_real()
1065
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
1066
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1067
    @property
1068
    def texts(self):
1069
        """Decorate the real repository for now.
1070
1071
        In the long term a full blown network facility is needed to avoid
1072
        creating a real repository object locally.
1073
        """
1074
        self._ensure_real()
1075
        return self._real_repository.texts
1076
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1077
    @needs_read_lock
1078
    def get_revisions(self, revision_ids):
1079
        self._ensure_real()
1080
        return self._real_repository.get_revisions(revision_ids)
1081
1082
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
1083
        self._ensure_real()
1084
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1085
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1086
    def iter_reverse_revision_history(self, revision_id):
1087
        self._ensure_real()
1088
        return self._real_repository.iter_reverse_revision_history(revision_id)
1089
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1090
    @property
1091
    def _serializer(self):
1092
        self._ensure_real()
1093
        return self._real_repository._serializer
1094
2018.5.97 by Andrew Bennetts
Fix more tests.
1095
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1096
        self._ensure_real()
1097
        return self._real_repository.store_revision_signature(
1098
            gpg_strategy, plaintext, revision_id)
1099
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1100
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1101
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1102
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1103
2018.5.97 by Andrew Bennetts
Fix more tests.
1104
    def has_signature_for_revision_id(self, revision_id):
1105
        self._ensure_real()
1106
        return self._real_repository.has_signature_for_revision_id(revision_id)
1107
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1108
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1109
        self._ensure_real()
1110
        return self._real_repository.item_keys_introduced_by(revision_ids,
1111
            _files_pb=_files_pb)
1112
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1113
    def revision_graph_can_have_wrong_parents(self):
1114
        # The answer depends on the remote repo format.
1115
        self._ensure_real()
1116
        return self._real_repository.revision_graph_can_have_wrong_parents()
1117
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1118
    def _find_inconsistent_revision_parents(self):
1119
        self._ensure_real()
1120
        return self._real_repository._find_inconsistent_revision_parents()
1121
1122
    def _check_for_inconsistent_revision_parents(self):
1123
        self._ensure_real()
1124
        return self._real_repository._check_for_inconsistent_revision_parents()
1125
3089.2.1 by Andrew Bennetts
Implement RemoteRepository._make_parents_provider.
1126
    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.
1127
        return self
1128
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.
1129
    def _serialise_search_recipe(self, recipe):
1130
        """Serialise a graph search recipe.
1131
1132
        :param recipe: A search recipe (start, stop, count).
1133
        :return: Serialised bytes.
1134
        """
1135
        start_keys = ' '.join(recipe[0])
1136
        stop_keys = ' '.join(recipe[1])
1137
        count = str(recipe[2])
1138
        return '\n'.join((start_keys, stop_keys, count))
1139
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1140
    def autopack(self):
1141
        path = self.bzrdir._path_for_remote_call(self._client)
1142
        self._client.call('PackRepository.autopack', path)
1143
1144
1145
class RemotePacker(Packer):
1146
1147
    def __init__(self, path, client, pack_collection, packs, suffix, revision_ids=None):
1148
        self.path = path
1149
        self.client = client
1150
        Packer.__init__(self, pack_collection, packs, suffix, revision_ids)
1151
1152
    def _check_references(self):
1153
        external_refs = self.new_pack._external_compression_parents_of_texts()
1154
        if external_refs:
1155
            try:
3452.2.6 by Andrew Bennetts
Batch get_parent_map calls in InterPackToRemotePack._walk_to_common_revisions to
1156
                # XXX: external_refs can be pretty long.  It's probably still
1157
                # more time- and bandwidth-efficient to send this list rather
3452.2.7 by Andrew Bennetts
Elaborate on comment.
1158
                # than doing lots of readvs, but ideally we wouldn't duplicate
1159
                # the data that's in the pack we're about to transfer.
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1160
                self.client.call(
3452.2.6 by Andrew Bennetts
Batch get_parent_map calls in InterPackToRemotePack._walk_to_common_revisions to
1161
                    'PackRepository.check_references', self.path,
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1162
                    *external_refs)
1163
            except errors.ErrorFromSmartServer, err:
1164
                if err.error_verb == 'RevisionNotPresent':
1165
                    missing_revision_id, missing_file_id = err.error_args
1166
                    raise errors.RevisionNotPresent(
1167
                        missing_revision_id, missing_file_id)
1168
                raise
1169
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1170
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1171
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1172
    """A 'LockableFiles' implementation that talks to a smart server.
1173
    
1174
    This is not a public interface class.
1175
    """
1176
1177
    def __init__(self, bzrdir, _client):
1178
        self.bzrdir = bzrdir
1179
        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.
1180
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1181
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1182
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1183
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1184
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.
1185
    def _find_modes(self):
1186
        # RemoteBranches don't let the client set the mode of control files.
1187
        self._dir_mode = None
1188
        self._file_mode = None
1189
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1190
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1191
class RemoteBranchFormat(branch.BranchFormat):
1192
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.
1193
    def __eq__(self, other):
1194
        return (isinstance(other, RemoteBranchFormat) and 
1195
            self.__dict__ == other.__dict__)
1196
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1197
    def get_format_description(self):
1198
        return 'Remote BZR Branch'
1199
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1200
    def get_format_string(self):
1201
        return 'Remote BZR Branch'
1202
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1203
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1204
        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.
1205
1206
    def initialize(self, a_bzrdir):
1207
        return a_bzrdir.create_branch()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1208
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1209
    def supports_tags(self):
1210
        # Remote branches might support tags, but we won't know until we
1211
        # access the real remote branch.
1212
        return True
1213
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1214
1215
class RemoteBranch(branch.Branch):
1216
    """Branch stored on a server accessed by HPSS RPC.
1217
1218
    At the moment most operations are mapped down to simple file operations.
1219
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1220
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1221
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1222
        _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.
1223
        """Create a RemoteBranch instance.
1224
1225
        :param real_branch: An optional local implementation of the branch
1226
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1227
        :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.
1228
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1229
        # We intentionally don't call the parent class's __init__, because it
1230
        # will try to assign to self.tags, which is a property in this subclass.
1231
        # 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.
1232
        self._revision_id_to_revno_cache = None
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1233
        self._revision_history_cache = None
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1234
        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.
1235
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1236
        if _client is not None:
1237
            self._client = _client
1238
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1239
            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.
1240
        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.
1241
        if real_branch is not None:
1242
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1243
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1244
            real_repo = self._real_branch.repository
1245
            if isinstance(real_repo, RemoteRepository):
1246
                real_repo._ensure_real()
1247
                real_repo = real_repo._real_repository
1248
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1249
            # Give the branch the remote repository to let fast-pathing happen.
1250
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1251
        else:
1252
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1253
        # 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.
1254
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1255
        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.
1256
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1257
        self._lock_mode = None
1258
        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.
1259
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1260
        self._lock_count = 0
1261
        self._leave_lock = False
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1262
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1263
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1264
        # if we try vfs access, return the real branch's vfs transport
1265
        self._ensure_real()
1266
        return self._real_branch._transport
1267
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1268
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1269
2477.1.1 by Martin Pool
Add RemoteBranch repr
1270
    def __str__(self):
1271
        return "%s(%s)" % (self.__class__.__name__, self.base)
1272
1273
    __repr__ = __str__
1274
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1275
    def _ensure_real(self):
1276
        """Ensure that there is a _real_branch set.
1277
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1278
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1279
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1280
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1281
            if not vfs.vfs_enabled():
1282
                raise AssertionError('smart server vfs must be enabled '
1283
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1284
            self.bzrdir._ensure_real()
1285
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1286
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1287
            real_repo = self._real_branch.repository
1288
            if isinstance(real_repo, RemoteRepository):
1289
                real_repo._ensure_real()
1290
                real_repo = real_repo._real_repository
1291
            self.repository._set_real_repository(real_repo)
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
1292
            # 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.
1293
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1294
            # XXX: deal with _lock_mode == 'w'
1295
            if self._lock_mode == 'r':
1296
                self._real_branch.lock_read()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1297
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1298
    def _clear_cached_state(self):
1299
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1300
        if self._real_branch is not None:
1301
            self._real_branch._clear_cached_state()
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1302
1303
    def _clear_cached_state_of_remote_branch_only(self):
1304
        """Like _clear_cached_state, but doesn't clear the cache of
1305
        self._real_branch.
1306
1307
        This is useful when falling back to calling a method of
1308
        self._real_branch that changes state.  In that case the underlying
1309
        branch changes, so we need to invalidate this RemoteBranch's cache of
1310
        it.  However, there's no need to invalidate the _real_branch's cache
1311
        too, in fact doing so might harm performance.
1312
        """
1313
        super(RemoteBranch, self)._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1314
        
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.
1315
    @property
1316
    def control_files(self):
1317
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1318
        # because it triggers an _ensure_real that we otherwise might not need.
1319
        if self._control_files is None:
1320
            self._control_files = RemoteBranchLockableFiles(
1321
                self.bzrdir, self._client)
1322
        return self._control_files
1323
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1324
    def _get_checkout_format(self):
1325
        self._ensure_real()
1326
        return self._real_branch._get_checkout_format()
1327
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1328
    def get_physical_lock_status(self):
1329
        """See Branch.get_physical_lock_status()."""
1330
        # 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.
1331
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1332
        return self._real_branch.get_physical_lock_status()
1333
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1334
    def lock_read(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1335
        if not self._lock_mode:
1336
            self._lock_mode = 'r'
1337
            self._lock_count = 1
1338
            if self._real_branch is not None:
1339
                self._real_branch.lock_read()
1340
        else:
1341
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1342
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).
1343
    def _remote_lock_write(self, token):
1344
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1345
            branch_token = repo_token = ''
1346
        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).
1347
            branch_token = token
1348
            repo_token = self.repository.lock_write()
1349
            self.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1350
        path = self.bzrdir._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1351
        try:
1352
            response = self._client.call(
1353
                'Branch.lock_write', path, branch_token, repo_token or '')
1354
        except errors.ErrorFromSmartServer, err:
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1355
            if err.error_verb == 'LockContention':
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1356
                raise errors.LockContention('(remote lock)')
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1357
            elif err.error_verb == 'TokenMismatch':
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1358
                raise errors.TokenMismatch(token, '(remote token)')
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1359
            elif err.error_verb == 'UnlockableTransport':
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1360
                raise errors.UnlockableTransport(self.bzrdir.root_transport)
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1361
            elif err.error_verb == 'ReadOnlyError':
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1362
                raise errors.ReadOnlyError(self)
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1363
            elif err.error_verb == 'LockFailed':
1364
                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.
1365
            raise
1366
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1367
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1368
        ok, branch_token, repo_token = response
1369
        return branch_token, repo_token
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1370
            
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).
1371
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1372
        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).
1373
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1374
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1375
            if not self._lock_token:
1376
                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.
1377
            # TODO: We really, really, really don't want to call _ensure_real
1378
            # here, but it's the easiest way to ensure coherency between the
1379
            # state of the RemoteBranch and RemoteRepository objects and the
1380
            # physical locks.  If we don't materialise the real objects here,
1381
            # then getting everything in the right state later is complex, so
1382
            # for now we just do it the lazy way.
1383
            #   -- Andrew Bennetts, 2007-02-22.
1384
            self._ensure_real()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1385
            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).
1386
                self._real_branch.repository.lock_write(
1387
                    token=self._repo_lock_token)
1388
                try:
1389
                    self._real_branch.lock_write(token=self._lock_token)
1390
                finally:
1391
                    self._real_branch.repository.unlock()
1392
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1393
                self._leave_lock = True
1394
            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).
1395
                # 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.
1396
                self._leave_lock = False
1397
            self._lock_mode = 'w'
1398
            self._lock_count = 1
1399
        elif self._lock_mode == 'r':
1400
            raise errors.ReadOnlyTransaction
1401
        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).
1402
            if token is not None:
1403
                # A token was given to lock_write, and we're relocking, so check
1404
                # that the given token actually matches the one we already have.
1405
                if token != self._lock_token:
1406
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1407
            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.
1408
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1409
1410
    def _unlock(self, branch_token, repo_token):
1411
        path = self.bzrdir._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1412
        try:
1413
            response = self._client.call('Branch.unlock', path, branch_token,
1414
                                         repo_token or '')
1415
        except errors.ErrorFromSmartServer, err:
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1416
            if err.error_verb == 'TokenMismatch':
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1417
                raise errors.TokenMismatch(
1418
                    str((branch_token, repo_token)), '(remote tokens)')
1419
            raise
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1420
        if response == ('ok',):
1421
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1422
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1423
1424
    def unlock(self):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1425
        self._lock_count -= 1
1426
        if not self._lock_count:
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1427
            self._clear_cached_state()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1428
            mode = self._lock_mode
1429
            self._lock_mode = None
1430
            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.
1431
                if (not self._leave_lock and mode == 'w' and
1432
                    self._repo_lock_token):
2018.15.1 by Andrew Bennetts
All branch_implementations/test_locking tests passing.
1433
                    # If this RemoteBranch will remove the physical lock for the
1434
                    # repository, make sure the _real_branch doesn't do it
1435
                    # first.  (Because the _real_branch's repository is set to
1436
                    # be the RemoteRepository.)
1437
                    self._real_branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1438
                self._real_branch.unlock()
1439
            if mode != 'w':
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1440
                # Only write-locked branched need to make a remote method call
1441
                # to perfom the unlock.
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1442
                return
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1443
            if not self._lock_token:
1444
                raise AssertionError('Locked, but no token!')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1445
            branch_token = self._lock_token
1446
            repo_token = self._repo_lock_token
1447
            self._lock_token = None
1448
            self._repo_lock_token = None
1449
            if not self._leave_lock:
1450
                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.
1451
1452
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1453
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1454
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1455
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1456
    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.
1457
        if not self._lock_token:
1458
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1459
        self._leave_lock = True
1460
1461
    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.
1462
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1463
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1464
        self._leave_lock = False
1465
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1466
    def _last_revision_info(self):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1467
        path = self.bzrdir._path_for_remote_call(self._client)
1468
        response = self._client.call('Branch.last_revision_info', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1469
        if response[0] != 'ok':
1470
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1471
        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.
1472
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1473
        return (revno, last_revision)
1474
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1475
    def _gen_revision_history(self):
1476
        """See Branch._gen_revision_history()."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1477
        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.
1478
        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.
1479
            '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.
1480
        if response_tuple[0] != 'ok':
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
1481
            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.
1482
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1483
        if result == ['']:
1484
            return []
1485
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1486
3441.5.18 by Andrew Bennetts
Fix some test failures.
1487
    def _set_last_revision_descendant(self, revision_id, other_branch,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
1488
            allow_diverged=False, allow_overwrite_descendant=False):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1489
        path = self.bzrdir._path_for_remote_call(self._client)
1490
        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.
1491
            response = self._client.call('Branch.set_last_revision_ex',
3441.5.18 by Andrew Bennetts
Fix some test failures.
1492
                path, self._lock_token, self._repo_lock_token, revision_id,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
1493
                int(allow_diverged), int(allow_overwrite_descendant))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1494
        except errors.ErrorFromSmartServer, err:
1495
            if err.error_verb == 'NoSuchRevision':
1496
                raise NoSuchRevision(self, revision_id)
3441.5.18 by Andrew Bennetts
Fix some test failures.
1497
            elif err.error_verb == 'Diverged':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1498
                raise errors.DivergedBranches(self, other_branch)
1499
            raise
1500
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
1501
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1502
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
1503
        new_revno, new_revision_id = response[1:]
1504
        self._last_revision_info_cache = new_revno, new_revision_id
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1505
        self._real_branch._last_revision_info_cache = new_revno, new_revision_id
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1506
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1507
    def _set_last_revision(self, revision_id):
1508
        path = self.bzrdir._path_for_remote_call(self._client)
1509
        self._clear_cached_state()
1510
        try:
1511
            response = self._client.call('Branch.set_last_revision',
1512
                path, self._lock_token, self._repo_lock_token, revision_id)
1513
        except errors.ErrorFromSmartServer, err:
1514
            if err.error_verb == 'NoSuchRevision':
1515
                raise NoSuchRevision(self, revision_id)
1516
            raise
1517
        if response != ('ok',):
1518
            raise errors.UnexpectedSmartServerResponse(response)
1519
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1520
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1521
    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.
1522
        # Send just the tip revision of the history; the server will generate
1523
        # the full history from that.  If the revision doesn't exist in this
1524
        # branch, NoSuchRevision will be raised.
1525
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1526
            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.
1527
        else:
1528
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1529
        self._set_last_revision(rev_id)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1530
        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.
1531
1532
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1533
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1534
        return self._real_branch.get_parent()
1535
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1536
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1537
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1538
        return self._real_branch.set_parent(url)
1539
        
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1540
    def sprout(self, to_bzrdir, revision_id=None):
1541
        # Like Branch.sprout, except that it sprouts a branch in the default
1542
        # format, because RemoteBranches can't be created at arbitrary URLs.
1543
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1544
        # to_bzrdir.create_branch...
3047.1.1 by Andrew Bennetts
Fix for bug 164626, add test that Repository.sprout preserves format.
1545
        self._ensure_real()
1546
        result = self._real_branch._format.initialize(to_bzrdir)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1547
        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).
1548
        result.set_parent(self.bzrdir.root_transport.base)
1549
        return result
1550
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1551
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1552
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1553
             **kwargs):
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1554
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1555
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
1556
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1557
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1558
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1559
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1560
    @needs_read_lock
1561
    def push(self, target, overwrite=False, stop_revision=None):
1562
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1563
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1564
            target, overwrite=overwrite, stop_revision=stop_revision,
1565
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1566
1567
    def is_locked(self):
1568
        return self._lock_count >= 1
1569
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1570
    @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.
1571
    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.
1572
        revision_id = ensure_null(revision_id)
1573
        path = self.bzrdir._path_for_remote_call(self._client)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1574
        try:
1575
            response = self._client.call('Branch.set_last_revision_info',
1576
                path, self._lock_token, self._repo_lock_token, str(revno), revision_id)
1577
        except errors.UnknownSmartMethod:
1578
            self._ensure_real()
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1579
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1580
            self._real_branch.set_last_revision_info(revno, revision_id)
1581
            self._last_revision_info_cache = revno, revision_id
1582
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1583
        except errors.ErrorFromSmartServer, err:
3245.4.52 by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer.
1584
            if err.error_verb == 'NoSuchRevision':
1585
                raise NoSuchRevision(self, err.error_args[0])
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1586
            raise
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1587
        if response == ('ok',):
1588
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1589
            self._last_revision_info_cache = revno, revision_id
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1590
            # Update the _real_branch's cache too.
1591
            if self._real_branch is not None:
1592
                cache = self._last_revision_info_cache
1593
                self._real_branch._last_revision_info_cache = cache
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1594
        else:
1595
            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.
1596
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1597
    @needs_write_lock
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
1598
    def generate_revision_history(self, revision_id, last_rev=None,
1599
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1600
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1601
        if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1602
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1603
                self._set_last_revision_descendant(revision_id, other_branch,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
1604
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1605
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
1606
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1607
                medium._remember_remote_is_before((1, 6))
3441.5.29 by Andrew Bennetts
More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
1608
        self._clear_cached_state_of_remote_branch_only()
3441.5.2 by Andrew Bennetts
Remove various debugging cruft.
1609
        self._ensure_real()
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1610
        self._real_branch.generate_revision_history(
3441.5.2 by Andrew Bennetts
Remove various debugging cruft.
1611
            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.
1612
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1613
    @property
1614
    def tags(self):
1615
        self._ensure_real()
1616
        return self._real_branch.tags
1617
2018.5.97 by Andrew Bennetts
Fix more tests.
1618
    def set_push_location(self, location):
1619
        self._ensure_real()
1620
        return self._real_branch.set_push_location(location)
1621
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1622
    @needs_write_lock
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1623
    def update_revisions(self, other, stop_revision=None, overwrite=False,
1624
                         graph=None):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1625
        """See Branch.update_revisions."""
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1626
        other.lock_read()
1627
        try:
1628
            if stop_revision is None:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1629
                stop_revision = other.last_revision()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1630
                if revision.is_null(stop_revision):
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1631
                    # if there are no commits, we're done.
1632
                    return
1633
            self.fetch(other, stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1634
1635
            if overwrite:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1636
                # Just unconditionally set the new revision.  We don't care if
1637
                # the branches have diverged.
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1638
                self._set_last_revision(stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1639
            else:
1640
                medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1641
                if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1642
                    try:
1643
                        self._set_last_revision_descendant(stop_revision, other)
1644
                        return
3441.5.7 by Andrew Bennetts
Fix unbound global.
1645
                    except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1646
                        medium._remember_remote_is_before((1, 6))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1647
                # Fallback for pre-1.6 servers: check for divergence
1648
                # client-side, then do _set_last_revision.
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1649
                last_rev = revision.ensure_null(self.last_revision())
3441.5.18 by Andrew Bennetts
Fix some test failures.
1650
                if graph is None:
1651
                    graph = self.repository.get_graph()
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1652
                if self._check_if_descendant_or_diverged(
3441.5.18 by Andrew Bennetts
Fix some test failures.
1653
                        stop_revision, last_rev, graph, other):
1654
                    # stop_revision is a descendant of last_rev, but we aren't
1655
                    # overwriting, so we're done.
1656
                    return
1657
                self._set_last_revision(stop_revision)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1658
        finally:
1659
            other.unlock()
2018.5.97 by Andrew Bennetts
Fix more tests.
1660
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1661
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1662
def _extract_tar(tar, to_dir):
1663
    """Extract all the contents of a tarfile object.
1664
1665
    A replacement for extractall, which is not present in python2.4
1666
    """
1667
    for tarinfo in tar:
1668
        tar.extract(tarinfo, to_dir)