/brz/remove-bazaar

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