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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.lazy_import import lazy_import
18
lazy_import(globals(), """
19
17
from bzrlib import (
26
revision as _mod_revision,
38
30
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
31
from bzrlib.repository import (
43
33
MetaDirRepositoryFormat,
49
class _KnitParentsProvider(object):
51
def __init__(self, knit):
55
return 'KnitParentsProvider(%r)' % self._knit
57
def get_parent_map(self, keys):
58
"""See graph.StackedParentsProvider.get_parent_map"""
60
for revision_id in keys:
61
if revision_id is None:
62
raise ValueError('get_parent_map(None) is not valid')
63
if revision_id == _mod_revision.NULL_REVISION:
64
parent_map[revision_id] = ()
68
self._knit.get_parents_with_ghosts(revision_id))
69
except errors.RevisionNotPresent:
73
parents = (_mod_revision.NULL_REVISION,)
74
parent_map[revision_id] = parents
78
class _KnitsParentsProvider(object):
80
def __init__(self, knit, prefix=()):
81
"""Create a parent provider for string keys mapped to tuple keys."""
86
return 'KnitsParentsProvider(%r)' % self._knit
88
def get_parent_map(self, keys):
89
"""See graph.StackedParentsProvider.get_parent_map"""
90
parent_map = self._knit.get_parent_map(
91
[self._prefix + (key,) for key in keys])
93
for key, parents in parent_map.items():
96
parents = (_mod_revision.NULL_REVISION,)
98
parents = tuple(parent[-1] for parent in parents)
99
result[revid] = parents
100
for revision_id in keys:
101
if revision_id == _mod_revision.NULL_REVISION:
102
result[revision_id] = ()
37
import bzrlib.revision as _mod_revision
38
from bzrlib.store.versioned import VersionedFileStore
39
from bzrlib.trace import mutter, note, warning
106
42
class KnitRepository(MetaDirRepository):
107
43
"""Knit format repository."""
109
# These attributes are inherited from the Repository base class. Setting
110
# them to None ensures that if the constructor is changed to not initialize
111
# them, or a subclass fails to call the constructor, that an error will
112
# occur rather than the system working but generating incorrect data.
113
_commit_builder_class = None
116
def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
118
MetaDirRepository.__init__(self, _format, a_bzrdir, control_files)
119
self._commit_builder_class = _commit_builder_class
120
self._serializer = _serializer
121
self._reconcile_fixes_text_parents = True
46
_serializer = xml5.serializer_v5
48
def _warn_if_deprecated(self):
49
# This class isn't deprecated
52
def _inventory_add_lines(self, inv_vf, revid, parents, lines):
53
inv_vf.add_lines_with_ghosts(revid, parents, lines)
124
56
def _all_revision_ids(self):
125
57
"""See Repository.all_revision_ids()."""
126
return [key[0] for key in self.revisions.keys()]
128
def _activate_new_inventory(self):
129
"""Put a replacement inventory.new into use as inventories."""
130
# Copy the content across
132
t.copy('inventory.new.kndx', 'inventory.kndx')
134
t.copy('inventory.new.knit', 'inventory.knit')
135
except errors.NoSuchFile:
136
# empty inventories knit
137
t.delete('inventory.knit')
138
# delete the temp inventory
139
t.delete('inventory.new.kndx')
141
t.delete('inventory.new.knit')
142
except errors.NoSuchFile:
143
# empty inventories knit
145
# Force index reload (sanity check)
146
self.inventories._index._reset_cache()
147
self.inventories.keys()
149
def _backup_inventory(self):
151
t.copy('inventory.kndx', 'inventory.backup.kndx')
152
t.copy('inventory.knit', 'inventory.backup.knit')
154
def _move_file_id(self, from_id, to_id):
155
t = self._transport.clone('knits')
156
from_rel_url = self.texts._index._mapper.map((from_id, None))
157
to_rel_url = self.texts._index._mapper.map((to_id, None))
158
# We expect both files to always exist in this case.
159
for suffix in ('.knit', '.kndx'):
160
t.rename(from_rel_url + suffix, to_rel_url + suffix)
162
def _remove_file_id(self, file_id):
163
t = self._transport.clone('knits')
164
rel_url = self.texts._index._mapper.map((file_id, None))
165
for suffix in ('.kndx', '.knit'):
167
t.delete(rel_url + suffix)
168
except errors.NoSuchFile:
171
def _temp_inventories(self):
172
result = self._format._get_inventories(self._transport, self,
174
# Reconciling when the output has no revisions would result in no
175
# writes - but we want to ensure there is an inventory for
176
# compatibility with older clients that don't lazy-load.
177
result.get_parent_map([('A',)])
58
# Knits get the revision graph from the index of the revision knit, so
59
# it's always possible even if they're on an unlistable transport.
60
return self._revision_store.all_revision_ids(self.get_transaction())
180
62
def fileid_involved_between_revs(self, from_revid, to_revid):
181
63
"""Find file_id(s) which are involved in the changes between revisions.
203
87
return self._fileid_involved_by_set(changed)
90
def get_ancestry(self, revision_id):
91
"""Return a list of revision-ids integrated by a revision.
93
This is topologically sorted.
95
if revision_id is None:
97
revision_id = osutils.safe_revision_id(revision_id)
98
vf = self._get_revision_vf()
100
return [None] + vf.get_ancestry(revision_id)
101
except errors.RevisionNotPresent:
102
raise errors.NoSuchRevision(self, revision_id)
206
105
def get_revision(self, revision_id):
207
106
"""Return the Revision object for a named revision"""
208
107
revision_id = osutils.safe_revision_id(revision_id)
209
108
return self.get_revision_reconcile(revision_id)
211
def _refresh_data(self):
212
if not self.is_locked():
214
if self.is_in_write_group():
215
raise IsInWriteGroupError(self)
216
# Create a new transaction to force all knits to see the scope change.
217
# This is safe because we're outside a write group.
218
self.control_files._finish_transaction()
219
if self.is_write_locked():
220
self.control_files._set_write_transaction()
222
self.control_files._set_read_transaction()
111
def get_revision_graph(self, revision_id=None):
112
"""Return a dictionary containing the revision graph.
114
:param revision_id: The revision_id to get a graph from. If None, then
115
the entire revision graph is returned. This is a deprecated mode of
116
operation and will be removed in the future.
117
:return: a dictionary of revision_id->revision_parents_list.
119
# special case NULL_REVISION
120
if revision_id == _mod_revision.NULL_REVISION:
122
revision_id = osutils.safe_revision_id(revision_id)
123
a_weave = self._get_revision_vf()
124
entire_graph = a_weave.get_graph()
125
if revision_id is None:
126
return a_weave.get_graph()
127
elif revision_id not in a_weave:
128
raise errors.NoSuchRevision(self, revision_id)
130
# add what can be reached from revision_id
132
pending = set([revision_id])
133
while len(pending) > 0:
135
result[node] = a_weave.get_parents(node)
136
for revision_id in result[node]:
137
if revision_id not in result:
138
pending.add(revision_id)
142
def get_revision_graph_with_ghosts(self, revision_ids=None):
143
"""Return a graph of the revisions with ghosts marked as applicable.
145
:param revision_ids: an iterable of revisions to graph or None for all.
146
:return: a Graph object with the graph reachable from revision_ids.
148
result = graph.Graph()
149
vf = self._get_revision_vf()
150
versions = set(vf.versions())
152
pending = set(self.all_revision_ids())
155
pending = set(osutils.safe_revision_id(r) for r in revision_ids)
156
# special case NULL_REVISION
157
if _mod_revision.NULL_REVISION in pending:
158
pending.remove(_mod_revision.NULL_REVISION)
159
required = set(pending)
162
revision_id = pending.pop()
163
if not revision_id in versions:
164
if revision_id in required:
165
raise errors.NoSuchRevision(self, revision_id)
167
result.add_ghost(revision_id)
168
# mark it as done so we don't try for it again.
169
done.add(revision_id)
171
parent_ids = vf.get_parents_with_ghosts(revision_id)
172
for parent_id in parent_ids:
173
# is this queued or done ?
174
if (parent_id not in pending and
175
parent_id not in done):
177
pending.add(parent_id)
178
result.add_node(revision_id, parent_ids)
179
done.add(revision_id)
182
def _get_revision_vf(self):
183
""":return: a versioned file containing the revisions."""
184
vf = self._revision_store.get_revision_file(self.get_transaction())
187
def _get_history_vf(self):
188
"""Get a versionedfile whose history graph reflects all revisions.
190
For knit repositories, this is the revision knit.
192
return self._get_revision_vf()
224
194
@needs_write_lock
225
195
def reconcile(self, other=None, thorough=False):
228
198
reconciler = KnitReconciler(self, thorough=thorough)
229
199
reconciler.reconcile()
230
200
return reconciler
232
def _make_parents_provider(self):
233
return _KnitsParentsProvider(self.revisions)
235
def _find_inconsistent_revision_parents(self, revisions_iterator=None):
236
"""Find revisions with different parent lists in the revision object
237
and in the index graph.
239
:param revisions_iterator: None, or an iterator of (revid,
240
Revision-or-None). This iterator controls the revisions checked.
241
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
242
parents-in-revision).
244
if not self.is_locked():
245
raise AssertionError()
247
if revisions_iterator is None:
248
revisions_iterator = self._iter_revisions(None)
249
for revid, revision in revisions_iterator:
252
parent_map = vf.get_parent_map([(revid,)])
253
parents_according_to_index = tuple(parent[-1] for parent in
254
parent_map[(revid,)])
255
parents_according_to_revision = tuple(revision.parent_ids)
256
if parents_according_to_index != parents_according_to_revision:
257
yield (revid, parents_according_to_index,
258
parents_according_to_revision)
260
def _check_for_inconsistent_revision_parents(self):
261
inconsistencies = list(self._find_inconsistent_revision_parents())
263
raise errors.BzrCheckError(
264
"Revision knit has inconsistent parents.")
266
def revision_graph_can_have_wrong_parents(self):
267
# The revision.kndx could potentially claim a revision has a different
268
# parent to the revision text.
202
def revision_parents(self, revision_id):
203
revision_id = osutils.safe_revision_id(revision_id)
204
return self._get_revision_vf().get_parents(revision_id)
207
class KnitRepository3(KnitRepository):
209
def __init__(self, _format, a_bzrdir, control_files, _revision_store,
210
control_store, text_store):
211
KnitRepository.__init__(self, _format, a_bzrdir, control_files,
212
_revision_store, control_store, text_store)
213
self._serializer = xml7.serializer_v7
215
def deserialise_inventory(self, revision_id, xml):
216
"""Transform the xml into an inventory object.
218
:param revision_id: The expected revision id of the inventory.
219
:param xml: A serialised inventory.
221
result = self._serializer.read_inventory_from_string(xml)
222
assert result.root.revision is not None
225
def serialise_inventory(self, inv):
226
"""Transform the inventory object into XML text.
228
:param revision_id: The expected revision id of the inventory.
229
:param xml: A serialised inventory.
231
assert inv.revision_id is not None
232
assert inv.root.revision is not None
233
return KnitRepository.serialise_inventory(self, inv)
235
def get_commit_builder(self, branch, parents, config, timestamp=None,
236
timezone=None, committer=None, revprops=None,
238
"""Obtain a CommitBuilder for this repository.
240
:param branch: Branch to commit to.
241
:param parents: Revision ids of the parents of the new revision.
242
:param config: Configuration to use.
243
:param timestamp: Optional timestamp recorded for commit.
244
:param timezone: Optional timezone for timestamp.
245
:param committer: Optional committer to set for commit.
246
:param revprops: Optional dictionary of revision properties.
247
:param revision_id: Optional revision id.
249
revision_id = osutils.safe_revision_id(revision_id)
250
return RootCommitBuilder(self, parents, config, timestamp, timezone,
251
committer, revprops, revision_id)
272
254
class RepositoryFormatKnit(MetaDirRepositoryFormat):
273
"""Bzr repository knit format (generalized).
255
"""Bzr repository knit format (generalized).
275
257
This repository format has:
276
258
- knits for file texts and inventory
286
# Set this attribute in derived classes to control the repository class
287
# created by open and initialize.
288
repository_class = None
289
# Set this attribute in derived classes to control the
290
# _commit_builder_class that the repository objects will have passed to
292
_commit_builder_class = None
293
# Set this attribute in derived clases to control the _serializer that the
294
# repository objects will have passed to their constructor.
296
def _serializer(self):
297
return xml5.serializer_v5
298
# Knit based repositories handle ghosts reasonably well.
299
supports_ghosts = True
300
# External lookups are not supported in this format.
301
supports_external_lookups = False
303
supports_chks = False
304
_fetch_order = 'topological'
305
_fetch_uses_deltas = True
308
def _get_inventories(self, repo_transport, repo, name='inventory'):
309
mapper = versionedfile.ConstantMapper(name)
310
index = _mod_knit._KndxIndex(repo_transport, mapper,
311
repo.get_transaction, repo.is_write_locked, repo.is_locked)
312
access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
313
return _mod_knit.KnitVersionedFiles(index, access, annotated=False)
315
def _get_revisions(self, repo_transport, repo):
316
mapper = versionedfile.ConstantMapper('revisions')
317
index = _mod_knit._KndxIndex(repo_transport, mapper,
318
repo.get_transaction, repo.is_write_locked, repo.is_locked)
319
access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
320
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0,
323
def _get_signatures(self, repo_transport, repo):
324
mapper = versionedfile.ConstantMapper('signatures')
325
index = _mod_knit._KndxIndex(repo_transport, mapper,
326
repo.get_transaction, repo.is_write_locked, repo.is_locked)
327
access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
328
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0,
331
def _get_texts(self, repo_transport, repo):
332
mapper = versionedfile.HashEscapedPrefixMapper()
333
base_transport = repo_transport.clone('knits')
334
index = _mod_knit._KndxIndex(base_transport, mapper,
335
repo.get_transaction, repo.is_write_locked, repo.is_locked)
336
access = _mod_knit._KnitKeyAccess(base_transport, mapper)
337
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=200,
268
def _get_control_store(self, repo_transport, control_files):
269
"""Return the control store for this repository."""
270
return VersionedFileStore(
273
file_mode=control_files._file_mode,
274
versionedfile_class=knit.KnitVersionedFile,
275
versionedfile_kwargs={'factory':knit.KnitPlainFactory()},
278
def _get_revision_store(self, repo_transport, control_files):
279
"""See RepositoryFormat._get_revision_store()."""
280
from bzrlib.store.revision.knit import KnitRevisionStore
281
versioned_file_store = VersionedFileStore(
283
file_mode=control_files._file_mode,
286
versionedfile_class=knit.KnitVersionedFile,
287
versionedfile_kwargs={'delta':False,
288
'factory':knit.KnitPlainFactory(),
292
return KnitRevisionStore(versioned_file_store)
294
def _get_text_store(self, transport, control_files):
295
"""See RepositoryFormat._get_text_store()."""
296
return self._get_versioned_file_store('knits',
299
versionedfile_class=knit.KnitVersionedFile,
300
versionedfile_kwargs={
301
'create_parent_dir':True,
303
'dir_mode':control_files._dir_mode,
340
307
def initialize(self, a_bzrdir, shared=False):
341
308
"""Create a knit format 1 repository.
345
312
:param shared: If true the repository will be initialized as a shared
348
trace.mutter('creating repository in %s.', a_bzrdir.transport.base)
315
mutter('creating repository in %s.', a_bzrdir.transport.base)
316
dirs = ['revision-store', 'knits']
351
318
utf8_files = [('format', self.get_format_string())]
353
320
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
354
321
repo_transport = a_bzrdir.get_repository_transport(None)
355
322
control_files = lockable_files.LockableFiles(repo_transport,
356
323
'lock', lockdir.LockDir)
324
control_store = self._get_control_store(repo_transport, control_files)
357
325
transaction = transactions.WriteTransaction()
358
result = self.open(a_bzrdir=a_bzrdir, _found=True)
326
# trigger a write of the inventory store.
327
control_store.get_weave_or_empty('inventory', transaction)
328
_revision_store = self._get_revision_store(repo_transport, control_files)
360
329
# the revision id here is irrelevant: it will not be stored, and cannot
361
# already exist, we do this to create files on disk for older clients.
362
result.inventories.get_parent_map([('A',)])
363
result.revisions.get_parent_map([('A',)])
364
result.signatures.get_parent_map([('A',)])
366
self._run_post_repo_init_hooks(result, a_bzrdir, shared)
331
_revision_store.has_revision_id('A', transaction)
332
_revision_store.get_signature_file(transaction)
333
return self.open(a_bzrdir=a_bzrdir, _found=True)
369
335
def open(self, a_bzrdir, _found=False, _override_transport=None):
370
336
"""See RepositoryFormat.open().
372
338
:param _override_transport: INTERNAL USE ONLY. Allows opening the
373
339
repository at a slightly different url
374
340
than normal. I.e. during 'upgrade'.
377
343
format = RepositoryFormat.find_format(a_bzrdir)
344
assert format.__class__ == self.__class__
378
345
if _override_transport is not None:
379
346
repo_transport = _override_transport
381
348
repo_transport = a_bzrdir.get_repository_transport(None)
382
349
control_files = lockable_files.LockableFiles(repo_transport,
383
350
'lock', lockdir.LockDir)
384
repo = self.repository_class(_format=self,
351
text_store = self._get_text_store(repo_transport, control_files)
352
control_store = self._get_control_store(repo_transport, control_files)
353
_revision_store = self._get_revision_store(repo_transport, control_files)
354
return KnitRepository(_format=self,
385
355
a_bzrdir=a_bzrdir,
386
356
control_files=control_files,
387
_commit_builder_class=self._commit_builder_class,
388
_serializer=self._serializer)
389
repo.revisions = self._get_revisions(repo_transport, repo)
390
repo.signatures = self._get_signatures(repo_transport, repo)
391
repo.inventories = self._get_inventories(repo_transport, repo)
392
repo.texts = self._get_texts(repo_transport, repo)
393
repo.chk_bytes = None
394
repo._transport = repo_transport
357
_revision_store=_revision_store,
358
control_store=control_store,
359
text_store=text_store)
398
362
class RepositoryFormatKnit1(RepositoryFormatKnit):
470
434
"""See RepositoryFormat.get_format_description()."""
471
435
return "Knit repository format 3"
474
class RepositoryFormatKnit4(RepositoryFormatKnit):
475
"""Bzr repository knit format 4.
477
This repository format has everything in format 3, except for
479
- knits for file texts and inventory
480
- hash subdirectory based stores.
481
- knits for revisions and signatures
482
- TextStores for revisions and signatures.
483
- a format marker of its own
484
- an optional 'shared-storage' flag
485
- an optional 'no-working-trees' flag
487
- support for recording full info about the tree root
490
repository_class = KnitRepository
491
_commit_builder_class = RootCommitBuilder
492
rich_root_data = True
493
supports_tree_reference = False
495
def _serializer(self):
496
return xml6.serializer_v6
498
def _get_matching_bzrdir(self):
499
return bzrdir.format_registry.make_bzrdir('rich-root')
501
def _ignore_setting_bzrdir(self, format):
504
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
506
def get_format_string(self):
507
"""See RepositoryFormat.get_format_string()."""
508
return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
510
def get_format_description(self):
511
"""See RepositoryFormat.get_format_description()."""
512
return "Knit repository format 4"
437
def open(self, a_bzrdir, _found=False, _override_transport=None):
438
"""See RepositoryFormat.open().
440
:param _override_transport: INTERNAL USE ONLY. Allows opening the
441
repository at a slightly different url
442
than normal. I.e. during 'upgrade'.
445
format = RepositoryFormat.find_format(a_bzrdir)
446
assert format.__class__ == self.__class__
447
if _override_transport is not None:
448
repo_transport = _override_transport
450
repo_transport = a_bzrdir.get_repository_transport(None)
451
control_files = lockable_files.LockableFiles(repo_transport, 'lock',
453
text_store = self._get_text_store(repo_transport, control_files)
454
control_store = self._get_control_store(repo_transport, control_files)
455
_revision_store = self._get_revision_store(repo_transport, control_files)
456
return self.repository_class(_format=self,
458
control_files=control_files,
459
_revision_store=_revision_store,
460
control_store=control_store,
461
text_store=text_store)
added
removed
bzrlib/repofmt/knitrepo.py
