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