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