62
71
# some existing branches where there's a mixture; we probably
63
72
# still want the option to look for both.
64
73
relpath = a_bzrdir._control_files._escape(name)
65
store = TextStore(a_bzrdir._control_files._transport.clone(relpath),
74
store = TextStore(a_bzrdir.transport.clone(relpath),
66
75
prefixed=prefixed, compressed=compressed,
68
77
file_mode=file_mode)
71
80
# not broken out yet because the controlweaves|inventory_store
72
# and text_store | weave_store bits are still different.
81
# and texts bits are still different.
73
82
if isinstance(_format, RepositoryFormat4):
74
83
# cannot remove these - there is still no consistent api
75
84
# which allows access to this old info.
76
85
self.inventory_store = get_store('inventory-store')
77
text_store = get_store('text-store')
78
super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
86
self._text_store = get_store('text-store')
87
super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files)
81
90
def _all_possible_ids(self):
82
91
"""Return all the possible revisions that we could find."""
83
92
if 'evil' in debug.debug_flags:
84
93
mutter_callsite(3, "_all_possible_ids scales with size of history.")
85
return self.get_inventory_weave().versions()
94
return [key[-1] for key in self.inventories.keys()]
88
97
def _all_revision_ids(self):
92
101
present: for weaves ghosts may lead to a lack of correctness until
93
102
the reweave updates the parents list.
95
if self._revision_store.text_store.listable():
96
return self._revision_store.all_revision_ids(self.get_transaction())
97
result = self._all_possible_ids()
98
# TODO: jam 20070210 Ensure that _all_possible_ids returns non-unicode
99
# ids. (It should, since _revision_store's API should change to
100
# return utf8 revision_ids)
101
return self._eliminate_revisions_not_present(result)
103
def _check_revision_parents(self, revision, inventory):
104
"""Private to Repository and Fetch.
106
This checks the parentage of revision in an inventory weave for
107
consistency and is only applicable to inventory-weave-for-ancestry
108
using repository formats & fetchers.
110
weave_parents = inventory.get_parents(revision.revision_id)
111
weave_names = inventory.versions()
112
for parent_id in revision.parent_ids:
113
if parent_id in weave_names:
114
# this parent must not be a ghost.
115
if not parent_id in weave_parents:
117
raise errors.CorruptRepository(self)
104
return [key[-1] for key in self.revisions.keys()]
106
def _activate_new_inventory(self):
107
"""Put a replacement inventory.new into use as inventories."""
108
# Copy the content across
109
t = self.bzrdir._control_files._transport
110
t.copy('inventory.new.weave', 'inventory.weave')
111
# delete the temp inventory
112
t.delete('inventory.new.weave')
113
# Check we can parse the new weave properly as a sanity check
114
self.inventories.keys()
116
def _backup_inventory(self):
117
t = self.bzrdir._control_files._transport
118
t.copy('inventory.weave', 'inventory.backup.weave')
120
def _temp_inventories(self):
121
t = self.bzrdir._control_files._transport
122
return self._format._get_inventories(t, self, 'inventory.new')
119
124
def get_commit_builder(self, branch, parents, config, timestamp=None,
120
125
timezone=None, committer=None, revprops=None,
121
126
revision_id=None):
122
127
self._check_ascii_revisionid(revision_id, self.get_commit_builder)
123
result = WeaveCommitBuilder(self, parents, config, timestamp, timezone,
128
result = CommitBuilder(self, parents, config, timestamp, timezone,
124
129
committer, revprops, revision_id)
125
130
self.start_write_group()
129
134
def get_revisions(self, revision_ids):
130
135
revs = self._get_revisions(revision_ids)
131
# weave corruption can lead to absent revision markers that should be
133
# the following test is reasonably cheap (it needs a single weave read)
134
# and the weave is cached in read transactions. In write transactions
135
# it is not cached but typically we only read a small number of
136
# revisions. For knits when they are introduced we will probably want
137
# to ensure that caching write transactions are in use.
138
inv = self.get_inventory_weave()
140
self._check_revision_parents(rev, inv)
144
def get_revision_graph(self, revision_id=None):
145
"""Return a dictionary containing the revision graph.
147
:param revision_id: The revision_id to get a graph from. If None, then
148
the entire revision graph is returned. This is a deprecated mode of
149
operation and will be removed in the future.
150
:return: a dictionary of revision_id->revision_parents_list.
152
if 'evil' in debug.debug_flags:
154
"get_revision_graph scales with size of history.")
155
# special case NULL_REVISION
156
if revision_id == _mod_revision.NULL_REVISION:
158
a_weave = self.get_inventory_weave()
159
all_revisions = self._eliminate_revisions_not_present(
161
entire_graph = dict([(node, tuple(a_weave.get_parents(node))) for
162
node in all_revisions])
163
if revision_id is None:
165
elif revision_id not in entire_graph:
166
raise errors.NoSuchRevision(self, revision_id)
168
# add what can be reached from revision_id
170
pending = set([revision_id])
171
while len(pending) > 0:
173
result[node] = entire_graph[node]
174
for revision_id in result[node]:
175
if revision_id not in result:
176
pending.add(revision_id)
179
def has_revisions(self, revision_ids):
180
"""See Repository.has_revisions()."""
182
transaction = self.get_transaction()
183
for revision_id in revision_ids:
184
if self._revision_store.has_revision_id(revision_id, transaction):
185
result.add(revision_id)
138
def _inventory_add_lines(self, revision_id, parents, lines,
140
"""Store lines in inv_vf and return the sha1 of the inventory."""
141
present_parents = self.get_graph().get_parent_map(parents)
143
for parent in parents:
144
if parent in present_parents:
145
final_parents.append((parent,))
146
return self.inventories.add_lines((revision_id,), final_parents, lines,
147
check_content=check_content)[0]
189
150
def is_shared(self):
232
193
present: for weaves ghosts may lead to a lack of correctness until
233
194
the reweave updates the parents list.
235
if self._revision_store.text_store.listable():
236
return self._revision_store.all_revision_ids(self.get_transaction())
237
result = self._all_possible_ids()
238
# TODO: jam 20070210 Ensure that _all_possible_ids returns non-unicode
239
# ids. (It should, since _revision_store's API should change to
240
# return utf8 revision_ids)
241
return self._eliminate_revisions_not_present(result)
243
def _check_revision_parents(self, revision, inventory):
244
"""Private to Repository and Fetch.
246
This checks the parentage of revision in an inventory weave for
247
consistency and is only applicable to inventory-weave-for-ancestry
248
using repository formats & fetchers.
250
weave_parents = inventory.get_parents(revision.revision_id)
251
weave_names = inventory.versions()
252
for parent_id in revision.parent_ids:
253
if parent_id in weave_names:
254
# this parent must not be a ghost.
255
if not parent_id in weave_parents:
257
raise errors.CorruptRepository(self)
196
return [key[-1] for key in self.revisions.keys()]
198
def _activate_new_inventory(self):
199
"""Put a replacement inventory.new into use as inventories."""
200
# Copy the content across
202
t.copy('inventory.new.weave', 'inventory.weave')
203
# delete the temp inventory
204
t.delete('inventory.new.weave')
205
# Check we can parse the new weave properly as a sanity check
206
self.inventories.keys()
208
def _backup_inventory(self):
210
t.copy('inventory.weave', 'inventory.backup.weave')
212
def _temp_inventories(self):
214
return self._format._get_inventories(t, self, 'inventory.new')
259
216
def get_commit_builder(self, branch, parents, config, timestamp=None,
260
217
timezone=None, committer=None, revprops=None,
261
218
revision_id=None):
262
219
self._check_ascii_revisionid(revision_id, self.get_commit_builder)
263
result = WeaveCommitBuilder(self, parents, config, timestamp, timezone,
220
result = CommitBuilder(self, parents, config, timestamp, timezone,
264
221
committer, revprops, revision_id)
265
222
self.start_write_group()
269
226
def get_revision(self, revision_id):
270
227
"""Return the Revision object for a named revision"""
271
# TODO: jam 20070210 get_revision_reconcile should do this for us
272
228
r = self.get_revision_reconcile(revision_id)
273
# weave corruption can lead to absent revision markers that should be
275
# the following test is reasonably cheap (it needs a single weave read)
276
# and the weave is cached in read transactions. In write transactions
277
# it is not cached but typically we only read a small number of
278
# revisions. For knits when they are introduced we will probably want
279
# to ensure that caching write transactions are in use.
280
inv = self.get_inventory_weave()
281
self._check_revision_parents(r, inv)
285
def get_revision_graph(self, revision_id=None):
286
"""Return a dictionary containing the revision graph.
288
:param revision_id: The revision_id to get a graph from. If None, then
289
the entire revision graph is returned. This is a deprecated mode of
290
operation and will be removed in the future.
291
:return: a dictionary of revision_id->revision_parents_list.
293
if 'evil' in debug.debug_flags:
295
"get_revision_graph scales with size of history.")
296
# special case NULL_REVISION
297
if revision_id == _mod_revision.NULL_REVISION:
299
a_weave = self.get_inventory_weave()
300
all_revisions = self._eliminate_revisions_not_present(
302
entire_graph = dict([(node, tuple(a_weave.get_parents(node))) for
303
node in all_revisions])
304
if revision_id is None:
306
elif revision_id not in entire_graph:
307
raise errors.NoSuchRevision(self, revision_id)
309
# add what can be reached from revision_id
311
pending = set([revision_id])
312
while len(pending) > 0:
314
result[node] = entire_graph[node]
315
for revision_id in result[node]:
316
if revision_id not in result:
317
pending.add(revision_id)
320
def has_revisions(self, revision_ids):
321
"""See Repository.has_revisions()."""
323
transaction = self.get_transaction()
324
for revision_id in revision_ids:
325
if self._revision_store.has_revision_id(revision_id, transaction):
326
result.add(revision_id)
231
def _inventory_add_lines(self, revision_id, parents, lines,
233
"""Store lines in inv_vf and return the sha1 of the inventory."""
234
present_parents = self.get_graph().get_parent_map(parents)
236
for parent in parents:
237
if parent in present_parents:
238
final_parents.append((parent,))
239
return self.inventories.add_lines((revision_id,), final_parents, lines,
240
check_content=check_content)[0]
329
242
def revision_graph_can_have_wrong_parents(self):
330
# XXX: This is an old format that we don't support full checking on, so
331
# just claim that checking for this inconsistency is not required.
355
266
empty_weave = sio.getvalue()
357
268
mutter('creating repository in %s.', a_bzrdir.transport.base)
358
dirs = ['revision-store', 'weaves']
359
files = [('inventory.weave', StringIO(empty_weave)),
362
270
# FIXME: RBC 20060125 don't peek under the covers
363
271
# NB: no need to escape relative paths that are url safe.
364
272
control_files = lockable_files.LockableFiles(a_bzrdir.transport,
365
'branch-lock', lockable_files.TransportLock)
273
'branch-lock', lockable_files.TransportLock)
366
274
control_files.create_lock()
367
275
control_files.lock_write()
368
control_files._transport.mkdir_multi(dirs,
369
mode=control_files._dir_mode)
276
transport = a_bzrdir.transport
371
for file, content in files:
372
control_files.put(file, content)
278
transport.mkdir_multi(['revision-store', 'weaves'],
279
mode=a_bzrdir._get_dir_mode())
280
transport.put_bytes_non_atomic('inventory.weave', empty_weave)
374
282
control_files.unlock()
375
283
return self.open(a_bzrdir, _found=True)
377
def _get_control_store(self, repo_transport, control_files):
378
"""Return the control store for this repository."""
379
return self._get_versioned_file_store('',
384
def _get_text_store(self, transport, control_files):
385
"""Get a store for file texts for this format."""
386
raise NotImplementedError(self._get_text_store)
388
285
def open(self, a_bzrdir, _found=False):
389
286
"""See RepositoryFormat.open()."""
443
def _get_control_store(self, repo_transport, control_files):
444
"""Format 4 repositories have no formal control store at this point.
446
This will cause any control-file-needing apis to fail - this is desired.
338
def _get_inventories(self, repo_transport, repo, name='inventory'):
339
# No inventories store written so far.
450
def _get_revision_store(self, repo_transport, control_files):
451
"""See RepositoryFormat._get_revision_store()."""
342
def _get_revisions(self, repo_transport, repo):
452
343
from bzrlib.xml4 import serializer_v4
453
return self._get_text_rev_store(repo_transport,
456
serializer=serializer_v4)
458
def _get_text_store(self, transport, control_files):
459
"""See RepositoryFormat._get_text_store()."""
344
return RevisionTextStore(repo_transport.clone('revision-store'),
345
serializer_v4, True, versionedfile.PrefixMapper(),
346
repo.is_locked, repo.is_write_locked)
348
def _get_signatures(self, repo_transport, repo):
349
return SignatureTextStore(repo_transport.clone('revision-store'),
350
False, versionedfile.PrefixMapper(),
351
repo.is_locked, repo.is_write_locked)
353
def _get_texts(self, repo_transport, repo):
462
357
class RepositoryFormat5(PreSplitOutRepositoryFormat):
478
373
"""See RepositoryFormat.get_format_description()."""
479
374
return "Weave repository format 5"
481
def _get_revision_store(self, repo_transport, control_files):
482
"""See RepositoryFormat._get_revision_store()."""
483
"""Return the revision store object for this a_bzrdir."""
484
return self._get_text_rev_store(repo_transport,
489
def _get_text_store(self, transport, control_files):
490
"""See RepositoryFormat._get_text_store()."""
491
return self._get_versioned_file_store('weaves', transport, control_files, prefixed=False)
376
def _get_inventories(self, repo_transport, repo, name='inventory'):
377
mapper = versionedfile.ConstantMapper(name)
378
return versionedfile.ThunkedVersionedFiles(repo_transport,
379
weave.WeaveFile, mapper, repo.is_locked)
381
def _get_revisions(self, repo_transport, repo):
382
from bzrlib.xml5 import serializer_v5
383
return RevisionTextStore(repo_transport.clone('revision-store'),
384
serializer_v5, False, versionedfile.PrefixMapper(),
385
repo.is_locked, repo.is_write_locked)
387
def _get_signatures(self, repo_transport, repo):
388
return SignatureTextStore(repo_transport.clone('revision-store'),
389
False, versionedfile.PrefixMapper(),
390
repo.is_locked, repo.is_write_locked)
392
def _get_texts(self, repo_transport, repo):
393
mapper = versionedfile.PrefixMapper()
394
base_transport = repo_transport.clone('weaves')
395
return versionedfile.ThunkedVersionedFiles(base_transport,
396
weave.WeaveFile, mapper, repo.is_locked)
494
399
class RepositoryFormat6(PreSplitOutRepositoryFormat):
510
415
"""See RepositoryFormat.get_format_description()."""
511
416
return "Weave repository format 6"
513
def _get_revision_store(self, repo_transport, control_files):
514
"""See RepositoryFormat._get_revision_store()."""
515
return self._get_text_rev_store(repo_transport,
521
def _get_text_store(self, transport, control_files):
522
"""See RepositoryFormat._get_text_store()."""
523
return self._get_versioned_file_store('weaves', transport, control_files)
418
def _get_inventories(self, repo_transport, repo, name='inventory'):
419
mapper = versionedfile.ConstantMapper(name)
420
return versionedfile.ThunkedVersionedFiles(repo_transport,
421
weave.WeaveFile, mapper, repo.is_locked)
423
def _get_revisions(self, repo_transport, repo):
424
from bzrlib.xml5 import serializer_v5
425
return RevisionTextStore(repo_transport.clone('revision-store'),
426
serializer_v5, False, versionedfile.HashPrefixMapper(),
427
repo.is_locked, repo.is_write_locked)
429
def _get_signatures(self, repo_transport, repo):
430
return SignatureTextStore(repo_transport.clone('revision-store'),
431
False, versionedfile.HashPrefixMapper(),
432
repo.is_locked, repo.is_write_locked)
434
def _get_texts(self, repo_transport, repo):
435
mapper = versionedfile.HashPrefixMapper()
436
base_transport = repo_transport.clone('weaves')
437
return versionedfile.ThunkedVersionedFiles(base_transport,
438
weave.WeaveFile, mapper, repo.is_locked)
525
441
class RepositoryFormat7(MetaDirRepositoryFormat):
526
442
"""Bzr repository 7.
555
464
def check_conversion_target(self, target_format):
558
def _get_revision_store(self, repo_transport, control_files):
559
"""See RepositoryFormat._get_revision_store()."""
560
return self._get_text_rev_store(repo_transport,
567
def _get_text_store(self, transport, control_files):
568
"""See RepositoryFormat._get_text_store()."""
569
return self._get_versioned_file_store('weaves',
467
def _get_inventories(self, repo_transport, repo, name='inventory'):
468
mapper = versionedfile.ConstantMapper(name)
469
return versionedfile.ThunkedVersionedFiles(repo_transport,
470
weave.WeaveFile, mapper, repo.is_locked)
472
def _get_revisions(self, repo_transport, repo):
473
from bzrlib.xml5 import serializer_v5
474
return RevisionTextStore(repo_transport.clone('revision-store'),
475
serializer_v5, True, versionedfile.HashPrefixMapper(),
476
repo.is_locked, repo.is_write_locked)
478
def _get_signatures(self, repo_transport, repo):
479
return SignatureTextStore(repo_transport.clone('revision-store'),
480
True, versionedfile.HashPrefixMapper(),
481
repo.is_locked, repo.is_write_locked)
483
def _get_texts(self, repo_transport, repo):
484
mapper = versionedfile.HashPrefixMapper()
485
base_transport = repo_transport.clone('weaves')
486
return versionedfile.ThunkedVersionedFiles(base_transport,
487
weave.WeaveFile, mapper, repo.is_locked)
573
489
def initialize(self, a_bzrdir, shared=False):
574
490
"""Create a weave repository.
601
517
format = RepositoryFormat.find_format(a_bzrdir)
602
assert format.__class__ == self.__class__
603
518
if _override_transport is not None:
604
519
repo_transport = _override_transport
606
521
repo_transport = a_bzrdir.get_repository_transport(None)
607
522
control_files = lockable_files.LockableFiles(repo_transport,
608
523
'lock', lockdir.LockDir)
609
text_store = self._get_text_store(repo_transport, control_files)
610
control_store = self._get_control_store(repo_transport, control_files)
611
_revision_store = self._get_revision_store(repo_transport, control_files)
612
return WeaveMetaDirRepository(_format=self,
614
control_files=control_files,
615
_revision_store=_revision_store,
616
control_store=control_store,
617
text_store=text_store)
620
class WeaveCommitBuilder(CommitBuilder):
621
"""A builder for weave based repos that don't support ghosts."""
623
def _add_text_to_weave(self, file_id, new_lines, parents, nostore_sha):
624
versionedfile = self.repository.weave_store.get_weave_or_empty(
625
file_id, self.repository.get_transaction())
626
result = versionedfile.add_lines(
627
self._new_revision_id, parents, new_lines,
628
nostore_sha=nostore_sha)[0:2]
629
versionedfile.clear_cache()
524
result = WeaveMetaDirRepository(_format=self, a_bzrdir=a_bzrdir,
525
control_files=control_files)
526
result.revisions = self._get_revisions(repo_transport, result)
527
result.signatures = self._get_signatures(repo_transport, result)
528
result.inventories = self._get_inventories(repo_transport, result)
529
result.texts = self._get_texts(repo_transport, result)
530
result._transport = repo_transport
534
class TextVersionedFiles(VersionedFiles):
535
"""Just-a-bunch-of-files based VersionedFile stores."""
537
def __init__(self, transport, compressed, mapper, is_locked, can_write):
538
self._compressed = compressed
539
self._transport = transport
540
self._mapper = mapper
545
self._is_locked = is_locked
546
self._can_write = can_write
548
def add_lines(self, key, parents, lines):
549
"""Add a revision to the store."""
550
if not self._is_locked():
551
raise errors.ObjectNotLocked(self)
552
if not self._can_write():
553
raise errors.ReadOnlyError(self)
555
raise ValueError('bad idea to put / in %r' % (key,))
556
text = ''.join(lines)
558
text = bytes_to_gzip(text)
559
path = self._map(key)
560
self._transport.put_bytes_non_atomic(path, text, create_parent_dir=True)
562
def insert_record_stream(self, stream):
564
for record in stream:
565
# Raise an error when a record is missing.
566
if record.storage_kind == 'absent':
567
raise errors.RevisionNotPresent([record.key[0]], self)
568
# adapt to non-tuple interface
569
if record.storage_kind == 'fulltext':
570
self.add_lines(record.key, None,
571
osutils.split_lines(record.get_bytes_as('fulltext')))
573
adapter_key = record.storage_kind, 'fulltext'
575
adapter = adapters[adapter_key]
577
adapter_factory = adapter_registry.get(adapter_key)
578
adapter = adapter_factory(self)
579
adapters[adapter_key] = adapter
580
lines = osutils.split_lines(adapter.get_bytes(
581
record, record.get_bytes_as(record.storage_kind)))
583
self.add_lines(record.key, None, lines)
584
except RevisionAlreadyPresent:
587
def _load_text(self, key):
588
if not self._is_locked():
589
raise errors.ObjectNotLocked(self)
590
path = self._map(key)
592
text = self._transport.get_bytes(path)
593
compressed = self._compressed
594
except errors.NoSuchFile:
596
# try without the .gz
599
text = self._transport.get_bytes(path)
601
except errors.NoSuchFile:
606
text = GzipFile(mode='rb', fileobj=StringIO(text)).read()
610
return self._mapper.map(key) + self._ext
613
class RevisionTextStore(TextVersionedFiles):
614
"""Legacy thunk for format 4 repositories."""
616
def __init__(self, transport, serializer, compressed, mapper, is_locked,
618
"""Create a RevisionTextStore at transport with serializer."""
619
TextVersionedFiles.__init__(self, transport, compressed, mapper,
620
is_locked, can_write)
621
self._serializer = serializer
623
def _load_text_parents(self, key):
624
text = self._load_text(key)
627
parents = self._serializer.read_revision_from_string(text).parent_ids
628
return text, tuple((parent,) for parent in parents)
630
def get_parent_map(self, keys):
633
parents = self._load_text_parents(key)[1]
636
result[key] = parents
639
def get_record_stream(self, keys, sort_order, include_delta_closure):
641
text, parents = self._load_text_parents(key)
643
yield AbsentContentFactory(key)
645
yield FulltextContentFactory(key, parents, None, text)
648
if not self._is_locked():
649
raise errors.ObjectNotLocked(self)
651
for quoted_relpath in self._transport.iter_files_recursive():
652
relpath = urllib.unquote(quoted_relpath)
653
path, ext = os.path.splitext(relpath)
656
if '.sig' not in relpath:
657
relpaths.add(relpath)
658
paths = list(relpaths)
659
return set([self._mapper.unmap(path) for path in paths])
662
class SignatureTextStore(TextVersionedFiles):
663
"""Legacy thunk for format 4-7 repositories."""
665
def __init__(self, transport, compressed, mapper, is_locked, can_write):
666
TextVersionedFiles.__init__(self, transport, compressed, mapper,
667
is_locked, can_write)
668
self._ext = '.sig' + self._ext
670
def get_parent_map(self, keys):
673
text = self._load_text(key)
679
def get_record_stream(self, keys, sort_order, include_delta_closure):
681
text = self._load_text(key)
683
yield AbsentContentFactory(key)
685
yield FulltextContentFactory(key, None, None, text)
688
if not self._is_locked():
689
raise errors.ObjectNotLocked(self)
691
for quoted_relpath in self._transport.iter_files_recursive():
692
relpath = urllib.unquote(quoted_relpath)
693
path, ext = os.path.splitext(relpath)
696
if not relpath.endswith('.sig'):
698
relpaths.add(relpath[:-4])
699
paths = list(relpaths)
700
return set([self._mapper.unmap(path) for path in paths])
633
702
_legacy_formats = [RepositoryFormat4(),
634
703
RepositoryFormat5(),
added
removed
bzrlib/repofmt/weaverepo.py
