62
61
except errors.ErrorFromSmartServer, err:
63
62
self._translate_error(err, **err_context)
65
def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
67
return self._client.call_with_body_bytes(method, args, body_bytes)
68
except errors.ErrorFromSmartServer, err:
69
self._translate_error(err, **err_context)
71
64
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
112
104
self._client = client._SmartClient(medium)
114
106
self._client = _client
121
return '%s(%r)' % (self.__class__.__name__, self._client)
123
def _probe_bzrdir(self):
124
medium = self._client._medium
125
109
path = self._path_for_remote_call(self._client)
126
if medium._is_remote_before((2, 1)):
130
self._rpc_open_2_1(path)
132
except errors.UnknownSmartMethod:
133
medium._remember_remote_is_before((2, 1))
136
def _rpc_open_2_1(self, path):
137
response = self._call('BzrDir.open_2.1', path)
138
if response == ('no',):
139
raise errors.NotBranchError(path=self.root_transport.base)
140
elif response[0] == 'yes':
141
if response[1] == 'yes':
142
self._has_working_tree = True
143
elif response[1] == 'no':
144
self._has_working_tree = False
146
raise errors.UnexpectedSmartServerResponse(response)
148
raise errors.UnexpectedSmartServerResponse(response)
150
def _rpc_open(self, path):
151
110
response = self._call('BzrDir.open', path)
152
111
if response not in [('yes',), ('no',)]:
153
112
raise errors.UnexpectedSmartServerResponse(response)
154
113
if response == ('no',):
155
raise errors.NotBranchError(path=self.root_transport.base)
114
raise errors.NotBranchError(path=transport.base)
157
116
def _ensure_real(self):
158
117
"""Ensure that there is a _real_bzrdir set.
245
200
self._ensure_real()
246
201
self._real_bzrdir.destroy_repository()
248
def create_branch(self, name=None):
203
def create_branch(self):
249
204
# as per meta1 formats - just delegate to the format object which may
250
205
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
206
real_branch = self._format.get_branch_format().initialize(self)
253
207
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
208
result = RemoteBranch(self, self.find_repository(), real_branch)
257
210
result = real_branch
258
211
# BzrDir.clone_on_transport() uses the result of create_branch but does
264
217
self._next_open_branch_result = result
267
def destroy_branch(self, name=None):
220
def destroy_branch(self):
268
221
"""See BzrDir.destroy_branch"""
269
222
self._ensure_real()
270
self._real_bzrdir.destroy_branch(name=name)
223
self._real_bzrdir.destroy_branch()
271
224
self._next_open_branch_result = None
273
226
def create_workingtree(self, revision_id=None, from_branch=None):
274
227
raise errors.NotLocalUrl(self.transport.base)
276
def find_branch_format(self, name=None):
229
def find_branch_format(self):
277
230
"""Find the branch 'format' for this bzrdir.
279
232
This might be a synthetic object for e.g. RemoteBranch and SVN.
281
b = self.open_branch(name=name)
234
b = self.open_branch()
284
def get_branch_reference(self, name=None):
237
def get_branch_reference(self):
285
238
"""See BzrDir.get_branch_reference()."""
287
# XXX JRV20100304: Support opening colocated branches
288
raise errors.NoColocatedBranchSupport(self)
289
239
response = self._get_branch_reference()
290
240
if response[0] == 'ref':
291
241
return response[1]
295
245
def _get_branch_reference(self):
296
246
path = self._path_for_remote_call(self._client)
297
247
medium = self._client._medium
299
('BzrDir.open_branchV3', (2, 1)),
300
('BzrDir.open_branchV2', (1, 13)),
301
('BzrDir.open_branch', None),
303
for verb, required_version in candidate_calls:
304
if required_version and medium._is_remote_before(required_version):
248
if not medium._is_remote_before((1, 13)):
307
response = self._call(verb, path)
250
response = self._call('BzrDir.open_branchV2', path)
251
if response[0] not in ('ref', 'branch'):
252
raise errors.UnexpectedSmartServerResponse(response)
308
254
except errors.UnknownSmartMethod:
309
if required_version is None:
311
medium._remember_remote_is_before(required_version)
314
if verb == 'BzrDir.open_branch':
315
if response[0] != 'ok':
316
raise errors.UnexpectedSmartServerResponse(response)
317
if response[1] != '':
318
return ('ref', response[1])
320
return ('branch', '')
321
if response[0] not in ('ref', 'branch'):
255
medium._remember_remote_is_before((1, 13))
256
response = self._call('BzrDir.open_branch', path)
257
if response[0] != 'ok':
322
258
raise errors.UnexpectedSmartServerResponse(response)
259
if response[1] != '':
260
return ('ref', response[1])
262
return ('branch', '')
325
def _get_tree_branch(self, name=None):
264
def _get_tree_branch(self):
326
265
"""See BzrDir._get_tree_branch()."""
327
return None, self.open_branch(name=name)
266
return None, self.open_branch()
329
def open_branch(self, name=None, unsupported=False,
330
ignore_fallbacks=False):
268
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
332
270
raise NotImplementedError('unsupported flag support not implemented yet.')
333
271
if self._next_open_branch_result is not None:
334
272
# See create_branch for details.
339
277
if response[0] == 'ref':
340
278
# a branch reference, use the existing BranchReference logic.
341
279
format = BranchReferenceFormat()
342
return format.open(self, name=name, _found=True,
343
location=response[1], ignore_fallbacks=ignore_fallbacks)
280
return format.open(self, _found=True, location=response[1],
281
ignore_fallbacks=ignore_fallbacks)
344
282
branch_format_name = response[1]
345
283
if not branch_format_name:
346
284
branch_format_name = None
347
285
format = RemoteBranchFormat(network_name=branch_format_name)
348
286
return RemoteBranch(self, self.find_repository(), format=format,
349
setup_stacking=not ignore_fallbacks, name=name)
287
setup_stacking=not ignore_fallbacks)
351
289
def _open_repo_v1(self, path):
352
290
verb = 'BzrDir.find_repository'
624
545
return self._custom_format._fetch_reconcile
626
547
def get_format_description(self):
628
return 'Remote: ' + self._custom_format.get_format_description()
548
return 'bzr remote repository'
630
550
def __eq__(self, other):
631
551
return self.__class__ is other.__class__
553
def check_conversion_target(self, target_format):
554
if self.rich_root_data and not target_format.rich_root_data:
555
raise errors.BadConversionTarget(
556
'Does not support rich root data.', target_format)
557
if (self.supports_tree_reference and
558
not getattr(target_format, 'supports_tree_reference', False)):
559
raise errors.BadConversionTarget(
560
'Does not support nested trees', target_format)
633
562
def network_name(self):
634
563
if self._network_name:
635
564
return self._network_name
896
808
result.add(_mod_revision.NULL_REVISION)
899
def _has_same_fallbacks(self, other_repo):
900
"""Returns true if the repositories have the same fallbacks."""
901
# XXX: copied from Repository; it should be unified into a base class
902
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
903
my_fb = self._fallback_repositories
904
other_fb = other_repo._fallback_repositories
905
if len(my_fb) != len(other_fb):
907
for f, g in zip(my_fb, other_fb):
908
if not f.has_same_location(g):
912
811
def has_same_location(self, other):
913
# TODO: Move to RepositoryBase and unify with the regular Repository
914
# one; unfortunately the tests rely on slightly different behaviour at
915
# present -- mbp 20090710
916
812
return (self.__class__ is other.__class__ and
917
813
self.bzrdir.transport.base == other.bzrdir.transport.base)
921
817
parents_provider = self._make_parents_provider(other_repository)
922
818
return graph.Graph(parents_provider)
925
def get_known_graph_ancestry(self, revision_ids):
926
"""Return the known graph for a set of revision ids and their ancestors.
928
st = static_tuple.StaticTuple
929
revision_keys = [st(r_id).intern() for r_id in revision_ids]
930
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
931
return graph.GraphThunkIdsToKeys(known_graph)
933
820
def gather_stats(self, revid=None, committers=None):
934
821
"""See Repository.gather_stats()."""
935
822
path = self.bzrdir._path_for_remote_call(self._client)
1249
1123
# state, so always add a lock here. If a caller passes us a locked
1250
1124
# repository, they are responsible for unlocking it later.
1251
1125
repository.lock_read()
1252
self._check_fallback_repository(repository)
1253
1126
self._fallback_repositories.append(repository)
1254
1127
# If self._real_repository was parameterised already (e.g. because a
1255
1128
# _real_branch had its get_stacked_on_url method called), then the
1256
1129
# repository to be added may already be in the _real_repositories list.
1257
1130
if self._real_repository is not None:
1258
fallback_locations = [repo.user_url for repo in
1131
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1259
1132
self._real_repository._fallback_repositories]
1260
if repository.user_url not in fallback_locations:
1133
if repository.bzrdir.root_transport.base not in fallback_locations:
1261
1134
self._real_repository.add_fallback_repository(repository)
1263
def _check_fallback_repository(self, repository):
1264
"""Check that this repository can fallback to repository safely.
1266
Raise an error if not.
1268
:param repository: A repository to fallback to.
1270
return _mod_repository.InterRepository._assert_same_model(
1273
1136
def add_inventory(self, revid, inv, parents):
1274
1137
self._ensure_real()
1275
1138
return self._real_repository.add_inventory(revid, inv, parents)
1277
1140
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1278
parents, basis_inv=None, propagate_caches=False):
1279
1142
self._ensure_real()
1280
1143
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1281
delta, new_revision_id, parents, basis_inv=basis_inv,
1282
propagate_caches=propagate_caches)
1144
delta, new_revision_id, parents)
1284
1146
def add_revision(self, rev_id, rev, inv=None, config=None):
1285
1147
self._ensure_real()
1315
1177
return self._real_repository.make_working_trees()
1317
1179
def refresh_data(self):
1318
"""Re-read any data needed to synchronise with disk.
1180
"""Re-read any data needed to to synchronise with disk.
1320
1182
This method is intended to be called after another repository instance
1321
1183
(such as one used by a smart server) has inserted data into the
1322
repository. On all repositories this will work outside of write groups.
1323
Some repository formats (pack and newer for bzrlib native formats)
1324
support refresh_data inside write groups. If called inside a write
1325
group on a repository that does not support refreshing in a write group
1326
IsInWriteGroupError will be raised.
1184
repository. It may not be called during a write group, but may be
1185
called at any other time.
1187
if self.is_in_write_group():
1188
raise errors.InternalBzrError(
1189
"May not refresh_data while in a write group.")
1328
1190
if self._real_repository is not None:
1329
1191
self._real_repository.refresh_data()
1791
1653
def insert_stream(self, stream, src_format, resume_tokens):
1792
1654
target = self.target_repo
1793
1655
target._unstacked_provider.missing_keys.clear()
1794
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1795
1656
if target._lock_token:
1796
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1797
lock_args = (target._lock_token or '',)
1657
verb = 'Repository.insert_stream_locked'
1658
extra_args = (target._lock_token or '',)
1659
required_version = (1, 14)
1799
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1661
verb = 'Repository.insert_stream'
1663
required_version = (1, 13)
1801
1664
client = target._client
1802
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)
1803
1669
path = target.bzrdir._path_for_remote_call(client)
1804
# Probe for the verb to use with an empty stream before sending the
1805
# real stream to it. We do this both to avoid the risk of sending a
1806
# large request that is then rejected, and because we don't want to
1807
# implement a way to buffer, rewind, or restart the stream.
1809
for verb, required_version in candidate_calls:
1810
if medium._is_remote_before(required_version):
1813
# We've already done the probing (and set _is_remote_before) on
1814
# a previous insert.
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
1817
1679
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1819
1681
response = client.call_with_body_stream(
1820
(verb, path, '') + lock_args, byte_stream)
1682
(verb, path, '') + extra_args, byte_stream)
1821
1683
except errors.UnknownSmartMethod:
1822
1684
medium._remember_remote_is_before(required_version)
1828
return self._insert_real(stream, src_format, resume_tokens)
1829
self._last_inv_record = None
1830
self._last_substream = None
1831
if required_version < (1, 19):
1832
# Remote side doesn't support inventory deltas. Wrap the stream to
1833
# make sure we don't send any. If the stream contains inventory
1834
# deltas we'll interrupt the smart insert_stream request and
1836
stream = self._stop_stream_if_inventory_delta(stream)
1685
return self._insert_real(stream, src_format, resume_tokens)
1837
1686
byte_stream = smart_repo._stream_to_byte_stream(
1838
1687
stream, src_format)
1839
1688
resume_tokens = ' '.join(resume_tokens)
1840
1689
response = client.call_with_body_stream(
1841
(verb, path, resume_tokens) + lock_args, byte_stream)
1690
(verb, path, resume_tokens) + extra_args, byte_stream)
1842
1691
if response[0][0] not in ('ok', 'missing-basis'):
1843
1692
raise errors.UnexpectedSmartServerResponse(response)
1844
if self._last_substream is not None:
1845
# The stream included an inventory-delta record, but the remote
1846
# side isn't new enough to support them. So we need to send the
1847
# rest of the stream via VFS.
1848
self.target_repo.refresh_data()
1849
return self._resume_stream_with_vfs(response, src_format)
1850
1693
if response[0][0] == 'missing-basis':
1851
1694
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1852
1695
resume_tokens = tokens
1855
1698
self.target_repo.refresh_data()
1856
1699
return [], set()
1858
def _resume_stream_with_vfs(self, response, src_format):
1859
"""Resume sending a stream via VFS, first resending the record and
1860
substream that couldn't be sent via an insert_stream verb.
1862
if response[0][0] == 'missing-basis':
1863
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1864
# Ignore missing_keys, we haven't finished inserting yet
1867
def resume_substream():
1868
# Yield the substream that was interrupted.
1869
for record in self._last_substream:
1871
self._last_substream = None
1872
def resume_stream():
1873
# Finish sending the interrupted substream
1874
yield ('inventory-deltas', resume_substream())
1875
# Then simply continue sending the rest of the stream.
1876
for substream_kind, substream in self._last_stream:
1877
yield substream_kind, substream
1878
return self._insert_real(resume_stream(), src_format, tokens)
1880
def _stop_stream_if_inventory_delta(self, stream):
1881
"""Normally this just lets the original stream pass-through unchanged.
1883
However if any 'inventory-deltas' substream occurs it will stop
1884
streaming, and store the interrupted substream and stream in
1885
self._last_substream and self._last_stream so that the stream can be
1886
resumed by _resume_stream_with_vfs.
1889
stream_iter = iter(stream)
1890
for substream_kind, substream in stream_iter:
1891
if substream_kind == 'inventory-deltas':
1892
self._last_substream = substream
1893
self._last_stream = stream_iter
1896
yield substream_kind, substream
1899
1702
class RemoteStreamSource(repository.StreamSource):
1900
1703
"""Stream data from a remote server."""
1903
1706
if (self.from_repository._fallback_repositories and
1904
1707
self.to_format._fetch_order == 'topological'):
1905
1708
return self._real_stream(self.from_repository, search)
1908
repos = [self.from_repository]
1914
repos.extend(repo._fallback_repositories)
1915
sources.append(repo)
1916
return self.missing_parents_chain(search, sources)
1918
def get_stream_for_missing_keys(self, missing_keys):
1919
self.from_repository._ensure_real()
1920
real_repo = self.from_repository._real_repository
1921
real_source = real_repo._get_source(self.to_format)
1922
return real_source.get_stream_for_missing_keys(missing_keys)
1709
return self.missing_parents_chain(search, [self.from_repository] +
1710
self.from_repository._fallback_repositories)
1924
1712
def _real_stream(self, repo, search):
1925
1713
"""Get a stream for search from repo.
1956
1743
return self._real_stream(repo, search)
1957
1744
client = repo._client
1958
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)
1959
1749
path = repo.bzrdir._path_for_remote_call(client)
1960
search_bytes = repo._serialise_search_result(search)
1961
args = (path, self.to_format.network_name())
1963
('Repository.get_stream_1.19', (1, 19)),
1964
('Repository.get_stream', (1, 13))]
1966
for verb, version in candidate_verbs:
1967
if medium._is_remote_before(version):
1970
response = repo._call_with_body_bytes_expecting_body(
1971
verb, args, search_bytes)
1972
except errors.UnknownSmartMethod:
1973
medium._remember_remote_is_before(version)
1975
response_tuple, response_handler = response
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))
1979
1758
return self._real_stream(repo, search)
1980
1759
if response_tuple[0] != 'ok':
1981
1760
raise errors.UnexpectedSmartServerResponse(response_tuple)
2062
1840
self._network_name)
2064
1842
def get_format_description(self):
2066
return 'Remote: ' + self._custom_format.get_format_description()
1843
return 'Remote BZR Branch'
2068
1845
def network_name(self):
2069
1846
return self._network_name
2071
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2072
return a_bzrdir.open_branch(name=name,
2073
ignore_fallbacks=ignore_fallbacks)
1848
def open(self, a_bzrdir, ignore_fallbacks=False):
1849
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2075
def _vfs_initialize(self, a_bzrdir, name):
1851
def _vfs_initialize(self, a_bzrdir):
2076
1852
# Initialisation when using a local bzrdir object, or a non-vfs init
2077
1853
# method is not available on the server.
2078
1854
# self._custom_format is always set - the start of initialize ensures
2080
1856
if isinstance(a_bzrdir, RemoteBzrDir):
2081
1857
a_bzrdir._ensure_real()
2082
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1858
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2085
1860
# We assume the bzrdir is parameterised; it may not be.
2086
result = self._custom_format.initialize(a_bzrdir, name)
1861
result = self._custom_format.initialize(a_bzrdir)
2087
1862
if (isinstance(a_bzrdir, RemoteBzrDir) and
2088
1863
not isinstance(result, RemoteBranch)):
2089
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1864
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2093
def initialize(self, a_bzrdir, name=None):
1867
def initialize(self, a_bzrdir):
2094
1868
# 1) get the network name to use.
2095
1869
if self._custom_format:
2096
1870
network_name = self._custom_format.network_name()
2102
1876
network_name = reference_format.network_name()
2103
1877
# Being asked to create on a non RemoteBzrDir:
2104
1878
if not isinstance(a_bzrdir, RemoteBzrDir):
2105
return self._vfs_initialize(a_bzrdir, name=name)
1879
return self._vfs_initialize(a_bzrdir)
2106
1880
medium = a_bzrdir._client._medium
2107
1881
if medium._is_remote_before((1, 13)):
2108
return self._vfs_initialize(a_bzrdir, name=name)
1882
return self._vfs_initialize(a_bzrdir)
2109
1883
# Creating on a remote bzr dir.
2110
1884
# 2) try direct creation via RPC
2111
1885
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2112
if name is not None:
2113
# XXX JRV20100304: Support creating colocated branches
2114
raise errors.NoColocatedBranchSupport(self)
2115
1886
verb = 'BzrDir.create_branch'
2117
1888
response = a_bzrdir._call(verb, path, network_name)
2118
1889
except errors.UnknownSmartMethod:
2119
1890
# Fallback - use vfs methods
2120
1891
medium._remember_remote_is_before((1, 13))
2121
return self._vfs_initialize(a_bzrdir, name=name)
1892
return self._vfs_initialize(a_bzrdir)
2122
1893
if response[0] != 'ok':
2123
1894
raise errors.UnexpectedSmartServerResponse(response)
2124
1895
# Turn the response into a RemoteRepository object.
2158
1929
return self._custom_format.supports_set_append_revisions_only()
2161
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1932
class RemoteBranch(branch.Branch, _RpcHelper):
2162
1933
"""Branch stored on a server accessed by HPSS RPC.
2164
1935
At the moment most operations are mapped down to simple file operations.
2167
1938
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2168
_client=None, format=None, setup_stacking=True, name=None):
1939
_client=None, format=None, setup_stacking=True):
2169
1940
"""Create a RemoteBranch instance.
2171
1942
:param real_branch: An optional local implementation of the branch
2377
2141
return self._vfs_get_tags_bytes()
2378
2142
return response[0]
2380
def _vfs_set_tags_bytes(self, bytes):
2382
return self._real_branch._set_tags_bytes(bytes)
2384
def _set_tags_bytes(self, bytes):
2385
medium = self._client._medium
2386
if medium._is_remote_before((1, 18)):
2387
self._vfs_set_tags_bytes(bytes)
2391
self._remote_path(), self._lock_token, self._repo_lock_token)
2392
response = self._call_with_body_bytes(
2393
'Branch.set_tags_bytes', args, bytes)
2394
except errors.UnknownSmartMethod:
2395
medium._remember_remote_is_before((1, 18))
2396
self._vfs_set_tags_bytes(bytes)
2398
2144
def lock_read(self):
2399
"""Lock the branch for read operations.
2401
:return: A bzrlib.lock.LogicalLockResult.
2403
2145
self.repository.lock_read()
2404
2146
if not self._lock_mode:
2405
self._note_lock('r')
2406
2147
self._lock_mode = 'r'
2407
2148
self._lock_count = 1
2408
2149
if self._real_branch is not None:
2409
2150
self._real_branch.lock_read()
2411
2152
self._lock_count += 1
2412
return lock.LogicalLockResult(self.unlock)
2414
2154
def _remote_lock_write(self, token):
2415
2155
if token is None:
2416
2156
branch_token = repo_token = ''
2418
2158
branch_token = token
2419
repo_token = self.repository.lock_write().repository_token
2159
repo_token = self.repository.lock_write()
2420
2160
self.repository.unlock()
2421
2161
err_context = {'token': token}
2422
2162
response = self._call(
2887
2628
'Missing key %r in context %r', key_err.args[0], context)
2890
if err.error_verb == 'IncompatibleRepositories':
2891
raise errors.IncompatibleRepositories(err.error_args[0],
2892
err.error_args[1], err.error_args[2])
2893
elif err.error_verb == 'NoSuchRevision':
2631
if err.error_verb == 'NoSuchRevision':
2894
2632
raise NoSuchRevision(find('branch'), err.error_args[0])
2895
2633
elif err.error_verb == 'nosuchrevision':
2896
2634
raise NoSuchRevision(find('repository'), err.error_args[0])
2897
elif err.error_verb == 'nobranch':
2898
if len(err.error_args) >= 1:
2899
extra = err.error_args[0]
2902
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2635
elif err.error_tuple == ('nobranch',):
2636
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2904
2637
elif err.error_verb == 'norepository':
2905
2638
raise errors.NoRepositoryPresent(find('bzrdir'))
2906
2639
elif err.error_verb == 'LockContention':