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