1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
210
206
# an inventory delta was accumulated without creating a new
212
208
basis_id = self.basis_delta_revision
213
# We ignore the 'inventory' returned by add_inventory_by_delta
214
# because self.new_inventory is used to hint to the rest of the
215
# system what code path was taken
216
self.inv_sha1, _ = self.repository.add_inventory_by_delta(
209
self.inv_sha1 = self.repository.add_inventory_by_delta(
217
210
basis_id, self._basis_delta, self._new_revision_id,
860
853
# versioned roots do not change unless the tree found a change.
863
class RepositoryWriteLockResult(object):
864
"""The result of write locking a repository.
866
:ivar repository_token: The token obtained from the underlying lock, or
868
:ivar unlock: A callable which will unlock the lock.
871
def __init__(self, unlock, repository_token):
872
self.repository_token = repository_token
876
856
######################################################################
880
class Repository(_RelockDebugMixin, bzrdir.ControlComponent):
860
class Repository(_RelockDebugMixin):
881
861
"""Repository holding history for one or more branches.
883
863
The repository holds and retrieves historical information including
1042
1022
:seealso: add_inventory, for the contract.
1044
inv_lines = self._serializer.write_inventory_to_lines(inv)
1024
inv_lines = self._serialise_inventory_to_lines(inv)
1045
1025
return self._inventory_add_lines(revision_id, parents,
1046
1026
inv_lines, check_content=False)
1254
1234
"""Check a single text from this repository."""
1255
1235
if kind == 'inventories':
1256
1236
rev_id = record.key[0]
1257
inv = self._deserialise_inventory(rev_id,
1237
inv = self.deserialise_inventory(rev_id,
1258
1238
record.get_bytes_as('fulltext'))
1259
1239
if last_object is not None:
1260
1240
delta = inv._make_delta(last_object)
1305
1285
:param _format: The format of the repository on disk.
1306
1286
:param a_bzrdir: The BzrDir of the repository.
1288
In the future we will have a single api for all stores for
1289
getting file texts, inventories and revisions, then
1290
this construct will accept instances of those things.
1308
# In the future we will have a single api for all stores for
1309
# getting file texts, inventories and revisions, then
1310
# this construct will accept instances of those things.
1311
1292
super(Repository, self).__init__()
1312
1293
self._format = _format
1313
1294
# the following are part of the public API for Repository:
1319
1300
self._reconcile_does_inventory_gc = True
1320
1301
self._reconcile_fixes_text_parents = False
1321
1302
self._reconcile_backsup_inventory = True
1303
# not right yet - should be more semantically clear ?
1305
# TODO: make sure to construct the right store classes, etc, depending
1306
# on whether escaping is required.
1307
self._warn_if_deprecated()
1322
1308
self._write_group = None
1323
1309
# Additional places to query for data.
1324
1310
self._fallback_repositories = []
1325
1311
# An InventoryEntry cache, used during deserialization
1326
1312
self._inventory_entry_cache = fifo_cache.FIFOCache(10*1024)
1327
# Is it safe to return inventory entries directly from the entry cache,
1328
# rather copying them?
1329
self._safe_to_return_from_cache = False
1332
def user_transport(self):
1333
return self.bzrdir.user_transport
1336
def control_transport(self):
1337
return self._transport
1339
1314
def __repr__(self):
1340
1315
if self._fallback_repositories:
1389
1364
data during reads, and allows a 'write_group' to be obtained. Write
1390
1365
groups must be used for actual data insertion.
1392
A token should be passed in if you know that you have locked the object
1393
some other way, and need to synchronise this object's state with that
1396
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1398
1367
:param token: if this is already locked, then lock_write will fail
1399
1368
unless the token matches the existing lock.
1400
1369
:returns: a token if this instance supports tokens, otherwise None.
1403
1372
:raises MismatchedToken: if the specified token doesn't match the token
1404
1373
of the existing lock.
1405
1374
:seealso: start_write_group.
1406
:return: A RepositoryWriteLockResult.
1376
A token should be passed in if you know that you have locked the object
1377
some other way, and need to synchronise this object's state with that
1380
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1408
1382
locked = self.is_locked()
1409
token = self.control_files.lock_write(token=token)
1383
result = self.control_files.lock_write(token=token)
1411
self._warn_if_deprecated()
1412
1385
self._note_lock('w')
1413
1386
for repo in self._fallback_repositories:
1414
1387
# Writes don't affect fallback repos
1415
1388
repo.lock_read()
1416
1389
self._refresh_data()
1417
return RepositoryWriteLockResult(self.unlock, token)
1419
1392
def lock_read(self):
1420
"""Lock the repository for read operations.
1422
:return: An object with an unlock method which will release the lock
1425
1393
locked = self.is_locked()
1426
1394
self.control_files.lock_read()
1428
self._warn_if_deprecated()
1429
1396
self._note_lock('r')
1430
1397
for repo in self._fallback_repositories:
1431
1398
repo.lock_read()
1432
1399
self._refresh_data()
1435
1401
def get_physical_lock_status(self):
1436
1402
return self.control_files.get_physical_lock_status()
1497
1463
# now gather global repository information
1498
1464
# XXX: This is available for many repos regardless of listability.
1499
if self.user_transport.listable():
1465
if self.bzrdir.root_transport.listable():
1500
1466
# XXX: do we want to __define len__() ?
1501
1467
# Maybe the versionedfiles object should provide a different
1502
1468
# method to get the number of keys.
1512
1478
:param using: If True, list only branches using this repository.
1514
1480
if using and not self.is_shared():
1515
return self.bzrdir.list_branches()
1482
return [self.bzrdir.open_branch()]
1483
except errors.NotBranchError:
1516
1485
class Evaluator(object):
1518
1487
def __init__(self):
1527
1496
except errors.NoRepositoryPresent:
1530
return False, ([], repository)
1499
return False, (None, repository)
1531
1500
self.first_call = False
1532
value = (bzrdir.list_branches(), None)
1502
value = (bzrdir.open_branch(), None)
1503
except errors.NotBranchError:
1504
value = (None, None)
1533
1505
return True, value
1536
for branches, repository in bzrdir.BzrDir.find_bzrdirs(
1537
self.user_transport, evaluate=Evaluator()):
1538
if branches is not None:
1539
ret.extend(branches)
1508
for branch, repository in bzrdir.BzrDir.find_bzrdirs(
1509
self.bzrdir.root_transport, evaluate=Evaluator()):
1510
if branch is not None:
1511
branches.append(branch)
1540
1512
if not using and repository is not None:
1541
ret.extend(repository.find_branches())
1513
branches.extend(repository.find_branches())
1544
1516
@needs_read_lock
1545
1517
def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1923
1895
rev = self._serializer.read_revision_from_string(text)
1924
1896
yield (revid, rev)
1899
def get_revision_xml(self, revision_id):
1900
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1901
# would have already do it.
1902
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1903
# TODO: this can't just be replaced by:
1904
# return self._serializer.write_revision_to_string(
1905
# self.get_revision(revision_id))
1906
# as cStringIO preservers the encoding unlike write_revision_to_string
1907
# or some other call down the path.
1908
rev = self.get_revision(revision_id)
1909
rev_tmp = cStringIO.StringIO()
1910
# the current serializer..
1911
self._serializer.write_revision(rev, rev_tmp)
1913
return rev_tmp.getvalue()
1926
1915
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1927
1916
"""Produce a generator of revision deltas.
2171
2160
selected_keys = set((revid,) for revid in revision_ids)
2172
2161
w = _inv_weave or self.inventories
2173
return self._find_file_ids_from_xml_inventory_lines(
2174
w.iter_lines_added_or_present_in_keys(
2175
selected_keys, pb=None),
2162
pb = ui.ui_factory.nested_progress_bar()
2164
return self._find_file_ids_from_xml_inventory_lines(
2165
w.iter_lines_added_or_present_in_keys(
2166
selected_keys, pb=pb),
2178
2171
def iter_files_bytes(self, desired_files):
2179
2172
"""Iterate through file versions.
2389
2382
"""single-document based inventory iteration."""
2390
2383
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2391
2384
for text, revision_id in inv_xmls:
2392
yield self._deserialise_inventory(revision_id, text)
2385
yield self.deserialise_inventory(revision_id, text)
2394
2387
def _iter_inventory_xmls(self, revision_ids, ordering):
2395
2388
if ordering is None:
2427
2420
next_key = None
2430
def _deserialise_inventory(self, revision_id, xml):
2423
def deserialise_inventory(self, revision_id, xml):
2431
2424
"""Transform the xml into an inventory object.
2433
2426
:param revision_id: The expected revision id of the inventory.
2434
2427
:param xml: A serialised inventory.
2436
2429
result = self._serializer.read_inventory_from_string(xml, revision_id,
2437
entry_cache=self._inventory_entry_cache,
2438
return_from_cache=self._safe_to_return_from_cache)
2430
entry_cache=self._inventory_entry_cache)
2439
2431
if result.revision_id != revision_id:
2440
2432
raise AssertionError('revision id mismatch %s != %s' % (
2441
2433
result.revision_id, revision_id))
2436
def serialise_inventory(self, inv):
2437
return self._serializer.write_inventory_to_string(inv)
2439
def _serialise_inventory_to_lines(self, inv):
2440
return self._serializer.write_inventory_to_lines(inv)
2444
2442
def get_serializer_format(self):
2445
2443
return self._serializer.format_num
2447
2445
@needs_read_lock
2448
def _get_inventory_xml(self, revision_id):
2449
"""Get serialized inventory as a string."""
2446
def get_inventory_xml(self, revision_id):
2447
"""Get inventory XML as a file object."""
2450
2448
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2452
2450
text, revision_id = texts.next()
2454
2452
raise errors.HistoryMissing(self, 'inventory', revision_id)
2456
def get_inventory_sha1(self, revision_id):
2457
"""Return the sha1 hash of the inventory entry
2459
return self.get_revision(revision_id).inventory_sha1
2457
2461
def get_rev_id_for_revno(self, revno, known_pair):
2458
2462
"""Return the revision id of a revno, given a later (revno, revid)
2459
2463
pair in the same history.
2511
2515
next_id = parents[0]
2518
def get_revision_inventory(self, revision_id):
2519
"""Return inventory of a past revision."""
2520
# TODO: Unify this with get_inventory()
2521
# bzr 0.0.6 and later imposes the constraint that the inventory_id
2522
# must be the same as its revision, so this is trivial.
2523
if revision_id is None:
2524
# This does not make sense: if there is no revision,
2525
# then it is the current tree inventory surely ?!
2526
# and thus get_root_id() is something that looks at the last
2527
# commit on the branch, and the get_root_id is an inventory check.
2528
raise NotImplementedError
2529
# return Inventory(self.get_root_id())
2531
return self.get_inventory(revision_id)
2513
2533
def is_shared(self):
2514
2534
"""Return True if this repository is flagged as a shared repository."""
2515
2535
raise NotImplementedError(self.is_shared)
2549
2569
return RevisionTree(self, Inventory(root_id=None),
2550
2570
_mod_revision.NULL_REVISION)
2552
inv = self.get_inventory(revision_id)
2572
inv = self.get_revision_inventory(revision_id)
2553
2573
return RevisionTree(self, inv, revision_id)
2555
2575
def revision_trees(self, revision_ids):
2608
2628
keys = tsort.topo_sort(parent_map)
2609
2629
return [None] + list(keys)
2611
def pack(self, hint=None, clean_obsolete_packs=False):
2631
def pack(self, hint=None):
2612
2632
"""Compress the data within the repository.
2614
2634
This operation only makes sense for some repository types. For other
2624
2644
obtained from the result of commit_write_group(). Out of
2625
2645
date hints are simply ignored, because concurrent operations
2626
2646
can obsolete them rapidly.
2628
:param clean_obsolete_packs: Clean obsolete packs immediately after
2632
2649
def get_transaction(self):
2648
2665
for ((revision_id,), parent_keys) in \
2649
2666
self.revisions.get_parent_map(query_keys).iteritems():
2650
2667
if parent_keys:
2651
result[revision_id] = tuple([parent_revid
2652
for (parent_revid,) in parent_keys])
2668
result[revision_id] = tuple(parent_revid
2669
for (parent_revid,) in parent_keys)
2654
2671
result[revision_id] = (_mod_revision.NULL_REVISION,)
2657
2674
def _make_parents_provider(self):
2661
def get_known_graph_ancestry(self, revision_ids):
2662
"""Return the known graph for a set of revision ids and their ancestors.
2664
st = static_tuple.StaticTuple
2665
revision_keys = [st(r_id).intern() for r_id in revision_ids]
2666
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
2667
return graph.GraphThunkIdsToKeys(known_graph)
2669
2677
def get_graph(self, other_repository=None):
2670
2678
"""Return the graph walker for this repository format"""
2671
2679
parents_provider = self._make_parents_provider()
2766
2774
result.check(callback_refs)
2769
def _warn_if_deprecated(self, branch=None):
2777
def _warn_if_deprecated(self):
2770
2778
global _deprecation_warning_done
2771
2779
if _deprecation_warning_done:
2775
conf = config.GlobalConfig()
2777
conf = branch.get_config()
2778
if conf.suppress_warning('format_deprecation'):
2780
warning("Format %s for %s is deprecated -"
2781
" please use 'bzr upgrade' to get better performance"
2782
% (self._format, self.bzrdir.transport.base))
2784
_deprecation_warning_done = True
2781
_deprecation_warning_done = True
2782
warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
2783
% (self._format, self.bzrdir.transport.base))
2786
2785
def supports_rich_root(self):
2787
2786
return self._format.rich_root_data
3070
3069
pack_compresses = False
3071
3070
# Does the repository inventory storage understand references to trees?
3072
3071
supports_tree_reference = None
3073
# Is the format experimental ?
3074
experimental = False
3077
return "%s()" % self.__class__.__name__
3074
return "<%s>" % self.__class__.__name__
3079
3076
def __eq__(self, other):
3080
3077
# format objects are generally stateless
3095
3092
transport = a_bzrdir.get_repository_transport(None)
3096
format_string = transport.get_bytes("format")
3093
format_string = transport.get("format").read()
3097
3094
return format_registry.get(format_string)
3098
3095
except errors.NoSuchFile:
3099
3096
raise errors.NoRepositoryPresent(a_bzrdir)
3199
3196
raise NotImplementedError(self.open)
3201
def _run_post_repo_init_hooks(self, repository, a_bzrdir, shared):
3202
from bzrlib.bzrdir import BzrDir, RepoInitHookParams
3203
hooks = BzrDir.hooks['post_repo_init']
3206
params = RepoInitHookParams(repository, self, a_bzrdir, shared)
3211
3199
class MetaDirRepositoryFormat(RepositoryFormat):
3212
3200
"""Common base class for the new repositories using the metadir layout."""
3418
3406
:param revision_id: if None all content is copied, if NULL_REVISION no
3419
3407
content is copied.
3408
:param pb: optional progress bar to use for progress reports. If not
3409
provided a default one will be created.
3423
ui.ui_factory.warn_experimental_format_fetch(self)
3424
3412
from bzrlib.fetch import RepoFetcher
3425
# See <https://launchpad.net/bugs/456077> asking for a warning here
3426
if self.source._format.network_name() != self.target._format.network_name():
3427
ui.ui_factory.show_user_warning('cross_format_fetch',
3428
from_format=self.source._format,
3429
to_format=self.target._format)
3430
3413
f = RepoFetcher(to_repository=self.target,
3431
3414
from_repository=self.source,
3432
3415
last_revision=revision_id,
3433
3416
fetch_spec=fetch_spec,
3434
find_ghosts=find_ghosts)
3417
pb=pb, find_ghosts=find_ghosts)
3436
3419
def _walk_to_common_revisions(self, revision_ids):
3437
3420
"""Walk out from revision_ids in source to revisions target has.
3833
3816
basis_id, delta, current_revision_id, parents_parents)
3834
3817
cache[current_revision_id] = parent_tree
3836
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3819
def _fetch_batch(self, revision_ids, basis_id, cache):
3837
3820
"""Fetch across a few revisions.
3839
3822
:param revision_ids: The revisions to copy
3840
3823
:param basis_id: The revision_id of a tree that must be in cache, used
3841
3824
as a basis for delta when no other base is available
3842
3825
:param cache: A cache of RevisionTrees that we can use.
3843
:param a_graph: A Graph object to determine the heads() of the
3844
rich-root data stream.
3845
3826
:return: The revision_id of the last converted tree. The RevisionTree
3846
3827
for it will be in cache
3854
3835
pending_revisions = []
3855
3836
parent_map = self.source.get_parent_map(revision_ids)
3856
3837
self._fetch_parent_invs_for_stacking(parent_map, cache)
3857
self.source._safe_to_return_from_cache = True
3858
3838
for tree in self.source.revision_trees(revision_ids):
3859
3839
# Find a inventory delta for this revision.
3860
3840
# Find text entries that need to be copied, too.
3908
3888
pending_revisions.append(revision)
3909
3889
cache[current_revision_id] = tree
3910
3890
basis_id = current_revision_id
3911
self.source._safe_to_return_from_cache = False
3912
3891
# Copy file texts
3913
3892
from_texts = self.source.texts
3914
3893
to_texts = self.target.texts
3915
3894
if root_keys_to_create:
3916
root_stream = _mod_fetch._new_root_data_stream(
3895
from bzrlib.fetch import _new_root_data_stream
3896
root_stream = _new_root_data_stream(
3917
3897
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3918
self.source, graph=a_graph)
3919
3899
to_texts.insert_record_stream(root_stream)
3920
3900
to_texts.insert_record_stream(from_texts.get_record_stream(
3921
3901
text_keys, self.target._format._fetch_order,
3978
3958
cache[basis_id] = basis_tree
3979
3959
del basis_tree # We don't want to hang on to it here
3981
if self._converting_to_rich_root and len(revision_ids) > 100:
3982
a_graph = _mod_fetch._get_rich_root_heads_graph(self.source,
3987
3961
for offset in range(0, len(revision_ids), batch_size):
3988
3962
self.target.start_write_group()
3990
3964
pb.update('Transferring revisions', offset,
3991
3965
len(revision_ids))
3992
3966
batch = revision_ids[offset:offset+batch_size]
3993
basis_id = self._fetch_batch(batch, basis_id, cache,
3967
basis_id = self._fetch_batch(batch, basis_id, cache)
3996
self.source._safe_to_return_from_cache = False
3997
3969
self.target.abort_write_group()
4011
3983
"""See InterRepository.fetch()."""
4012
3984
if fetch_spec is not None:
4013
3985
raise AssertionError("Not implemented yet...")
4014
ui.ui_factory.warn_experimental_format_fetch(self)
4015
3986
if (not self.source.supports_rich_root()
4016
3987
and self.target.supports_rich_root()):
4017
3988
self._converting_to_rich_root = True
4018
3989
self._revision_id_to_root_id = {}
4020
3991
self._converting_to_rich_root = False
4021
# See <https://launchpad.net/bugs/456077> asking for a warning here
4022
if self.source._format.network_name() != self.target._format.network_name():
4023
ui.ui_factory.show_user_warning('cross_format_fetch',
4024
from_format=self.source._format,
4025
to_format=self.target._format)
4026
3992
revision_ids = self.target.search_missing_revision_ids(self.source,
4027
3993
revision_id, find_ghosts=find_ghosts).get_keys()
4028
3994
if not revision_ids:
4097
4063
:param to_convert: The disk object to convert.
4098
4064
:param pb: a progress bar to use for progress information.
4100
pb = ui.ui_factory.nested_progress_bar()
4103
4069
# this is only useful with metadir layouts - separated repo content.
4104
4070
# trigger an assertion if not such
4105
4071
repo._format.get_format_string()
4106
4072
self.repo_dir = repo.bzrdir
4107
pb.update('Moving repository to repository.backup')
4073
self.step('Moving repository to repository.backup')
4108
4074
self.repo_dir.transport.move('repository', 'repository.backup')
4109
4075
backup_transport = self.repo_dir.transport.clone('repository.backup')
4110
4076
repo._format.check_conversion_target(self.target_format)
4111
4077
self.source_repo = repo._format.open(self.repo_dir,
4113
4079
_override_transport=backup_transport)
4114
pb.update('Creating new repository')
4080
self.step('Creating new repository')
4115
4081
converted = self.target_format.initialize(self.repo_dir,
4116
4082
self.source_repo.is_shared())
4117
4083
converted.lock_write()
4119
pb.update('Copying content')
4085
self.step('Copying content')
4120
4086
self.source_repo.copy_content_into(converted)
4122
4088
converted.unlock()
4123
pb.update('Deleting old repository content')
4089
self.step('Deleting old repository content')
4124
4090
self.repo_dir.transport.delete_tree('repository.backup')
4125
4091
ui.ui_factory.note('repository converted')
4093
def step(self, message):
4094
"""Update the pb by a step."""
4096
self.pb.update(message, self.count, self.total)
4129
4099
_unescape_map = {
4473
4443
fetching the inventory weave.
4475
4445
if self._rich_root_upgrade():
4476
return _mod_fetch.Inter1and2Helper(
4447
return bzrlib.fetch.Inter1and2Helper(
4477
4448
self.from_repository).generate_root_texts(revs)
4622
4593
def _get_convertable_inventory_stream(self, revision_ids,
4623
4594
delta_versus_null=False):
4624
# The two formats are sufficiently different that there is no fast
4625
# path, so we need to send just inventorydeltas, which any
4626
# sufficiently modern client can insert into any repository.
4627
# The StreamSink code expects to be able to
4595
# The source is using CHKs, but the target either doesn't or it has a
4596
# different serializer. The StreamSink code expects to be able to
4628
4597
# convert on the target, so we need to put bytes-on-the-wire that can
4629
4598
# be converted. That means inventory deltas (if the remote is <1.19,
4630
4599
# RemoteStreamSink will fallback to VFS to insert the deltas).
added
removed
bzrlib/repository.py
