~bzr-pqm/bzr/bzr.dev

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