/brz/remove-bazaar

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