/brz/remove-bazaar

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