13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
# TODO: At some point, handle upgrades by just passing the whole request
18
18
# across to run on the server.
21
from cStringIO import StringIO
23
22
from bzrlib import (
33
revision as _mod_revision,
33
36
from bzrlib.branch import BranchReferenceFormat
34
37
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
35
from bzrlib.config import BranchConfig, TreeConfig
36
38
from bzrlib.decorators import needs_read_lock, needs_write_lock
37
39
from bzrlib.errors import (
39
41
SmartProtocolError,
41
43
from bzrlib.lockable_files import LockableFiles
42
from bzrlib.pack import ContainerPushParser
43
from bzrlib.smart import client, vfs
44
from bzrlib.smart import client, vfs, repository as smart_repo
44
45
from bzrlib.revision import ensure_null, NULL_REVISION
45
from bzrlib.trace import mutter, mutter_callsite, note, warning
46
from bzrlib.trace import mutter, note, warning
49
class _RpcHelper(object):
50
"""Mixin class that helps with issuing RPCs."""
52
def _call(self, method, *args, **err_context):
54
return self._client.call(method, *args)
55
except errors.ErrorFromSmartServer, err:
56
self._translate_error(err, **err_context)
58
def _call_expecting_body(self, method, *args, **err_context):
60
return self._client.call_expecting_body(method, *args)
61
except errors.ErrorFromSmartServer, err:
62
self._translate_error(err, **err_context)
64
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
67
return self._client.call_with_body_bytes_expecting_body(
68
method, args, body_bytes)
69
except errors.ErrorFromSmartServer, err:
70
self._translate_error(err, **err_context)
73
def response_tuple_to_repo_format(response):
74
"""Convert a response tuple describing a repository format to a format."""
75
format = RemoteRepositoryFormat()
76
format._rich_root_data = (response[0] == 'yes')
77
format._supports_tree_reference = (response[1] == 'yes')
78
format._supports_external_lookups = (response[2] == 'yes')
79
format._network_name = response[3]
47
83
# Note: RemoteBzrDirFormat is in bzrdir.py
49
class RemoteBzrDir(BzrDir):
85
class RemoteBzrDir(BzrDir, _RpcHelper):
50
86
"""Control directory on a remote server, accessed via bzr:// or similar."""
52
def __init__(self, transport, _client=None):
88
def __init__(self, transport, format, _client=None):
53
89
"""Construct a RemoteBzrDir.
55
91
:param _client: Private parameter for testing. Disables probing and the
56
92
use of a real bzrdir.
58
BzrDir.__init__(self, transport, RemoteBzrDirFormat())
94
BzrDir.__init__(self, transport, format)
59
95
# this object holds a delegated bzrdir that uses file-level operations
60
96
# to talk to the other side
61
97
self._real_bzrdir = None
98
# 1-shot cache for the call pattern 'create_branch; open_branch' - see
99
# create_branch for details.
100
self._next_open_branch_result = None
63
102
if _client is None:
64
103
medium = transport.get_smart_medium()
82
121
if not self._real_bzrdir:
83
122
self._real_bzrdir = BzrDir.open_from_transport(
84
123
self.root_transport, _server_formats=False)
124
self._format._network_name = \
125
self._real_bzrdir._format.network_name()
127
def _translate_error(self, err, **context):
128
_translate_error(err, bzrdir=self, **context)
130
def break_lock(self):
131
# Prevent aliasing problems in the next_open_branch_result cache.
132
# See create_branch for rationale.
133
self._next_open_branch_result = None
134
return BzrDir.break_lock(self)
136
def _vfs_cloning_metadir(self, require_stacking=False):
138
return self._real_bzrdir.cloning_metadir(
139
require_stacking=require_stacking)
141
def cloning_metadir(self, require_stacking=False):
142
medium = self._client._medium
143
if medium._is_remote_before((1, 13)):
144
return self._vfs_cloning_metadir(require_stacking=require_stacking)
145
verb = 'BzrDir.cloning_metadir'
150
path = self._path_for_remote_call(self._client)
152
response = self._call(verb, path, stacking)
153
except errors.UnknownSmartMethod:
154
medium._remember_remote_is_before((1, 13))
155
return self._vfs_cloning_metadir(require_stacking=require_stacking)
156
except errors.UnknownErrorFromSmartServer, err:
157
if err.error_tuple != ('BranchReference',):
159
# We need to resolve the branch reference to determine the
160
# cloning_metadir. This causes unnecessary RPCs to open the
161
# referenced branch (and bzrdir, etc) but only when the caller
162
# didn't already resolve the branch reference.
163
referenced_branch = self.open_branch()
164
return referenced_branch.bzrdir.cloning_metadir()
165
if len(response) != 3:
166
raise errors.UnexpectedSmartServerResponse(response)
167
control_name, repo_name, branch_info = response
168
if len(branch_info) != 2:
169
raise errors.UnexpectedSmartServerResponse(response)
170
branch_ref, branch_name = branch_info
171
format = bzrdir.network_format_registry.get(control_name)
173
format.repository_format = repository.network_format_registry.get(
175
if branch_ref == 'ref':
176
# XXX: we need possible_transports here to avoid reopening the
177
# connection to the referenced location
178
ref_bzrdir = BzrDir.open(branch_name)
179
branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
180
format.set_branch_format(branch_format)
181
elif branch_ref == 'branch':
183
format.set_branch_format(
184
branch.network_format_registry.get(branch_name))
186
raise errors.UnexpectedSmartServerResponse(response)
86
189
def create_repository(self, shared=False):
88
self._real_bzrdir.create_repository(shared=shared)
89
return self.open_repository()
190
# as per meta1 formats - just delegate to the format object which may
192
result = self._format.repository_format.initialize(self, shared)
193
if not isinstance(result, RemoteRepository):
194
return self.open_repository()
91
198
def destroy_repository(self):
92
199
"""See BzrDir.destroy_repository"""
117
237
def get_branch_reference(self):
118
238
"""See BzrDir.get_branch_reference()."""
239
response = self._get_branch_reference()
240
if response[0] == 'ref':
245
def _get_branch_reference(self):
119
246
path = self._path_for_remote_call(self._client)
121
response = self._client.call('BzrDir.open_branch', path)
122
except errors.ErrorFromSmartServer, err:
123
if err.error_tuple == ('nobranch',):
124
raise errors.NotBranchError(path=self.root_transport.base)
126
if response[0] == 'ok':
127
if response[1] == '':
128
# branch at this location.
131
# a branch reference, use the existing BranchReference logic.
247
medium = self._client._medium
248
if not medium._is_remote_before((1, 13)):
250
response = self._call('BzrDir.open_branchV2', path)
251
if response[0] not in ('ref', 'branch'):
252
raise errors.UnexpectedSmartServerResponse(response)
254
except errors.UnknownSmartMethod:
255
medium._remember_remote_is_before((1, 13))
256
response = self._call('BzrDir.open_branch', path)
257
if response[0] != 'ok':
134
258
raise errors.UnexpectedSmartServerResponse(response)
259
if response[1] != '':
260
return ('ref', response[1])
262
return ('branch', '')
136
264
def _get_tree_branch(self):
137
265
"""See BzrDir._get_tree_branch()."""
138
266
return None, self.open_branch()
140
def open_branch(self, _unsupported=False):
268
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
142
270
raise NotImplementedError('unsupported flag support not implemented yet.')
143
reference_url = self.get_branch_reference()
144
if reference_url is None:
145
# branch at this location.
146
return RemoteBranch(self, self.find_repository())
271
if self._next_open_branch_result is not None:
272
# See create_branch for details.
273
result = self._next_open_branch_result
274
self._next_open_branch_result = None
276
response = self._get_branch_reference()
277
if response[0] == 'ref':
148
278
# a branch reference, use the existing BranchReference logic.
149
279
format = BranchReferenceFormat()
150
return format.open(self, _found=True, location=reference_url)
280
return format.open(self, _found=True, location=response[1],
281
ignore_fallbacks=ignore_fallbacks)
282
branch_format_name = response[1]
283
if not branch_format_name:
284
branch_format_name = None
285
format = RemoteBranchFormat(network_name=branch_format_name)
286
return RemoteBranch(self, self.find_repository(), format=format,
287
setup_stacking=not ignore_fallbacks)
289
def _open_repo_v1(self, path):
290
verb = 'BzrDir.find_repository'
291
response = self._call(verb, path)
292
if response[0] != 'ok':
293
raise errors.UnexpectedSmartServerResponse(response)
294
# servers that only support the v1 method don't support external
297
repo = self._real_bzrdir.open_repository()
298
response = response + ('no', repo._format.network_name())
299
return response, repo
301
def _open_repo_v2(self, path):
302
verb = 'BzrDir.find_repositoryV2'
303
response = self._call(verb, path)
304
if response[0] != 'ok':
305
raise errors.UnexpectedSmartServerResponse(response)
307
repo = self._real_bzrdir.open_repository()
308
response = response + (repo._format.network_name(),)
309
return response, repo
311
def _open_repo_v3(self, path):
312
verb = 'BzrDir.find_repositoryV3'
313
medium = self._client._medium
314
if medium._is_remote_before((1, 13)):
315
raise errors.UnknownSmartMethod(verb)
317
response = self._call(verb, path)
318
except errors.UnknownSmartMethod:
319
medium._remember_remote_is_before((1, 13))
321
if response[0] != 'ok':
322
raise errors.UnexpectedSmartServerResponse(response)
323
return response, None
152
325
def open_repository(self):
153
326
path = self._path_for_remote_call(self._client)
154
verb = 'BzrDir.find_repositoryV2'
328
for probe in [self._open_repo_v3, self._open_repo_v2,
157
response = self._client.call(verb, path)
331
response, real_repo = probe(path)
158
333
except errors.UnknownSmartMethod:
159
verb = 'BzrDir.find_repository'
160
response = self._client.call(verb, path)
161
except errors.ErrorFromSmartServer, err:
162
if err.error_verb == 'norepository':
163
raise errors.NoRepositoryPresent(self)
336
raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
165
337
if response[0] != 'ok':
166
338
raise errors.UnexpectedSmartServerResponse(response)
167
if verb == 'BzrDir.find_repository':
168
# servers that don't support the V2 method don't support external
170
response = response + ('no', )
171
if not (len(response) == 5):
339
if len(response) != 6:
172
340
raise SmartProtocolError('incorrect response length %s' % (response,))
173
341
if response[1] == '':
174
format = RemoteRepositoryFormat()
175
format.rich_root_data = (response[2] == 'yes')
176
format.supports_tree_reference = (response[3] == 'yes')
177
# No wire format to check this yet.
178
format.supports_external_lookups = (response[4] == 'yes')
179
return RemoteRepository(self, format)
342
# repo is at this dir.
343
format = response_tuple_to_repo_format(response[2:])
344
# Used to support creating a real format instance when needed.
345
format._creating_bzrdir = self
346
remote_repo = RemoteRepository(self, format)
347
format._creating_repo = remote_repo
348
if real_repo is not None:
349
remote_repo._set_real_repository(real_repo)
181
352
raise errors.NoRepositoryPresent(self)
228
406
the attributes rich_root_data and supports_tree_reference are set
229
407
on a per instance basis, and are not set (and should not be) at
410
:ivar _custom_format: If set, a specific concrete repository format that
411
will be used when initializing a repository with this
412
RemoteRepositoryFormat.
413
:ivar _creating_repo: If set, the repository object that this
414
RemoteRepositoryFormat was created for: it can be called into
415
to obtain data like the network name.
233
_matchingbzrdir = RemoteBzrDirFormat
418
_matchingbzrdir = RemoteBzrDirFormat()
421
repository.RepositoryFormat.__init__(self)
422
self._custom_format = None
423
self._network_name = None
424
self._creating_bzrdir = None
425
self._supports_external_lookups = None
426
self._supports_tree_reference = None
427
self._rich_root_data = None
430
def fast_deltas(self):
432
return self._custom_format.fast_deltas
435
def rich_root_data(self):
436
if self._rich_root_data is None:
438
self._rich_root_data = self._custom_format.rich_root_data
439
return self._rich_root_data
442
def supports_external_lookups(self):
443
if self._supports_external_lookups is None:
445
self._supports_external_lookups = \
446
self._custom_format.supports_external_lookups
447
return self._supports_external_lookups
450
def supports_tree_reference(self):
451
if self._supports_tree_reference is None:
453
self._supports_tree_reference = \
454
self._custom_format.supports_tree_reference
455
return self._supports_tree_reference
457
def _vfs_initialize(self, a_bzrdir, shared):
458
"""Helper for common code in initialize."""
459
if self._custom_format:
460
# Custom format requested
461
result = self._custom_format.initialize(a_bzrdir, shared=shared)
462
elif self._creating_bzrdir is not None:
463
# Use the format that the repository we were created to back
465
prior_repo = self._creating_bzrdir.open_repository()
466
prior_repo._ensure_real()
467
result = prior_repo._real_repository._format.initialize(
468
a_bzrdir, shared=shared)
470
# assume that a_bzr is a RemoteBzrDir but the smart server didn't
471
# support remote initialization.
472
# We delegate to a real object at this point (as RemoteBzrDir
473
# delegate to the repository format which would lead to infinite
474
# recursion if we just called a_bzrdir.create_repository.
475
a_bzrdir._ensure_real()
476
result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
477
if not isinstance(result, RemoteRepository):
478
return self.open(a_bzrdir)
235
482
def initialize(self, a_bzrdir, shared=False):
483
# Being asked to create on a non RemoteBzrDir:
236
484
if not isinstance(a_bzrdir, RemoteBzrDir):
237
raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
238
return a_bzrdir.create_repository(shared=shared)
485
return self._vfs_initialize(a_bzrdir, shared)
486
medium = a_bzrdir._client._medium
487
if medium._is_remote_before((1, 13)):
488
return self._vfs_initialize(a_bzrdir, shared)
489
# Creating on a remote bzr dir.
490
# 1) get the network name to use.
491
if self._custom_format:
492
network_name = self._custom_format.network_name()
493
elif self._network_name:
494
network_name = self._network_name
496
# Select the current bzrlib default and ask for that.
497
reference_bzrdir_format = bzrdir.format_registry.get('default')()
498
reference_format = reference_bzrdir_format.repository_format
499
network_name = reference_format.network_name()
500
# 2) try direct creation via RPC
501
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
502
verb = 'BzrDir.create_repository'
508
response = a_bzrdir._call(verb, path, network_name, shared_str)
509
except errors.UnknownSmartMethod:
510
# Fallback - use vfs methods
511
medium._remember_remote_is_before((1, 13))
512
return self._vfs_initialize(a_bzrdir, shared)
514
# Turn the response into a RemoteRepository object.
515
format = response_tuple_to_repo_format(response[1:])
516
# Used to support creating a real format instance when needed.
517
format._creating_bzrdir = a_bzrdir
518
remote_repo = RemoteRepository(a_bzrdir, format)
519
format._creating_repo = remote_repo
240
522
def open(self, a_bzrdir):
241
523
if not isinstance(a_bzrdir, RemoteBzrDir):
242
524
raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
243
525
return a_bzrdir.open_repository()
527
def _ensure_real(self):
528
if self._custom_format is None:
529
self._custom_format = repository.network_format_registry.get(
533
def _fetch_order(self):
535
return self._custom_format._fetch_order
538
def _fetch_uses_deltas(self):
540
return self._custom_format._fetch_uses_deltas
543
def _fetch_reconcile(self):
545
return self._custom_format._fetch_reconcile
245
547
def get_format_description(self):
246
548
return 'bzr remote repository'
248
550
def __eq__(self, other):
249
return self.__class__ == other.__class__
551
return self.__class__ is other.__class__
251
553
def check_conversion_target(self, target_format):
252
554
if self.rich_root_data and not target_format.rich_root_data:
257
559
raise errors.BadConversionTarget(
258
560
'Does not support nested trees', target_format)
261
class RemoteGraph(object):
263
def __init__(self, real_graph, remote_repo):
264
self._real_graph = real_graph
265
self._remote_repo = remote_repo
267
def heads(self, keys):
268
client = self._remote_repo._client
269
path = self._remote_repo.bzrdir._path_for_remote_call(client)
270
return set(client.call('Repository.graph_heads', path, *keys))
272
def find_lca(self, *revisions):
273
return self._real_graph.find_lca(*revisions)
275
def find_difference(self, left_revision, right_revision):
276
return self._real_graph.find_difference(left_revision, right_revision)
278
def find_unique_ancestors(self, unique_revision, common_revisions):
279
return self._real_graph.find_unique_ancestors(
280
unique_revision, common_revisions)
282
def find_unique_lca(self, left_revision, right_revision,
284
return self._real_graph.find_unique_lca(
285
left_revision, right_revision, count_steps=count_steps)
287
def get_parents(self, revisions):
288
return self._real_graph.get_parents(revisions)
290
def get_parent_map(self, revisions):
291
return self._real_graph.get_parent_map(revisions)
293
def is_ancestor(self, candidate_ancestor, candidate_descendant):
294
return self._real_graph.is_ancestor(
295
candidate_ancestor, candidate_descendant)
297
def iter_ancestry(self, revision_ids):
298
return self._real_graph.iter_ancestry(revision_ids)
300
def iter_topo_order(self, revisions):
301
return self._real_graph.iter_topo_order(revisions)
303
def _make_breadth_first_searcher(self, revisions):
304
return self._real_graph._make_breadth_first_searcher(revisions)
307
class RemoteRepository(object):
562
def network_name(self):
563
if self._network_name:
564
return self._network_name
565
self._creating_repo._ensure_real()
566
return self._creating_repo._real_repository._format.network_name()
569
def _serializer(self):
571
return self._custom_format._serializer
574
class RemoteRepository(_RpcHelper):
308
575
"""Repository accessed over rpc.
310
577
For the moment most operations are performed using local transport-backed
377
660
self._ensure_real()
378
661
return self._real_repository.commit_write_group()
663
def resume_write_group(self, tokens):
665
return self._real_repository.resume_write_group(tokens)
667
def suspend_write_group(self):
669
return self._real_repository.suspend_write_group()
671
def get_missing_parent_inventories(self, check_for_missing_texts=True):
673
return self._real_repository.get_missing_parent_inventories(
674
check_for_missing_texts=check_for_missing_texts)
676
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
678
return self._real_repository.get_rev_id_for_revno(
681
def get_rev_id_for_revno(self, revno, known_pair):
682
"""See Repository.get_rev_id_for_revno."""
683
path = self.bzrdir._path_for_remote_call(self._client)
685
if self._client._medium._is_remote_before((1, 17)):
686
return self._get_rev_id_for_revno_vfs(revno, known_pair)
687
response = self._call(
688
'Repository.get_rev_id_for_revno', path, revno, known_pair)
689
except errors.UnknownSmartMethod:
690
self._client._medium._remember_remote_is_before((1, 17))
691
return self._get_rev_id_for_revno_vfs(revno, known_pair)
692
if response[0] == 'ok':
693
return True, response[1]
694
elif response[0] == 'history-incomplete':
695
known_pair = response[1:3]
696
for fallback in self._fallback_repositories:
697
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
702
# Not found in any fallbacks
703
return False, known_pair
705
raise errors.UnexpectedSmartServerResponse(response)
380
707
def _ensure_real(self):
381
708
"""Ensure that there is a _real_repository set.
383
710
Used before calls to self._real_repository.
712
Note that _ensure_real causes many roundtrips to the server which are
713
not desirable, and prevents the use of smart one-roundtrip RPC's to
714
perform complex operations (such as accessing parent data, streaming
715
revisions etc). Adding calls to _ensure_real should only be done when
716
bringing up new functionality, adding fallbacks for smart methods that
717
require a fallback path, and never to replace an existing smart method
718
invocation. If in doubt chat to the bzr network team.
385
if not self._real_repository:
720
if self._real_repository is None:
721
if 'hpss' in debug.debug_flags:
723
warning('VFS Repository access triggered\n%s',
724
''.join(traceback.format_stack()))
725
self._unstacked_provider.missing_keys.clear()
386
726
self.bzrdir._ensure_real()
387
#self._real_repository = self.bzrdir._real_bzrdir.open_repository()
388
self._set_real_repository(self.bzrdir._real_bzrdir.open_repository())
727
self._set_real_repository(
728
self.bzrdir._real_bzrdir.open_repository())
730
def _translate_error(self, err, **context):
731
self.bzrdir._translate_error(err, repository=self, **context)
390
733
def find_text_key_references(self):
391
734
"""Find the text key references within the repository.
444
777
for line in lines:
445
778
d = tuple(line.split())
446
779
revision_graph[d[0]] = d[1:]
448
781
return revision_graph
784
"""See Repository._get_sink()."""
785
return RemoteStreamSink(self)
787
def _get_source(self, to_format):
788
"""Return a source for streaming from this repository."""
789
return RemoteStreamSource(self, to_format)
450
792
def has_revision(self, revision_id):
451
"""See Repository.has_revision()."""
452
if revision_id == NULL_REVISION:
453
# The null revision is always present.
455
path = self.bzrdir._path_for_remote_call(self._client)
456
response = self._client.call(
457
'Repository.has_revision', path, revision_id)
458
if response[0] not in ('yes', 'no'):
459
raise errors.UnexpectedSmartServerResponse(response)
460
return response[0] == 'yes'
793
"""True if this repository has a copy of the revision."""
794
# Copy of bzrlib.repository.Repository.has_revision
795
return revision_id in self.has_revisions((revision_id,))
462
798
def has_revisions(self, revision_ids):
463
"""See Repository.has_revisions()."""
465
for revision_id in revision_ids:
466
if self.has_revision(revision_id):
467
result.add(revision_id)
799
"""Probe to find out the presence of multiple revisions.
801
:param revision_ids: An iterable of revision_ids.
802
:return: A set of the revision_ids that were present.
804
# Copy of bzrlib.repository.Repository.has_revisions
805
parent_map = self.get_parent_map(revision_ids)
806
result = set(parent_map)
807
if _mod_revision.NULL_REVISION in revision_ids:
808
result.add(_mod_revision.NULL_REVISION)
470
811
def has_same_location(self, other):
471
return (self.__class__ == other.__class__ and
812
return (self.__class__ is other.__class__ and
472
813
self.bzrdir.transport.base == other.bzrdir.transport.base)
474
815
def get_graph(self, other_repository=None):
475
816
"""Return the graph for this repository format"""
476
parents_provider = self
477
if (other_repository is not None and
478
other_repository.bzrdir.transport.base !=
479
self.bzrdir.transport.base):
480
parents_provider = graph._StackedParentsProvider(
481
[parents_provider, other_repository._make_parents_provider()])
482
real_graph = graph.Graph(parents_provider)
483
return RemoteGraph(real_graph, self)
817
parents_provider = self._make_parents_provider(other_repository)
818
return graph.Graph(parents_provider)
485
820
def gather_stats(self, revid=None, committers=None):
486
821
"""See Repository.gather_stats()."""
737
1101
# FIXME: It ought to be possible to call this without immediately
738
1102
# triggering _ensure_real. For now it's the easiest thing to do.
739
1103
self._ensure_real()
740
builder = self._real_repository.get_commit_builder(branch, parents,
1104
real_repo = self._real_repository
1105
builder = real_repo.get_commit_builder(branch, parents,
741
1106
config, timestamp=timestamp, timezone=timezone,
742
1107
committer=committer, revprops=revprops, revision_id=revision_id)
1110
def add_fallback_repository(self, repository):
1111
"""Add a repository to use for looking up data not held locally.
1113
:param repository: A repository.
1115
if not self._format.supports_external_lookups:
1116
raise errors.UnstackableRepositoryFormat(
1117
self._format.network_name(), self.base)
1118
# We need to accumulate additional repositories here, to pass them in
1121
if self.is_locked():
1122
# We will call fallback.unlock() when we transition to the unlocked
1123
# state, so always add a lock here. If a caller passes us a locked
1124
# repository, they are responsible for unlocking it later.
1125
repository.lock_read()
1126
self._fallback_repositories.append(repository)
1127
# If self._real_repository was parameterised already (e.g. because a
1128
# _real_branch had its get_stacked_on_url method called), then the
1129
# repository to be added may already be in the _real_repositories list.
1130
if self._real_repository is not None:
1131
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1132
self._real_repository._fallback_repositories]
1133
if repository.bzrdir.root_transport.base not in fallback_locations:
1134
self._real_repository.add_fallback_repository(repository)
745
1136
def add_inventory(self, revid, inv, parents):
746
1137
self._ensure_real()
747
1138
return self._real_repository.add_inventory(revid, inv, parents)
1140
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1143
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1144
delta, new_revision_id, parents)
749
1146
def add_revision(self, rev_id, rev, inv=None, config=None):
750
1147
self._ensure_real()
751
1148
return self._real_repository.add_revision(
808
1214
return repository.InterRepository.get(
809
1215
other, self).search_missing_revision_ids(revision_id, find_ghosts)
811
def fetch(self, source, revision_id=None, pb=None):
812
if self.has_same_location(source):
1217
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1219
# No base implementation to use as RemoteRepository is not a subclass
1220
# of Repository; so this is a copy of Repository.fetch().
1221
if fetch_spec is not None and revision_id is not None:
1222
raise AssertionError(
1223
"fetch_spec and revision_id are mutually exclusive.")
1224
if self.is_in_write_group():
1225
raise errors.InternalBzrError(
1226
"May not fetch while in a write group.")
1227
# fast path same-url fetch operations
1228
if self.has_same_location(source) and fetch_spec is None:
813
1229
# check that last_revision is in 'from' and then return a
815
1231
if (revision_id is not None and
816
1232
not revision.is_null(revision_id)):
817
1233
self.get_revision(revision_id)
820
return self._real_repository.fetch(
821
source, revision_id=revision_id, pb=pb)
1235
# if there is no specific appropriate InterRepository, this will get
1236
# the InterRepository base class, which raises an
1237
# IncompatibleRepositories when asked to fetch.
1238
inter = repository.InterRepository.get(source, self)
1239
return inter.fetch(revision_id=revision_id, pb=pb,
1240
find_ghosts=find_ghosts, fetch_spec=fetch_spec)
823
1242
def create_bundle(self, target, base, fileobj, format=None):
824
1243
self._ensure_real()
825
1244
self._real_repository.create_bundle(target, base, fileobj, format)
828
def control_weaves(self):
830
return self._real_repository.control_weaves
832
1246
@needs_read_lock
833
1247
def get_ancestry(self, revision_id, topo_sorted=True):
834
1248
self._ensure_real()
835
1249
return self._real_repository.get_ancestry(revision_id, topo_sorted)
838
def get_inventory_weave(self):
840
return self._real_repository.get_inventory_weave()
842
1251
def fileids_altered_by_revision_ids(self, revision_ids):
843
1252
self._ensure_real()
844
1253
return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
847
1256
self._ensure_real()
848
1257
return self._real_repository._get_versioned_file_checker(
849
1258
revisions, revision_versions_cache)
851
1260
def iter_files_bytes(self, desired_files):
852
1261
"""See Repository.iter_file_bytes.
854
1263
self._ensure_real()
855
1264
return self._real_repository.iter_files_bytes(desired_files)
857
def get_parent_map(self, keys):
1266
def get_parent_map(self, revision_ids):
858
1267
"""See bzrlib.Graph.get_parent_map()."""
859
# mutter_callsite(None, "get_parent_map called with %d keys", len(keys))
860
# import pdb;pdb.set_trace()
861
# Hack to build up the caching logic.
862
ancestry = self._parents_map
864
# Repository is not locked, so there's no cache.
865
missing_revisions = set(keys)
868
missing_revisions = set(key for key in keys if key not in ancestry)
869
if missing_revisions:
870
parent_map = self._get_parent_map(missing_revisions)
871
if 'hpss' in debug.debug_flags:
872
mutter('retransmitted revisions: %d of %d',
873
len(set(ancestry).intersection(parent_map)),
875
ancestry.update(parent_map)
876
present_keys = [k for k in keys if k in ancestry]
877
if 'hpss' in debug.debug_flags and False:
878
if self._requested_parents is not None and len(ancestry) != 0:
879
self._requested_parents.update(present_keys)
880
mutter('Current RemoteRepository graph hit rate: %d%%',
881
100.0 * len(self._requested_parents) / len(ancestry))
882
return dict((k, ancestry[k]) for k in present_keys)
1268
return self._make_parents_provider().get_parent_map(revision_ids)
884
def _get_parent_map(self, keys):
1270
def _get_parent_map_rpc(self, keys):
885
1271
"""Helper for get_parent_map that performs the RPC."""
886
1272
medium = self._client._medium
887
if not medium._remote_is_at_least_1_2:
1273
if medium._is_remote_before((1, 2)):
888
1274
# We already found out that the server can't understand
889
1275
# Repository.get_parent_map requests, so just fetch the whole
891
# XXX: Note that this will issue a deprecation warning. This is ok
892
# :- its because we're working with a deprecated server anyway, and
893
# the user will almost certainly have seen a warning about the
894
# server version already.
895
rg = self.get_revision_graph()
896
# There is an api discrepency between get_parent_map and
1278
# Note that this reads the whole graph, when only some keys are
1279
# wanted. On this old server there's no way (?) to get them all
1280
# in one go, and the user probably will have seen a warning about
1281
# the server being old anyhow.
1282
rg = self._get_revision_graph(None)
1283
# There is an API discrepancy between get_parent_map and
897
1284
# get_revision_graph. Specifically, a "key:()" pair in
898
1285
# get_revision_graph just means a node has no parents. For
899
1286
# "get_parent_map" it means the node is a ghost. So fix up the
1122
1581
self._ensure_real()
1123
1582
return self._real_repository.has_signature_for_revision_id(revision_id)
1125
def get_data_stream_for_search(self, search):
1126
medium = self._client._medium
1127
if not medium._remote_is_at_least_1_2:
1129
return self._real_repository.get_data_stream_for_search(search)
1130
REQUEST_NAME = 'Repository.stream_revisions_chunked'
1131
path = self.bzrdir._path_for_remote_call(self._client)
1132
body = self._serialise_search_recipe(search.get_recipe())
1134
result = self._client.call_with_body_bytes_expecting_body(
1135
REQUEST_NAME, (path,), body)
1136
response, protocol = result
1137
except errors.UnknownSmartMethod:
1138
# Server does not support this method, so fall back to VFS.
1139
# Worse, we have to force a disconnection, because the server now
1140
# doesn't realise it has a body on the wire to consume, so the
1141
# only way to recover is to abandon the connection.
1143
'Server is too old for streaming pull, reconnecting. '
1144
'(Upgrade the server to Bazaar 1.2 to avoid this)')
1146
# To avoid having to disconnect repeatedly, we keep track of the
1147
# fact the server doesn't understand this remote method.
1148
medium._remote_is_at_least_1_2 = False
1150
return self._real_repository.get_data_stream_for_search(search)
1152
if response == ('ok',):
1153
return self._deserialise_stream(protocol)
1154
if response == ('NoSuchRevision', ):
1155
# We cannot easily identify the revision that is missing in this
1156
# situation without doing much more network IO. For now, bail.
1157
raise NoSuchRevision(self, "unknown")
1159
raise errors.UnexpectedSmartServerResponse(response)
1161
def _deserialise_stream(self, protocol):
1162
stream = protocol.read_streamed_body()
1163
container_parser = ContainerPushParser()
1164
for bytes in stream:
1165
container_parser.accept_bytes(bytes)
1166
records = container_parser.read_pending_records()
1167
for record_names, record_bytes in records:
1168
if len(record_names) != 1:
1169
# These records should have only one name, and that name
1170
# should be a one-element tuple.
1171
raise errors.SmartProtocolError(
1172
'Repository data stream had invalid record name %r'
1174
name_tuple = record_names[0]
1175
yield name_tuple, record_bytes
1177
def insert_data_stream(self, stream):
1179
self._real_repository.insert_data_stream(stream)
1181
1584
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1182
1585
self._ensure_real()
1183
1586
return self._real_repository.item_keys_introduced_by(revision_ids,
1205
1613
:param recipe: A search recipe (start, stop, count).
1206
1614
:return: Serialised bytes.
1208
start_keys = ' '.join(recipe[0])
1209
stop_keys = ' '.join(recipe[1])
1210
count = str(recipe[2])
1616
start_keys = ' '.join(recipe[1])
1617
stop_keys = ' '.join(recipe[2])
1618
count = str(recipe[3])
1211
1619
return '\n'.join((start_keys, stop_keys, count))
1621
def _serialise_search_result(self, search_result):
1622
if isinstance(search_result, graph.PendingAncestryResult):
1623
parts = ['ancestry-of']
1624
parts.extend(search_result.heads)
1626
recipe = search_result.get_recipe()
1627
parts = [recipe[0], self._serialise_search_recipe(recipe)]
1628
return '\n'.join(parts)
1631
path = self.bzrdir._path_for_remote_call(self._client)
1633
response = self._call('PackRepository.autopack', path)
1634
except errors.UnknownSmartMethod:
1636
self._real_repository._pack_collection.autopack()
1639
if response[0] != 'ok':
1640
raise errors.UnexpectedSmartServerResponse(response)
1643
class RemoteStreamSink(repository.StreamSink):
1645
def _insert_real(self, stream, src_format, resume_tokens):
1646
self.target_repo._ensure_real()
1647
sink = self.target_repo._real_repository._get_sink()
1648
result = sink.insert_stream(stream, src_format, resume_tokens)
1650
self.target_repo.autopack()
1653
def insert_stream(self, stream, src_format, resume_tokens):
1654
target = self.target_repo
1655
target._unstacked_provider.missing_keys.clear()
1656
if target._lock_token:
1657
verb = 'Repository.insert_stream_locked'
1658
extra_args = (target._lock_token or '',)
1659
required_version = (1, 14)
1661
verb = 'Repository.insert_stream'
1663
required_version = (1, 13)
1664
client = target._client
1665
medium = client._medium
1666
if medium._is_remote_before(required_version):
1667
# No possible way this can work.
1668
return self._insert_real(stream, src_format, resume_tokens)
1669
path = target.bzrdir._path_for_remote_call(client)
1670
if not resume_tokens:
1671
# XXX: Ugly but important for correctness, *will* be fixed during
1672
# 1.13 cycle. Pushing a stream that is interrupted results in a
1673
# fallback to the _real_repositories sink *with a partial stream*.
1674
# Thats bad because we insert less data than bzr expected. To avoid
1675
# this we do a trial push to make sure the verb is accessible, and
1676
# do not fallback when actually pushing the stream. A cleanup patch
1677
# is going to look at rewinding/restarting the stream/partial
1679
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1681
response = client.call_with_body_stream(
1682
(verb, path, '') + extra_args, byte_stream)
1683
except errors.UnknownSmartMethod:
1684
medium._remember_remote_is_before(required_version)
1685
return self._insert_real(stream, src_format, resume_tokens)
1686
byte_stream = smart_repo._stream_to_byte_stream(
1688
resume_tokens = ' '.join(resume_tokens)
1689
response = client.call_with_body_stream(
1690
(verb, path, resume_tokens) + extra_args, byte_stream)
1691
if response[0][0] not in ('ok', 'missing-basis'):
1692
raise errors.UnexpectedSmartServerResponse(response)
1693
if response[0][0] == 'missing-basis':
1694
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1695
resume_tokens = tokens
1696
return resume_tokens, set(missing_keys)
1698
self.target_repo.refresh_data()
1702
class RemoteStreamSource(repository.StreamSource):
1703
"""Stream data from a remote server."""
1705
def get_stream(self, search):
1706
if (self.from_repository._fallback_repositories and
1707
self.to_format._fetch_order == 'topological'):
1708
return self._real_stream(self.from_repository, search)
1709
return self.missing_parents_chain(search, [self.from_repository] +
1710
self.from_repository._fallback_repositories)
1712
def _real_stream(self, repo, search):
1713
"""Get a stream for search from repo.
1715
This never called RemoteStreamSource.get_stream, and is a heler
1716
for RemoteStreamSource._get_stream to allow getting a stream
1717
reliably whether fallback back because of old servers or trying
1718
to stream from a non-RemoteRepository (which the stacked support
1721
source = repo._get_source(self.to_format)
1722
if isinstance(source, RemoteStreamSource):
1723
return repository.StreamSource.get_stream(source, search)
1724
return source.get_stream(search)
1726
def _get_stream(self, repo, search):
1727
"""Core worker to get a stream from repo for search.
1729
This is used by both get_stream and the stacking support logic. It
1730
deliberately gets a stream for repo which does not need to be
1731
self.from_repository. In the event that repo is not Remote, or
1732
cannot do a smart stream, a fallback is made to the generic
1733
repository._get_stream() interface, via self._real_stream.
1735
In the event of stacking, streams from _get_stream will not
1736
contain all the data for search - this is normal (see get_stream).
1738
:param repo: A repository.
1739
:param search: A search.
1741
# Fallbacks may be non-smart
1742
if not isinstance(repo, RemoteRepository):
1743
return self._real_stream(repo, search)
1744
client = repo._client
1745
medium = client._medium
1746
if medium._is_remote_before((1, 13)):
1747
# streaming was added in 1.13
1748
return self._real_stream(repo, search)
1749
path = repo.bzrdir._path_for_remote_call(client)
1751
search_bytes = repo._serialise_search_result(search)
1752
response = repo._call_with_body_bytes_expecting_body(
1753
'Repository.get_stream',
1754
(path, self.to_format.network_name()), search_bytes)
1755
response_tuple, response_handler = response
1756
except errors.UnknownSmartMethod:
1757
medium._remember_remote_is_before((1,13))
1758
return self._real_stream(repo, search)
1759
if response_tuple[0] != 'ok':
1760
raise errors.UnexpectedSmartServerResponse(response_tuple)
1761
byte_stream = response_handler.read_streamed_body()
1762
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1763
if src_format.network_name() != repo._format.network_name():
1764
raise AssertionError(
1765
"Mismatched RemoteRepository and stream src %r, %r" % (
1766
src_format.network_name(), repo._format.network_name()))
1769
def missing_parents_chain(self, search, sources):
1770
"""Chain multiple streams together to handle stacking.
1772
:param search: The overall search to satisfy with streams.
1773
:param sources: A list of Repository objects to query.
1775
self.serialiser = self.to_format._serializer
1776
self.seen_revs = set()
1777
self.referenced_revs = set()
1778
# If there are heads in the search, or the key count is > 0, we are not
1780
while not search.is_empty() and len(sources) > 1:
1781
source = sources.pop(0)
1782
stream = self._get_stream(source, search)
1783
for kind, substream in stream:
1784
if kind != 'revisions':
1785
yield kind, substream
1787
yield kind, self.missing_parents_rev_handler(substream)
1788
search = search.refine(self.seen_revs, self.referenced_revs)
1789
self.seen_revs = set()
1790
self.referenced_revs = set()
1791
if not search.is_empty():
1792
for kind, stream in self._get_stream(sources[0], search):
1795
def missing_parents_rev_handler(self, substream):
1796
for content in substream:
1797
revision_bytes = content.get_bytes_as('fulltext')
1798
revision = self.serialiser.read_revision_from_string(revision_bytes)
1799
self.seen_revs.add(content.key[-1])
1800
self.referenced_revs.update(revision.parent_ids)
1214
1804
class RemoteBranchLockableFiles(LockableFiles):
1215
1805
"""A 'LockableFiles' implementation that talks to a smart server.
1217
1807
This is not a public interface class.
1234
1824
class RemoteBranchFormat(branch.BranchFormat):
1826
def __init__(self, network_name=None):
1827
super(RemoteBranchFormat, self).__init__()
1828
self._matchingbzrdir = RemoteBzrDirFormat()
1829
self._matchingbzrdir.set_branch_format(self)
1830
self._custom_format = None
1831
self._network_name = network_name
1236
1833
def __eq__(self, other):
1237
return (isinstance(other, RemoteBranchFormat) and
1834
return (isinstance(other, RemoteBranchFormat) and
1238
1835
self.__dict__ == other.__dict__)
1837
def _ensure_real(self):
1838
if self._custom_format is None:
1839
self._custom_format = branch.network_format_registry.get(
1240
1842
def get_format_description(self):
1241
1843
return 'Remote BZR Branch'
1243
def get_format_string(self):
1244
return 'Remote BZR Branch'
1246
def open(self, a_bzrdir):
1247
return a_bzrdir.open_branch()
1845
def network_name(self):
1846
return self._network_name
1848
def open(self, a_bzrdir, ignore_fallbacks=False):
1849
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
1851
def _vfs_initialize(self, a_bzrdir):
1852
# Initialisation when using a local bzrdir object, or a non-vfs init
1853
# method is not available on the server.
1854
# self._custom_format is always set - the start of initialize ensures
1856
if isinstance(a_bzrdir, RemoteBzrDir):
1857
a_bzrdir._ensure_real()
1858
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
1860
# We assume the bzrdir is parameterised; it may not be.
1861
result = self._custom_format.initialize(a_bzrdir)
1862
if (isinstance(a_bzrdir, RemoteBzrDir) and
1863
not isinstance(result, RemoteBranch)):
1864
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
1249
1867
def initialize(self, a_bzrdir):
1250
return a_bzrdir.create_branch()
1868
# 1) get the network name to use.
1869
if self._custom_format:
1870
network_name = self._custom_format.network_name()
1872
# Select the current bzrlib default and ask for that.
1873
reference_bzrdir_format = bzrdir.format_registry.get('default')()
1874
reference_format = reference_bzrdir_format.get_branch_format()
1875
self._custom_format = reference_format
1876
network_name = reference_format.network_name()
1877
# Being asked to create on a non RemoteBzrDir:
1878
if not isinstance(a_bzrdir, RemoteBzrDir):
1879
return self._vfs_initialize(a_bzrdir)
1880
medium = a_bzrdir._client._medium
1881
if medium._is_remote_before((1, 13)):
1882
return self._vfs_initialize(a_bzrdir)
1883
# Creating on a remote bzr dir.
1884
# 2) try direct creation via RPC
1885
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
1886
verb = 'BzrDir.create_branch'
1888
response = a_bzrdir._call(verb, path, network_name)
1889
except errors.UnknownSmartMethod:
1890
# Fallback - use vfs methods
1891
medium._remember_remote_is_before((1, 13))
1892
return self._vfs_initialize(a_bzrdir)
1893
if response[0] != 'ok':
1894
raise errors.UnexpectedSmartServerResponse(response)
1895
# Turn the response into a RemoteRepository object.
1896
format = RemoteBranchFormat(network_name=response[1])
1897
repo_format = response_tuple_to_repo_format(response[3:])
1898
if response[2] == '':
1899
repo_bzrdir = a_bzrdir
1901
repo_bzrdir = RemoteBzrDir(
1902
a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
1904
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
1905
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
1906
format=format, setup_stacking=False)
1907
# XXX: We know this is a new branch, so it must have revno 0, revid
1908
# NULL_REVISION. Creating the branch locked would make this be unable
1909
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
1910
remote_branch._last_revision_info_cache = 0, NULL_REVISION
1911
return remote_branch
1913
def make_tags(self, branch):
1915
return self._custom_format.make_tags(branch)
1252
1917
def supports_tags(self):
1253
1918
# Remote branches might support tags, but we won't know until we
1254
1919
# access the real remote branch.
1258
class RemoteBranch(branch.Branch):
1921
return self._custom_format.supports_tags()
1923
def supports_stacking(self):
1925
return self._custom_format.supports_stacking()
1927
def supports_set_append_revisions_only(self):
1929
return self._custom_format.supports_set_append_revisions_only()
1932
class RemoteBranch(branch.Branch, _RpcHelper):
1259
1933
"""Branch stored on a server accessed by HPSS RPC.
1261
1935
At the moment most operations are mapped down to simple file operations.
1264
1938
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1939
_client=None, format=None, setup_stacking=True):
1266
1940
"""Create a RemoteBranch instance.
1268
1942
:param real_branch: An optional local implementation of the branch
1269
1943
format, usually accessing the data via the VFS.
1270
1944
:param _client: Private parameter for testing.
1945
:param format: A RemoteBranchFormat object, None to create one
1946
automatically. If supplied it should have a network_name already
1948
:param setup_stacking: If True make an RPC call to determine the
1949
stacked (or not) status of the branch. If False assume the branch
1272
1952
# We intentionally don't call the parent class's __init__, because it
1273
1953
# will try to assign to self.tags, which is a property in this subclass.
1274
1954
# And the parent's __init__ doesn't do much anyway.
1275
self._revision_id_to_revno_cache = None
1276
self._revision_history_cache = None
1277
self._last_revision_info_cache = None
1278
1955
self.bzrdir = remote_bzrdir
1279
1956
if _client is not None:
1280
1957
self._client = _client
1314
2035
Used before calls to self._real_branch.
1316
if not self._real_branch:
2037
if self._real_branch is None:
1317
2038
if not vfs.vfs_enabled():
1318
2039
raise AssertionError('smart server vfs must be enabled '
1319
2040
'to use vfs implementation')
1320
2041
self.bzrdir._ensure_real()
1321
2042
self._real_branch = self.bzrdir._real_bzrdir.open_branch()
1322
# Give the remote repository the matching real repo.
1323
real_repo = self._real_branch.repository
1324
if isinstance(real_repo, RemoteRepository):
1325
real_repo._ensure_real()
1326
real_repo = real_repo._real_repository
1327
self.repository._set_real_repository(real_repo)
1328
# Give the branch the remote repository to let fast-pathing happen.
2043
if self.repository._real_repository is None:
2044
# Give the remote repository the matching real repo.
2045
real_repo = self._real_branch.repository
2046
if isinstance(real_repo, RemoteRepository):
2047
real_repo._ensure_real()
2048
real_repo = real_repo._real_repository
2049
self.repository._set_real_repository(real_repo)
2050
# Give the real branch the remote repository to let fast-pathing
1329
2052
self._real_branch.repository = self.repository
1330
# XXX: deal with _lock_mode == 'w'
1331
2053
if self._lock_mode == 'r':
1332
2054
self._real_branch.lock_read()
2055
elif self._lock_mode == 'w':
2056
self._real_branch.lock_write(token=self._lock_token)
2058
def _translate_error(self, err, **context):
2059
self.repository._translate_error(err, branch=self, **context)
1334
2061
def _clear_cached_state(self):
1335
2062
super(RemoteBranch, self)._clear_cached_state()
1336
self._last_revision_info_cache = None
2063
if self._real_branch is not None:
2064
self._real_branch._clear_cached_state()
2066
def _clear_cached_state_of_remote_branch_only(self):
2067
"""Like _clear_cached_state, but doesn't clear the cache of
2070
This is useful when falling back to calling a method of
2071
self._real_branch that changes state. In that case the underlying
2072
branch changes, so we need to invalidate this RemoteBranch's cache of
2073
it. However, there's no need to invalidate the _real_branch's cache
2074
too, in fact doing so might harm performance.
2076
super(RemoteBranch, self)._clear_cached_state()
1339
2079
def control_files(self):
1340
2080
# Defer actually creating RemoteBranchLockableFiles until its needed,
1370
2158
branch_token = token
1371
2159
repo_token = self.repository.lock_write()
1372
2160
self.repository.unlock()
1373
path = self.bzrdir._path_for_remote_call(self._client)
1375
response = self._client.call(
1376
'Branch.lock_write', path, branch_token, repo_token or '')
1377
except errors.ErrorFromSmartServer, err:
1378
if err.error_verb == 'LockContention':
1379
raise errors.LockContention('(remote lock)')
1380
elif err.error_verb == 'TokenMismatch':
1381
raise errors.TokenMismatch(token, '(remote token)')
1382
elif err.error_verb == 'UnlockableTransport':
1383
raise errors.UnlockableTransport(self.bzrdir.root_transport)
1384
elif err.error_verb == 'ReadOnlyError':
1385
raise errors.ReadOnlyError(self)
1386
elif err.error_verb == 'LockFailed':
1387
raise errors.LockFailed(err.error_args[0], err.error_args[1])
2161
err_context = {'token': token}
2162
response = self._call(
2163
'Branch.lock_write', self._remote_path(), branch_token,
2164
repo_token or '', **err_context)
1389
2165
if response[0] != 'ok':
1390
2166
raise errors.UnexpectedSmartServerResponse(response)
1391
2167
ok, branch_token, repo_token = response
1392
2168
return branch_token, repo_token
1394
2170
def lock_write(self, token=None):
1395
2171
if not self._lock_mode:
2172
# Lock the branch and repo in one remote call.
1396
2173
remote_tokens = self._remote_lock_write(token)
1397
2174
self._lock_token, self._repo_lock_token = remote_tokens
1398
2175
if not self._lock_token:
1399
2176
raise SmartProtocolError('Remote server did not return a token!')
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.
2177
# Tell the self.repository object that it is locked.
2178
self.repository.lock_write(
2179
self._repo_lock_token, _skip_rpc=True)
1408
2181
if self._real_branch is not None:
1409
self._real_branch.repository.lock_write(
1410
token=self._repo_lock_token)
1412
self._real_branch.lock_write(token=self._lock_token)
1414
self._real_branch.repository.unlock()
2182
self._real_branch.lock_write(token=self._lock_token)
1415
2183
if token is not None:
1416
2184
self._leave_lock = True
1418
# XXX: this case seems to be unreachable; token cannot be None.
1419
2186
self._leave_lock = False
1420
2187
self._lock_mode = 'w'
1421
2188
self._lock_count = 1
1423
2190
raise errors.ReadOnlyTransaction
1425
2192
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.
2193
# A token was given to lock_write, and we're relocking, so
2194
# check that the given token actually matches the one we
1428
2196
if token != self._lock_token:
1429
2197
raise errors.TokenMismatch(token, self._lock_token)
1430
2198
self._lock_count += 1
2199
# Re-lock the repository too.
2200
self.repository.lock_write(self._repo_lock_token)
1431
2201
return self._lock_token or None
2203
def _set_tags_bytes(self, bytes):
2205
return self._real_branch._set_tags_bytes(bytes)
1433
2207
def _unlock(self, branch_token, repo_token):
1434
path = self.bzrdir._path_for_remote_call(self._client)
1436
response = self._client.call('Branch.unlock', path, branch_token,
1438
except errors.ErrorFromSmartServer, err:
1439
if err.error_verb == 'TokenMismatch':
1440
raise errors.TokenMismatch(
1441
str((branch_token, repo_token)), '(remote tokens)')
2208
err_context = {'token': str((branch_token, repo_token))}
2209
response = self._call(
2210
'Branch.unlock', self._remote_path(), branch_token,
2211
repo_token or '', **err_context)
1443
2212
if response == ('ok',):
1445
2214
raise errors.UnexpectedSmartServerResponse(response)
1447
2216
def unlock(self):
1448
self._lock_count -= 1
1449
if not self._lock_count:
1450
self._clear_cached_state()
1451
mode = self._lock_mode
1452
self._lock_mode = None
1453
if self._real_branch is not None:
1454
if (not self._leave_lock and mode == 'w' and
1455
self._repo_lock_token):
1456
# If this RemoteBranch will remove the physical lock for the
1457
# repository, make sure the _real_branch doesn't do it
1458
# first. (Because the _real_branch's repository is set to
1459
# be the RemoteRepository.)
1460
self._real_branch.repository.leave_lock_in_place()
1461
self._real_branch.unlock()
1463
# Only write-locked branched need to make a remote method call
1464
# to perfom the unlock.
1466
if not self._lock_token:
1467
raise AssertionError('Locked, but no token!')
1468
branch_token = self._lock_token
1469
repo_token = self._repo_lock_token
1470
self._lock_token = None
1471
self._repo_lock_token = None
1472
if not self._leave_lock:
1473
self._unlock(branch_token, repo_token)
2218
self._lock_count -= 1
2219
if not self._lock_count:
2220
self._clear_cached_state()
2221
mode = self._lock_mode
2222
self._lock_mode = None
2223
if self._real_branch is not None:
2224
if (not self._leave_lock and mode == 'w' and
2225
self._repo_lock_token):
2226
# If this RemoteBranch will remove the physical lock
2227
# for the repository, make sure the _real_branch
2228
# doesn't do it first. (Because the _real_branch's
2229
# repository is set to be the RemoteRepository.)
2230
self._real_branch.repository.leave_lock_in_place()
2231
self._real_branch.unlock()
2233
# Only write-locked branched need to make a remote method
2234
# call to perform the unlock.
2236
if not self._lock_token:
2237
raise AssertionError('Locked, but no token!')
2238
branch_token = self._lock_token
2239
repo_token = self._repo_lock_token
2240
self._lock_token = None
2241
self._repo_lock_token = None
2242
if not self._leave_lock:
2243
self._unlock(branch_token, repo_token)
2245
self.repository.unlock()
1475
2247
def break_lock(self):
1476
2248
self._ensure_real()
1504
2286
def _gen_revision_history(self):
1505
2287
"""See Branch._gen_revision_history()."""
1506
path = self.bzrdir._path_for_remote_call(self._client)
1507
response_tuple, response_handler = self._client.call_expecting_body(
1508
'Branch.revision_history', path)
2288
if self._is_stacked:
2290
return self._real_branch._gen_revision_history()
2291
response_tuple, response_handler = self._call_expecting_body(
2292
'Branch.revision_history', self._remote_path())
1509
2293
if response_tuple[0] != 'ok':
1510
raise UnexpectedSmartServerResponse(response_tuple)
2294
raise errors.UnexpectedSmartServerResponse(response_tuple)
1511
2295
result = response_handler.read_body_bytes().split('\x00')
1512
2296
if result == ['']:
2300
def _remote_path(self):
2301
return self.bzrdir._path_for_remote_call(self._client)
2303
def _set_last_revision_descendant(self, revision_id, other_branch,
2304
allow_diverged=False, allow_overwrite_descendant=False):
2305
# This performs additional work to meet the hook contract; while its
2306
# undesirable, we have to synthesise the revno to call the hook, and
2307
# not calling the hook is worse as it means changes can't be prevented.
2308
# Having calculated this though, we can't just call into
2309
# set_last_revision_info as a simple call, because there is a set_rh
2310
# hook that some folk may still be using.
2311
old_revno, old_revid = self.last_revision_info()
2312
history = self._lefthand_history(revision_id)
2313
self._run_pre_change_branch_tip_hooks(len(history), revision_id)
2314
err_context = {'other_branch': other_branch}
2315
response = self._call('Branch.set_last_revision_ex',
2316
self._remote_path(), self._lock_token, self._repo_lock_token,
2317
revision_id, int(allow_diverged), int(allow_overwrite_descendant),
2319
self._clear_cached_state()
2320
if len(response) != 3 and response[0] != 'ok':
2321
raise errors.UnexpectedSmartServerResponse(response)
2322
new_revno, new_revision_id = response[1:]
2323
self._last_revision_info_cache = new_revno, new_revision_id
2324
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2325
if self._real_branch is not None:
2326
cache = new_revno, new_revision_id
2327
self._real_branch._last_revision_info_cache = cache
1516
2329
def _set_last_revision(self, revision_id):
1517
path = self.bzrdir._path_for_remote_call(self._client)
2330
old_revno, old_revid = self.last_revision_info()
2331
# This performs additional work to meet the hook contract; while its
2332
# undesirable, we have to synthesise the revno to call the hook, and
2333
# not calling the hook is worse as it means changes can't be prevented.
2334
# Having calculated this though, we can't just call into
2335
# set_last_revision_info as a simple call, because there is a set_rh
2336
# hook that some folk may still be using.
2337
history = self._lefthand_history(revision_id)
2338
self._run_pre_change_branch_tip_hooks(len(history), revision_id)
1518
2339
self._clear_cached_state()
1520
response = self._client.call('Branch.set_last_revision',
1521
path, self._lock_token, self._repo_lock_token, revision_id)
1522
except errors.ErrorFromSmartServer, err:
1523
if err.error_verb == 'NoSuchRevision':
1524
raise NoSuchRevision(self, revision_id)
2340
response = self._call('Branch.set_last_revision',
2341
self._remote_path(), self._lock_token, self._repo_lock_token,
1526
2343
if response != ('ok',):
1527
2344
raise errors.UnexpectedSmartServerResponse(response)
2345
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
1529
2347
@needs_write_lock
1530
2348
def set_revision_history(self, rev_history):
1537
2355
rev_id = rev_history[-1]
1538
2356
self._set_last_revision(rev_id)
2357
for hook in branch.Branch.hooks['set_rh']:
2358
hook(self, rev_history)
1539
2359
self._cache_revision_history(rev_history)
1541
def get_parent(self):
1543
return self._real_branch.get_parent()
1545
def set_parent(self, url):
1547
return self._real_branch.set_parent(url)
1549
def sprout(self, to_bzrdir, revision_id=None):
1550
# Like Branch.sprout, except that it sprouts a branch in the default
1551
# format, because RemoteBranches can't be created at arbitrary URLs.
1552
# XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1553
# to_bzrdir.create_branch...
1555
result = self._real_branch._format.initialize(to_bzrdir)
1556
self.copy_content_into(result, revision_id=revision_id)
1557
result.set_parent(self.bzrdir.root_transport.base)
2361
def _get_parent_location(self):
2362
medium = self._client._medium
2363
if medium._is_remote_before((1, 13)):
2364
return self._vfs_get_parent_location()
2366
response = self._call('Branch.get_parent', self._remote_path())
2367
except errors.UnknownSmartMethod:
2368
medium._remember_remote_is_before((1, 13))
2369
return self._vfs_get_parent_location()
2370
if len(response) != 1:
2371
raise errors.UnexpectedSmartServerResponse(response)
2372
parent_location = response[0]
2373
if parent_location == '':
2375
return parent_location
2377
def _vfs_get_parent_location(self):
2379
return self._real_branch._get_parent_location()
2381
def _set_parent_location(self, url):
2382
medium = self._client._medium
2383
if medium._is_remote_before((1, 15)):
2384
return self._vfs_set_parent_location(url)
2386
call_url = url or ''
2387
if type(call_url) is not str:
2388
raise AssertionError('url must be a str or None (%s)' % url)
2389
response = self._call('Branch.set_parent_location',
2390
self._remote_path(), self._lock_token, self._repo_lock_token,
2392
except errors.UnknownSmartMethod:
2393
medium._remember_remote_is_before((1, 15))
2394
return self._vfs_set_parent_location(url)
2396
raise errors.UnexpectedSmartServerResponse(response)
2398
def _vfs_set_parent_location(self, url):
2400
return self._real_branch._set_parent_location(url)
1560
2402
@needs_write_lock
1561
2403
def pull(self, source, overwrite=False, stop_revision=None,
1563
# FIXME: This asks the real branch to run the hooks, which means
1564
# they're called with the wrong target branch parameter.
1565
# The test suite specifically allows this at present but it should be
1566
# fixed. It should get a _override_hook_target branch,
1567
# as push does. -- mbp 20070405
2405
self._clear_cached_state_of_remote_branch_only()
1568
2406
self._ensure_real()
1569
self._real_branch.pull(
2407
return self._real_branch.pull(
1570
2408
source, overwrite=overwrite, stop_revision=stop_revision,
2409
_override_hook_target=self, **kwargs)
1573
2411
@needs_read_lock
1574
2412
def push(self, target, overwrite=False, stop_revision=None):
1580
2418
def is_locked(self):
1581
2419
return self._lock_count >= 1
2422
def revision_id_to_revno(self, revision_id):
2424
return self._real_branch.revision_id_to_revno(revision_id)
1583
2426
@needs_write_lock
1584
2427
def set_last_revision_info(self, revno, revision_id):
2428
# XXX: These should be returned by the set_last_revision_info verb
2429
old_revno, old_revid = self.last_revision_info()
2430
self._run_pre_change_branch_tip_hooks(revno, revision_id)
1585
2431
revision_id = ensure_null(revision_id)
1586
path = self.bzrdir._path_for_remote_call(self._client)
1588
response = self._client.call('Branch.set_last_revision_info',
1589
path, self._lock_token, self._repo_lock_token, str(revno), revision_id)
2433
response = self._call('Branch.set_last_revision_info',
2434
self._remote_path(), self._lock_token, self._repo_lock_token,
2435
str(revno), revision_id)
1590
2436
except errors.UnknownSmartMethod:
1591
2437
self._ensure_real()
1592
self._clear_cached_state()
2438
self._clear_cached_state_of_remote_branch_only()
1593
2439
self._real_branch.set_last_revision_info(revno, revision_id)
1594
2440
self._last_revision_info_cache = revno, revision_id
1596
except errors.ErrorFromSmartServer, err:
1597
if err.error_verb == 'NoSuchRevision':
1598
raise NoSuchRevision(self, err.error_args[0])
1600
2442
if response == ('ok',):
1601
2443
self._clear_cached_state()
1602
2444
self._last_revision_info_cache = revno, revision_id
2445
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2446
# Update the _real_branch's cache too.
2447
if self._real_branch is not None:
2448
cache = self._last_revision_info_cache
2449
self._real_branch._last_revision_info_cache = cache
1604
2451
raise errors.UnexpectedSmartServerResponse(response)
1606
2454
def generate_revision_history(self, revision_id, last_rev=None,
1607
2455
other_branch=None):
1608
# self._ensure_real()
1609
# return self._real_branch.generate_revision_history(
1610
# revision_id, last_rev=last_rev, other_branch=other_branch)
1611
self._set_last_revision(revision_id)
1613
if last_rev is None and other_branch is None:
1614
self._set_last_revision(revision_id)
1617
return self._real_branch.generate_revision_history(
1618
revision_id, last_rev=last_rev, other_branch=other_branch)
1623
return self._real_branch.tags
2456
medium = self._client._medium
2457
if not medium._is_remote_before((1, 6)):
2458
# Use a smart method for 1.6 and above servers
2460
self._set_last_revision_descendant(revision_id, other_branch,
2461
allow_diverged=True, allow_overwrite_descendant=True)
2463
except errors.UnknownSmartMethod:
2464
medium._remember_remote_is_before((1, 6))
2465
self._clear_cached_state_of_remote_branch_only()
2466
self.set_revision_history(self._lefthand_history(revision_id,
2467
last_rev=last_rev,other_branch=other_branch))
1625
2469
def set_push_location(self, location):
1626
2470
self._ensure_real()
1627
2471
return self._real_branch.set_push_location(location)
1629
def update_revisions(self, other, stop_revision=None, overwrite=False):
1630
mutter('RemoteBranch.update_revisions(%r, %s, %r)',
1631
other, stop_revision, overwrite)
1634
return self._real_branch.update_revisions(
1635
other, stop_revision=stop_revision, overwrite=True)
1636
from bzrlib import revision as _mod_revision
2474
class RemoteConfig(object):
2475
"""A Config that reads and writes from smart verbs.
2477
It is a low-level object that considers config data to be name/value pairs
2478
that may be associated with a section. Assigning meaning to the these
2479
values is done at higher levels like bzrlib.config.TreeConfig.
2482
def get_option(self, name, section=None, default=None):
2483
"""Return the value associated with a named option.
2485
:param name: The name of the value
2486
:param section: The section the option is in (if any)
2487
:param default: The value to return if the value is not set
2488
:return: The value or default value
1639
other_last_revno, other_last_revision = other.last_revision_info()
1640
if stop_revision is None:
1641
stop_revision = other_last_revision
1642
if _mod_revision.is_null(stop_revision):
1643
# if there are no commits, we're done.
1645
# whats the current last revision, before we fetch [and change it
1647
last_rev = _mod_revision.ensure_null(self.last_revision())
1648
# we fetch here so that we don't process data twice in the common
1649
# case of having something to pull, and so that the check for
1650
# already merged can operate on the just fetched graph, which will
1651
# be cached in memory.
1652
mutter('about to fetch %s from %r', stop_revision, other)
1653
self.fetch(other, stop_revision)
1654
# Check to see if one is an ancestor of the other
1655
heads = self.repository.get_graph().heads([stop_revision,
1657
if heads == set([last_rev]):
1658
# The current revision is a decendent of the target,
1661
elif heads == set([stop_revision, last_rev]):
1662
# These branches have diverged
1663
raise errors.DivergedBranches(self, other)
1664
elif heads != set([stop_revision]):
1665
raise AssertionError("invalid heads: %r" % heads)
1666
if other_last_revision == stop_revision:
1667
self.set_last_revision_info(other_last_revno,
1668
other_last_revision)
2491
configobj = self._get_configobj()
2493
section_obj = configobj
1670
self._set_last_revision(stop_revision)
1671
# # TODO: jam 2007-11-29 Is there a way to determine the
1672
# # revno without searching all of history??
1673
# self.generate_revision_history(stop_revision,
1674
# last_rev=last_rev, other_branch=other)
1681
return self._real_branch.update_revisions(
1682
other, stop_revision=stop_revision, overwrite=overwrite)
2496
section_obj = configobj[section]
2499
return section_obj.get(name, default)
2500
except errors.UnknownSmartMethod:
2501
return self._vfs_get_option(name, section, default)
2503
def _response_to_configobj(self, response):
2504
if len(response[0]) and response[0][0] != 'ok':
2505
raise errors.UnexpectedSmartServerResponse(response)
2506
lines = response[1].read_body_bytes().splitlines()
2507
return config.ConfigObj(lines, encoding='utf-8')
2510
class RemoteBranchConfig(RemoteConfig):
2511
"""A RemoteConfig for Branches."""
2513
def __init__(self, branch):
2514
self._branch = branch
2516
def _get_configobj(self):
2517
path = self._branch._remote_path()
2518
response = self._branch._client.call_expecting_body(
2519
'Branch.get_config_file', path)
2520
return self._response_to_configobj(response)
2522
def set_option(self, value, name, section=None):
2523
"""Set the value associated with a named option.
2525
:param value: The value to set
2526
:param name: The name of the value to set
2527
:param section: The section the option is in (if any)
2529
medium = self._branch._client._medium
2530
if medium._is_remote_before((1, 14)):
2531
return self._vfs_set_option(value, name, section)
2533
path = self._branch._remote_path()
2534
response = self._branch._client.call('Branch.set_config_option',
2535
path, self._branch._lock_token, self._branch._repo_lock_token,
2536
value.encode('utf8'), name, section or '')
2537
except errors.UnknownSmartMethod:
2538
medium._remember_remote_is_before((1, 14))
2539
return self._vfs_set_option(value, name, section)
2541
raise errors.UnexpectedSmartServerResponse(response)
2543
def _real_object(self):
2544
self._branch._ensure_real()
2545
return self._branch._real_branch
2547
def _vfs_set_option(self, value, name, section=None):
2548
return self._real_object()._get_config().set_option(
2549
value, name, section)
2552
class RemoteBzrDirConfig(RemoteConfig):
2553
"""A RemoteConfig for BzrDirs."""
2555
def __init__(self, bzrdir):
2556
self._bzrdir = bzrdir
2558
def _get_configobj(self):
2559
medium = self._bzrdir._client._medium
2560
verb = 'BzrDir.get_config_file'
2561
if medium._is_remote_before((1, 15)):
2562
raise errors.UnknownSmartMethod(verb)
2563
path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2564
response = self._bzrdir._call_expecting_body(
2566
return self._response_to_configobj(response)
2568
def _vfs_get_option(self, name, section, default):
2569
return self._real_object()._get_config().get_option(
2570
name, section, default)
2572
def set_option(self, value, name, section=None):
2573
"""Set the value associated with a named option.
2575
:param value: The value to set
2576
:param name: The name of the value to set
2577
:param section: The section the option is in (if any)
2579
return self._real_object()._get_config().set_option(
2580
value, name, section)
2582
def _real_object(self):
2583
self._bzrdir._ensure_real()
2584
return self._bzrdir._real_bzrdir
1685
2588
def _extract_tar(tar, to_dir):
1690
2593
for tarinfo in tar:
1691
2594
tar.extract(tarinfo, to_dir)
2597
def _translate_error(err, **context):
2598
"""Translate an ErrorFromSmartServer into a more useful error.
2600
Possible context keys:
2608
If the error from the server doesn't match a known pattern, then
2609
UnknownErrorFromSmartServer is raised.
2613
return context[name]
2614
except KeyError, key_err:
2615
mutter('Missing key %r in context %r', key_err.args[0], context)
2618
"""Get the path from the context if present, otherwise use first error
2622
return context['path']
2623
except KeyError, key_err:
2625
return err.error_args[0]
2626
except IndexError, idx_err:
2628
'Missing key %r in context %r', key_err.args[0], context)
2631
if err.error_verb == 'NoSuchRevision':
2632
raise NoSuchRevision(find('branch'), err.error_args[0])
2633
elif err.error_verb == 'nosuchrevision':
2634
raise NoSuchRevision(find('repository'), err.error_args[0])
2635
elif err.error_tuple == ('nobranch',):
2636
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2637
elif err.error_verb == 'norepository':
2638
raise errors.NoRepositoryPresent(find('bzrdir'))
2639
elif err.error_verb == 'LockContention':
2640
raise errors.LockContention('(remote lock)')
2641
elif err.error_verb == 'UnlockableTransport':
2642
raise errors.UnlockableTransport(find('bzrdir').root_transport)
2643
elif err.error_verb == 'LockFailed':
2644
raise errors.LockFailed(err.error_args[0], err.error_args[1])
2645
elif err.error_verb == 'TokenMismatch':
2646
raise errors.TokenMismatch(find('token'), '(remote token)')
2647
elif err.error_verb == 'Diverged':
2648
raise errors.DivergedBranches(find('branch'), find('other_branch'))
2649
elif err.error_verb == 'TipChangeRejected':
2650
raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
2651
elif err.error_verb == 'UnstackableBranchFormat':
2652
raise errors.UnstackableBranchFormat(*err.error_args)
2653
elif err.error_verb == 'UnstackableRepositoryFormat':
2654
raise errors.UnstackableRepositoryFormat(*err.error_args)
2655
elif err.error_verb == 'NotStacked':
2656
raise errors.NotStacked(branch=find('branch'))
2657
elif err.error_verb == 'PermissionDenied':
2659
if len(err.error_args) >= 2:
2660
extra = err.error_args[1]
2663
raise errors.PermissionDenied(path, extra=extra)
2664
elif err.error_verb == 'ReadError':
2666
raise errors.ReadError(path)
2667
elif err.error_verb == 'NoSuchFile':
2669
raise errors.NoSuchFile(path)
2670
elif err.error_verb == 'FileExists':
2671
raise errors.FileExists(err.error_args[0])
2672
elif err.error_verb == 'DirectoryNotEmpty':
2673
raise errors.DirectoryNotEmpty(err.error_args[0])
2674
elif err.error_verb == 'ShortReadvError':
2675
args = err.error_args
2676
raise errors.ShortReadvError(
2677
args[0], int(args[1]), int(args[2]), int(args[3]))
2678
elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
2679
encoding = str(err.error_args[0]) # encoding must always be a string
2680
val = err.error_args[1]
2681
start = int(err.error_args[2])
2682
end = int(err.error_args[3])
2683
reason = str(err.error_args[4]) # reason must always be a string
2684
if val.startswith('u:'):
2685
val = val[2:].decode('utf-8')
2686
elif val.startswith('s:'):
2687
val = val[2:].decode('base64')
2688
if err.error_verb == 'UnicodeDecodeError':
2689
raise UnicodeDecodeError(encoding, val, start, end, reason)
2690
elif err.error_verb == 'UnicodeEncodeError':
2691
raise UnicodeEncodeError(encoding, val, start, end, reason)
2692
elif err.error_verb == 'ReadOnlyError':
2693
raise errors.TransportNotPossible('readonly transport')
2694
raise errors.UnknownErrorFromSmartServer(err)
added
removed
bzrlib/remote.py
