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