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