/brz/remove-bazaar

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