bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
1  | 
# Copyright (C) 2006, 2007 Canonical Ltd
 | 
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
2  | 
#
 | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1752.2.39
by Martin Pool
 [broken] implement upgrade apis on remote bzrdirs  | 
17  | 
# TODO: At some point, handle upgrades by just passing the whole request
 | 
18  | 
# across to run on the server.
 | 
|
19  | 
||
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
20  | 
from cStringIO import StringIO  | 
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
21  | 
|
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
22  | 
from bzrlib import (  | 
23  | 
branch,  | 
|
24  | 
errors,  | 
|
25  | 
lockdir,  | 
|
26  | 
repository,  | 
|
27  | 
)
 | 
|
| 
2477.1.5
by Martin Pool
 More cleanups of Branch.push to get the right behaviour with RemoteBranches  | 
28  | 
from bzrlib.branch import Branch, BranchReferenceFormat  | 
| 
2018.5.174
by Andrew Bennetts
 Various nits discovered by pyflakes.  | 
29  | 
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat  | 
| 
2018.14.2
by Andrew Bennetts
 All but one repository_implementation tests for RemoteRepository passing.  | 
30  | 
from bzrlib.config import BranchConfig, TreeConfig  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
31  | 
from bzrlib.decorators import needs_read_lock, needs_write_lock  | 
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
32  | 
from bzrlib.errors import NoSuchRevision  | 
| 
2018.5.127
by Andrew Bennetts
 Fix most of the lockable_files tests for RemoteBranchLockableFiles.  | 
33  | 
from bzrlib.lockable_files import LockableFiles  | 
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
34  | 
from bzrlib.revision import NULL_REVISION  | 
| 
2018.6.1
by Robert Collins
 Implement a BzrDir.open_branch smart server method for opening a branch without VFS.  | 
35  | 
from bzrlib.smart import client, vfs  | 
| 
2697.2.2
by Martin Pool
 deprecate Branch.append_revision  | 
36  | 
from bzrlib.symbol_versioning import (  | 
37  | 
deprecated_method,  | 
|
38  | 
zero_ninetyone,  | 
|
39  | 
    )
 | 
|
| 
2018.18.20
by Martin Pool
 Route branch operations through remote copy_content_into  | 
40  | 
from bzrlib.trace import note  | 
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
41  | 
|
| 
2018.5.25
by Andrew Bennetts
 Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).  | 
42  | 
# Note: RemoteBzrDirFormat is in bzrdir.py
 | 
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
43  | 
|
44  | 
class RemoteBzrDir(BzrDir):  | 
|
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
45  | 
"""Control directory on a remote server, accessed via bzr:// or similar."""  | 
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
46  | 
|
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
47  | 
def __init__(self, transport, _client=None):  | 
48  | 
"""Construct a RemoteBzrDir.  | 
|
49  | 
||
50  | 
        :param _client: Private parameter for testing. Disables probing and the
 | 
|
51  | 
            use of a real bzrdir.
 | 
|
52  | 
        """
 | 
|
| 
1752.2.39
by Martin Pool
 [broken] implement upgrade apis on remote bzrdirs  | 
53  | 
BzrDir.__init__(self, transport, RemoteBzrDirFormat())  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
54  | 
        # this object holds a delegated bzrdir that uses file-level operations
 | 
55  | 
        # to talk to the other side
 | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
56  | 
self._real_bzrdir = None  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
57  | 
|
58  | 
if _client is None:  | 
|
| 
2485.8.54
by Vincent Ladeuil
 Refactor medium uses by making a distinction betweem shared and real medium.  | 
59  | 
self._shared_medium = transport.get_shared_medium()  | 
60  | 
self._client = client._SmartClient(self._shared_medium)  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
61  | 
else:  | 
62  | 
self._client = _client  | 
|
| 
2485.8.54
by Vincent Ladeuil
 Refactor medium uses by making a distinction betweem shared and real medium.  | 
63  | 
self._shared_medium = None  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
64  | 
            return
 | 
65  | 
||
66  | 
path = self._path_for_remote_call(self._client)  | 
|
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
67  | 
response = self._client.call('BzrDir.open', path)  | 
68  | 
if response not in [('yes',), ('no',)]:  | 
|
69  | 
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.  | 
70  | 
if response == ('no',):  | 
71  | 
raise errors.NotBranchError(path=transport.base)  | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
72  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
73  | 
def _ensure_real(self):  | 
74  | 
"""Ensure that there is a _real_bzrdir set.  | 
|
75  | 
||
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
76  | 
        Used before calls to self._real_bzrdir.
 | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
77  | 
        """
 | 
78  | 
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.  | 
79  | 
self._real_bzrdir = BzrDir.open_from_transport(  | 
80  | 
self.root_transport, _server_formats=False)  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
81  | 
|
| 
1752.2.39
by Martin Pool
 [broken] implement upgrade apis on remote bzrdirs  | 
82  | 
def create_repository(self, shared=False):  | 
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
83  | 
self._ensure_real()  | 
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
84  | 
self._real_bzrdir.create_repository(shared=shared)  | 
85  | 
return self.open_repository()  | 
|
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
86  | 
|
87  | 
def create_branch(self):  | 
|
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
88  | 
self._ensure_real()  | 
| 
1752.2.72
by Andrew Bennetts
 Make Remote* classes in remote.py more consistent and remove some dead code.  | 
89  | 
real_branch = self._real_bzrdir.create_branch()  | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
90  | 
return RemoteBranch(self, self.find_repository(), real_branch)  | 
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
91  | 
|
| 
2796.2.6
by Aaron Bentley
 Implement destroy_branch  | 
92  | 
def destroy_branch(self):  | 
| 
2796.2.16
by Aaron Bentley
 Documentation updates from review  | 
93  | 
"""See BzrDir.destroy_branch"""  | 
| 
2796.2.6
by Aaron Bentley
 Implement destroy_branch  | 
94  | 
self._ensure_real()  | 
95  | 
self._real_bzrdir.destroy_branch()  | 
|
96  | 
||
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
97  | 
def create_workingtree(self, revision_id=None):  | 
| 
2018.5.174
by Andrew Bennetts
 Various nits discovered by pyflakes.  | 
98  | 
raise errors.NotLocalUrl(self.transport.base)  | 
| 
1752.2.39
by Martin Pool
 [broken] implement upgrade apis on remote bzrdirs  | 
99  | 
|
| 
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.  | 
100  | 
def find_branch_format(self):  | 
101  | 
"""Find the branch 'format' for this bzrdir.  | 
|
102  | 
||
103  | 
        This might be a synthetic object for e.g. RemoteBranch and SVN.
 | 
|
104  | 
        """
 | 
|
105  | 
b = self.open_branch()  | 
|
106  | 
return b._format  | 
|
107  | 
||
| 
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.  | 
108  | 
def get_branch_reference(self):  | 
109  | 
"""See BzrDir.get_branch_reference()."""  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
110  | 
path = self._path_for_remote_call(self._client)  | 
111  | 
response = self._client.call('BzrDir.open_branch', path)  | 
|
112  | 
if response[0] == 'ok':  | 
|
113  | 
if response[1] == '':  | 
|
114  | 
                # 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.  | 
115  | 
return None  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
116  | 
else:  | 
117  | 
                # 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.  | 
118  | 
return response[1]  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
119  | 
elif response == ('nobranch',):  | 
| 
2018.6.1
by Robert Collins
 Implement a BzrDir.open_branch smart server method for opening a branch without VFS.  | 
120  | 
raise errors.NotBranchError(path=self.root_transport.base)  | 
121  | 
else:  | 
|
| 
2555.1.1
by Martin Pool
 Remove use of 'assert False' to raise an exception unconditionally  | 
122  | 
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.  | 
123  | 
|
124  | 
def open_branch(self, _unsupported=False):  | 
|
125  | 
assert _unsupported == False, 'unsupported flag support not implemented yet.'  | 
|
126  | 
reference_url = self.get_branch_reference()  | 
|
127  | 
if reference_url is None:  | 
|
128  | 
            # branch at this location.
 | 
|
129  | 
return RemoteBranch(self, self.find_repository())  | 
|
130  | 
else:  | 
|
131  | 
            # a branch reference, use the existing BranchReference logic.
 | 
|
132  | 
format = BranchReferenceFormat()  | 
|
133  | 
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.  | 
134  | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
135  | 
def open_repository(self):  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
136  | 
path = self._path_for_remote_call(self._client)  | 
137  | 
response = self._client.call('BzrDir.find_repository', path)  | 
|
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
138  | 
assert response[0] in ('ok', 'norepository'), \  | 
| 
2018.5.52
by Wouter van Heyst
 Provide more information when encountering unexpected responses from a smart  | 
139  | 
'unexpected response code %s' % (response,)  | 
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
140  | 
if response[0] == 'norepository':  | 
141  | 
raise errors.NoRepositoryPresent(self)  | 
|
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
142  | 
assert len(response) == 4, 'incorrect response length %s' % (response,)  | 
| 
2018.5.34
by Robert Collins
 Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.  | 
143  | 
if response[1] == '':  | 
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
144  | 
format = RemoteRepositoryFormat()  | 
| 
2018.5.166
by Andrew Bennetts
 Small changes in response to Aaron's review.  | 
145  | 
format.rich_root_data = (response[2] == 'yes')  | 
146  | 
format.supports_tree_reference = (response[3] == 'yes')  | 
|
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
147  | 
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.  | 
148  | 
else:  | 
149  | 
raise errors.NoRepositoryPresent(self)  | 
|
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
150  | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
151  | 
def open_workingtree(self, recommend_upgrade=True):  | 
| 
2445.1.1
by Andrew Bennetts
 Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl  | 
152  | 
self._ensure_real()  | 
153  | 
if self._real_bzrdir.has_workingtree():  | 
|
154  | 
raise errors.NotLocalUrl(self.root_transport)  | 
|
155  | 
else:  | 
|
156  | 
raise errors.NoWorkingTree(self.root_transport.base)  | 
|
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
157  | 
|
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
158  | 
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.  | 
159  | 
"""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 :).  | 
160  | 
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.  | 
161  | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
162  | 
def get_branch_transport(self, branch_format):  | 
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
163  | 
self._ensure_real()  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
164  | 
return self._real_bzrdir.get_branch_transport(branch_format)  | 
165  | 
||
| 
1752.2.43
by Andrew Bennetts
 Fix get_{branch,repository,workingtree}_transport.  | 
166  | 
def get_repository_transport(self, repository_format):  | 
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
167  | 
self._ensure_real()  | 
| 
1752.2.43
by Andrew Bennetts
 Fix get_{branch,repository,workingtree}_transport.  | 
168  | 
return self._real_bzrdir.get_repository_transport(repository_format)  | 
169  | 
||
170  | 
def get_workingtree_transport(self, workingtree_format):  | 
|
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
171  | 
self._ensure_real()  | 
| 
1752.2.43
by Andrew Bennetts
 Fix get_{branch,repository,workingtree}_transport.  | 
172  | 
return self._real_bzrdir.get_workingtree_transport(workingtree_format)  | 
173  | 
||
| 
1752.2.39
by Martin Pool
 [broken] implement upgrade apis on remote bzrdirs  | 
174  | 
def can_convert_format(self):  | 
175  | 
"""Upgrading of remote bzrdirs is not supported yet."""  | 
|
176  | 
return False  | 
|
177  | 
||
178  | 
def needs_format_conversion(self, format=None):  | 
|
179  | 
"""Upgrading of remote bzrdirs is not supported yet."""  | 
|
180  | 
return False  | 
|
181  | 
||
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
182  | 
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).  | 
183  | 
self._ensure_real()  | 
184  | 
return self._real_bzrdir.clone(url, revision_id=revision_id,  | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
185  | 
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).  | 
186  | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
187  | 
|
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
188  | 
class RemoteRepositoryFormat(repository.RepositoryFormat):  | 
| 
2018.5.159
by Andrew Bennetts
 Rename SmartClient to _SmartClient.  | 
189  | 
"""Format for repositories accessed over a _SmartClient.  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
190  | 
|
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
191  | 
    Instances of this repository are represented by RemoteRepository
 | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
192  | 
    instances.
 | 
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
193  | 
|
194  | 
    The RemoteRepositoryFormat is parameterised during construction
 | 
|
195  | 
    to reflect the capabilities of the real, remote format. Specifically
 | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
196  | 
    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.  | 
197  | 
    on a per instance basis, and are not set (and should not be) at
 | 
198  | 
    the class level.
 | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
199  | 
    """
 | 
200  | 
||
201  | 
_matchingbzrdir = RemoteBzrDirFormat  | 
|
202  | 
||
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
203  | 
def initialize(self, a_bzrdir, shared=False):  | 
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
204  | 
assert isinstance(a_bzrdir, RemoteBzrDir), \  | 
205  | 
'%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.  | 
206  | 
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.  | 
207  | 
|
208  | 
def open(self, a_bzrdir):  | 
|
| 
1752.2.72
by Andrew Bennetts
 Make Remote* classes in remote.py more consistent and remove some dead code.  | 
209  | 
assert isinstance(a_bzrdir, RemoteBzrDir)  | 
210  | 
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.  | 
211  | 
|
212  | 
def get_format_description(self):  | 
|
213  | 
return 'bzr remote repository'  | 
|
214  | 
||
215  | 
def __eq__(self, other):  | 
|
| 
1752.2.87
by Andrew Bennetts
 Make tests pass.  | 
216  | 
return self.__class__ == other.__class__  | 
217  | 
||
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
218  | 
def check_conversion_target(self, target_format):  | 
219  | 
if self.rich_root_data and not target_format.rich_root_data:  | 
|
220  | 
raise errors.BadConversionTarget(  | 
|
221  | 
'Does not support rich root data.', target_format)  | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
222  | 
if (self.supports_tree_reference and  | 
223  | 
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.  | 
224  | 
raise errors.BadConversionTarget(  | 
225  | 
'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.  | 
226  | 
|
| 
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  | 
class RemoteRepository(object):  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
229  | 
"""Repository accessed over rpc.  | 
230  | 
||
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
231  | 
    For the moment most operations are performed using local transport-backed
 | 
232  | 
    Repository objects.
 | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
233  | 
    """
 | 
234  | 
||
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
235  | 
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.  | 
236  | 
"""Create a RemoteRepository instance.  | 
237  | 
        
 | 
|
238  | 
        :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.  | 
239  | 
        :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.  | 
240  | 
        :param real_repository: If not None, a local implementation of the
 | 
241  | 
            repository logic for the repository, usually accessing the data
 | 
|
242  | 
            via the VFS.
 | 
|
| 
2018.5.57
by Robert Collins
 Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).  | 
243  | 
        :param _client: Private testing parameter - override the smart client
 | 
244  | 
            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.  | 
245  | 
        """
 | 
246  | 
if real_repository:  | 
|
| 
2018.5.36
by Andrew Bennetts
 Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.  | 
247  | 
self._real_repository = real_repository  | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
248  | 
else:  | 
249  | 
self._real_repository = None  | 
|
| 
1752.2.50
by Andrew Bennetts
 Implement RemoteBzrDir.create_{branch,workingtree}  | 
250  | 
self.bzrdir = remote_bzrdir  | 
| 
2018.5.57
by Robert Collins
 Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).  | 
251  | 
if _client is None:  | 
| 
2485.8.54
by Vincent Ladeuil
 Refactor medium uses by making a distinction betweem shared and real medium.  | 
252  | 
self._client = client._SmartClient(self.bzrdir._shared_medium)  | 
| 
2018.5.57
by Robert Collins
 Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).  | 
253  | 
else:  | 
254  | 
self._client = _client  | 
|
| 
2018.5.118
by Robert Collins
 Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.  | 
255  | 
self._format = format  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
256  | 
self._lock_mode = None  | 
257  | 
self._lock_token = None  | 
|
258  | 
self._lock_count = 0  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
259  | 
self._leave_lock = False  | 
| 
2671.4.2
by Robert Collins
 Review feedback.  | 
260  | 
        # for tests
 | 
261  | 
self._reconcile_does_inventory_gc = True  | 
|
| 
2857.3.1
by Robert Collins
 (robertc) Remote object tweaks from the packs branch. (Robert Collins)  | 
262  | 
self.base = self.bzrdir.transport.base  | 
263  | 
||
264  | 
def __str__(self):  | 
|
265  | 
return "%s(%s)" % (self.__class__.__name__, self.base)  | 
|
266  | 
||
267  | 
__repr__ = __str__  | 
|
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
268  | 
|
| 
2617.6.2
by Robert Collins
 Add abort_write_group and wire write_groups into fetch and commit.  | 
269  | 
def abort_write_group(self):  | 
| 
2617.6.7
by Robert Collins
 More review feedback.  | 
270  | 
"""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.  | 
271  | 
        
 | 
272  | 
        Smart methods peform operations in a single step so this api
 | 
|
| 
2617.6.6
by Robert Collins
 Some review feedback.  | 
273  | 
        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.  | 
274  | 
        for older plugins that don't use e.g. the CommitBuilder
 | 
275  | 
        facility.
 | 
|
276  | 
        """
 | 
|
277  | 
self._ensure_real()  | 
|
278  | 
return self._real_repository.abort_write_group()  | 
|
279  | 
||
280  | 
def commit_write_group(self):  | 
|
| 
2617.6.7
by Robert Collins
 More review feedback.  | 
281  | 
"""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.  | 
282  | 
        
 | 
283  | 
        Smart methods peform operations in a single step so this api
 | 
|
| 
2617.6.6
by Robert Collins
 Some review feedback.  | 
284  | 
        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.  | 
285  | 
        for older plugins that don't use e.g. the CommitBuilder
 | 
286  | 
        facility.
 | 
|
287  | 
        """
 | 
|
288  | 
self._ensure_real()  | 
|
289  | 
return self._real_repository.commit_write_group()  | 
|
| 
2617.6.1
by Robert Collins
 * New method on Repository - ``start_write_group``, ``end_write_group``  | 
290  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
291  | 
def _ensure_real(self):  | 
292  | 
"""Ensure that there is a _real_repository set.  | 
|
293  | 
||
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
294  | 
        Used before calls to self._real_repository.
 | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
295  | 
        """
 | 
296  | 
if not self._real_repository:  | 
|
297  | 
self.bzrdir._ensure_real()  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
298  | 
            #self._real_repository = self.bzrdir._real_bzrdir.open_repository()
 | 
299  | 
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.  | 
300  | 
|
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
301  | 
def get_revision_graph(self, revision_id=None):  | 
302  | 
"""See Repository.get_revision_graph()."""  | 
|
303  | 
if revision_id is None:  | 
|
304  | 
revision_id = ''  | 
|
305  | 
elif revision_id == NULL_REVISION:  | 
|
306  | 
return {}  | 
|
307  | 
||
308  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
309  | 
assert type(revision_id) is str  | 
| 
2018.5.153
by Andrew Bennetts
 Rename call2 to call_expecting_body, and other small changes prompted by review.  | 
310  | 
response = self._client.call_expecting_body(  | 
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
311  | 
'Repository.get_revision_graph', path, revision_id)  | 
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
312  | 
if response[0][0] not in ['ok', 'nosuchrevision']:  | 
313  | 
raise errors.UnexpectedSmartServerResponse(response[0])  | 
|
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
314  | 
if response[0][0] == 'ok':  | 
315  | 
coded = response[1].read_body_bytes()  | 
|
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
316  | 
if coded == '':  | 
317  | 
                # no revisions in this repository!
 | 
|
318  | 
return {}  | 
|
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
319  | 
lines = coded.split('\n')  | 
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
320  | 
revision_graph = {}  | 
321  | 
for line in lines:  | 
|
| 
2625.8.1
by Robert Collins
 LIBRARY API BREAKS:  | 
322  | 
d = tuple(line.split())  | 
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
323  | 
revision_graph[d[0]] = d[1:]  | 
324  | 
||
325  | 
return revision_graph  | 
|
326  | 
else:  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
327  | 
response_body = response[1].read_body_bytes()  | 
328  | 
assert response_body == ''  | 
|
| 
2018.5.67
by Wouter van Heyst
 Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)  | 
329  | 
raise NoSuchRevision(self, revision_id)  | 
330  | 
||
| 
2018.5.40
by Robert Collins
 Implement a remote Repository.has_revision method.  | 
331  | 
def has_revision(self, revision_id):  | 
332  | 
"""See Repository.has_revision()."""  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
333  | 
if revision_id is None:  | 
334  | 
            # The null revision is always present.
 | 
|
335  | 
return True  | 
|
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
336  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
337  | 
response = self._client.call('Repository.has_revision', path, revision_id)  | 
| 
2018.5.158
by Andrew Bennetts
 Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.  | 
338  | 
assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)  | 
339  | 
return response[0] == 'yes'  | 
|
| 
2018.5.40
by Robert Collins
 Implement a remote Repository.has_revision method.  | 
340  | 
|
| 
2617.6.9
by Robert Collins
 Merge bzr.dev.  | 
341  | 
def has_same_location(self, other):  | 
| 
2857.3.2
by Robert Collins
 Back out class test removal in RemoteRepository.has_same_location.  | 
342  | 
return (self.__class__ == other.__class__ and  | 
343  | 
self.bzrdir.transport.base == other.bzrdir.transport.base)  | 
|
| 
2617.6.9
by Robert Collins
 Merge bzr.dev.  | 
344  | 
|
| 
2490.2.21
by Aaron Bentley
 Rename graph to deprecated_graph  | 
345  | 
def get_graph(self, other_repository=None):  | 
346  | 
"""Return the graph for this repository format"""  | 
|
347  | 
return self._real_repository.get_graph(other_repository)  | 
|
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
348  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
349  | 
def gather_stats(self, revid=None, committers=None):  | 
| 
2018.5.62
by Robert Collins
 Stub out RemoteRepository.gather_stats while its implemented in parallel.  | 
350  | 
"""See Repository.gather_stats()."""  | 
| 
2018.10.3
by v.ladeuil+lp at free
 more tests for gather_stats  | 
351  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
352  | 
if revid in (None, NULL_REVISION):  | 
|
353  | 
fmt_revid = ''  | 
|
354  | 
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.  | 
355  | 
fmt_revid = revid  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
356  | 
if committers is None or not committers:  | 
| 
2018.10.3
by v.ladeuil+lp at free
 more tests for gather_stats  | 
357  | 
fmt_committers = 'no'  | 
358  | 
else:  | 
|
359  | 
fmt_committers = 'yes'  | 
|
| 
2018.5.153
by Andrew Bennetts
 Rename call2 to call_expecting_body, and other small changes prompted by review.  | 
360  | 
response = self._client.call_expecting_body(  | 
361  | 
'Repository.gather_stats', path, fmt_revid, fmt_committers)  | 
|
| 
2018.10.3
by v.ladeuil+lp at free
 more tests for gather_stats  | 
362  | 
assert response[0][0] == 'ok', \  | 
363  | 
'unexpected response code %s' % (response[0],)  | 
|
364  | 
||
365  | 
body = response[1].read_body_bytes()  | 
|
366  | 
result = {}  | 
|
367  | 
for line in body.split('\n'):  | 
|
368  | 
if not line:  | 
|
369  | 
                continue
 | 
|
370  | 
key, val_text = line.split(':')  | 
|
371  | 
if key in ('revisions', 'size', 'committers'):  | 
|
372  | 
result[key] = int(val_text)  | 
|
373  | 
elif key in ('firstrev', 'latestrev'):  | 
|
374  | 
values = val_text.split(' ')[1:]  | 
|
375  | 
result[key] = (float(values[0]), long(values[1]))  | 
|
376  | 
||
377  | 
return result  | 
|
| 
2018.5.62
by Robert Collins
 Stub out RemoteRepository.gather_stats while its implemented in parallel.  | 
378  | 
|
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
379  | 
def get_physical_lock_status(self):  | 
380  | 
"""See Repository.get_physical_lock_status()."""  | 
|
381  | 
return False  | 
|
382  | 
||
| 
2617.6.1
by Robert Collins
 * New method on Repository - ``start_write_group``, ``end_write_group``  | 
383  | 
def is_in_write_group(self):  | 
384  | 
"""Return True if there is an open write group.  | 
|
385  | 
||
386  | 
        write groups are only applicable locally for the smart server..
 | 
|
387  | 
        """
 | 
|
388  | 
if self._real_repository:  | 
|
389  | 
return self._real_repository.is_in_write_group()  | 
|
390  | 
||
391  | 
def is_locked(self):  | 
|
392  | 
return self._lock_count >= 1  | 
|
393  | 
||
| 
2018.5.57
by Robert Collins
 Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).  | 
394  | 
def is_shared(self):  | 
395  | 
"""See Repository.is_shared()."""  | 
|
396  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
397  | 
response = self._client.call('Repository.is_shared', path)  | 
|
398  | 
assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)  | 
|
399  | 
return response[0] == 'yes'  | 
|
400  | 
||
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
401  | 
def lock_read(self):  | 
402  | 
        # wrong eventually - want a local lock cache context
 | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
403  | 
if not self._lock_mode:  | 
404  | 
self._lock_mode = 'r'  | 
|
405  | 
self._lock_count = 1  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
406  | 
if self._real_repository is not None:  | 
407  | 
self._real_repository.lock_read()  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
408  | 
else:  | 
409  | 
self._lock_count += 1  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
410  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
411  | 
def _remote_lock_write(self, token):  | 
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
412  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
413  | 
if token is None:  | 
|
414  | 
token = ''  | 
|
415  | 
response = self._client.call('Repository.lock_write', path, token)  | 
|
416  | 
if response[0] == 'ok':  | 
|
417  | 
ok, token = response  | 
|
418  | 
return token  | 
|
419  | 
elif response[0] == 'LockContention':  | 
|
420  | 
raise errors.LockContention('(remote lock)')  | 
|
| 
2018.5.95
by Andrew Bennetts
 Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.  | 
421  | 
elif response[0] == 'UnlockableTransport':  | 
422  | 
raise errors.UnlockableTransport(self.bzrdir.root_transport)  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
423  | 
else:  | 
| 
2555.1.1
by Martin Pool
 Remove use of 'assert False' to raise an exception unconditionally  | 
424  | 
raise errors.UnexpectedSmartServerResponse(response)  | 
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
425  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
426  | 
def lock_write(self, token=None):  | 
427  | 
if not self._lock_mode:  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
428  | 
self._lock_token = self._remote_lock_write(token)  | 
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
429  | 
assert self._lock_token, 'Remote server did not return a token!'  | 
430  | 
if self._real_repository is not None:  | 
|
431  | 
self._real_repository.lock_write(token=self._lock_token)  | 
|
432  | 
if token is not None:  | 
|
433  | 
self._leave_lock = True  | 
|
434  | 
else:  | 
|
435  | 
self._leave_lock = False  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
436  | 
self._lock_mode = 'w'  | 
437  | 
self._lock_count = 1  | 
|
438  | 
elif self._lock_mode == 'r':  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
439  | 
raise errors.ReadOnlyError(self)  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
440  | 
else:  | 
441  | 
self._lock_count += 1  | 
|
442  | 
return self._lock_token  | 
|
443  | 
||
444  | 
def leave_lock_in_place(self):  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
445  | 
self._leave_lock = True  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
446  | 
|
447  | 
def dont_leave_lock_in_place(self):  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
448  | 
self._leave_lock = False  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
449  | 
|
450  | 
def _set_real_repository(self, repository):  | 
|
451  | 
"""Set the _real_repository for this repository.  | 
|
452  | 
||
453  | 
        :param repository: The repository to fallback to for non-hpss
 | 
|
454  | 
            implemented operations.
 | 
|
455  | 
        """
 | 
|
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
456  | 
assert not isinstance(repository, RemoteRepository)  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
457  | 
self._real_repository = repository  | 
458  | 
if self._lock_mode == 'w':  | 
|
459  | 
            # if we are already locked, the real repository must be able to
 | 
|
460  | 
            # acquire the lock with our token.
 | 
|
461  | 
self._real_repository.lock_write(self._lock_token)  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
462  | 
elif self._lock_mode == 'r':  | 
463  | 
self._real_repository.lock_read()  | 
|
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
464  | 
|
| 
2617.6.1
by Robert Collins
 * New method on Repository - ``start_write_group``, ``end_write_group``  | 
465  | 
def start_write_group(self):  | 
466  | 
"""Start a write group on the decorated repository.  | 
|
467  | 
        
 | 
|
468  | 
        Smart methods peform operations in a single step so this api
 | 
|
| 
2617.6.6
by Robert Collins
 Some review feedback.  | 
469  | 
        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``  | 
470  | 
        for older plugins that don't use e.g. the CommitBuilder
 | 
471  | 
        facility.
 | 
|
472  | 
        """
 | 
|
473  | 
self._ensure_real()  | 
|
474  | 
return self._real_repository.start_write_group()  | 
|
475  | 
||
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
476  | 
def _unlock(self, token):  | 
477  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
478  | 
response = self._client.call('Repository.unlock', path, token)  | 
|
479  | 
if response == ('ok',):  | 
|
480  | 
            return
 | 
|
481  | 
elif response[0] == 'TokenMismatch':  | 
|
482  | 
raise errors.TokenMismatch(token, '(remote token)')  | 
|
483  | 
else:  | 
|
| 
2555.1.1
by Martin Pool
 Remove use of 'assert False' to raise an exception unconditionally  | 
484  | 
raise errors.UnexpectedSmartServerResponse(response)  | 
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
485  | 
|
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
486  | 
def unlock(self):  | 
| 
2617.6.1
by Robert Collins
 * New method on Repository - ``start_write_group``, ``end_write_group``  | 
487  | 
if self._lock_count == 1 and self._lock_mode == 'w':  | 
488  | 
            # don't unlock if inside a write group.
 | 
|
489  | 
if self.is_in_write_group():  | 
|
490  | 
raise errors.BzrError(  | 
|
491  | 
'Must end write groups before releasing write locks.')  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
492  | 
self._lock_count -= 1  | 
493  | 
if not self._lock_count:  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
494  | 
mode = self._lock_mode  | 
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
495  | 
self._lock_mode = None  | 
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
496  | 
if self._real_repository is not None:  | 
497  | 
self._real_repository.unlock()  | 
|
498  | 
if mode != 'w':  | 
|
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
499  | 
                # Only write-locked repositories need to make a remote method
 | 
500  | 
                # call to perfom the unlock.
 | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
501  | 
                return
 | 
502  | 
assert self._lock_token, 'Locked, but no token!'  | 
|
503  | 
token = self._lock_token  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
504  | 
self._lock_token = None  | 
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
505  | 
if not self._leave_lock:  | 
506  | 
self._unlock(token)  | 
|
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
507  | 
|
508  | 
def break_lock(self):  | 
|
| 
2018.5.78
by Andrew Bennetts
 Implement RemoteRepository.lock_write/unlock to expect and send tokens over the  | 
509  | 
        # should hand off to the network
 | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
510  | 
self._ensure_real()  | 
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
511  | 
return self._real_repository.break_lock()  | 
512  | 
||
| 
2018.18.8
by Ian Clatworthy
 Tarball proxy code & tests  | 
513  | 
def _get_tarball(self, compression):  | 
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
514  | 
"""Return a TemporaryFile containing a repository tarball.  | 
515  | 
        
 | 
|
516  | 
        Returns None if the server does not support sending tarballs.
 | 
|
517  | 
        """
 | 
|
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
518  | 
import tempfile  | 
| 
2018.18.8
by Ian Clatworthy
 Tarball proxy code & tests  | 
519  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
| 
2018.18.14
by Martin Pool
 merge hpss again; restore incorrectly removed RemoteRepository.break_lock  | 
520  | 
response, protocol = self._client.call_expecting_body(  | 
521  | 
'Repository.tarball', path, compression)  | 
|
| 
2018.18.8
by Ian Clatworthy
 Tarball proxy code & tests  | 
522  | 
if response[0] == 'ok':  | 
523  | 
            # Extract the tarball and return it
 | 
|
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
524  | 
t = tempfile.NamedTemporaryFile()  | 
525  | 
            # TODO: rpc layer should read directly into it...
 | 
|
526  | 
t.write(protocol.read_body_bytes())  | 
|
527  | 
t.seek(0)  | 
|
528  | 
return t  | 
|
| 
2814.10.1
by Andrew Bennetts
 Cope gracefully if the server doesn't support the Repository.tarball smart request.  | 
529  | 
if (response == ('error', "Generic bzr smart protocol error: "  | 
530  | 
"bad request 'Repository.tarball'") or  | 
|
531  | 
response == ('error', "Generic bzr smart protocol error: "  | 
|
532  | 
"bad request u'Repository.tarball'")):  | 
|
533  | 
protocol.cancel_read_body()  | 
|
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
534  | 
return None  | 
| 
2814.10.1
by Andrew Bennetts
 Cope gracefully if the server doesn't support the Repository.tarball smart request.  | 
535  | 
raise errors.UnexpectedSmartServerResponse(response)  | 
| 
2018.18.8
by Ian Clatworthy
 Tarball proxy code & tests  | 
536  | 
|
| 
2440.1.1
by Martin Pool
 Add new Repository.sprout,  | 
537  | 
def sprout(self, to_bzrdir, revision_id=None):  | 
538  | 
        # TODO: Option to control what format is created?
 | 
|
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
539  | 
to_repo = self._copy_repository_tarball(to_bzrdir, revision_id)  | 
540  | 
if to_repo is None:  | 
|
| 
2814.10.1
by Andrew Bennetts
 Cope gracefully if the server doesn't support the Repository.tarball smart request.  | 
541  | 
self._ensure_real()  | 
542  | 
return self._real_repository.sprout(  | 
|
543  | 
to_bzrdir, revision_id=revision_id)  | 
|
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
544  | 
else:  | 
545  | 
return to_repo  | 
|
| 
2440.1.1
by Martin Pool
 Add new Repository.sprout,  | 
546  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
547  | 
    ### These methods are just thin shims to the VFS object for now.
 | 
548  | 
||
549  | 
def revision_tree(self, revision_id):  | 
|
550  | 
self._ensure_real()  | 
|
551  | 
return self._real_repository.revision_tree(revision_id)  | 
|
552  | 
||
| 
2520.4.113
by Aaron Bentley
 Avoid peeking at Repository._serializer  | 
553  | 
def get_serializer_format(self):  | 
554  | 
self._ensure_real()  | 
|
555  | 
return self._real_repository.get_serializer_format()  | 
|
556  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
557  | 
def get_commit_builder(self, branch, parents, config, timestamp=None,  | 
558  | 
timezone=None, committer=None, revprops=None,  | 
|
559  | 
revision_id=None):  | 
|
560  | 
        # FIXME: It ought to be possible to call this without immediately
 | 
|
561  | 
        # triggering _ensure_real.  For now it's the easiest thing to do.
 | 
|
562  | 
self._ensure_real()  | 
|
563  | 
builder = self._real_repository.get_commit_builder(branch, parents,  | 
|
564  | 
config, timestamp=timestamp, timezone=timezone,  | 
|
565  | 
committer=committer, revprops=revprops, revision_id=revision_id)  | 
|
566  | 
        # Make the builder use this RemoteRepository rather than the real one.
 | 
|
567  | 
builder.repository = self  | 
|
568  | 
return builder  | 
|
569  | 
||
570  | 
    @needs_write_lock
 | 
|
571  | 
def add_inventory(self, revid, inv, parents):  | 
|
572  | 
self._ensure_real()  | 
|
573  | 
return self._real_repository.add_inventory(revid, inv, parents)  | 
|
574  | 
||
575  | 
    @needs_write_lock
 | 
|
576  | 
def add_revision(self, rev_id, rev, inv=None, config=None):  | 
|
577  | 
self._ensure_real()  | 
|
578  | 
return self._real_repository.add_revision(  | 
|
579  | 
rev_id, rev, inv=inv, config=config)  | 
|
580  | 
||
581  | 
    @needs_read_lock
 | 
|
582  | 
def get_inventory(self, revision_id):  | 
|
583  | 
self._ensure_real()  | 
|
584  | 
return self._real_repository.get_inventory(revision_id)  | 
|
585  | 
||
586  | 
    @needs_read_lock
 | 
|
587  | 
def get_revision(self, revision_id):  | 
|
588  | 
self._ensure_real()  | 
|
589  | 
return self._real_repository.get_revision(revision_id)  | 
|
590  | 
||
591  | 
    @property
 | 
|
592  | 
def weave_store(self):  | 
|
593  | 
self._ensure_real()  | 
|
594  | 
return self._real_repository.weave_store  | 
|
595  | 
||
596  | 
def get_transaction(self):  | 
|
597  | 
self._ensure_real()  | 
|
598  | 
return self._real_repository.get_transaction()  | 
|
599  | 
||
600  | 
    @needs_read_lock
 | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
601  | 
def clone(self, a_bzrdir, revision_id=None):  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
602  | 
self._ensure_real()  | 
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
603  | 
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.  | 
604  | 
|
605  | 
def make_working_trees(self):  | 
|
| 
2018.5.120
by Robert Collins
 The Repository API ``make_working_trees`` is now permitted to return  | 
606  | 
"""RemoteRepositories never create working trees by default."""  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
607  | 
return False  | 
608  | 
||
609  | 
def fetch(self, source, revision_id=None, pb=None):  | 
|
610  | 
self._ensure_real()  | 
|
611  | 
return self._real_repository.fetch(  | 
|
612  | 
source, revision_id=revision_id, pb=pb)  | 
|
613  | 
||
| 
2520.4.54
by Aaron Bentley
 Hang a create_bundle method off repository  | 
614  | 
def create_bundle(self, target, base, fileobj, format=None):  | 
615  | 
self._ensure_real()  | 
|
616  | 
self._real_repository.create_bundle(target, base, fileobj, format)  | 
|
617  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
618  | 
    @property
 | 
619  | 
def control_weaves(self):  | 
|
620  | 
self._ensure_real()  | 
|
621  | 
return self._real_repository.control_weaves  | 
|
622  | 
||
623  | 
    @needs_read_lock
 | 
|
| 
2530.1.1
by Aaron Bentley
 Make topological sorting optional for get_ancestry  | 
624  | 
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.  | 
625  | 
self._ensure_real()  | 
| 
2530.1.1
by Aaron Bentley
 Make topological sorting optional for get_ancestry  | 
626  | 
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.  | 
627  | 
|
628  | 
    @needs_read_lock
 | 
|
629  | 
def get_inventory_weave(self):  | 
|
630  | 
self._ensure_real()  | 
|
631  | 
return self._real_repository.get_inventory_weave()  | 
|
632  | 
||
633  | 
def fileids_altered_by_revision_ids(self, revision_ids):  | 
|
634  | 
self._ensure_real()  | 
|
635  | 
return self._real_repository.fileids_altered_by_revision_ids(revision_ids)  | 
|
636  | 
||
| 
2708.1.7
by Aaron Bentley
 Rename extract_files_bytes to iter_files_bytes  | 
637  | 
def iter_files_bytes(self, desired_files):  | 
| 
2708.1.9
by Aaron Bentley
 Clean-up docs and imports  | 
638  | 
"""See Repository.iter_file_bytes.  | 
| 
2708.1.3
by Aaron Bentley
 Implement extract_files_bytes on Repository  | 
639  | 
        """
 | 
640  | 
self._ensure_real()  | 
|
| 
2708.1.7
by Aaron Bentley
 Rename extract_files_bytes to iter_files_bytes  | 
641  | 
return self._real_repository.iter_files_bytes(desired_files)  | 
| 
2708.1.3
by Aaron Bentley
 Implement extract_files_bytes on Repository  | 
642  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
643  | 
    @needs_read_lock
 | 
644  | 
def get_signature_text(self, revision_id):  | 
|
645  | 
self._ensure_real()  | 
|
646  | 
return self._real_repository.get_signature_text(revision_id)  | 
|
647  | 
||
648  | 
    @needs_read_lock
 | 
|
649  | 
def get_revision_graph_with_ghosts(self, revision_ids=None):  | 
|
650  | 
self._ensure_real()  | 
|
651  | 
return self._real_repository.get_revision_graph_with_ghosts(  | 
|
652  | 
revision_ids=revision_ids)  | 
|
653  | 
||
654  | 
    @needs_read_lock
 | 
|
655  | 
def get_inventory_xml(self, revision_id):  | 
|
656  | 
self._ensure_real()  | 
|
657  | 
return self._real_repository.get_inventory_xml(revision_id)  | 
|
658  | 
||
659  | 
def deserialise_inventory(self, revision_id, xml):  | 
|
660  | 
self._ensure_real()  | 
|
661  | 
return self._real_repository.deserialise_inventory(revision_id, xml)  | 
|
662  | 
||
663  | 
def reconcile(self, other=None, thorough=False):  | 
|
664  | 
self._ensure_real()  | 
|
665  | 
return self._real_repository.reconcile(other=other, thorough=thorough)  | 
|
666  | 
||
667  | 
def all_revision_ids(self):  | 
|
668  | 
self._ensure_real()  | 
|
669  | 
return self._real_repository.all_revision_ids()  | 
|
670  | 
||
671  | 
    @needs_read_lock
 | 
|
672  | 
def get_deltas_for_revisions(self, revisions):  | 
|
673  | 
self._ensure_real()  | 
|
674  | 
return self._real_repository.get_deltas_for_revisions(revisions)  | 
|
675  | 
||
676  | 
    @needs_read_lock
 | 
|
677  | 
def get_revision_delta(self, revision_id):  | 
|
678  | 
self._ensure_real()  | 
|
679  | 
return self._real_repository.get_revision_delta(revision_id)  | 
|
680  | 
||
681  | 
    @needs_read_lock
 | 
|
682  | 
def revision_trees(self, revision_ids):  | 
|
683  | 
self._ensure_real()  | 
|
684  | 
return self._real_repository.revision_trees(revision_ids)  | 
|
685  | 
||
686  | 
    @needs_read_lock
 | 
|
687  | 
def get_revision_reconcile(self, revision_id):  | 
|
688  | 
self._ensure_real()  | 
|
689  | 
return self._real_repository.get_revision_reconcile(revision_id)  | 
|
690  | 
||
691  | 
    @needs_read_lock
 | 
|
692  | 
def check(self, revision_ids):  | 
|
693  | 
self._ensure_real()  | 
|
694  | 
return self._real_repository.check(revision_ids)  | 
|
695  | 
||
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
696  | 
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.  | 
697  | 
self._ensure_real()  | 
698  | 
return self._real_repository.copy_content_into(  | 
|
| 
2018.5.138
by Robert Collins
 Merge bzr.dev.  | 
699  | 
destination, revision_id=revision_id)  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
700  | 
|
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
701  | 
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.  | 
702  | 
        # get a tarball of the remote repository, and copy from that into the
 | 
703  | 
        # destination
 | 
|
704  | 
from bzrlib import osutils  | 
|
| 
2018.18.9
by Martin Pool
 remote Repository.tarball builds a temporary directory and tars that  | 
705  | 
import tarfile  | 
| 
2018.18.10
by Martin Pool
 copy_content_into from Remote repositories by using temporary directories on both ends.  | 
706  | 
import tempfile  | 
| 
2018.18.9
by Martin Pool
 remote Repository.tarball builds a temporary directory and tars that  | 
707  | 
from StringIO import StringIO  | 
| 
2018.18.20
by Martin Pool
 Route branch operations through remote copy_content_into  | 
708  | 
        # TODO: Maybe a progress bar while streaming the tarball?
 | 
709  | 
note("Copying repository content as tarball...")  | 
|
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
710  | 
tar_file = self._get_tarball('bz2')  | 
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
711  | 
if tar_file is None:  | 
712  | 
return None  | 
|
713  | 
destination = to_bzrdir.create_repository()  | 
|
| 
2018.18.10
by Martin Pool
 copy_content_into from Remote repositories by using temporary directories on both ends.  | 
714  | 
try:  | 
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
715  | 
tar = tarfile.open('repository', fileobj=tar_file,  | 
716  | 
mode='r|bz2')  | 
|
717  | 
tmpdir = tempfile.mkdtemp()  | 
|
718  | 
try:  | 
|
719  | 
_extract_tar(tar, tmpdir)  | 
|
720  | 
tmp_bzrdir = BzrDir.open(tmpdir)  | 
|
721  | 
tmp_repo = tmp_bzrdir.open_repository()  | 
|
722  | 
tmp_repo.copy_content_into(destination, revision_id)  | 
|
723  | 
finally:  | 
|
724  | 
osutils.rmtree(tmpdir)  | 
|
| 
2018.18.10
by Martin Pool
 copy_content_into from Remote repositories by using temporary directories on both ends.  | 
725  | 
finally:  | 
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
726  | 
tar_file.close()  | 
| 
2814.10.2
by Andrew Bennetts
 Make the fallback a little tidier.  | 
727  | 
return destination  | 
| 
2018.18.23
by Martin Pool
 review cleanups  | 
728  | 
        # TODO: Suggestion from john: using external tar is much faster than
 | 
729  | 
        # 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.  | 
730  | 
|
| 
2604.2.1
by Robert Collins
 (robertc) Introduce a pack command.  | 
731  | 
    @needs_write_lock
 | 
732  | 
def pack(self):  | 
|
733  | 
"""Compress the data within the repository.  | 
|
734  | 
||
735  | 
        This is not currently implemented within the smart server.
 | 
|
736  | 
        """
 | 
|
737  | 
self._ensure_real()  | 
|
738  | 
return self._real_repository.pack()  | 
|
739  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
740  | 
def set_make_working_trees(self, new_value):  | 
741  | 
raise NotImplementedError(self.set_make_working_trees)  | 
|
742  | 
||
743  | 
    @needs_write_lock
 | 
|
744  | 
def sign_revision(self, revision_id, gpg_strategy):  | 
|
745  | 
self._ensure_real()  | 
|
746  | 
return self._real_repository.sign_revision(revision_id, gpg_strategy)  | 
|
747  | 
||
748  | 
    @needs_read_lock
 | 
|
749  | 
def get_revisions(self, revision_ids):  | 
|
750  | 
self._ensure_real()  | 
|
751  | 
return self._real_repository.get_revisions(revision_ids)  | 
|
752  | 
||
753  | 
def supports_rich_root(self):  | 
|
| 
2018.5.84
by Andrew Bennetts
 Merge in supports-rich-root, another test passing.  | 
754  | 
self._ensure_real()  | 
755  | 
return self._real_repository.supports_rich_root()  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
756  | 
|
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
757  | 
def iter_reverse_revision_history(self, revision_id):  | 
758  | 
self._ensure_real()  | 
|
759  | 
return self._real_repository.iter_reverse_revision_history(revision_id)  | 
|
760  | 
||
| 
2018.5.96
by Andrew Bennetts
 Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's  | 
761  | 
    @property
 | 
762  | 
def _serializer(self):  | 
|
763  | 
self._ensure_real()  | 
|
764  | 
return self._real_repository._serializer  | 
|
765  | 
||
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
766  | 
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):  | 
767  | 
self._ensure_real()  | 
|
768  | 
return self._real_repository.store_revision_signature(  | 
|
769  | 
gpg_strategy, plaintext, revision_id)  | 
|
770  | 
||
771  | 
def has_signature_for_revision_id(self, revision_id):  | 
|
772  | 
self._ensure_real()  | 
|
773  | 
return self._real_repository.has_signature_for_revision_id(revision_id)  | 
|
774  | 
||
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
775  | 
|
| 
2018.5.127
by Andrew Bennetts
 Fix most of the lockable_files tests for RemoteBranchLockableFiles.  | 
776  | 
class RemoteBranchLockableFiles(LockableFiles):  | 
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
777  | 
"""A 'LockableFiles' implementation that talks to a smart server.  | 
778  | 
    
 | 
|
779  | 
    This is not a public interface class.
 | 
|
780  | 
    """
 | 
|
781  | 
||
782  | 
def __init__(self, bzrdir, _client):  | 
|
783  | 
self.bzrdir = bzrdir  | 
|
784  | 
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.  | 
785  | 
self._need_find_modes = True  | 
| 
2018.5.133
by Andrew Bennetts
 All TestLockableFiles_RemoteLockDir tests passing.  | 
786  | 
LockableFiles.__init__(  | 
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
787  | 
self, bzrdir.get_branch_transport(None),  | 
| 
2018.5.133
by Andrew Bennetts
 All TestLockableFiles_RemoteLockDir tests passing.  | 
788  | 
'lock', lockdir.LockDir)  | 
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
789  | 
|
| 
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.  | 
790  | 
def _find_modes(self):  | 
791  | 
        # RemoteBranches don't let the client set the mode of control files.
 | 
|
792  | 
self._dir_mode = None  | 
|
793  | 
self._file_mode = None  | 
|
794  | 
||
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
795  | 
def get(self, path):  | 
796  | 
"""'get' a remote path as per the LockableFiles interface.  | 
|
797  | 
||
798  | 
        :param path: the file to 'get'. If this is 'branch.conf', we do not
 | 
|
799  | 
             just retrieve a file, instead we ask the smart server to generate
 | 
|
800  | 
             a configuration for us - which is retrieved as an INI file.
 | 
|
801  | 
        """
 | 
|
| 
2018.5.133
by Andrew Bennetts
 All TestLockableFiles_RemoteLockDir tests passing.  | 
802  | 
if path == 'branch.conf':  | 
803  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
| 
2018.5.153
by Andrew Bennetts
 Rename call2 to call_expecting_body, and other small changes prompted by review.  | 
804  | 
response = self._client.call_expecting_body(  | 
805  | 
'Branch.get_config_file', path)  | 
|
| 
2018.5.133
by Andrew Bennetts
 All TestLockableFiles_RemoteLockDir tests passing.  | 
806  | 
assert response[0][0] == 'ok', \  | 
807  | 
'unexpected response code %s' % (response[0],)  | 
|
808  | 
return StringIO(response[1].read_body_bytes())  | 
|
809  | 
else:  | 
|
810  | 
            # VFS fallback.
 | 
|
811  | 
return LockableFiles.get(self, path)  | 
|
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
812  | 
|
813  | 
||
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
814  | 
class RemoteBranchFormat(branch.BranchFormat):  | 
815  | 
||
| 
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.  | 
816  | 
def __eq__(self, other):  | 
817  | 
return (isinstance(other, RemoteBranchFormat) and  | 
|
818  | 
self.__dict__ == other.__dict__)  | 
|
819  | 
||
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
820  | 
def get_format_description(self):  | 
821  | 
return 'Remote BZR Branch'  | 
|
822  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
823  | 
def get_format_string(self):  | 
824  | 
return 'Remote BZR Branch'  | 
|
825  | 
||
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
826  | 
def open(self, a_bzrdir):  | 
| 
1752.2.72
by Andrew Bennetts
 Make Remote* classes in remote.py more consistent and remove some dead code.  | 
827  | 
assert isinstance(a_bzrdir, RemoteBzrDir)  | 
828  | 
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.  | 
829  | 
|
830  | 
def initialize(self, a_bzrdir):  | 
|
831  | 
assert isinstance(a_bzrdir, RemoteBzrDir)  | 
|
832  | 
return a_bzrdir.create_branch()  | 
|
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
833  | 
|
| 
2696.3.6
by Martin Pool
 Mark RemoteBranch as (possibly) supporting tags  | 
834  | 
def supports_tags(self):  | 
835  | 
        # Remote branches might support tags, but we won't know until we
 | 
|
836  | 
        # access the real remote branch.
 | 
|
837  | 
return True  | 
|
838  | 
||
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
839  | 
|
840  | 
class RemoteBranch(branch.Branch):  | 
|
841  | 
"""Branch stored on a server accessed by HPSS RPC.  | 
|
842  | 
||
843  | 
    At the moment most operations are mapped down to simple file operations.
 | 
|
844  | 
    """
 | 
|
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
845  | 
|
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
846  | 
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,  | 
847  | 
_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.  | 
848  | 
"""Create a RemoteBranch instance.  | 
849  | 
||
850  | 
        :param real_branch: An optional local implementation of the branch
 | 
|
851  | 
            format, usually accessing the data via the VFS.
 | 
|
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
852  | 
        :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.  | 
853  | 
        """
 | 
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
854  | 
        # We intentionally don't call the parent class's __init__, because it
 | 
855  | 
        # will try to assign to self.tags, which is a property in this subclass.
 | 
|
856  | 
        # And the parent's __init__ doesn't do much anyway.
 | 
|
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
857  | 
self._revision_history_cache = None  | 
| 
1752.2.64
by Andrew Bennetts
 Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.  | 
858  | 
self.bzrdir = remote_bzrdir  | 
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
859  | 
if _client is not None:  | 
860  | 
self._client = _client  | 
|
861  | 
else:  | 
|
| 
2485.8.54
by Vincent Ladeuil
 Refactor medium uses by making a distinction betweem shared and real medium.  | 
862  | 
self._client = client._SmartClient(self.bzrdir._shared_medium)  | 
| 
1752.2.64
by Andrew Bennetts
 Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.  | 
863  | 
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.  | 
864  | 
if real_branch is not None:  | 
865  | 
self._real_branch = real_branch  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
866  | 
            # Give the remote repository the matching real repo.
 | 
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
867  | 
real_repo = self._real_branch.repository  | 
868  | 
if isinstance(real_repo, RemoteRepository):  | 
|
869  | 
real_repo._ensure_real()  | 
|
870  | 
real_repo = real_repo._real_repository  | 
|
871  | 
self.repository._set_real_repository(real_repo)  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
872  | 
            # Give the branch the remote repository to let fast-pathing happen.
 | 
873  | 
self._real_branch.repository = self.repository  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
874  | 
else:  | 
875  | 
self._real_branch = None  | 
|
| 
2018.5.59
by Robert Collins
 Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).  | 
876  | 
        # 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.  | 
877  | 
self._format = RemoteBranchFormat()  | 
| 
2018.5.55
by Robert Collins
 Give RemoteBranch a base url in line with the Branch protocol.  | 
878  | 
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.  | 
879  | 
self._control_files = None  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
880  | 
self._lock_mode = None  | 
881  | 
self._lock_token = None  | 
|
882  | 
self._lock_count = 0  | 
|
883  | 
self._leave_lock = False  | 
|
| 
1752.2.64
by Andrew Bennetts
 Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.  | 
884  | 
|
| 
2477.1.1
by Martin Pool
 Add RemoteBranch repr  | 
885  | 
def __str__(self):  | 
886  | 
return "%s(%s)" % (self.__class__.__name__, self.base)  | 
|
887  | 
||
888  | 
__repr__ = __str__  | 
|
889  | 
||
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
890  | 
def _ensure_real(self):  | 
891  | 
"""Ensure that there is a _real_branch set.  | 
|
892  | 
||
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
893  | 
        Used before calls to self._real_branch.
 | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
894  | 
        """
 | 
895  | 
if not self._real_branch:  | 
|
896  | 
assert vfs.vfs_enabled()  | 
|
897  | 
self.bzrdir._ensure_real()  | 
|
898  | 
self._real_branch = self.bzrdir._real_bzrdir.open_branch()  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
899  | 
            # Give the remote repository the matching real repo.
 | 
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
900  | 
real_repo = self._real_branch.repository  | 
901  | 
if isinstance(real_repo, RemoteRepository):  | 
|
902  | 
real_repo._ensure_real()  | 
|
903  | 
real_repo = real_repo._real_repository  | 
|
904  | 
self.repository._set_real_repository(real_repo)  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
905  | 
            # 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.  | 
906  | 
self._real_branch.repository = self.repository  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
907  | 
            # XXX: deal with _lock_mode == 'w'
 | 
908  | 
if self._lock_mode == 'r':  | 
|
909  | 
self._real_branch.lock_read()  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
910  | 
|
| 
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.  | 
911  | 
    @property
 | 
912  | 
def control_files(self):  | 
|
913  | 
        # Defer actually creating RemoteBranchLockableFiles until its needed,
 | 
|
914  | 
        # because it triggers an _ensure_real that we otherwise might not need.
 | 
|
915  | 
if self._control_files is None:  | 
|
916  | 
self._control_files = RemoteBranchLockableFiles(  | 
|
917  | 
self.bzrdir, self._client)  | 
|
918  | 
return self._control_files  | 
|
919  | 
||
| 
2018.5.166
by Andrew Bennetts
 Small changes in response to Aaron's review.  | 
920  | 
def _get_checkout_format(self):  | 
921  | 
self._ensure_real()  | 
|
922  | 
return self._real_branch._get_checkout_format()  | 
|
923  | 
||
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
924  | 
def get_physical_lock_status(self):  | 
925  | 
"""See Branch.get_physical_lock_status()."""  | 
|
926  | 
        # 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.  | 
927  | 
self._ensure_real()  | 
| 
2018.5.60
by Robert Collins
 More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.  | 
928  | 
return self._real_branch.get_physical_lock_status()  | 
929  | 
||
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
930  | 
def lock_read(self):  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
931  | 
if not self._lock_mode:  | 
932  | 
self._lock_mode = 'r'  | 
|
933  | 
self._lock_count = 1  | 
|
934  | 
if self._real_branch is not None:  | 
|
935  | 
self._real_branch.lock_read()  | 
|
936  | 
else:  | 
|
937  | 
self._lock_count += 1  | 
|
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
938  | 
|
| 
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).  | 
939  | 
def _remote_lock_write(self, token):  | 
940  | 
if token is None:  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
941  | 
branch_token = repo_token = ''  | 
942  | 
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).  | 
943  | 
branch_token = token  | 
944  | 
repo_token = self.repository.lock_write()  | 
|
945  | 
self.repository.unlock()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
946  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
947  | 
response = self._client.call('Branch.lock_write', path, branch_token,  | 
|
948  | 
repo_token)  | 
|
949  | 
if response[0] == 'ok':  | 
|
950  | 
ok, branch_token, repo_token = response  | 
|
951  | 
return branch_token, repo_token  | 
|
952  | 
elif response[0] == 'LockContention':  | 
|
953  | 
raise errors.LockContention('(remote lock)')  | 
|
954  | 
elif response[0] == 'TokenMismatch':  | 
|
| 
2018.5.142
by Andrew Bennetts
 Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).  | 
955  | 
raise errors.TokenMismatch(token, '(remote token)')  | 
| 
2018.5.95
by Andrew Bennetts
 Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.  | 
956  | 
elif response[0] == 'UnlockableTransport':  | 
957  | 
raise errors.UnlockableTransport(self.bzrdir.root_transport)  | 
|
| 
2018.5.123
by Robert Collins
 Translate ReadOnlyError in RemoteBranch._remote_lock_write.  | 
958  | 
elif response[0] == 'ReadOnlyError':  | 
959  | 
raise errors.ReadOnlyError(self)  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
960  | 
else:  | 
| 
2555.1.1
by Martin Pool
 Remove use of 'assert False' to raise an exception unconditionally  | 
961  | 
raise errors.UnexpectedSmartServerResponse(response)  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
962  | 
|
| 
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).  | 
963  | 
def lock_write(self, token=None):  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
964  | 
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).  | 
965  | 
remote_tokens = self._remote_lock_write(token)  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
966  | 
self._lock_token, self._repo_lock_token = remote_tokens  | 
967  | 
assert self._lock_token, 'Remote server did not return a token!'  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
968  | 
            # TODO: We really, really, really don't want to call _ensure_real
 | 
969  | 
            # here, but it's the easiest way to ensure coherency between the
 | 
|
970  | 
            # state of the RemoteBranch and RemoteRepository objects and the
 | 
|
971  | 
            # physical locks.  If we don't materialise the real objects here,
 | 
|
972  | 
            # then getting everything in the right state later is complex, so
 | 
|
973  | 
            # for now we just do it the lazy way.
 | 
|
974  | 
            #   -- Andrew Bennetts, 2007-02-22.
 | 
|
975  | 
self._ensure_real()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
976  | 
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).  | 
977  | 
self._real_branch.repository.lock_write(  | 
978  | 
token=self._repo_lock_token)  | 
|
979  | 
try:  | 
|
980  | 
self._real_branch.lock_write(token=self._lock_token)  | 
|
981  | 
finally:  | 
|
982  | 
self._real_branch.repository.unlock()  | 
|
983  | 
if token is not None:  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
984  | 
self._leave_lock = True  | 
985  | 
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).  | 
986  | 
                # 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.  | 
987  | 
self._leave_lock = False  | 
988  | 
self._lock_mode = 'w'  | 
|
989  | 
self._lock_count = 1  | 
|
990  | 
elif self._lock_mode == 'r':  | 
|
991  | 
raise errors.ReadOnlyTransaction  | 
|
992  | 
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).  | 
993  | 
if token is not None:  | 
994  | 
                # A token was given to lock_write, and we're relocking, so check
 | 
|
995  | 
                # that the given token actually matches the one we already have.
 | 
|
996  | 
if token != self._lock_token:  | 
|
997  | 
raise errors.TokenMismatch(token, self._lock_token)  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
998  | 
self._lock_count += 1  | 
| 
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).  | 
999  | 
return self._lock_token  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1000  | 
|
1001  | 
def _unlock(self, branch_token, repo_token):  | 
|
1002  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
1003  | 
response = self._client.call('Branch.unlock', path, branch_token,  | 
|
1004  | 
repo_token)  | 
|
1005  | 
if response == ('ok',):  | 
|
1006  | 
            return
 | 
|
1007  | 
elif response[0] == 'TokenMismatch':  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1008  | 
raise errors.TokenMismatch(  | 
1009  | 
str((branch_token, repo_token)), '(remote tokens)')  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1010  | 
else:  | 
| 
2555.1.1
by Martin Pool
 Remove use of 'assert False' to raise an exception unconditionally  | 
1011  | 
raise errors.UnexpectedSmartServerResponse(response)  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
1012  | 
|
1013  | 
def unlock(self):  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1014  | 
self._lock_count -= 1  | 
1015  | 
if not self._lock_count:  | 
|
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
1016  | 
self._clear_cached_state()  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1017  | 
mode = self._lock_mode  | 
1018  | 
self._lock_mode = None  | 
|
1019  | 
if self._real_branch is not None:  | 
|
| 
2018.15.1
by Andrew Bennetts
 All branch_implementations/test_locking tests passing.  | 
1020  | 
if not self._leave_lock:  | 
1021  | 
                    # If this RemoteBranch will remove the physical lock for the
 | 
|
1022  | 
                    # repository, make sure the _real_branch doesn't do it
 | 
|
1023  | 
                    # first.  (Because the _real_branch's repository is set to
 | 
|
1024  | 
                    # be the RemoteRepository.)
 | 
|
1025  | 
self._real_branch.repository.leave_lock_in_place()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1026  | 
self._real_branch.unlock()  | 
1027  | 
if mode != 'w':  | 
|
| 
2018.5.163
by Andrew Bennetts
 Deal with various review comments from Robert.  | 
1028  | 
                # Only write-locked branched need to make a remote method call
 | 
1029  | 
                # to perfom the unlock.
 | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1030  | 
                return
 | 
1031  | 
assert self._lock_token, 'Locked, but no token!'  | 
|
1032  | 
branch_token = self._lock_token  | 
|
1033  | 
repo_token = self._repo_lock_token  | 
|
1034  | 
self._lock_token = None  | 
|
1035  | 
self._repo_lock_token = None  | 
|
1036  | 
if not self._leave_lock:  | 
|
1037  | 
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.  | 
1038  | 
|
1039  | 
def break_lock(self):  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
1040  | 
self._ensure_real()  | 
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
1041  | 
return self._real_branch.break_lock()  | 
| 
1752.2.31
by Martin Pool
 [broken] some support for write operations over hpss  | 
1042  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
1043  | 
def leave_lock_in_place(self):  | 
1044  | 
self._leave_lock = True  | 
|
1045  | 
||
1046  | 
def dont_leave_lock_in_place(self):  | 
|
1047  | 
self._leave_lock = False  | 
|
1048  | 
||
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
1049  | 
def last_revision_info(self):  | 
1050  | 
"""See Branch.last_revision_info()."""  | 
|
1051  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
1052  | 
response = self._client.call('Branch.last_revision_info', path)  | 
|
| 
2018.5.52
by Wouter van Heyst
 Provide more information when encountering unexpected responses from a smart  | 
1053  | 
assert response[0] == 'ok', 'unexpected response code %s' % (response,)  | 
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
1054  | 
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.  | 
1055  | 
last_revision = response[2]  | 
| 
2018.5.51
by Wouter van Heyst
 Test and implement RemoteBranch.last_revision_info()  | 
1056  | 
return (revno, last_revision)  | 
1057  | 
||
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
1058  | 
def _gen_revision_history(self):  | 
1059  | 
"""See Branch._gen_revision_history()."""  | 
|
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
1060  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
| 
2018.5.153
by Andrew Bennetts
 Rename call2 to call_expecting_body, and other small changes prompted by review.  | 
1061  | 
response = self._client.call_expecting_body(  | 
1062  | 
'Branch.revision_history', path)  | 
|
1063  | 
assert response[0][0] == 'ok', ('unexpected response code %s'  | 
|
1064  | 
% (response[0],))  | 
|
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
1065  | 
result = response[1].read_body_bytes().split('\x00')  | 
| 
2018.5.38
by Robert Collins
 Implement RemoteBranch.revision_history().  | 
1066  | 
if result == ['']:  | 
1067  | 
return []  | 
|
1068  | 
return result  | 
|
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
1069  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1070  | 
    @needs_write_lock
 | 
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
1071  | 
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.  | 
1072  | 
        # Send just the tip revision of the history; the server will generate
 | 
1073  | 
        # the full history from that.  If the revision doesn't exist in this
 | 
|
1074  | 
        # branch, NoSuchRevision will be raised.
 | 
|
1075  | 
path = self.bzrdir._path_for_remote_call(self._client)  | 
|
1076  | 
if rev_history == []:  | 
|
| 
2018.5.170
by Andrew Bennetts
 Use 'null:' instead of '' to mean NULL_REVISION on the wire.  | 
1077  | 
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.  | 
1078  | 
else:  | 
1079  | 
rev_id = rev_history[-1]  | 
|
| 
2418.5.12
by John Arbash Meinel
 Move functions from BzrBranch to base Branch object.  | 
1080  | 
self._clear_cached_state()  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1081  | 
response = self._client.call('Branch.set_last_revision',  | 
1082  | 
path, self._lock_token, self._repo_lock_token, rev_id)  | 
|
| 
2018.12.3
by Andrew Bennetts
 Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.  | 
1083  | 
if response[0] == 'NoSuchRevision':  | 
1084  | 
raise NoSuchRevision(self, rev_id)  | 
|
1085  | 
else:  | 
|
1086  | 
assert response == ('ok',), (  | 
|
1087  | 
'unexpected response code %r' % (response,))  | 
|
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
1088  | 
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.  | 
1089  | 
|
1090  | 
def get_parent(self):  | 
|
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
1091  | 
self._ensure_real()  | 
| 
1752.2.52
by Andrew Bennetts
 Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.  | 
1092  | 
return self._real_branch.get_parent()  | 
1093  | 
||
| 
1752.2.63
by Andrew Bennetts
 Delegate set_parent.  | 
1094  | 
def set_parent(self, url):  | 
| 
2018.5.70
by Robert Collins
 Only try to get real repositories when an operation requires them.  | 
1095  | 
self._ensure_real()  | 
| 
1752.2.63
by Andrew Bennetts
 Delegate set_parent.  | 
1096  | 
return self._real_branch.set_parent(url)  | 
1097  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1098  | 
def get_config(self):  | 
1099  | 
return RemoteBranchConfig(self)  | 
|
1100  | 
||
| 
2018.5.94
by Andrew Bennetts
 Various small changes in aid of making tests pass (including deleting one invalid test).  | 
1101  | 
def sprout(self, to_bzrdir, revision_id=None):  | 
1102  | 
        # Like Branch.sprout, except that it sprouts a branch in the default
 | 
|
1103  | 
        # format, because RemoteBranches can't be created at arbitrary URLs.
 | 
|
1104  | 
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
 | 
|
1105  | 
        # to_bzrdir.create_branch...
 | 
|
1106  | 
result = branch.BranchFormat.get_default_format().initialize(to_bzrdir)  | 
|
| 
2018.18.20
by Martin Pool
 Route branch operations through remote copy_content_into  | 
1107  | 
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).  | 
1108  | 
result.set_parent(self.bzrdir.root_transport.base)  | 
1109  | 
return result  | 
|
1110  | 
||
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1111  | 
    @needs_write_lock
 | 
| 
2477.1.2
by Martin Pool
 Rename push/pull back to 'run_hooks' (jameinel)  | 
1112  | 
def pull(self, source, overwrite=False, stop_revision=None,  | 
| 
2477.1.9
by Martin Pool
 Review cleanups from John, mostly docs  | 
1113  | 
**kwargs):  | 
1114  | 
        # FIXME: This asks the real branch to run the hooks, which means
 | 
|
1115  | 
        # they're called with the wrong target branch parameter. 
 | 
|
1116  | 
        # The test suite specifically allows this at present but it should be
 | 
|
1117  | 
        # fixed.  It should get a _override_hook_target branch,
 | 
|
1118  | 
        # as push does.  -- mbp 20070405
 | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1119  | 
self._ensure_real()  | 
1120  | 
self._real_branch.pull(  | 
|
| 
2477.1.2
by Martin Pool
 Rename push/pull back to 'run_hooks' (jameinel)  | 
1121  | 
source, overwrite=overwrite, stop_revision=stop_revision,  | 
1122  | 
**kwargs)  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1123  | 
|
| 
2018.14.3
by Andrew Bennetts
 Make a couple more branch_implementations tests pass.  | 
1124  | 
    @needs_read_lock
 | 
1125  | 
def push(self, target, overwrite=False, stop_revision=None):  | 
|
1126  | 
self._ensure_real()  | 
|
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
1127  | 
return self._real_branch.push(  | 
| 
2477.1.5
by Martin Pool
 More cleanups of Branch.push to get the right behaviour with RemoteBranches  | 
1128  | 
target, overwrite=overwrite, stop_revision=stop_revision,  | 
1129  | 
_override_hook_source_branch=self)  | 
|
| 
2018.14.3
by Andrew Bennetts
 Make a couple more branch_implementations tests pass.  | 
1130  | 
|
1131  | 
def is_locked(self):  | 
|
1132  | 
return self._lock_count >= 1  | 
|
1133  | 
||
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
1134  | 
def set_last_revision_info(self, revno, revision_id):  | 
1135  | 
self._ensure_real()  | 
|
| 
2018.5.105
by Andrew Bennetts
 Implement revision_history caching for RemoteBranch.  | 
1136  | 
self._clear_cached_state()  | 
| 
2018.5.83
by Andrew Bennetts
 Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.  | 
1137  | 
return self._real_branch.set_last_revision_info(revno, revision_id)  | 
1138  | 
||
| 
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.  | 
1139  | 
def generate_revision_history(self, revision_id, last_rev=None,  | 
1140  | 
other_branch=None):  | 
|
1141  | 
self._ensure_real()  | 
|
1142  | 
return self._real_branch.generate_revision_history(  | 
|
1143  | 
revision_id, last_rev=last_rev, other_branch=other_branch)  | 
|
1144  | 
||
| 
2018.5.96
by Andrew Bennetts
 Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's  | 
1145  | 
    @property
 | 
1146  | 
def tags(self):  | 
|
1147  | 
self._ensure_real()  | 
|
1148  | 
return self._real_branch.tags  | 
|
1149  | 
||
| 
2018.5.97
by Andrew Bennetts
 Fix more tests.  | 
1150  | 
def set_push_location(self, location):  | 
1151  | 
self._ensure_real()  | 
|
1152  | 
return self._real_branch.set_push_location(location)  | 
|
1153  | 
||
1154  | 
def update_revisions(self, other, stop_revision=None):  | 
|
1155  | 
self._ensure_real()  | 
|
1156  | 
return self._real_branch.update_revisions(  | 
|
1157  | 
other, stop_revision=stop_revision)  | 
|
1158  | 
||
| 
1752.2.30
by Martin Pool
 Start adding a RemoteBzrDir, etc  | 
1159  | 
|
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
1160  | 
class RemoteBranchConfig(BranchConfig):  | 
1161  | 
||
1162  | 
def username(self):  | 
|
1163  | 
self.branch._ensure_real()  | 
|
1164  | 
return self.branch._real_branch.get_config().username()  | 
|
1165  | 
||
| 
2018.14.2
by Andrew Bennetts
 All but one repository_implementation tests for RemoteRepository passing.  | 
1166  | 
def _get_branch_data_config(self):  | 
1167  | 
self.branch._ensure_real()  | 
|
1168  | 
if self._branch_data_config is None:  | 
|
1169  | 
self._branch_data_config = TreeConfig(self.branch._real_branch)  | 
|
1170  | 
return self._branch_data_config  | 
|
1171  | 
||
| 
2018.18.25
by Martin Pool
 Repository.tarball fixes for python2.4  | 
1172  | 
|
1173  | 
def _extract_tar(tar, to_dir):  | 
|
1174  | 
"""Extract all the contents of a tarfile object.  | 
|
1175  | 
||
1176  | 
    A replacement for extractall, which is not present in python2.4
 | 
|
1177  | 
    """
 | 
|
1178  | 
for tarinfo in tar:  | 
|
1179  | 
tar.extract(tarinfo, to_dir)  |