/brz/remove-bazaar

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