/brz/remove-bazaar

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