/brz/remove-bazaar

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