/brz/remove-bazaar

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