/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
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
91
    def cloning_metadir(self, stacked=False):
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
92
        self._ensure_real()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
93
        return self._real_bzrdir.cloning_metadir(stacked)
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
94
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
95
    def _translate_error(self, err, **context):
96
        _translate_error(err, bzrdir=self, **context)
97
        
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
98
    def create_repository(self, shared=False):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
99
        self._ensure_real()
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
100
        self._real_bzrdir.create_repository(shared=shared)
101
        return self.open_repository()
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
102
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
103
    def destroy_repository(self):
104
        """See BzrDir.destroy_repository"""
105
        self._ensure_real()
106
        self._real_bzrdir.destroy_repository()
107
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
108
    def create_branch(self):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
109
        self._ensure_real()
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
110
        real_branch = self._real_bzrdir.create_branch()
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
111
        return RemoteBranch(self, self.find_repository(), real_branch)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
112
2796.2.6 by Aaron Bentley
Implement destroy_branch
113
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
114
        """See BzrDir.destroy_branch"""
2796.2.6 by Aaron Bentley
Implement destroy_branch
115
        self._ensure_real()
116
        self._real_bzrdir.destroy_branch()
117
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
118
    def create_workingtree(self, revision_id=None, from_branch=None):
2018.5.174 by Andrew Bennetts
Various nits discovered by pyflakes.
119
        raise errors.NotLocalUrl(self.transport.base)
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
120
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.
121
    def find_branch_format(self):
122
        """Find the branch 'format' for this bzrdir.
123
124
        This might be a synthetic object for e.g. RemoteBranch and SVN.
125
        """
126
        b = self.open_branch()
127
        return b._format
128
2018.5.132 by Robert Collins
Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
129
    def get_branch_reference(self):
130
        """See BzrDir.get_branch_reference()."""
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
131
        path = self._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
132
        try:
133
            response = self._client.call('BzrDir.open_branch', path)
134
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
135
            self._translate_error(err)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
136
        if response[0] == 'ok':
137
            if response[1] == '':
138
                # 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.
139
                return None
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
140
            else:
141
                # 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.
142
                return response[1]
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
143
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
144
            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.
145
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
146
    def _get_tree_branch(self):
147
        """See BzrDir._get_tree_branch()."""
148
        return None, self.open_branch()
149
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.
150
    def open_branch(self, _unsupported=False):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
151
        if _unsupported:
152
            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.
153
        reference_url = self.get_branch_reference()
154
        if reference_url is None:
155
            # branch at this location.
156
            return RemoteBranch(self, self.find_repository())
157
        else:
158
            # a branch reference, use the existing BranchReference logic.
159
            format = BranchReferenceFormat()
160
            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.
161
                
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
162
    def open_repository(self):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
163
        path = self._path_for_remote_call(self._client)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
164
        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.
165
        try:
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
166
            try:
167
                response = self._client.call(verb, path)
168
            except errors.UnknownSmartMethod:
169
                verb = 'BzrDir.find_repository'
170
                response = self._client.call(verb, path)
171
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
172
            self._translate_error(err)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
173
        if response[0] != 'ok':
174
            raise errors.UnexpectedSmartServerResponse(response)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
175
        if verb == 'BzrDir.find_repository':
176
            # servers that don't support the V2 method don't support external
177
            # references either.
178
            response = response + ('no', )
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
179
        if not (len(response) == 5):
180
            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.
181
        if response[1] == '':
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
182
            format = RemoteRepositoryFormat()
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
183
            format.rich_root_data = (response[2] == 'yes')
184
            format.supports_tree_reference = (response[3] == 'yes')
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
185
            # No wire format to check this yet.
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
186
            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.
187
            # Used to support creating a real format instance when needed.
188
            format._creating_bzrdir = self
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
189
            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.
190
        else:
191
            raise errors.NoRepositoryPresent(self)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
192
2018.5.138 by Robert Collins
Merge bzr.dev.
193
    def open_workingtree(self, recommend_upgrade=True):
2445.1.1 by Andrew Bennetts
Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
194
        self._ensure_real()
195
        if self._real_bzrdir.has_workingtree():
196
            raise errors.NotLocalUrl(self.root_transport)
197
        else:
198
            raise errors.NoWorkingTree(self.root_transport.base)
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
199
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
200
    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.
201
        """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 :).
202
        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.
203
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
204
    def get_branch_transport(self, branch_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
205
        self._ensure_real()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
206
        return self._real_bzrdir.get_branch_transport(branch_format)
207
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
208
    def get_repository_transport(self, repository_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
209
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
210
        return self._real_bzrdir.get_repository_transport(repository_format)
211
212
    def get_workingtree_transport(self, workingtree_format):
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
213
        self._ensure_real()
1752.2.43 by Andrew Bennetts
Fix get_{branch,repository,workingtree}_transport.
214
        return self._real_bzrdir.get_workingtree_transport(workingtree_format)
215
1752.2.39 by Martin Pool
[broken] implement upgrade apis on remote bzrdirs
216
    def can_convert_format(self):
217
        """Upgrading of remote bzrdirs is not supported yet."""
218
        return False
219
220
    def needs_format_conversion(self, format=None):
221
        """Upgrading of remote bzrdirs is not supported yet."""
222
        return False
223
3242.3.37 by Aaron Bentley
Updates from reviews
224
    def clone(self, url, revision_id=None, force_new_repo=False,
225
              preserve_stacking=False):
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
226
        self._ensure_real()
227
        return self._real_bzrdir.clone(url, revision_id=revision_id,
3242.3.37 by Aaron Bentley
Updates from reviews
228
            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).
229
3567.1.3 by Michael Hudson
fix problem
230
    def get_config(self):
231
        self._ensure_real()
232
        return self._real_bzrdir.get_config()
233
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
234
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
235
class RemoteRepositoryFormat(repository.RepositoryFormat):
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
236
    """Format for repositories accessed over a _SmartClient.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
237
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
238
    Instances of this repository are represented by RemoteRepository
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
239
    instances.
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
240
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
241
    The RemoteRepositoryFormat is parameterized during construction
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
242
    to reflect the capabilities of the real, remote format. Specifically
2018.5.138 by Robert Collins
Merge bzr.dev.
243
    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.
244
    on a per instance basis, and are not set (and should not be) at
245
    the class level.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
246
    """
247
3543.1.2 by Michael Hudson
the two character fix
248
    _matchingbzrdir = RemoteBzrDirFormat()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
249
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
250
    def initialize(self, a_bzrdir, shared=False):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
251
        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.
252
            prior_repo = self._creating_bzrdir.open_repository()
253
            prior_repo._ensure_real()
254
            return prior_repo._real_repository._format.initialize(
255
                a_bzrdir, shared=shared)
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
256
        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.
257
    
258
    def open(self, a_bzrdir):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
259
        if not isinstance(a_bzrdir, RemoteBzrDir):
260
            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.
261
        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.
262
263
    def get_format_description(self):
264
        return 'bzr remote repository'
265
266
    def __eq__(self, other):
1752.2.87 by Andrew Bennetts
Make tests pass.
267
        return self.__class__ == other.__class__
268
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
269
    def check_conversion_target(self, target_format):
270
        if self.rich_root_data and not target_format.rich_root_data:
271
            raise errors.BadConversionTarget(
272
                'Does not support rich root data.', target_format)
2018.5.138 by Robert Collins
Merge bzr.dev.
273
        if (self.supports_tree_reference and
274
            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.
275
            raise errors.BadConversionTarget(
276
                '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.
277
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
278
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
279
class RemoteRepository(object):
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
280
    """Repository accessed over rpc.
281
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
282
    For the moment most operations are performed using local transport-backed
283
    Repository objects.
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
284
    """
285
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
286
    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.
287
        """Create a RemoteRepository instance.
288
        
289
        :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.
290
        :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.
291
        :param real_repository: If not None, a local implementation of the
292
            repository logic for the repository, usually accessing the data
293
            via the VFS.
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
294
        :param _client: Private testing parameter - override the smart client
295
            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.
296
        """
297
        if real_repository:
2018.5.36 by Andrew Bennetts
Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
298
            self._real_repository = real_repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
299
        else:
300
            self._real_repository = None
1752.2.50 by Andrew Bennetts
Implement RemoteBzrDir.create_{branch,workingtree}
301
        self.bzrdir = remote_bzrdir
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
302
        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.
303
            self._client = remote_bzrdir._client
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
304
        else:
305
            self._client = _client
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
306
        self._format = format
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
307
        self._lock_mode = None
308
        self._lock_token = None
309
        self._lock_count = 0
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
310
        self._leave_lock = False
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
311
        # A cache of looked up revision parent data; reset at unlock time.
312
        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.
313
        if 'hpss' in debug.debug_flags:
314
            self._requested_parents = None
2951.1.10 by Robert Collins
Peer review feedback with Ian.
315
        # For tests:
316
        # These depend on the actual remote format, so force them off for
317
        # maximum compatibility. XXX: In future these should depend on the
318
        # remote repository instance, but this is irrelevant until we perform
319
        # 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.
320
        self._reconcile_does_inventory_gc = False
321
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
322
        self._reconcile_backsup_inventory = False
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
323
        self.base = self.bzrdir.transport.base
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
324
        # Additional places to query for data.
325
        self._fallback_repositories = []
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
326
327
    def __str__(self):
328
        return "%s(%s)" % (self.__class__.__name__, self.base)
329
330
    __repr__ = __str__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
331
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
332
    def abort_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
333
        """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.
334
        
335
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
336
        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.
337
        for older plugins that don't use e.g. the CommitBuilder
338
        facility.
339
        """
340
        self._ensure_real()
341
        return self._real_repository.abort_write_group()
342
343
    def commit_write_group(self):
2617.6.7 by Robert Collins
More review feedback.
344
        """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.
345
        
346
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
347
        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.
348
        for older plugins that don't use e.g. the CommitBuilder
349
        facility.
350
        """
351
        self._ensure_real()
352
        return self._real_repository.commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
353
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
354
    def _ensure_real(self):
355
        """Ensure that there is a _real_repository set.
356
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
357
        Used before calls to self._real_repository.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
358
        """
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
359
        if self._real_repository is None:
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
360
            self.bzrdir._ensure_real()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
361
            self._set_real_repository(
362
                self.bzrdir._real_bzrdir.open_repository())
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
363
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
364
    def _translate_error(self, err, **context):
365
        self.bzrdir._translate_error(err, repository=self, **context)
366
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
367
    def find_text_key_references(self):
368
        """Find the text key references within the repository.
369
370
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
371
        revision_ids. Each altered file-ids has the exact revision_ids that
372
        altered it listed explicitly.
373
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
374
            to whether they were referred to by the inventory of the
375
            revision_id that they contain. The inventory texts from all present
376
            revision ids are assessed to generate this report.
377
        """
378
        self._ensure_real()
379
        return self._real_repository.find_text_key_references()
380
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
381
    def _generate_text_key_index(self):
382
        """Generate a new text key index for the repository.
383
384
        This is an expensive function that will take considerable time to run.
385
386
        :return: A dict mapping (file_id, revision_id) tuples to a list of
387
            parents, also (file_id, revision_id) tuples.
388
        """
389
        self._ensure_real()
390
        return self._real_repository._generate_text_key_index()
391
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
392
    @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)
393
    def get_revision_graph(self, revision_id=None):
394
        """See Repository.get_revision_graph()."""
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
395
        return self._get_revision_graph(revision_id)
396
397
    def _get_revision_graph(self, revision_id):
398
        """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)
399
        if revision_id is None:
400
            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.
401
        elif revision.is_null(revision_id):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
402
            return {}
403
404
        path = self.bzrdir._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
405
        try:
406
            response = self._client.call_expecting_body(
407
                'Repository.get_revision_graph', path, revision_id)
408
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
409
            self._translate_error(err)
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:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
544
            self._translate_error(err, token=token)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
545
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
546
        if response[0] == 'ok':
547
            ok, token = response
548
            return token
549
        else:
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
550
            raise errors.UnexpectedSmartServerResponse(response)
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
551
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
552
    def lock_write(self, token=None, _skip_rpc=False):
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
553
        if not self._lock_mode:
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
554
            if _skip_rpc:
555
                if self._lock_token is not None:
556
                    if token != self._lock_token:
557
                        raise TokenMismatch(token, self._lock_token)
558
                self._lock_token = token
559
            else:
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
        """
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
598
        if self._real_repository is not None:
599
            raise AssertionError('_real_repository is already set')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
600
        if isinstance(repository, RemoteRepository):
601
            raise AssertionError()
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
602
        self._real_repository = repository
603
        if self._lock_mode == 'w':
604
            # if we are already locked, the real repository must be able to
605
            # acquire the lock with our token.
606
            self._real_repository.lock_write(self._lock_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
607
        elif self._lock_mode == 'r':
608
            self._real_repository.lock_read()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
609
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
610
    def start_write_group(self):
611
        """Start a write group on the decorated repository.
612
        
613
        Smart methods peform operations in a single step so this api
2617.6.6 by Robert Collins
Some review feedback.
614
        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``
615
        for older plugins that don't use e.g. the CommitBuilder
616
        facility.
617
        """
618
        self._ensure_real()
619
        return self._real_repository.start_write_group()
620
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
621
    def _unlock(self, token):
622
        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.
623
        if not token:
624
            # with no token the remote repository is not persistently locked.
625
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
626
        try:
627
            response = self._client.call('Repository.unlock', path, token)
628
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
629
            self._translate_error(err, token=token)
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()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
714
        real_repo = self._real_repository
715
        builder = real_repo.get_commit_builder(branch, parents,
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
716
                config, timestamp=timestamp, timezone=timezone,
717
                committer=committer, revprops=revprops, revision_id=revision_id)
718
        return builder
719
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
720
    def add_fallback_repository(self, repository):
721
        """Add a repository to use for looking up data not held locally.
722
        
723
        :param repository: A repository.
724
        """
725
        if not self._format.supports_external_lookups:
726
            raise errors.UnstackableRepositoryFormat(self._format, self.base)
727
        # We need to accumulate additional repositories here, to pass them in
728
        # on various RPC's.
729
        self._fallback_repositories.append(repository)
730
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
731
    def add_inventory(self, revid, inv, parents):
732
        self._ensure_real()
733
        return self._real_repository.add_inventory(revid, inv, parents)
734
735
    def add_revision(self, rev_id, rev, inv=None, config=None):
736
        self._ensure_real()
737
        return self._real_repository.add_revision(
738
            rev_id, rev, inv=inv, config=config)
739
740
    @needs_read_lock
741
    def get_inventory(self, revision_id):
742
        self._ensure_real()
743
        return self._real_repository.get_inventory(revision_id)
744
3169.2.1 by Robert Collins
New method ``iter_inventories`` on Repository for access to many
745
    def iter_inventories(self, revision_ids):
746
        self._ensure_real()
747
        return self._real_repository.iter_inventories(revision_ids)
748
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
749
    @needs_read_lock
750
    def get_revision(self, revision_id):
751
        self._ensure_real()
752
        return self._real_repository.get_revision(revision_id)
753
754
    def get_transaction(self):
755
        self._ensure_real()
756
        return self._real_repository.get_transaction()
757
758
    @needs_read_lock
2018.5.138 by Robert Collins
Merge bzr.dev.
759
    def clone(self, a_bzrdir, revision_id=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
760
        self._ensure_real()
2018.5.138 by Robert Collins
Merge bzr.dev.
761
        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.
762
763
    def make_working_trees(self):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
764
        """See Repository.make_working_trees"""
765
        self._ensure_real()
766
        return self._real_repository.make_working_trees()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
767
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
768
    def revision_ids_to_search_result(self, result_set):
769
        """Convert a set of revision ids to a graph SearchResult."""
770
        result_parents = set()
771
        for parents in self.get_graph().get_parent_map(
772
            result_set).itervalues():
773
            result_parents.update(parents)
774
        included_keys = result_set.intersection(result_parents)
775
        start_keys = result_set.difference(included_keys)
776
        exclude_keys = result_parents.difference(result_set)
777
        result = graph.SearchResult(start_keys, exclude_keys,
778
            len(result_set), result_set)
779
        return result
780
781
    @needs_read_lock
782
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
783
        """Return the revision ids that other has that this does not.
784
        
785
        These are returned in topological order.
786
787
        revision_id: only return revision ids included by revision_id.
788
        """
789
        return repository.InterRepository.get(
790
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
791
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
792
    def fetch(self, source, revision_id=None, pb=None):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
793
        if self.has_same_location(source):
794
            # check that last_revision is in 'from' and then return a
795
            # no-operation.
796
            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.
797
                not revision.is_null(revision_id)):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
798
                self.get_revision(revision_id)
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
799
            return 0, []
2592.3.119 by Robert Collins
Merge some test fixes from Martin.
800
        self._ensure_real()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
801
        return self._real_repository.fetch(
802
            source, revision_id=revision_id, pb=pb)
803
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
804
    def create_bundle(self, target, base, fileobj, format=None):
805
        self._ensure_real()
806
        self._real_repository.create_bundle(target, base, fileobj, format)
807
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
808
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
809
    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.
810
        self._ensure_real()
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
811
        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.
812
813
    def fileids_altered_by_revision_ids(self, revision_ids):
814
        self._ensure_real()
815
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
816
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
817
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.1 by Aaron Bentley
Initial checking of knit graphs
818
        self._ensure_real()
3036.1.3 by Robert Collins
Privatise VersionedFileChecker.
819
        return self._real_repository._get_versioned_file_checker(
2745.6.50 by Andrew Bennetts
Remove find_bad_ancestors; it's not needed anymore.
820
            revisions, revision_versions_cache)
821
        
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
822
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
823
        """See Repository.iter_file_bytes.
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
824
        """
825
        self._ensure_real()
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
826
        return self._real_repository.iter_files_bytes(desired_files)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
827
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
828
    @property
829
    def _fetch_order(self):
830
        """Decorate the real repository for now.
831
832
        In the long term getting this back from the remote repository as part
833
        of open would be more efficient.
834
        """
835
        self._ensure_real()
836
        return self._real_repository._fetch_order
837
838
    @property
839
    def _fetch_uses_deltas(self):
840
        """Decorate the real repository for now.
841
842
        In the long term getting this back from the remote repository as part
843
        of open would be more efficient.
844
        """
845
        self._ensure_real()
846
        return self._real_repository._fetch_uses_deltas
847
3565.3.4 by Robert Collins
Defer decision to reconcile to the repository being fetched into.
848
    @property
849
    def _fetch_reconcile(self):
850
        """Decorate the real repository for now.
851
852
        In the long term getting this back from the remote repository as part
853
        of open would be more efficient.
854
        """
855
        self._ensure_real()
856
        return self._real_repository._fetch_reconcile
857
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
858
    def get_parent_map(self, keys):
859
        """See bzrlib.Graph.get_parent_map()."""
860
        # Hack to build up the caching logic.
861
        ancestry = self._parents_map
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
862
        if ancestry is None:
863
            # Repository is not locked, so there's no cache.
864
            missing_revisions = set(keys)
865
            ancestry = {}
866
        else:
867
            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.
868
        if missing_revisions:
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
869
            parent_map = self._get_parent_map(missing_revisions)
870
            if 'hpss' in debug.debug_flags:
871
                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.
872
                        len(set(ancestry).intersection(parent_map)),
3192.1.1 by Andrew Bennetts
Add some -Dhpss debugging to get_parent_map.
873
                        len(parent_map))
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
874
            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.
875
        present_keys = [k for k in keys if k in ancestry]
3441.5.2 by Andrew Bennetts
Remove various debugging cruft.
876
        if 'hpss' in debug.debug_flags:
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
877
            if self._requested_parents is not None and len(ancestry) != 0:
878
                self._requested_parents.update(present_keys)
879
                mutter('Current RemoteRepository graph hit rate: %d%%',
880
                    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.
881
        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.
882
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
883
    def _get_parent_map(self, keys):
884
        """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.
885
        medium = self._client._medium
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
886
        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.
887
            # We already found out that the server can't understand
3213.1.3 by Andrew Bennetts
Fix typo in comment.
888
            # 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.
889
            # graph.
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
890
            # XXX: Note that this will issue a deprecation warning. This is ok
891
            # :- its because we're working with a deprecated server anyway, and
892
            # the user will almost certainly have seen a warning about the
893
            # server version already.
3389.1.1 by John Arbash Meinel
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
894
            rg = self.get_revision_graph()
895
            # There is an api discrepency between get_parent_map and
896
            # get_revision_graph. Specifically, a "key:()" pair in
897
            # get_revision_graph just means a node has no parents. For
898
            # "get_parent_map" it means the node is a ghost. So fix up the
899
            # graph to correct this.
900
            #   https://bugs.launchpad.net/bzr/+bug/214894
901
            # There is one other "bug" which is that ghosts in
902
            # get_revision_graph() are not returned at all. But we won't worry
903
            # about that for now.
904
            for node_id, parent_ids in rg.iteritems():
905
                if parent_ids == ():
906
                    rg[node_id] = (NULL_REVISION,)
907
            rg[NULL_REVISION] = ()
908
            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.
909
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
910
        keys = set(keys)
3373.5.2 by John Arbash Meinel
Add repository_implementation tests for get_parent_map
911
        if None in keys:
912
            raise ValueError('get_parent_map(None) is not valid')
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
913
        if NULL_REVISION in keys:
914
            keys.discard(NULL_REVISION)
915
            found_parents = {NULL_REVISION:()}
916
            if not keys:
917
                return found_parents
918
        else:
919
            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.
920
        # TODO(Needs analysis): We could assume that the keys being requested
921
        # from get_parent_map are in a breadth first search, so typically they
922
        # will all be depth N from some common parent, and we don't have to
923
        # have the server iterate from the root parent, but rather from the
924
        # keys we're searching; and just tell the server the keyspace we
925
        # already have; but this may be more traffic again.
926
927
        # Transform self._parents_map into a search request recipe.
928
        # TODO: Manage this incrementally to avoid covering the same path
929
        # repeatedly. (The server will have to on each request, but the less
930
        # work done the better).
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
931
        parents_map = self._parents_map
932
        if parents_map is None:
933
            # Repository is not locked, so there's no cache.
934
            parents_map = {}
935
        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.
936
        result_parents = set()
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
937
        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.
938
            result_parents.update(parents)
939
        stop_keys = result_parents.difference(start_set)
940
        included_keys = start_set.intersection(result_parents)
941
        start_set.difference_update(included_keys)
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
942
        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.
943
        body = self._serialise_search_recipe(recipe)
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
944
        path = self.bzrdir._path_for_remote_call(self._client)
945
        for key in keys:
3360.2.8 by Martin Pool
Change assertion to a plain raise
946
            if type(key) is not str:
947
                raise ValueError(
948
                    "key %r not a plain string" % (key,))
3172.5.8 by Robert Collins
Review feedback.
949
        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.
950
        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.
951
        try:
952
            response = self._client.call_with_body_bytes_expecting_body(
953
                verb, args, self._serialise_search_recipe(recipe))
954
        except errors.UnknownSmartMethod:
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
955
            # 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.
956
            # Worse, we have to force a disconnection, because the server now
957
            # doesn't realise it has a body on the wire to consume, so the
958
            # only way to recover is to abandon the connection.
3213.1.6 by Andrew Bennetts
Emit warnings when forcing a reconnect.
959
            warning(
960
                'Server is too old for fast get_parent_map, reconnecting.  '
961
                '(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.
962
            medium.disconnect()
963
            # To avoid having to disconnect repeatedly, we keep track of the
964
            # 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.
965
            medium._remember_remote_is_before((1, 2))
3297.3.4 by Andrew Bennetts
Merge from bzr.dev.
966
            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.
967
        response_tuple, response_handler = response
968
        if response_tuple[0] not in ['ok']:
969
            response_handler.cancel_read_body()
970
            raise errors.UnexpectedSmartServerResponse(response_tuple)
971
        if response_tuple[0] == 'ok':
972
            coded = bz2.decompress(response_handler.read_body_bytes())
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
973
            if coded == '':
974
                # no revisions found
975
                return {}
976
            lines = coded.split('\n')
977
            revision_graph = {}
978
            for line in lines:
979
                d = tuple(line.split())
980
                if len(d) > 1:
981
                    revision_graph[d[0]] = d[1:]
982
                else:
983
                    # No parents - so give the Graph result (NULL_REVISION,).
984
                    revision_graph[d[0]] = (NULL_REVISION,)
985
            return revision_graph
986
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
987
    @needs_read_lock
988
    def get_signature_text(self, revision_id):
989
        self._ensure_real()
990
        return self._real_repository.get_signature_text(revision_id)
991
992
    @needs_read_lock
3228.4.11 by John Arbash Meinel
Deprecations abound.
993
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
994
    def get_revision_graph_with_ghosts(self, revision_ids=None):
995
        self._ensure_real()
996
        return self._real_repository.get_revision_graph_with_ghosts(
997
            revision_ids=revision_ids)
998
999
    @needs_read_lock
1000
    def get_inventory_xml(self, revision_id):
1001
        self._ensure_real()
1002
        return self._real_repository.get_inventory_xml(revision_id)
1003
1004
    def deserialise_inventory(self, revision_id, xml):
1005
        self._ensure_real()
1006
        return self._real_repository.deserialise_inventory(revision_id, xml)
1007
1008
    def reconcile(self, other=None, thorough=False):
1009
        self._ensure_real()
1010
        return self._real_repository.reconcile(other=other, thorough=thorough)
1011
        
1012
    def all_revision_ids(self):
1013
        self._ensure_real()
1014
        return self._real_repository.all_revision_ids()
1015
    
1016
    @needs_read_lock
1017
    def get_deltas_for_revisions(self, revisions):
1018
        self._ensure_real()
1019
        return self._real_repository.get_deltas_for_revisions(revisions)
1020
1021
    @needs_read_lock
1022
    def get_revision_delta(self, revision_id):
1023
        self._ensure_real()
1024
        return self._real_repository.get_revision_delta(revision_id)
1025
1026
    @needs_read_lock
1027
    def revision_trees(self, revision_ids):
1028
        self._ensure_real()
1029
        return self._real_repository.revision_trees(revision_ids)
1030
1031
    @needs_read_lock
1032
    def get_revision_reconcile(self, revision_id):
1033
        self._ensure_real()
1034
        return self._real_repository.get_revision_reconcile(revision_id)
1035
1036
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1037
    def check(self, revision_ids=None):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1038
        self._ensure_real()
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1039
        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.
1040
2018.5.138 by Robert Collins
Merge bzr.dev.
1041
    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.
1042
        self._ensure_real()
1043
        return self._real_repository.copy_content_into(
2018.5.138 by Robert Collins
Merge bzr.dev.
1044
            destination, revision_id=revision_id)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1045
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1046
    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.
1047
        # get a tarball of the remote repository, and copy from that into the
1048
        # destination
1049
        from bzrlib import osutils
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1050
        import tarfile
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1051
        # TODO: Maybe a progress bar while streaming the tarball?
1052
        note("Copying repository content as tarball...")
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1053
        tar_file = self._get_tarball('bz2')
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1054
        if tar_file is None:
1055
            return None
1056
        destination = to_bzrdir.create_repository()
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1057
        try:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1058
            tar = tarfile.open('repository', fileobj=tar_file,
1059
                mode='r|bz2')
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
1060
            tmpdir = osutils.mkdtemp()
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1061
            try:
1062
                _extract_tar(tar, tmpdir)
1063
                tmp_bzrdir = BzrDir.open(tmpdir)
1064
                tmp_repo = tmp_bzrdir.open_repository()
1065
                tmp_repo.copy_content_into(destination, revision_id)
1066
            finally:
1067
                osutils.rmtree(tmpdir)
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1068
        finally:
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1069
            tar_file.close()
2814.10.2 by Andrew Bennetts
Make the fallback a little tidier.
1070
        return destination
2018.18.23 by Martin Pool
review cleanups
1071
        # TODO: Suggestion from john: using external tar is much faster than
1072
        # 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.
1073
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.
1074
    @property
1075
    def inventories(self):
1076
        """Decorate the real repository for now.
1077
1078
        In the long term a full blown network facility is needed to
1079
        avoid creating a real repository object locally.
1080
        """
1081
        self._ensure_real()
1082
        return self._real_repository.inventories
1083
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1084
    @needs_write_lock
1085
    def pack(self):
1086
        """Compress the data within the repository.
1087
1088
        This is not currently implemented within the smart server.
1089
        """
1090
        self._ensure_real()
1091
        return self._real_repository.pack()
1092
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.
1093
    @property
1094
    def revisions(self):
1095
        """Decorate the real repository for now.
1096
1097
        In the short term this should become a real object to intercept graph
1098
        lookups.
1099
1100
        In the long term a full blown network facility is needed.
1101
        """
1102
        self._ensure_real()
1103
        return self._real_repository.revisions
1104
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1105
    def set_make_working_trees(self, new_value):
3349.1.1 by Aaron Bentley
Enable setting and getting make_working_trees for all repositories
1106
        self._ensure_real()
1107
        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.
1108
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.
1109
    @property
1110
    def signatures(self):
1111
        """Decorate the real repository for now.
1112
1113
        In the long term a full blown network facility is needed to avoid
1114
        creating a real repository object locally.
1115
        """
1116
        self._ensure_real()
1117
        return self._real_repository.signatures
1118
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1119
    @needs_write_lock
1120
    def sign_revision(self, revision_id, gpg_strategy):
1121
        self._ensure_real()
1122
        return self._real_repository.sign_revision(revision_id, gpg_strategy)
1123
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.
1124
    @property
1125
    def texts(self):
1126
        """Decorate the real repository for now.
1127
1128
        In the long term a full blown network facility is needed to avoid
1129
        creating a real repository object locally.
1130
        """
1131
        self._ensure_real()
1132
        return self._real_repository.texts
1133
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1134
    @needs_read_lock
1135
    def get_revisions(self, revision_ids):
1136
        self._ensure_real()
1137
        return self._real_repository.get_revisions(revision_ids)
1138
1139
    def supports_rich_root(self):
2018.5.84 by Andrew Bennetts
Merge in supports-rich-root, another test passing.
1140
        self._ensure_real()
1141
        return self._real_repository.supports_rich_root()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1142
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1143
    def iter_reverse_revision_history(self, revision_id):
1144
        self._ensure_real()
1145
        return self._real_repository.iter_reverse_revision_history(revision_id)
1146
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1147
    @property
1148
    def _serializer(self):
1149
        self._ensure_real()
1150
        return self._real_repository._serializer
1151
2018.5.97 by Andrew Bennetts
Fix more tests.
1152
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1153
        self._ensure_real()
1154
        return self._real_repository.store_revision_signature(
1155
            gpg_strategy, plaintext, revision_id)
1156
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1157
    def add_signature_text(self, revision_id, signature):
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1158
        self._ensure_real()
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1159
        return self._real_repository.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1160
2018.5.97 by Andrew Bennetts
Fix more tests.
1161
    def has_signature_for_revision_id(self, revision_id):
1162
        self._ensure_real()
1163
        return self._real_repository.has_signature_for_revision_id(revision_id)
1164
2535.3.45 by Andrew Bennetts
Add item_keys_introduced_by to RemoteRepository.
1165
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1166
        self._ensure_real()
1167
        return self._real_repository.item_keys_introduced_by(revision_ids,
1168
            _files_pb=_files_pb)
1169
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1170
    def revision_graph_can_have_wrong_parents(self):
1171
        # The answer depends on the remote repo format.
1172
        self._ensure_real()
1173
        return self._real_repository.revision_graph_can_have_wrong_parents()
1174
2819.2.5 by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents.
1175
    def _find_inconsistent_revision_parents(self):
1176
        self._ensure_real()
1177
        return self._real_repository._find_inconsistent_revision_parents()
1178
1179
    def _check_for_inconsistent_revision_parents(self):
1180
        self._ensure_real()
1181
        return self._real_repository._check_for_inconsistent_revision_parents()
1182
3089.2.1 by Andrew Bennetts
Implement RemoteRepository._make_parents_provider.
1183
    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.
1184
        return self
1185
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.
1186
    def _serialise_search_recipe(self, recipe):
1187
        """Serialise a graph search recipe.
1188
1189
        :param recipe: A search recipe (start, stop, count).
1190
        :return: Serialised bytes.
1191
        """
1192
        start_keys = ' '.join(recipe[0])
1193
        stop_keys = ' '.join(recipe[1])
1194
        count = str(recipe[2])
1195
        return '\n'.join((start_keys, stop_keys, count))
1196
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1197
2018.5.127 by Andrew Bennetts
Fix most of the lockable_files tests for RemoteBranchLockableFiles.
1198
class RemoteBranchLockableFiles(LockableFiles):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1199
    """A 'LockableFiles' implementation that talks to a smart server.
1200
    
1201
    This is not a public interface class.
1202
    """
1203
1204
    def __init__(self, bzrdir, _client):
1205
        self.bzrdir = bzrdir
1206
        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.
1207
        self._need_find_modes = True
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1208
        LockableFiles.__init__(
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1209
            self, bzrdir.get_branch_transport(None),
2018.5.133 by Andrew Bennetts
All TestLockableFiles_RemoteLockDir tests passing.
1210
            'lock', lockdir.LockDir)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1211
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.
1212
    def _find_modes(self):
1213
        # RemoteBranches don't let the client set the mode of control files.
1214
        self._dir_mode = None
1215
        self._file_mode = None
1216
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1217
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1218
class RemoteBranchFormat(branch.BranchFormat):
1219
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.
1220
    def __eq__(self, other):
1221
        return (isinstance(other, RemoteBranchFormat) and 
1222
            self.__dict__ == other.__dict__)
1223
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1224
    def get_format_description(self):
1225
        return 'Remote BZR Branch'
1226
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1227
    def get_format_string(self):
1228
        return 'Remote BZR Branch'
1229
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1230
    def open(self, a_bzrdir):
1752.2.72 by Andrew Bennetts
Make Remote* classes in remote.py more consistent and remove some dead code.
1231
        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.
1232
1233
    def initialize(self, a_bzrdir):
1234
        return a_bzrdir.create_branch()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1235
2696.3.6 by Martin Pool
Mark RemoteBranch as (possibly) supporting tags
1236
    def supports_tags(self):
1237
        # Remote branches might support tags, but we won't know until we
1238
        # access the real remote branch.
1239
        return True
1240
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1241
1242
class RemoteBranch(branch.Branch):
1243
    """Branch stored on a server accessed by HPSS RPC.
1244
1245
    At the moment most operations are mapped down to simple file operations.
1246
    """
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1247
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1248
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1249
        _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.
1250
        """Create a RemoteBranch instance.
1251
1252
        :param real_branch: An optional local implementation of the branch
1253
            format, usually accessing the data via the VFS.
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1254
        :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.
1255
        """
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1256
        # We intentionally don't call the parent class's __init__, because it
1257
        # will try to assign to self.tags, which is a property in this subclass.
1258
        # 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.
1259
        self._revision_id_to_revno_cache = None
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1260
        self._revision_history_cache = None
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1261
        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.
1262
        self.bzrdir = remote_bzrdir
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1263
        if _client is not None:
1264
            self._client = _client
1265
        else:
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
1266
            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.
1267
        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.
1268
        if real_branch is not None:
1269
            self._real_branch = real_branch
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1270
            # Give the remote repository the matching real repo.
2018.5.97 by Andrew Bennetts
Fix more tests.
1271
            real_repo = self._real_branch.repository
1272
            if isinstance(real_repo, RemoteRepository):
1273
                real_repo._ensure_real()
1274
                real_repo = real_repo._real_repository
1275
            self.repository._set_real_repository(real_repo)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1276
            # Give the branch the remote repository to let fast-pathing happen.
1277
            self._real_branch.repository = self.repository
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1278
        else:
1279
            self._real_branch = None
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1280
        # 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.
1281
        self._format = RemoteBranchFormat()
2018.5.55 by Robert Collins
Give RemoteBranch a base url in line with the Branch protocol.
1282
        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.
1283
        self._control_files = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1284
        self._lock_mode = None
1285
        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.
1286
        self._repo_lock_token = None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1287
        self._lock_count = 0
1288
        self._leave_lock = False
1752.2.64 by Andrew Bennetts
Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
1289
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1290
    def _get_real_transport(self):
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1291
        # if we try vfs access, return the real branch's vfs transport
1292
        self._ensure_real()
1293
        return self._real_branch._transport
1294
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1295
    _transport = property(_get_real_transport)
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1296
2477.1.1 by Martin Pool
Add RemoteBranch repr
1297
    def __str__(self):
1298
        return "%s(%s)" % (self.__class__.__name__, self.base)
1299
1300
    __repr__ = __str__
1301
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1302
    def _ensure_real(self):
1303
        """Ensure that there is a _real_branch set.
1304
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1305
        Used before calls to self._real_branch.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1306
        """
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1307
        if self._real_branch is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1308
            if not vfs.vfs_enabled():
1309
                raise AssertionError('smart server vfs must be enabled '
1310
                    'to use vfs implementation')
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1311
            self.bzrdir._ensure_real()
1312
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1313
            if self.repository._real_repository is None:
1314
                # Give the remote repository the matching real repo.
1315
                real_repo = self._real_branch.repository
1316
                if isinstance(real_repo, RemoteRepository):
1317
                    real_repo._ensure_real()
1318
                    real_repo = real_repo._real_repository
1319
                self.repository._set_real_repository(real_repo)
1320
            # Give the real branch the remote repository to let fast-pathing
1321
            # happen.
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1322
            self._real_branch.repository = self.repository
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1323
            if self._lock_mode == 'r':
1324
                self._real_branch.lock_read()
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1325
            elif self._lock_mode == 'w':
1326
                self._real_branch.lock_write(token=self._lock_token)
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1327
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1328
    def _translate_error(self, err, **context):
1329
        self.repository._translate_error(err, branch=self, **context)
1330
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1331
    def _clear_cached_state(self):
1332
        super(RemoteBranch, self)._clear_cached_state()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1333
        if self._real_branch is not None:
1334
            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.
1335
1336
    def _clear_cached_state_of_remote_branch_only(self):
1337
        """Like _clear_cached_state, but doesn't clear the cache of
1338
        self._real_branch.
1339
1340
        This is useful when falling back to calling a method of
1341
        self._real_branch that changes state.  In that case the underlying
1342
        branch changes, so we need to invalidate this RemoteBranch's cache of
1343
        it.  However, there's no need to invalidate the _real_branch's cache
1344
        too, in fact doing so might harm performance.
1345
        """
1346
        super(RemoteBranch, self)._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1347
        
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.
1348
    @property
1349
    def control_files(self):
1350
        # Defer actually creating RemoteBranchLockableFiles until its needed,
1351
        # because it triggers an _ensure_real that we otherwise might not need.
1352
        if self._control_files is None:
1353
            self._control_files = RemoteBranchLockableFiles(
1354
                self.bzrdir, self._client)
1355
        return self._control_files
1356
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
1357
    def _get_checkout_format(self):
1358
        self._ensure_real()
1359
        return self._real_branch._get_checkout_format()
1360
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1361
    def get_physical_lock_status(self):
1362
        """See Branch.get_physical_lock_status()."""
1363
        # 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.
1364
        self._ensure_real()
2018.5.60 by Robert Collins
More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
1365
        return self._real_branch.get_physical_lock_status()
1366
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1367
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1368
        """Get the URL this branch is stacked against.
1369
1370
        :raises NotStacked: If the branch is not stacked.
1371
        :raises UnstackableBranchFormat: If the branch does not support
1372
            stacking.
1373
        :raises UnstackableRepositoryFormat: If the repository does not support
1374
            stacking.
1375
        """
1376
        self._ensure_real()
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1377
        return self._real_branch.get_stacked_on_url()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1378
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1379
    def lock_read(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1380
        self.repository.lock_read()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1381
        if not self._lock_mode:
1382
            self._lock_mode = 'r'
1383
            self._lock_count = 1
1384
            if self._real_branch is not None:
1385
                self._real_branch.lock_read()
1386
        else:
1387
            self._lock_count += 1
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1388
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).
1389
    def _remote_lock_write(self, token):
1390
        if token is None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1391
            branch_token = repo_token = ''
1392
        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).
1393
            branch_token = token
1394
            repo_token = self.repository.lock_write()
1395
            self.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1396
        path = self.bzrdir._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1397
        try:
1398
            response = self._client.call(
1399
                'Branch.lock_write', path, branch_token, repo_token or '')
1400
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1401
            self._translate_error(err, token=token)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1402
        if response[0] != 'ok':
2555.1.1 by Martin Pool
Remove use of 'assert False' to raise an exception unconditionally
1403
            raise errors.UnexpectedSmartServerResponse(response)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1404
        ok, branch_token, repo_token = response
1405
        return branch_token, repo_token
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1406
            
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).
1407
    def lock_write(self, token=None):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1408
        if not self._lock_mode:
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1409
            # Lock the branch and repo in one remote call.
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).
1410
            remote_tokens = self._remote_lock_write(token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1411
            self._lock_token, self._repo_lock_token = remote_tokens
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1412
            if not self._lock_token:
1413
                raise SmartProtocolError('Remote server did not return a token!')
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1414
            # Tell the self.repository object that it is locked.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
1415
            self.repository.lock_write(
1416
                self._repo_lock_token, _skip_rpc=True)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1417
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1418
            if self._real_branch is not None:
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
1419
                self._real_branch.lock_write(token=self._lock_token)
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).
1420
            if token is not None:
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1421
                self._leave_lock = True
1422
            else:
1423
                self._leave_lock = False
1424
            self._lock_mode = 'w'
1425
            self._lock_count = 1
1426
        elif self._lock_mode == 'r':
1427
            raise errors.ReadOnlyTransaction
1428
        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).
1429
            if token is not None:
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1430
                # A token was given to lock_write, and we're relocking, so
1431
                # check that the given token actually matches the one we
1432
                # already have.
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).
1433
                if token != self._lock_token:
1434
                    raise errors.TokenMismatch(token, self._lock_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1435
            self._lock_count += 1
3692.1.3 by Andrew Bennetts
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
1436
            # Re-lock the repository too.
3692.1.2 by Andrew Bennetts
Fix regression introduced by fix, and add a test for that regression.
1437
            self.repository.lock_write(self._repo_lock_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.
1438
        return self._lock_token or None
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1439
1440
    def _unlock(self, branch_token, repo_token):
1441
        path = self.bzrdir._path_for_remote_call(self._client)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1442
        try:
1443
            response = self._client.call('Branch.unlock', path, branch_token,
1444
                                         repo_token or '')
1445
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1446
            self._translate_error(err, token=str((branch_token, repo_token)))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1447
        if response == ('ok',):
1448
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1449
        raise errors.UnexpectedSmartServerResponse(response)
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1450
1451
    def unlock(self):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1452
        try:
1453
            self._lock_count -= 1
1454
            if not self._lock_count:
1455
                self._clear_cached_state()
1456
                mode = self._lock_mode
1457
                self._lock_mode = None
1458
                if self._real_branch is not None:
1459
                    if (not self._leave_lock and mode == 'w' and
1460
                        self._repo_lock_token):
1461
                        # If this RemoteBranch will remove the physical lock
1462
                        # for the repository, make sure the _real_branch
1463
                        # doesn't do it first.  (Because the _real_branch's
1464
                        # repository is set to be the RemoteRepository.)
1465
                        self._real_branch.repository.leave_lock_in_place()
1466
                    self._real_branch.unlock()
1467
                if mode != 'w':
1468
                    # Only write-locked branched need to make a remote method
1469
                    # call to perfom the unlock.
1470
                    return
1471
                if not self._lock_token:
1472
                    raise AssertionError('Locked, but no token!')
1473
                branch_token = self._lock_token
1474
                repo_token = self._repo_lock_token
1475
                self._lock_token = None
1476
                self._repo_lock_token = None
1477
                if not self._leave_lock:
1478
                    self._unlock(branch_token, repo_token)
1479
        finally:
1480
            self.repository.unlock()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1481
1482
    def break_lock(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1483
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1484
        return self._real_branch.break_lock()
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
1485
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1486
    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.
1487
        if not self._lock_token:
1488
            raise NotImplementedError(self.leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1489
        self._leave_lock = True
1490
1491
    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.
1492
        if not self._lock_token:
3015.2.15 by Robert Collins
Review feedback.
1493
            raise NotImplementedError(self.dont_leave_lock_in_place)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1494
        self._leave_lock = False
1495
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1496
    def _last_revision_info(self):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1497
        path = self.bzrdir._path_for_remote_call(self._client)
1498
        response = self._client.call('Branch.last_revision_info', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1499
        if response[0] != 'ok':
1500
            raise SmartProtocolError('unexpected response code %s' % (response,))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1501
        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.
1502
        last_revision = response[2]
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1503
        return (revno, last_revision)
1504
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1505
    def _gen_revision_history(self):
1506
        """See Branch._gen_revision_history()."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1507
        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.
1508
        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.
1509
            '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.
1510
        if response_tuple[0] != 'ok':
3441.5.18 by Andrew Bennetts
Fix some test failures.
1511
            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.
1512
        result = response_handler.read_body_bytes().split('\x00')
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1513
        if result == ['']:
1514
            return []
1515
        return result
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
1516
3441.5.18 by Andrew Bennetts
Fix some test failures.
1517
    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.
1518
            allow_diverged=False, allow_overwrite_descendant=False):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1519
        path = self.bzrdir._path_for_remote_call(self._client)
1520
        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.
1521
            response = self._client.call('Branch.set_last_revision_ex',
3441.5.18 by Andrew Bennetts
Fix some test failures.
1522
                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.
1523
                int(allow_diverged), int(allow_overwrite_descendant))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1524
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1525
            self._translate_error(err, other_branch=other_branch)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1526
        self._clear_cached_state()
3441.5.18 by Andrew Bennetts
Fix some test failures.
1527
        if len(response) != 3 and response[0] != 'ok':
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1528
            raise errors.UnexpectedSmartServerResponse(response)
3441.5.18 by Andrew Bennetts
Fix some test failures.
1529
        new_revno, new_revision_id = response[1:]
1530
        self._last_revision_info_cache = new_revno, new_revision_id
3692.1.5 by Andrew Bennetts
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
1531
        if self._real_branch is not None:
1532
            cache = new_revno, new_revision_id
1533
            self._real_branch._last_revision_info_cache = cache
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1534
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1535
    def _set_last_revision(self, revision_id):
1536
        path = self.bzrdir._path_for_remote_call(self._client)
1537
        self._clear_cached_state()
1538
        try:
1539
            response = self._client.call('Branch.set_last_revision',
1540
                path, self._lock_token, self._repo_lock_token, revision_id)
1541
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1542
            self._translate_error(err)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1543
        if response != ('ok',):
1544
            raise errors.UnexpectedSmartServerResponse(response)
1545
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1546
    @needs_write_lock
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1547
    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.
1548
        # Send just the tip revision of the history; the server will generate
1549
        # the full history from that.  If the revision doesn't exist in this
1550
        # branch, NoSuchRevision will be raised.
1551
        if rev_history == []:
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
1552
            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.
1553
        else:
1554
            rev_id = rev_history[-1]
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1555
        self._set_last_revision(rev_id)
2018.5.105 by Andrew Bennetts
Implement revision_history caching for RemoteBranch.
1556
        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.
1557
1558
    def get_parent(self):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1559
        self._ensure_real()
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1560
        return self._real_branch.get_parent()
1561
        
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1562
    def set_parent(self, url):
2018.5.70 by Robert Collins
Only try to get real repositories when an operation requires them.
1563
        self._ensure_real()
1752.2.63 by Andrew Bennetts
Delegate set_parent.
1564
        return self._real_branch.set_parent(url)
1565
        
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1566
    def set_stacked_on_url(self, stacked_location):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1567
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1568
1569
        :raises UnstackableBranchFormat: If the branch does not support
1570
            stacking.
1571
        :raises UnstackableRepositoryFormat: If the repository does not support
1572
            stacking.
1573
        """
1574
        self._ensure_real()
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1575
        return self._real_branch.set_stacked_on_url(stacked_location)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1576
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1577
    def sprout(self, to_bzrdir, revision_id=None):
1578
        # Like Branch.sprout, except that it sprouts a branch in the default
1579
        # format, because RemoteBranches can't be created at arbitrary URLs.
1580
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1581
        # to_bzrdir.create_branch...
3047.1.1 by Andrew Bennetts
Fix for bug 164626, add test that Repository.sprout preserves format.
1582
        self._ensure_real()
1583
        result = self._real_branch._format.initialize(to_bzrdir)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
1584
        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).
1585
        result.set_parent(self.bzrdir.root_transport.base)
1586
        return result
1587
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1588
    @needs_write_lock
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1589
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1590
             **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.
1591
        self._clear_cached_state_of_remote_branch_only()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1592
        self._ensure_real()
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
1593
        return self._real_branch.pull(
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1594
            source, overwrite=overwrite, stop_revision=stop_revision,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1595
            _override_hook_target=self, **kwargs)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1596
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1597
    @needs_read_lock
1598
    def push(self, target, overwrite=False, stop_revision=None):
1599
        self._ensure_real()
2018.5.97 by Andrew Bennetts
Fix more tests.
1600
        return self._real_branch.push(
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1601
            target, overwrite=overwrite, stop_revision=stop_revision,
1602
            _override_hook_source_branch=self)
2018.14.3 by Andrew Bennetts
Make a couple more branch_implementations tests pass.
1603
1604
    def is_locked(self):
1605
        return self._lock_count >= 1
1606
3634.2.1 by John Arbash Meinel
Thunk over to the real branch's revision_id_to_revno.
1607
    @needs_read_lock
1608
    def revision_id_to_revno(self, revision_id):
1609
        self._ensure_real()
1610
        return self._real_branch.revision_id_to_revno(revision_id)
1611
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1612
    @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.
1613
    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.
1614
        revision_id = ensure_null(revision_id)
1615
        path = self.bzrdir._path_for_remote_call(self._client)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1616
        try:
1617
            response = self._client.call('Branch.set_last_revision_info',
1618
                path, self._lock_token, self._repo_lock_token, str(revno), revision_id)
1619
        except errors.UnknownSmartMethod:
1620
            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.
1621
            self._clear_cached_state_of_remote_branch_only()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1622
            self._real_branch.set_last_revision_info(revno, revision_id)
1623
            self._last_revision_info_cache = revno, revision_id
1624
            return
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1625
        except errors.ErrorFromSmartServer, err:
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1626
            self._translate_error(err)
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1627
        if response == ('ok',):
1628
            self._clear_cached_state()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1629
            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.
1630
            # Update the _real_branch's cache too.
1631
            if self._real_branch is not None:
1632
                cache = self._last_revision_info_cache
1633
                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.
1634
        else:
1635
            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.
1636
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.
1637
    @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.
1638
    def generate_revision_history(self, revision_id, last_rev=None,
1639
                                  other_branch=None):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1640
        medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1641
        if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1642
            try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1643
                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.
1644
                    allow_diverged=True, allow_overwrite_descendant=True)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1645
                return
3441.5.18 by Andrew Bennetts
Fix some test failures.
1646
            except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1647
                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.
1648
        self._clear_cached_state_of_remote_branch_only()
3441.5.2 by Andrew Bennetts
Remove various debugging cruft.
1649
        self._ensure_real()
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1650
        self._real_branch.generate_revision_history(
3441.5.2 by Andrew Bennetts
Remove various debugging cruft.
1651
            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.
1652
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1653
    @property
1654
    def tags(self):
1655
        self._ensure_real()
1656
        return self._real_branch.tags
1657
2018.5.97 by Andrew Bennetts
Fix more tests.
1658
    def set_push_location(self, location):
1659
        self._ensure_real()
1660
        return self._real_branch.set_push_location(location)
1661
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1662
    @needs_write_lock
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1663
    def update_revisions(self, other, stop_revision=None, overwrite=False,
1664
                         graph=None):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1665
        """See Branch.update_revisions."""
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1666
        other.lock_read()
1667
        try:
1668
            if stop_revision is None:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1669
                stop_revision = other.last_revision()
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1670
                if revision.is_null(stop_revision):
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1671
                    # if there are no commits, we're done.
1672
                    return
1673
            self.fetch(other, stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1674
1675
            if overwrite:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1676
                # Just unconditionally set the new revision.  We don't care if
1677
                # the branches have diverged.
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1678
                self._set_last_revision(stop_revision)
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1679
            else:
1680
                medium = self._client._medium
3441.5.23 by Andrew Bennetts
Fix test failures.
1681
                if not medium._is_remote_before((1, 6)):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1682
                    try:
1683
                        self._set_last_revision_descendant(stop_revision, other)
1684
                        return
3441.5.7 by Andrew Bennetts
Fix unbound global.
1685
                    except errors.UnknownSmartMethod:
3441.5.23 by Andrew Bennetts
Fix test failures.
1686
                        medium._remember_remote_is_before((1, 6))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1687
                # Fallback for pre-1.6 servers: check for divergence
1688
                # client-side, then do _set_last_revision.
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1689
                last_rev = revision.ensure_null(self.last_revision())
3441.5.18 by Andrew Bennetts
Fix some test failures.
1690
                if graph is None:
1691
                    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.
1692
                if self._check_if_descendant_or_diverged(
3441.5.18 by Andrew Bennetts
Fix some test failures.
1693
                        stop_revision, last_rev, graph, other):
1694
                    # stop_revision is a descendant of last_rev, but we aren't
1695
                    # overwriting, so we're done.
1696
                    return
1697
                self._set_last_revision(stop_revision)
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
1698
        finally:
1699
            other.unlock()
2018.5.97 by Andrew Bennetts
Fix more tests.
1700
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1701
1702
def _extract_tar(tar, to_dir):
1703
    """Extract all the contents of a tarfile object.
1704
1705
    A replacement for extractall, which is not present in python2.4
1706
    """
1707
    for tarinfo in tar:
1708
        tar.extract(tarinfo, to_dir)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1709
1710
1711
def _translate_error(err, **context):
1712
    """Translate an ErrorFromSmartServer into a more useful error.
1713
1714
    Possible context keys:
1715
      - branch
1716
      - repository
1717
      - bzrdir
1718
      - token
1719
      - other_branch
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
1720
1721
    If the error from the server doesn't match a known pattern, then
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1722
    UnknownErrorFromSmartServer is raised.
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1723
    """
1724
    def find(name):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1725
        try:
1726
            return context[name]
1727
        except KeyError, keyErr:
1728
            mutter('Missing key %r in context %r', keyErr.args[0], context)
1729
            raise err
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1730
    if err.error_verb == 'NoSuchRevision':
1731
        raise NoSuchRevision(find('branch'), err.error_args[0])
1732
    elif err.error_verb == 'nosuchrevision':
1733
        raise NoSuchRevision(find('repository'), err.error_args[0])
1734
    elif err.error_tuple == ('nobranch',):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1735
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1736
    elif err.error_verb == 'norepository':
1737
        raise errors.NoRepositoryPresent(find('bzrdir'))
1738
    elif err.error_verb == 'LockContention':
1739
        raise errors.LockContention('(remote lock)')
1740
    elif err.error_verb == 'UnlockableTransport':
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1741
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1742
    elif err.error_verb == 'LockFailed':
1743
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
1744
    elif err.error_verb == 'TokenMismatch':
1745
        raise errors.TokenMismatch(find('token'), '(remote token)')
1746
    elif err.error_verb == 'Diverged':
1747
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1748
    elif err.error_verb == 'TipChangeRejected':
1749
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1750
    raise errors.UnknownErrorFromSmartServer(err)
3533.3.1 by Andrew Bennetts
Remove duplication of error translation in bzrlib/remote.py.
1751