~bzr-pqm/bzr/bzr.dev

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