59
47
def __repr__(self):
60
48
return 'KnitParentsProvider(%r)' % self._knit
62
@symbol_versioning.deprecated_method(symbol_versioning.one_one)
63
50
def get_parents(self, revision_ids):
64
"""See graph._StackedParentsProvider.get_parents"""
65
parent_map = self.get_parent_map(revision_ids)
66
return [parent_map.get(r, None) for r in revision_ids]
68
def get_parent_map(self, keys):
69
"""See graph._StackedParentsProvider.get_parent_map"""
71
for revision_id in keys:
72
if revision_id is None:
73
raise ValueError('get_parent_map(None) is not valid')
52
for revision_id in revision_ids:
74
53
if revision_id == _mod_revision.NULL_REVISION:
75
parent_map[revision_id] = ()
79
self._knit.get_parents_with_ghosts(revision_id))
57
parents = self._knit.get_parents_with_ghosts(revision_id)
80
58
except errors.RevisionNotPresent:
83
61
if len(parents) == 0:
84
parents = (_mod_revision.NULL_REVISION,)
85
parent_map[revision_id] = parents
89
class _KnitsParentsProvider(object):
91
def __init__(self, knit, prefix=()):
92
"""Create a parent provider for string keys mapped to tuple keys."""
97
return 'KnitsParentsProvider(%r)' % self._knit
99
def get_parent_map(self, keys):
100
"""See graph._StackedParentsProvider.get_parent_map"""
101
parent_map = self._knit.get_parent_map(
102
[self._prefix + (key,) for key in keys])
104
for key, parents in parent_map.items():
106
if len(parents) == 0:
107
parents = (_mod_revision.NULL_REVISION,)
109
parents = tuple(parent[-1] for parent in parents)
110
result[revid] = parents
111
for revision_id in keys:
112
if revision_id == _mod_revision.NULL_REVISION:
113
result[revision_id] = ()
62
parents = [_mod_revision.NULL_REVISION]
63
parents_list.append(parents)
117
67
class KnitRepository(MetaDirRepository):
118
68
"""Knit format repository."""
120
# These attributes are inherited from the Repository base class. Setting
121
# them to None ensures that if the constructor is changed to not initialize
122
# them, or a subclass fails to call the constructor, that an error will
123
# occur rather than the system working but generating incorrect data.
124
_commit_builder_class = None
127
def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
129
MetaDirRepository.__init__(self, _format, a_bzrdir, control_files)
130
self._commit_builder_class = _commit_builder_class
131
self._serializer = _serializer
132
self._reconcile_fixes_text_parents = True
133
self._fetch_uses_deltas = True
134
self._fetch_order = 'topological'
70
_serializer = xml5.serializer_v5
72
def _warn_if_deprecated(self):
73
# This class isn't deprecated
76
def _inventory_add_lines(self, inv_vf, revid, parents, lines):
77
inv_vf.add_lines_with_ghosts(revid, parents, lines)
137
80
def _all_revision_ids(self):
138
81
"""See Repository.all_revision_ids()."""
139
return [key[0] for key in self.revisions.keys()]
141
def _activate_new_inventory(self):
142
"""Put a replacement inventory.new into use as inventories."""
143
# Copy the content across
145
t.copy('inventory.new.kndx', 'inventory.kndx')
147
t.copy('inventory.new.knit', 'inventory.knit')
148
except errors.NoSuchFile:
149
# empty inventories knit
150
t.delete('inventory.knit')
151
# delete the temp inventory
152
t.delete('inventory.new.kndx')
154
t.delete('inventory.new.knit')
155
except errors.NoSuchFile:
156
# empty inventories knit
158
# Force index reload (sanity check)
159
self.inventories._index._reset_cache()
160
self.inventories.keys()
162
def _backup_inventory(self):
164
t.copy('inventory.kndx', 'inventory.backup.kndx')
165
t.copy('inventory.knit', 'inventory.backup.knit')
167
def _move_file_id(self, from_id, to_id):
168
t = self._transport.clone('knits')
169
from_rel_url = self.texts._index._mapper.map((from_id, None))
170
to_rel_url = self.texts._index._mapper.map((to_id, None))
171
# We expect both files to always exist in this case.
172
for suffix in ('.knit', '.kndx'):
173
t.rename(from_rel_url + suffix, to_rel_url + suffix)
175
def _remove_file_id(self, file_id):
176
t = self._transport.clone('knits')
177
rel_url = self.texts._index._mapper.map((file_id, None))
178
for suffix in ('.kndx', '.knit'):
180
t.delete(rel_url + suffix)
181
except errors.NoSuchFile:
184
def _temp_inventories(self):
185
result = self._format._get_inventories(self._transport, self,
187
# Reconciling when the output has no revisions would result in no
188
# writes - but we want to ensure there is an inventory for
189
# compatibility with older clients that don't lazy-load.
190
result.get_parent_map([('A',)])
82
# Knits get the revision graph from the index of the revision knit, so
83
# it's always possible even if they're on an unlistable transport.
84
return self._revision_store.all_revision_ids(self.get_transaction())
193
86
def fileid_involved_between_revs(self, from_revid, to_revid):
194
87
"""Find file_id(s) which are involved in the changes between revisions.
216
111
return self._fileid_involved_by_set(changed)
114
def get_ancestry(self, revision_id, topo_sorted=True):
115
"""Return a list of revision-ids integrated by a revision.
117
This is topologically sorted, unless 'topo_sorted' is specified as
120
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
122
revision_id = osutils.safe_revision_id(revision_id)
123
vf = self._get_revision_vf()
125
return [None] + vf.get_ancestry(revision_id, topo_sorted)
126
except errors.RevisionNotPresent:
127
raise errors.NoSuchRevision(self, revision_id)
219
130
def get_revision(self, revision_id):
220
131
"""Return the Revision object for a named revision"""
221
132
revision_id = osutils.safe_revision_id(revision_id)
222
133
return self.get_revision_reconcile(revision_id)
136
def get_revision_graph(self, revision_id=None):
137
"""Return a dictionary containing the revision graph.
139
:param revision_id: The revision_id to get a graph from. If None, then
140
the entire revision graph is returned. This is a deprecated mode of
141
operation and will be removed in the future.
142
:return: a dictionary of revision_id->revision_parents_list.
144
# special case NULL_REVISION
145
if revision_id == _mod_revision.NULL_REVISION:
147
revision_id = osutils.safe_revision_id(revision_id)
148
a_weave = self._get_revision_vf()
149
entire_graph = a_weave.get_graph()
150
if revision_id is None:
151
return a_weave.get_graph()
152
elif revision_id not in a_weave:
153
raise errors.NoSuchRevision(self, revision_id)
155
# add what can be reached from revision_id
157
pending = set([revision_id])
158
while len(pending) > 0:
160
result[node] = a_weave.get_parents(node)
161
for revision_id in result[node]:
162
if revision_id not in result:
163
pending.add(revision_id)
167
def get_revision_graph_with_ghosts(self, revision_ids=None):
168
"""Return a graph of the revisions with ghosts marked as applicable.
170
:param revision_ids: an iterable of revisions to graph or None for all.
171
:return: a Graph object with the graph reachable from revision_ids.
173
result = deprecated_graph.Graph()
174
vf = self._get_revision_vf()
175
versions = set(vf.versions())
177
pending = set(self.all_revision_ids())
180
pending = set(osutils.safe_revision_id(r) for r in revision_ids)
181
# special case NULL_REVISION
182
if _mod_revision.NULL_REVISION in pending:
183
pending.remove(_mod_revision.NULL_REVISION)
184
required = set(pending)
187
revision_id = pending.pop()
188
if not revision_id in versions:
189
if revision_id in required:
190
raise errors.NoSuchRevision(self, revision_id)
192
result.add_ghost(revision_id)
193
# mark it as done so we don't try for it again.
194
done.add(revision_id)
196
parent_ids = vf.get_parents_with_ghosts(revision_id)
197
for parent_id in parent_ids:
198
# is this queued or done ?
199
if (parent_id not in pending and
200
parent_id not in done):
202
pending.add(parent_id)
203
result.add_node(revision_id, parent_ids)
204
done.add(revision_id)
207
def _get_revision_vf(self):
208
""":return: a versioned file containing the revisions."""
209
vf = self._revision_store.get_revision_file(self.get_transaction())
212
def _get_history_vf(self):
213
"""Get a versionedfile whose history graph reflects all revisions.
215
For knit repositories, this is the revision knit.
217
return self._get_revision_vf()
224
219
@needs_write_lock
225
220
def reconcile(self, other=None, thorough=False):
226
221
"""Reconcile this repository."""
229
224
reconciler.reconcile()
230
225
return reconciler
227
def revision_parents(self, revision_id):
228
revision_id = osutils.safe_revision_id(revision_id)
229
return self._get_revision_vf().get_parents(revision_id)
232
231
def _make_parents_provider(self):
233
return _KnitsParentsProvider(self.revisions)
235
def _find_inconsistent_revision_parents(self):
236
"""Find revisions with different parent lists in the revision object
237
and in the index graph.
239
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
240
parents-in-revision).
242
if not self.is_locked():
243
raise AssertionError()
245
for index_version in vf.keys():
246
parent_map = vf.get_parent_map([index_version])
247
parents_according_to_index = tuple(parent[-1] for parent in
248
parent_map[index_version])
249
revision = self.get_revision(index_version[-1])
250
parents_according_to_revision = tuple(revision.parent_ids)
251
if parents_according_to_index != parents_according_to_revision:
252
yield (index_version[-1], parents_according_to_index,
253
parents_according_to_revision)
255
def _check_for_inconsistent_revision_parents(self):
256
inconsistencies = list(self._find_inconsistent_revision_parents())
258
raise errors.BzrCheckError(
259
"Revision knit has inconsistent parents.")
261
def revision_graph_can_have_wrong_parents(self):
262
# The revision.kndx could potentially claim a revision has a different
263
# parent to the revision text.
232
return _KnitParentsProvider(self._get_revision_vf())
235
class KnitRepository3(KnitRepository):
237
def __init__(self, _format, a_bzrdir, control_files, _revision_store,
238
control_store, text_store):
239
KnitRepository.__init__(self, _format, a_bzrdir, control_files,
240
_revision_store, control_store, text_store)
241
self._serializer = xml7.serializer_v7
243
def deserialise_inventory(self, revision_id, xml):
244
"""Transform the xml into an inventory object.
246
:param revision_id: The expected revision id of the inventory.
247
:param xml: A serialised inventory.
249
result = self._serializer.read_inventory_from_string(xml)
250
assert result.root.revision is not None
253
def serialise_inventory(self, inv):
254
"""Transform the inventory object into XML text.
256
:param revision_id: The expected revision id of the inventory.
257
:param xml: A serialised inventory.
259
assert inv.revision_id is not None
260
assert inv.root.revision is not None
261
return KnitRepository.serialise_inventory(self, inv)
263
def get_commit_builder(self, branch, parents, config, timestamp=None,
264
timezone=None, committer=None, revprops=None,
266
"""Obtain a CommitBuilder for this repository.
268
:param branch: Branch to commit to.
269
:param parents: Revision ids of the parents of the new revision.
270
:param config: Configuration to use.
271
:param timestamp: Optional timestamp recorded for commit.
272
:param timezone: Optional timezone for timestamp.
273
:param committer: Optional committer to set for commit.
274
:param revprops: Optional dictionary of revision properties.
275
:param revision_id: Optional revision id.
277
revision_id = osutils.safe_revision_id(revision_id)
278
return RootCommitBuilder(self, parents, config, timestamp, timezone,
279
committer, revprops, revision_id)
267
282
class RepositoryFormatKnit(MetaDirRepositoryFormat):
281
# Set this attribute in derived classes to control the repository class
282
# created by open and initialize.
283
repository_class = None
284
# Set this attribute in derived classes to control the
285
# _commit_builder_class that the repository objects will have passed to
287
_commit_builder_class = None
288
# Set this attribute in derived clases to control the _serializer that the
289
# repository objects will have passed to their constructor.
290
_serializer = xml5.serializer_v5
291
# Knit based repositories handle ghosts reasonably well.
292
supports_ghosts = True
293
# External lookups are not supported in this format.
294
supports_external_lookups = False
296
def _get_inventories(self, repo_transport, repo, name='inventory'):
297
mapper = ConstantMapper(name)
298
index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
299
repo.is_write_locked, repo.is_locked)
300
access = _KnitKeyAccess(repo_transport, mapper)
301
return KnitVersionedFiles(index, access, annotated=False)
303
def _get_revisions(self, repo_transport, repo):
304
mapper = ConstantMapper('revisions')
305
index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
306
repo.is_write_locked, repo.is_locked)
307
access = _KnitKeyAccess(repo_transport, mapper)
308
return KnitVersionedFiles(index, access, max_delta_chain=0,
311
def _get_signatures(self, repo_transport, repo):
312
mapper = ConstantMapper('signatures')
313
index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
314
repo.is_write_locked, repo.is_locked)
315
access = _KnitKeyAccess(repo_transport, mapper)
316
return KnitVersionedFiles(index, access, max_delta_chain=0,
319
def _get_texts(self, repo_transport, repo):
320
mapper = HashEscapedPrefixMapper()
321
base_transport = repo_transport.clone('knits')
322
index = _KndxIndex(base_transport, mapper, repo.get_transaction,
323
repo.is_write_locked, repo.is_locked)
324
access = _KnitKeyAccess(base_transport, mapper)
325
return KnitVersionedFiles(index, access, max_delta_chain=200,
296
def _get_control_store(self, repo_transport, control_files):
297
"""Return the control store for this repository."""
298
return VersionedFileStore(
301
file_mode=control_files._file_mode,
302
versionedfile_class=knit.KnitVersionedFile,
303
versionedfile_kwargs={'factory':knit.KnitPlainFactory()},
306
def _get_revision_store(self, repo_transport, control_files):
307
"""See RepositoryFormat._get_revision_store()."""
308
from bzrlib.store.revision.knit import KnitRevisionStore
309
versioned_file_store = VersionedFileStore(
311
file_mode=control_files._file_mode,
314
versionedfile_class=knit.KnitVersionedFile,
315
versionedfile_kwargs={'delta':False,
316
'factory':knit.KnitPlainFactory(),
320
return KnitRevisionStore(versioned_file_store)
322
def _get_text_store(self, transport, control_files):
323
"""See RepositoryFormat._get_text_store()."""
324
return self._get_versioned_file_store('knits',
327
versionedfile_class=knit.KnitVersionedFile,
328
versionedfile_kwargs={
329
'create_parent_dir':True,
331
'dir_mode':control_files._dir_mode,
328
335
def initialize(self, a_bzrdir, shared=False):
329
336
"""Create a knit format 1 repository.
342
349
repo_transport = a_bzrdir.get_repository_transport(None)
343
350
control_files = lockable_files.LockableFiles(repo_transport,
344
351
'lock', lockdir.LockDir)
352
control_store = self._get_control_store(repo_transport, control_files)
345
353
transaction = transactions.WriteTransaction()
346
result = self.open(a_bzrdir=a_bzrdir, _found=True)
354
# trigger a write of the inventory store.
355
control_store.get_weave_or_empty('inventory', transaction)
356
_revision_store = self._get_revision_store(repo_transport, control_files)
348
357
# the revision id here is irrelevant: it will not be stored, and cannot
349
# already exist, we do this to create files on disk for older clients.
350
result.inventories.get_parent_map([('A',)])
351
result.revisions.get_parent_map([('A',)])
352
result.signatures.get_parent_map([('A',)])
359
_revision_store.has_revision_id('A', transaction)
360
_revision_store.get_signature_file(transaction)
361
return self.open(a_bzrdir=a_bzrdir, _found=True)
356
363
def open(self, a_bzrdir, _found=False, _override_transport=None):
357
364
"""See RepositoryFormat.open().
364
371
format = RepositoryFormat.find_format(a_bzrdir)
372
assert format.__class__ == self.__class__
365
373
if _override_transport is not None:
366
374
repo_transport = _override_transport
368
376
repo_transport = a_bzrdir.get_repository_transport(None)
369
377
control_files = lockable_files.LockableFiles(repo_transport,
370
378
'lock', lockdir.LockDir)
371
repo = self.repository_class(_format=self,
379
text_store = self._get_text_store(repo_transport, control_files)
380
control_store = self._get_control_store(repo_transport, control_files)
381
_revision_store = self._get_revision_store(repo_transport, control_files)
382
return KnitRepository(_format=self,
372
383
a_bzrdir=a_bzrdir,
373
384
control_files=control_files,
374
_commit_builder_class=self._commit_builder_class,
375
_serializer=self._serializer)
376
repo.revisions = self._get_revisions(repo_transport, repo)
377
repo.signatures = self._get_signatures(repo_transport, repo)
378
repo.inventories = self._get_inventories(repo_transport, repo)
379
repo.texts = self._get_texts(repo_transport, repo)
380
repo._transport = repo_transport
385
_revision_store=_revision_store,
386
control_store=control_store,
387
text_store=text_store)
384
390
class RepositoryFormatKnit1(RepositoryFormatKnit):
462
462
"""See RepositoryFormat.get_format_description()."""
463
463
return "Knit repository format 3"
466
class RepositoryFormatKnit4(RepositoryFormatKnit):
467
"""Bzr repository knit format 4.
469
This repository format has everything in format 3, except for
471
- knits for file texts and inventory
472
- hash subdirectory based stores.
473
- knits for revisions and signatures
474
- TextStores for revisions and signatures.
475
- a format marker of its own
476
- an optional 'shared-storage' flag
477
- an optional 'no-working-trees' flag
479
- support for recording full info about the tree root
482
repository_class = KnitRepository
483
_commit_builder_class = RootCommitBuilder
484
rich_root_data = True
485
supports_tree_reference = False
486
_serializer = xml6.serializer_v6
488
def _get_matching_bzrdir(self):
489
return bzrdir.format_registry.make_bzrdir('rich-root')
491
def _ignore_setting_bzrdir(self, format):
494
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
496
def check_conversion_target(self, target_format):
497
if not target_format.rich_root_data:
498
raise errors.BadConversionTarget(
499
'Does not support rich root data.', target_format)
501
def get_format_string(self):
502
"""See RepositoryFormat.get_format_string()."""
503
return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
505
def get_format_description(self):
506
"""See RepositoryFormat.get_format_description()."""
507
return "Knit repository format 4"
465
def open(self, a_bzrdir, _found=False, _override_transport=None):
466
"""See RepositoryFormat.open().
468
:param _override_transport: INTERNAL USE ONLY. Allows opening the
469
repository at a slightly different url
470
than normal. I.e. during 'upgrade'.
473
format = RepositoryFormat.find_format(a_bzrdir)
474
assert format.__class__ == self.__class__
475
if _override_transport is not None:
476
repo_transport = _override_transport
478
repo_transport = a_bzrdir.get_repository_transport(None)
479
control_files = lockable_files.LockableFiles(repo_transport, 'lock',
481
text_store = self._get_text_store(repo_transport, control_files)
482
control_store = self._get_control_store(repo_transport, control_files)
483
_revision_store = self._get_revision_store(repo_transport, control_files)
484
return self.repository_class(_format=self,
486
control_files=control_files,
487
_revision_store=_revision_store,
488
control_store=control_store,
489
text_store=text_store)
added
removed
bzrlib/repofmt/knitrepo.py
