1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import StringIO
19
from bzrlib.lazy_import import lazy_import
20
lazy_import(globals(), """
37
revision as _mod_revision,
42
from bzrlib.revisiontree import RevisionTree
43
from bzrlib.store.versioned import VersionedFileStore
44
from bzrlib.store.text import TextStore
45
from bzrlib.testament import Testament
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
50
from bzrlib.inter import InterObject
51
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, note, warning
59
# Old formats display a warning, but only once
60
_deprecation_warning_done = False
63
class Repository(object):
64
"""Repository holding history for one or more branches.
66
The repository holds and retrieves historical information including
67
revisions and file history. It's normally accessed only by the Branch,
68
which views a particular line of development through that history.
70
The Repository builds on top of Stores and a Transport, which respectively
71
describe the disk data format and the way of accessing the (possibly
75
_file_ids_altered_regex = lazy_regex.lazy_compile(
76
r'file_id="(?P<file_id>[^"]+)"'
77
r'.*revision="(?P<revision_id>[^"]+)"'
81
def add_inventory(self, revision_id, inv, parents):
82
"""Add the inventory inv to the repository as revision_id.
84
:param parents: The revision ids of the parents that revision_id
85
is known to have and are in the repository already.
87
returns the sha1 of the serialized inventory.
89
revision_id = osutils.safe_revision_id(revision_id)
90
_mod_revision.check_not_reserved_id(revision_id)
91
assert inv.revision_id is None or inv.revision_id == revision_id, \
92
"Mismatch between inventory revision" \
93
" id and insertion revid (%r, %r)" % (inv.revision_id, revision_id)
94
assert inv.root is not None
95
inv_text = self.serialise_inventory(inv)
96
inv_sha1 = osutils.sha_string(inv_text)
97
inv_vf = self.control_weaves.get_weave('inventory',
98
self.get_transaction())
99
self._inventory_add_lines(inv_vf, revision_id, parents,
100
osutils.split_lines(inv_text))
103
def _inventory_add_lines(self, inv_vf, revision_id, parents, lines):
105
for parent in parents:
107
final_parents.append(parent)
109
inv_vf.add_lines(revision_id, final_parents, lines)
112
def add_revision(self, revision_id, rev, inv=None, config=None):
113
"""Add rev to the revision store as revision_id.
115
:param revision_id: the revision id to use.
116
:param rev: The revision object.
117
:param inv: The inventory for the revision. if None, it will be looked
118
up in the inventory storer
119
:param config: If None no digital signature will be created.
120
If supplied its signature_needed method will be used
121
to determine if a signature should be made.
123
revision_id = osutils.safe_revision_id(revision_id)
124
# TODO: jam 20070210 Shouldn't we check rev.revision_id and
126
_mod_revision.check_not_reserved_id(revision_id)
127
if config is not None and config.signature_needed():
129
inv = self.get_inventory(revision_id)
130
plaintext = Testament(rev, inv).as_short_text()
131
self.store_revision_signature(
132
gpg.GPGStrategy(config), plaintext, revision_id)
133
if not revision_id in self.get_inventory_weave():
135
raise errors.WeaveRevisionNotPresent(revision_id,
136
self.get_inventory_weave())
138
# yes, this is not suitable for adding with ghosts.
139
self.add_inventory(revision_id, inv, rev.parent_ids)
140
self._revision_store.add_revision(rev, self.get_transaction())
143
def _all_possible_ids(self):
144
"""Return all the possible revisions that we could find."""
145
return self.get_inventory_weave().versions()
147
def all_revision_ids(self):
148
"""Returns a list of all the revision ids in the repository.
150
This is deprecated because code should generally work on the graph
151
reachable from a particular revision, and ignore any other revisions
152
that might be present. There is no direct replacement method.
154
return self._all_revision_ids()
157
def _all_revision_ids(self):
158
"""Returns a list of all the revision ids in the repository.
160
These are in as much topological order as the underlying store can
161
present: for weaves ghosts may lead to a lack of correctness until
162
the reweave updates the parents list.
164
if self._revision_store.text_store.listable():
165
return self._revision_store.all_revision_ids(self.get_transaction())
166
result = self._all_possible_ids()
167
# TODO: jam 20070210 Ensure that _all_possible_ids returns non-unicode
168
# ids. (It should, since _revision_store's API should change to
169
# return utf8 revision_ids)
170
return self._eliminate_revisions_not_present(result)
172
def break_lock(self):
173
"""Break a lock if one is present from another instance.
175
Uses the ui factory to ask for confirmation if the lock may be from
178
self.control_files.break_lock()
181
def _eliminate_revisions_not_present(self, revision_ids):
182
"""Check every revision id in revision_ids to see if we have it.
184
Returns a set of the present revisions.
187
for id in revision_ids:
188
if self.has_revision(id):
193
def create(a_bzrdir):
194
"""Construct the current default format repository in a_bzrdir."""
195
return RepositoryFormat.get_default_format().initialize(a_bzrdir)
197
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
198
"""instantiate a Repository.
200
:param _format: The format of the repository on disk.
201
:param a_bzrdir: The BzrDir of the repository.
203
In the future we will have a single api for all stores for
204
getting file texts, inventories and revisions, then
205
this construct will accept instances of those things.
207
super(Repository, self).__init__()
208
self._format = _format
209
# the following are part of the public API for Repository:
210
self.bzrdir = a_bzrdir
211
self.control_files = control_files
212
self._revision_store = _revision_store
213
self.text_store = text_store
214
# backwards compatibility
215
self.weave_store = text_store
216
# not right yet - should be more semantically clear ?
218
self.control_store = control_store
219
self.control_weaves = control_store
220
# TODO: make sure to construct the right store classes, etc, depending
221
# on whether escaping is required.
222
self._warn_if_deprecated()
225
return '%s(%r)' % (self.__class__.__name__,
226
self.bzrdir.transport.base)
229
return self.control_files.is_locked()
231
def lock_write(self):
232
self.control_files.lock_write()
235
self.control_files.lock_read()
237
def get_physical_lock_status(self):
238
return self.control_files.get_physical_lock_status()
241
def gather_stats(self, revid=None, committers=None):
242
"""Gather statistics from a revision id.
244
:param revid: The revision id to gather statistics from, if None, then
245
no revision specific statistics are gathered.
246
:param committers: Optional parameter controlling whether to grab
247
a count of committers from the revision specific statistics.
248
:return: A dictionary of statistics. Currently this contains:
249
committers: The number of committers if requested.
250
firstrev: A tuple with timestamp, timezone for the penultimate left
251
most ancestor of revid, if revid is not the NULL_REVISION.
252
latestrev: A tuple with timestamp, timezone for revid, if revid is
253
not the NULL_REVISION.
254
revisions: The total revision count in the repository.
255
size: An estimate disk size of the repository in bytes.
258
if revid and committers:
259
result['committers'] = 0
260
if revid and revid != _mod_revision.NULL_REVISION:
262
all_committers = set()
263
revisions = self.get_ancestry(revid)
264
# pop the leading None
266
first_revision = None
268
# ignore the revisions in the middle - just grab first and last
269
revisions = revisions[0], revisions[-1]
270
for revision in self.get_revisions(revisions):
271
if not first_revision:
272
first_revision = revision
274
all_committers.add(revision.committer)
275
last_revision = revision
277
result['committers'] = len(all_committers)
278
result['firstrev'] = (first_revision.timestamp,
279
first_revision.timezone)
280
result['latestrev'] = (last_revision.timestamp,
281
last_revision.timezone)
283
# now gather global repository information
284
if self.bzrdir.root_transport.listable():
285
c, t = self._revision_store.total_size(self.get_transaction())
286
result['revisions'] = c
291
def missing_revision_ids(self, other, revision_id=None):
292
"""Return the revision ids that other has that this does not.
294
These are returned in topological order.
296
revision_id: only return revision ids included by revision_id.
298
revision_id = osutils.safe_revision_id(revision_id)
299
return InterRepository.get(other, self).missing_revision_ids(revision_id)
303
"""Open the repository rooted at base.
305
For instance, if the repository is at URL/.bzr/repository,
306
Repository.open(URL) -> a Repository instance.
308
control = bzrdir.BzrDir.open(base)
309
return control.open_repository()
311
def copy_content_into(self, destination, revision_id=None, basis=None):
312
"""Make a complete copy of the content in self into destination.
314
This is a destructive operation! Do not use it on existing
317
revision_id = osutils.safe_revision_id(revision_id)
318
return InterRepository.get(self, destination).copy_content(revision_id, basis)
320
def fetch(self, source, revision_id=None, pb=None):
321
"""Fetch the content required to construct revision_id from source.
323
If revision_id is None all content is copied.
325
revision_id = osutils.safe_revision_id(revision_id)
326
return InterRepository.get(source, self).fetch(revision_id=revision_id,
329
def get_commit_builder(self, branch, parents, config, timestamp=None,
330
timezone=None, committer=None, revprops=None,
332
"""Obtain a CommitBuilder for this repository.
334
:param branch: Branch to commit to.
335
:param parents: Revision ids of the parents of the new revision.
336
:param config: Configuration to use.
337
:param timestamp: Optional timestamp recorded for commit.
338
:param timezone: Optional timezone for timestamp.
339
:param committer: Optional committer to set for commit.
340
:param revprops: Optional dictionary of revision properties.
341
:param revision_id: Optional revision id.
343
revision_id = osutils.safe_revision_id(revision_id)
344
return _CommitBuilder(self, parents, config, timestamp, timezone,
345
committer, revprops, revision_id)
348
self.control_files.unlock()
351
def clone(self, a_bzrdir, revision_id=None, basis=None):
352
"""Clone this repository into a_bzrdir using the current format.
354
Currently no check is made that the format of this repository and
355
the bzrdir format are compatible. FIXME RBC 20060201.
357
:return: The newly created destination repository.
359
if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
360
# use target default format.
361
dest_repo = a_bzrdir.create_repository()
363
# Most control formats need the repository to be specifically
364
# created, but on some old all-in-one formats it's not needed
366
dest_repo = self._format.initialize(a_bzrdir, shared=self.is_shared())
367
except errors.UninitializableFormat:
368
dest_repo = a_bzrdir.open_repository()
369
self.copy_content_into(dest_repo, revision_id, basis)
373
def has_revision(self, revision_id):
374
"""True if this repository has a copy of the revision."""
375
revision_id = osutils.safe_revision_id(revision_id)
376
return self._revision_store.has_revision_id(revision_id,
377
self.get_transaction())
380
def get_revision_reconcile(self, revision_id):
381
"""'reconcile' helper routine that allows access to a revision always.
383
This variant of get_revision does not cross check the weave graph
384
against the revision one as get_revision does: but it should only
385
be used by reconcile, or reconcile-alike commands that are correcting
386
or testing the revision graph.
388
if not revision_id or not isinstance(revision_id, basestring):
389
raise errors.InvalidRevisionId(revision_id=revision_id,
391
return self.get_revisions([revision_id])[0]
394
def get_revisions(self, revision_ids):
395
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
396
revs = self._revision_store.get_revisions(revision_ids,
397
self.get_transaction())
399
assert not isinstance(rev.revision_id, unicode)
400
for parent_id in rev.parent_ids:
401
assert not isinstance(parent_id, unicode)
405
def get_revision_xml(self, revision_id):
406
# TODO: jam 20070210 This shouldn't be necessary since get_revision
407
# would have already do it.
408
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
409
revision_id = osutils.safe_revision_id(revision_id)
410
rev = self.get_revision(revision_id)
412
# the current serializer..
413
self._revision_store._serializer.write_revision(rev, rev_tmp)
415
return rev_tmp.getvalue()
418
def get_revision(self, revision_id):
419
"""Return the Revision object for a named revision"""
420
# TODO: jam 20070210 get_revision_reconcile should do this for us
421
revision_id = osutils.safe_revision_id(revision_id)
422
r = self.get_revision_reconcile(revision_id)
423
# weave corruption can lead to absent revision markers that should be
425
# the following test is reasonably cheap (it needs a single weave read)
426
# and the weave is cached in read transactions. In write transactions
427
# it is not cached but typically we only read a small number of
428
# revisions. For knits when they are introduced we will probably want
429
# to ensure that caching write transactions are in use.
430
inv = self.get_inventory_weave()
431
self._check_revision_parents(r, inv)
435
def get_deltas_for_revisions(self, revisions):
436
"""Produce a generator of revision deltas.
438
Note that the input is a sequence of REVISIONS, not revision_ids.
439
Trees will be held in memory until the generator exits.
440
Each delta is relative to the revision's lefthand predecessor.
442
required_trees = set()
443
for revision in revisions:
444
required_trees.add(revision.revision_id)
445
required_trees.update(revision.parent_ids[:1])
446
trees = dict((t.get_revision_id(), t) for
447
t in self.revision_trees(required_trees))
448
for revision in revisions:
449
if not revision.parent_ids:
450
old_tree = self.revision_tree(None)
452
old_tree = trees[revision.parent_ids[0]]
453
yield trees[revision.revision_id].changes_from(old_tree)
456
def get_revision_delta(self, revision_id):
457
"""Return the delta for one revision.
459
The delta is relative to the left-hand predecessor of the
462
r = self.get_revision(revision_id)
463
return list(self.get_deltas_for_revisions([r]))[0]
465
def _check_revision_parents(self, revision, inventory):
466
"""Private to Repository and Fetch.
468
This checks the parentage of revision in an inventory weave for
469
consistency and is only applicable to inventory-weave-for-ancestry
470
using repository formats & fetchers.
472
weave_parents = inventory.get_parents(revision.revision_id)
473
weave_names = inventory.versions()
474
for parent_id in revision.parent_ids:
475
if parent_id in weave_names:
476
# this parent must not be a ghost.
477
if not parent_id in weave_parents:
479
raise errors.CorruptRepository(self)
482
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
483
revision_id = osutils.safe_revision_id(revision_id)
484
signature = gpg_strategy.sign(plaintext)
485
self._revision_store.add_revision_signature_text(revision_id,
487
self.get_transaction())
489
def fileids_altered_by_revision_ids(self, revision_ids):
490
"""Find the file ids and versions affected by revisions.
492
:param revisions: an iterable containing revision ids.
493
:return: a dictionary mapping altered file-ids to an iterable of
494
revision_ids. Each altered file-ids has the exact revision_ids that
495
altered it listed explicitly.
497
assert self._serializer.support_altered_by_hack, \
498
("fileids_altered_by_revision_ids only supported for branches "
499
"which store inventory as unnested xml, not on %r" % self)
500
selected_revision_ids = set(osutils.safe_revision_id(r)
501
for r in revision_ids)
502
w = self.get_inventory_weave()
505
# this code needs to read every new line in every inventory for the
506
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
507
# not present in one of those inventories is unnecessary but not
508
# harmful because we are filtering by the revision id marker in the
509
# inventory lines : we only select file ids altered in one of those
510
# revisions. We don't need to see all lines in the inventory because
511
# only those added in an inventory in rev X can contain a revision=X
513
unescape_revid_cache = {}
514
unescape_fileid_cache = {}
516
# jam 20061218 In a big fetch, this handles hundreds of thousands
517
# of lines, so it has had a lot of inlining and optimizing done.
518
# Sorry that it is a little bit messy.
519
# Move several functions to be local variables, since this is a long
521
search = self._file_ids_altered_regex.search
522
unescape = _unescape_xml
523
setdefault = result.setdefault
524
pb = ui.ui_factory.nested_progress_bar()
526
for line in w.iter_lines_added_or_present_in_versions(
527
selected_revision_ids, pb=pb):
531
# One call to match.group() returning multiple items is quite a
532
# bit faster than 2 calls to match.group() each returning 1
533
file_id, revision_id = match.group('file_id', 'revision_id')
535
# Inlining the cache lookups helps a lot when you make 170,000
536
# lines and 350k ids, versus 8.4 unique ids.
537
# Using a cache helps in 2 ways:
538
# 1) Avoids unnecessary decoding calls
539
# 2) Re-uses cached strings, which helps in future set and
541
# (2) is enough that removing encoding entirely along with
542
# the cache (so we are using plain strings) results in no
543
# performance improvement.
545
revision_id = unescape_revid_cache[revision_id]
547
unescaped = unescape(revision_id)
548
unescape_revid_cache[revision_id] = unescaped
549
revision_id = unescaped
551
if revision_id in selected_revision_ids:
553
file_id = unescape_fileid_cache[file_id]
555
unescaped = unescape(file_id)
556
unescape_fileid_cache[file_id] = unescaped
558
setdefault(file_id, set()).add(revision_id)
564
def get_inventory_weave(self):
565
return self.control_weaves.get_weave('inventory',
566
self.get_transaction())
569
def get_inventory(self, revision_id):
570
"""Get Inventory object by hash."""
571
# TODO: jam 20070210 Technically we don't need to sanitize, since all
572
# called functions must sanitize.
573
revision_id = osutils.safe_revision_id(revision_id)
574
return self.deserialise_inventory(
575
revision_id, self.get_inventory_xml(revision_id))
577
def deserialise_inventory(self, revision_id, xml):
578
"""Transform the xml into an inventory object.
580
:param revision_id: The expected revision id of the inventory.
581
:param xml: A serialised inventory.
583
revision_id = osutils.safe_revision_id(revision_id)
584
result = self._serializer.read_inventory_from_string(xml)
585
result.root.revision = revision_id
588
def serialise_inventory(self, inv):
589
return self._serializer.write_inventory_to_string(inv)
592
def get_inventory_xml(self, revision_id):
593
"""Get inventory XML as a file object."""
594
revision_id = osutils.safe_revision_id(revision_id)
596
assert isinstance(revision_id, str), type(revision_id)
597
iw = self.get_inventory_weave()
598
return iw.get_text(revision_id)
600
raise errors.HistoryMissing(self, 'inventory', revision_id)
603
def get_inventory_sha1(self, revision_id):
604
"""Return the sha1 hash of the inventory entry
606
# TODO: jam 20070210 Shouldn't this be deprecated / removed?
607
revision_id = osutils.safe_revision_id(revision_id)
608
return self.get_revision(revision_id).inventory_sha1
611
def get_revision_graph(self, revision_id=None):
612
"""Return a dictionary containing the revision graph.
614
:param revision_id: The revision_id to get a graph from. If None, then
615
the entire revision graph is returned. This is a deprecated mode of
616
operation and will be removed in the future.
617
:return: a dictionary of revision_id->revision_parents_list.
619
# special case NULL_REVISION
620
if revision_id == _mod_revision.NULL_REVISION:
622
revision_id = osutils.safe_revision_id(revision_id)
623
a_weave = self.get_inventory_weave()
624
all_revisions = self._eliminate_revisions_not_present(
626
entire_graph = dict([(node, a_weave.get_parents(node)) for
627
node in all_revisions])
628
if revision_id is None:
630
elif revision_id not in entire_graph:
631
raise errors.NoSuchRevision(self, revision_id)
633
# add what can be reached from revision_id
635
pending = set([revision_id])
636
while len(pending) > 0:
638
result[node] = entire_graph[node]
639
for revision_id in result[node]:
640
if revision_id not in result:
641
pending.add(revision_id)
645
def get_revision_graph_with_ghosts(self, revision_ids=None):
646
"""Return a graph of the revisions with ghosts marked as applicable.
648
:param revision_ids: an iterable of revisions to graph or None for all.
649
:return: a Graph object with the graph reachable from revision_ids.
651
result = graph.Graph()
653
pending = set(self.all_revision_ids())
656
pending = set(osutils.safe_revision_id(r) for r in revision_ids)
657
# special case NULL_REVISION
658
if _mod_revision.NULL_REVISION in pending:
659
pending.remove(_mod_revision.NULL_REVISION)
660
required = set(pending)
663
revision_id = pending.pop()
665
rev = self.get_revision(revision_id)
666
except errors.NoSuchRevision:
667
if revision_id in required:
670
result.add_ghost(revision_id)
672
for parent_id in rev.parent_ids:
673
# is this queued or done ?
674
if (parent_id not in pending and
675
parent_id not in done):
677
pending.add(parent_id)
678
result.add_node(revision_id, rev.parent_ids)
679
done.add(revision_id)
682
def _get_history_vf(self):
683
"""Get a versionedfile whose history graph reflects all revisions.
685
For weave repositories, this is the inventory weave.
687
return self.get_inventory_weave()
689
def iter_reverse_revision_history(self, revision_id):
690
"""Iterate backwards through revision ids in the lefthand history
692
:param revision_id: The revision id to start with. All its lefthand
693
ancestors will be traversed.
695
revision_id = osutils.safe_revision_id(revision_id)
696
if revision_id in (None, _mod_revision.NULL_REVISION):
698
next_id = revision_id
699
versionedfile = self._get_history_vf()
702
parents = versionedfile.get_parents(next_id)
703
if len(parents) == 0:
709
def get_revision_inventory(self, revision_id):
710
"""Return inventory of a past revision."""
711
# TODO: Unify this with get_inventory()
712
# bzr 0.0.6 and later imposes the constraint that the inventory_id
713
# must be the same as its revision, so this is trivial.
714
if revision_id is None:
715
# This does not make sense: if there is no revision,
716
# then it is the current tree inventory surely ?!
717
# and thus get_root_id() is something that looks at the last
718
# commit on the branch, and the get_root_id is an inventory check.
719
raise NotImplementedError
720
# return Inventory(self.get_root_id())
722
return self.get_inventory(revision_id)
726
"""Return True if this repository is flagged as a shared repository."""
727
raise NotImplementedError(self.is_shared)
730
def reconcile(self, other=None, thorough=False):
731
"""Reconcile this repository."""
732
from bzrlib.reconcile import RepoReconciler
733
reconciler = RepoReconciler(self, thorough=thorough)
734
reconciler.reconcile()
738
def revision_tree(self, revision_id):
739
"""Return Tree for a revision on this branch.
741
`revision_id` may be None for the empty tree revision.
743
# TODO: refactor this to use an existing revision object
744
# so we don't need to read it in twice.
745
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
746
return RevisionTree(self, Inventory(root_id=None),
747
_mod_revision.NULL_REVISION)
749
revision_id = osutils.safe_revision_id(revision_id)
750
inv = self.get_revision_inventory(revision_id)
751
return RevisionTree(self, inv, revision_id)
754
def revision_trees(self, revision_ids):
755
"""Return Tree for a revision on this branch.
757
`revision_id` may not be None or 'null:'"""
758
assert None not in revision_ids
759
assert _mod_revision.NULL_REVISION not in revision_ids
760
texts = self.get_inventory_weave().get_texts(revision_ids)
761
for text, revision_id in zip(texts, revision_ids):
762
inv = self.deserialise_inventory(revision_id, text)
763
yield RevisionTree(self, inv, revision_id)
766
def get_ancestry(self, revision_id):
767
"""Return a list of revision-ids integrated by a revision.
769
The first element of the list is always None, indicating the origin
770
revision. This might change when we have history horizons, or
771
perhaps we should have a new API.
773
This is topologically sorted.
775
if revision_id is None:
777
revision_id = osutils.safe_revision_id(revision_id)
778
if not self.has_revision(revision_id):
779
raise errors.NoSuchRevision(self, revision_id)
780
w = self.get_inventory_weave()
781
candidates = w.get_ancestry(revision_id)
782
return [None] + candidates # self._eliminate_revisions_not_present(candidates)
785
def print_file(self, file, revision_id):
786
"""Print `file` to stdout.
788
FIXME RBC 20060125 as John Meinel points out this is a bad api
789
- it writes to stdout, it assumes that that is valid etc. Fix
790
by creating a new more flexible convenience function.
792
revision_id = osutils.safe_revision_id(revision_id)
793
tree = self.revision_tree(revision_id)
794
# use inventory as it was in that revision
795
file_id = tree.inventory.path2id(file)
797
# TODO: jam 20060427 Write a test for this code path
798
# it had a bug in it, and was raising the wrong
800
raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
801
tree.print_file(file_id)
803
def get_transaction(self):
804
return self.control_files.get_transaction()
806
def revision_parents(self, revision_id):
807
revision_id = osutils.safe_revision_id(revision_id)
808
return self.get_inventory_weave().parent_names(revision_id)
811
def set_make_working_trees(self, new_value):
812
"""Set the policy flag for making working trees when creating branches.
814
This only applies to branches that use this repository.
816
The default is 'True'.
817
:param new_value: True to restore the default, False to disable making
820
raise NotImplementedError(self.set_make_working_trees)
822
def make_working_trees(self):
823
"""Returns the policy for making working trees on new branches."""
824
raise NotImplementedError(self.make_working_trees)
827
def sign_revision(self, revision_id, gpg_strategy):
828
revision_id = osutils.safe_revision_id(revision_id)
829
plaintext = Testament.from_revision(self, revision_id).as_short_text()
830
self.store_revision_signature(gpg_strategy, plaintext, revision_id)
833
def has_signature_for_revision_id(self, revision_id):
834
"""Query for a revision signature for revision_id in the repository."""
835
revision_id = osutils.safe_revision_id(revision_id)
836
return self._revision_store.has_signature(revision_id,
837
self.get_transaction())
840
def get_signature_text(self, revision_id):
841
"""Return the text for a signature."""
842
revision_id = osutils.safe_revision_id(revision_id)
843
return self._revision_store.get_signature_text(revision_id,
844
self.get_transaction())
847
def check(self, revision_ids):
848
"""Check consistency of all history of given revision_ids.
850
Different repository implementations should override _check().
852
:param revision_ids: A non-empty list of revision_ids whose ancestry
853
will be checked. Typically the last revision_id of a branch.
856
raise ValueError("revision_ids must be non-empty in %s.check"
858
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
859
return self._check(revision_ids)
861
def _check(self, revision_ids):
862
result = check.Check(self)
866
def _warn_if_deprecated(self):
867
global _deprecation_warning_done
868
if _deprecation_warning_done:
870
_deprecation_warning_done = True
871
warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
872
% (self._format, self.bzrdir.transport.base))
874
def supports_rich_root(self):
875
return self._format.rich_root_data
877
def _check_ascii_revisionid(self, revision_id, method):
878
"""Private helper for ascii-only repositories."""
879
# weave repositories refuse to store revisionids that are non-ascii.
880
if revision_id is not None:
881
# weaves require ascii revision ids.
882
if isinstance(revision_id, unicode):
884
revision_id.encode('ascii')
885
except UnicodeEncodeError:
886
raise errors.NonAsciiRevisionId(method, self)
889
revision_id.decode('ascii')
890
except UnicodeDecodeError:
891
raise errors.NonAsciiRevisionId(method, self)
895
# remove these delegates a while after bzr 0.15
896
def __make_delegated(name, from_module):
897
def _deprecated_repository_forwarder():
898
symbol_versioning.warn('%s moved to %s in bzr 0.15'
899
% (name, from_module),
902
m = __import__(from_module, globals(), locals(), [name])
904
return getattr(m, name)
905
except AttributeError:
906
raise AttributeError('module %s has no name %s'
908
globals()[name] = _deprecated_repository_forwarder
911
'AllInOneRepository',
912
'WeaveMetaDirRepository',
913
'PreSplitOutRepositoryFormat',
919
__make_delegated(_name, 'bzrlib.repofmt.weaverepo')
924
'RepositoryFormatKnit',
925
'RepositoryFormatKnit1',
926
'RepositoryFormatKnit2',
928
__make_delegated(_name, 'bzrlib.repofmt.knitrepo')
931
def install_revision(repository, rev, revision_tree):
932
"""Install all revision data into a repository."""
935
for p_id in rev.parent_ids:
936
if repository.has_revision(p_id):
937
present_parents.append(p_id)
938
parent_trees[p_id] = repository.revision_tree(p_id)
940
parent_trees[p_id] = repository.revision_tree(None)
942
inv = revision_tree.inventory
943
entries = inv.iter_entries()
944
# backwards compatability hack: skip the root id.
945
if not repository.supports_rich_root():
946
path, root = entries.next()
947
if root.revision != rev.revision_id:
948
raise errors.IncompatibleRevision(repr(repository))
949
# Add the texts that are not already present
950
for path, ie in entries:
951
w = repository.weave_store.get_weave_or_empty(ie.file_id,
952
repository.get_transaction())
953
if ie.revision not in w:
955
# FIXME: TODO: The following loop *may* be overlapping/duplicate
956
# with InventoryEntry.find_previous_heads(). if it is, then there
957
# is a latent bug here where the parents may have ancestors of each
959
for revision, tree in parent_trees.iteritems():
960
if ie.file_id not in tree:
962
parent_id = tree.inventory[ie.file_id].revision
963
if parent_id in text_parents:
965
text_parents.append(parent_id)
967
vfile = repository.weave_store.get_weave_or_empty(ie.file_id,
968
repository.get_transaction())
969
lines = revision_tree.get_file(ie.file_id).readlines()
970
vfile.add_lines(rev.revision_id, text_parents, lines)
972
# install the inventory
973
repository.add_inventory(rev.revision_id, inv, present_parents)
974
except errors.RevisionAlreadyPresent:
976
repository.add_revision(rev.revision_id, rev, inv)
979
class MetaDirRepository(Repository):
980
"""Repositories in the new meta-dir layout."""
982
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
983
super(MetaDirRepository, self).__init__(_format,
989
dir_mode = self.control_files._dir_mode
990
file_mode = self.control_files._file_mode
994
"""Return True if this repository is flagged as a shared repository."""
995
return self.control_files._transport.has('shared-storage')
998
def set_make_working_trees(self, new_value):
999
"""Set the policy flag for making working trees when creating branches.
1001
This only applies to branches that use this repository.
1003
The default is 'True'.
1004
:param new_value: True to restore the default, False to disable making
1009
self.control_files._transport.delete('no-working-trees')
1010
except errors.NoSuchFile:
1013
self.control_files.put_utf8('no-working-trees', '')
1015
def make_working_trees(self):
1016
"""Returns the policy for making working trees on new branches."""
1017
return not self.control_files._transport.has('no-working-trees')
1020
class RepositoryFormatRegistry(registry.Registry):
1021
"""Registry of RepositoryFormats.
1024
def get(self, format_string):
1025
r = registry.Registry.get(self, format_string)
1031
format_registry = RepositoryFormatRegistry()
1032
"""Registry of formats, indexed by their identifying format string.
1034
This can contain either format instances themselves, or classes/factories that
1035
can be called to obtain one.
1039
class RepositoryFormat(object):
1040
"""A repository format.
1042
Formats provide three things:
1043
* An initialization routine to construct repository data on disk.
1044
* a format string which is used when the BzrDir supports versioned
1046
* an open routine which returns a Repository instance.
1048
Formats are placed in an dict by their format string for reference
1049
during opening. These should be subclasses of RepositoryFormat
1052
Once a format is deprecated, just deprecate the initialize and open
1053
methods on the format class. Do not deprecate the object, as the
1054
object will be created every system load.
1056
Common instance attributes:
1057
_matchingbzrdir - the bzrdir format that the repository format was
1058
originally written to work with. This can be used if manually
1059
constructing a bzrdir and repository, or more commonly for test suite
1064
return "<%s>" % self.__class__.__name__
1066
def __eq__(self, other):
1067
# format objects are generally stateless
1068
return isinstance(other, self.__class__)
1070
def __ne__(self, other):
1071
return not self == other
1074
def find_format(klass, a_bzrdir):
1075
"""Return the format for the repository object in a_bzrdir.
1077
This is used by bzr native formats that have a "format" file in
1078
the repository. Other methods may be used by different types of
1082
transport = a_bzrdir.get_repository_transport(None)
1083
format_string = transport.get("format").read()
1084
return format_registry.get(format_string)
1085
except errors.NoSuchFile:
1086
raise errors.NoRepositoryPresent(a_bzrdir)
1088
raise errors.UnknownFormatError(format=format_string)
1091
def register_format(klass, format):
1092
format_registry.register(format.get_format_string(), format)
1095
def unregister_format(klass, format):
1096
format_registry.remove(format.get_format_string())
1099
def get_default_format(klass):
1100
"""Return the current default format."""
1101
from bzrlib import bzrdir
1102
return bzrdir.format_registry.make_bzrdir('default').repository_format
1104
def _get_control_store(self, repo_transport, control_files):
1105
"""Return the control store for this repository."""
1106
raise NotImplementedError(self._get_control_store)
1108
def get_format_string(self):
1109
"""Return the ASCII format string that identifies this format.
1111
Note that in pre format ?? repositories the format string is
1112
not permitted nor written to disk.
1114
raise NotImplementedError(self.get_format_string)
1116
def get_format_description(self):
1117
"""Return the short description for this format."""
1118
raise NotImplementedError(self.get_format_description)
1120
def _get_revision_store(self, repo_transport, control_files):
1121
"""Return the revision store object for this a_bzrdir."""
1122
raise NotImplementedError(self._get_revision_store)
1124
def _get_text_rev_store(self,
1131
"""Common logic for getting a revision store for a repository.
1133
see self._get_revision_store for the subclass-overridable method to
1134
get the store for a repository.
1136
from bzrlib.store.revision.text import TextRevisionStore
1137
dir_mode = control_files._dir_mode
1138
file_mode = control_files._file_mode
1139
text_store =TextStore(transport.clone(name),
1141
compressed=compressed,
1143
file_mode=file_mode)
1144
_revision_store = TextRevisionStore(text_store, serializer)
1145
return _revision_store
1147
# TODO: this shouldn't be in the base class, it's specific to things that
1148
# use weaves or knits -- mbp 20070207
1149
def _get_versioned_file_store(self,
1154
versionedfile_class=None,
1155
versionedfile_kwargs={},
1157
if versionedfile_class is None:
1158
versionedfile_class = self._versionedfile_class
1159
weave_transport = control_files._transport.clone(name)
1160
dir_mode = control_files._dir_mode
1161
file_mode = control_files._file_mode
1162
return VersionedFileStore(weave_transport, prefixed=prefixed,
1164
file_mode=file_mode,
1165
versionedfile_class=versionedfile_class,
1166
versionedfile_kwargs=versionedfile_kwargs,
1169
def initialize(self, a_bzrdir, shared=False):
1170
"""Initialize a repository of this format in a_bzrdir.
1172
:param a_bzrdir: The bzrdir to put the new repository in it.
1173
:param shared: The repository should be initialized as a sharable one.
1175
This may raise UninitializableFormat if shared repository are not
1176
compatible the a_bzrdir.
1179
def is_supported(self):
1180
"""Is this format supported?
1182
Supported formats must be initializable and openable.
1183
Unsupported formats may not support initialization or committing or
1184
some other features depending on the reason for not being supported.
1188
def check_conversion_target(self, target_format):
1189
raise NotImplementedError(self.check_conversion_target)
1191
def open(self, a_bzrdir, _found=False):
1192
"""Return an instance of this format for the bzrdir a_bzrdir.
1194
_found is a private parameter, do not use it.
1196
raise NotImplementedError(self.open)
1199
class MetaDirRepositoryFormat(RepositoryFormat):
1200
"""Common base class for the new repositories using the metadir layout."""
1202
rich_root_data = False
1203
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1206
super(MetaDirRepositoryFormat, self).__init__()
1208
def _create_control_files(self, a_bzrdir):
1209
"""Create the required files and the initial control_files object."""
1210
# FIXME: RBC 20060125 don't peek under the covers
1211
# NB: no need to escape relative paths that are url safe.
1212
repository_transport = a_bzrdir.get_repository_transport(self)
1213
control_files = lockable_files.LockableFiles(repository_transport,
1214
'lock', lockdir.LockDir)
1215
control_files.create_lock()
1216
return control_files
1218
def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
1219
"""Upload the initial blank content."""
1220
control_files = self._create_control_files(a_bzrdir)
1221
control_files.lock_write()
1223
control_files._transport.mkdir_multi(dirs,
1224
mode=control_files._dir_mode)
1225
for file, content in files:
1226
control_files.put(file, content)
1227
for file, content in utf8_files:
1228
control_files.put_utf8(file, content)
1230
control_files.put_utf8('shared-storage', '')
1232
control_files.unlock()
1235
# formats which have no format string are not discoverable
1236
# and not independently creatable, so are not registered. They're
1237
# all in bzrlib.repofmt.weaverepo now. When an instance of one of these is
1238
# needed, it's constructed directly by the BzrDir. Non-native formats where
1239
# the repository is not separately opened are similar.
1241
format_registry.register_lazy(
1242
'Bazaar-NG Repository format 7',
1243
'bzrlib.repofmt.weaverepo',
1246
# KEEP in sync with bzrdir.format_registry default, which controls the overall
1247
# default control directory format
1249
format_registry.register_lazy(
1250
'Bazaar-NG Knit Repository Format 1',
1251
'bzrlib.repofmt.knitrepo',
1252
'RepositoryFormatKnit1',
1254
format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
1256
format_registry.register_lazy(
1257
'Bazaar Knit Repository Format 2\n',
1258
'bzrlib.repofmt.knitrepo',
1259
'RepositoryFormatKnit2',
1262
format_registry.register_lazy(
1263
'Bazaar Knit Repository Format 3\n',
1264
'bzrlib.repofmt.knitrepo',
1265
'RepositoryFormatKnit3',
1269
class InterRepository(InterObject):
1270
"""This class represents operations taking place between two repositories.
1272
Its instances have methods like copy_content and fetch, and contain
1273
references to the source and target repositories these operations can be
1276
Often we will provide convenience methods on 'repository' which carry out
1277
operations with another repository - they will always forward to
1278
InterRepository.get(other).method_name(parameters).
1282
"""The available optimised InterRepository types."""
1284
def copy_content(self, revision_id=None, basis=None):
1285
raise NotImplementedError(self.copy_content)
1287
def fetch(self, revision_id=None, pb=None):
1288
"""Fetch the content required to construct revision_id.
1290
The content is copied from self.source to self.target.
1292
:param revision_id: if None all content is copied, if NULL_REVISION no
1294
:param pb: optional progress bar to use for progress reports. If not
1295
provided a default one will be created.
1297
Returns the copied revision count and the failed revisions in a tuple:
1300
raise NotImplementedError(self.fetch)
1303
def missing_revision_ids(self, revision_id=None):
1304
"""Return the revision ids that source has that target does not.
1306
These are returned in topological order.
1308
:param revision_id: only return revision ids included by this
1311
# generic, possibly worst case, slow code path.
1312
target_ids = set(self.target.all_revision_ids())
1313
if revision_id is not None:
1314
# TODO: jam 20070210 InterRepository is internal enough that it
1315
# should assume revision_ids are already utf-8
1316
revision_id = osutils.safe_revision_id(revision_id)
1317
source_ids = self.source.get_ancestry(revision_id)
1318
assert source_ids[0] is None
1321
source_ids = self.source.all_revision_ids()
1322
result_set = set(source_ids).difference(target_ids)
1323
# this may look like a no-op: its not. It preserves the ordering
1324
# other_ids had while only returning the members from other_ids
1325
# that we've decided we need.
1326
return [rev_id for rev_id in source_ids if rev_id in result_set]
1329
class InterSameDataRepository(InterRepository):
1330
"""Code for converting between repositories that represent the same data.
1332
Data format and model must match for this to work.
1336
def _get_repo_format_to_test(self):
1337
"""Repository format for testing with."""
1338
return RepositoryFormat.get_default_format()
1341
def is_compatible(source, target):
1342
if not isinstance(source, Repository):
1344
if not isinstance(target, Repository):
1346
if source._format.rich_root_data != target._format.rich_root_data:
1348
if source._serializer != target._serializer:
1354
def copy_content(self, revision_id=None, basis=None):
1355
"""Make a complete copy of the content in self into destination.
1357
This is a destructive operation! Do not use it on existing
1360
:param revision_id: Only copy the content needed to construct
1361
revision_id and its parents.
1362
:param basis: Copy the needed data preferentially from basis.
1365
self.target.set_make_working_trees(self.source.make_working_trees())
1366
except NotImplementedError:
1368
# TODO: jam 20070210 This is fairly internal, so we should probably
1369
# just assert that revision_id is not unicode.
1370
revision_id = osutils.safe_revision_id(revision_id)
1371
# grab the basis available data
1372
if basis is not None:
1373
self.target.fetch(basis, revision_id=revision_id)
1374
# but don't bother fetching if we have the needed data now.
1375
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
1376
self.target.has_revision(revision_id)):
1378
self.target.fetch(self.source, revision_id=revision_id)
1381
def fetch(self, revision_id=None, pb=None):
1382
"""See InterRepository.fetch()."""
1383
from bzrlib.fetch import GenericRepoFetcher
1384
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1385
self.source, self.source._format, self.target,
1386
self.target._format)
1387
# TODO: jam 20070210 This should be an assert, not a translate
1388
revision_id = osutils.safe_revision_id(revision_id)
1389
f = GenericRepoFetcher(to_repository=self.target,
1390
from_repository=self.source,
1391
last_revision=revision_id,
1393
return f.count_copied, f.failed_revisions
1396
class InterWeaveRepo(InterSameDataRepository):
1397
"""Optimised code paths between Weave based repositories."""
1400
def _get_repo_format_to_test(self):
1401
from bzrlib.repofmt import weaverepo
1402
return weaverepo.RepositoryFormat7()
1405
def is_compatible(source, target):
1406
"""Be compatible with known Weave formats.
1408
We don't test for the stores being of specific types because that
1409
could lead to confusing results, and there is no need to be
1412
from bzrlib.repofmt.weaverepo import (
1418
return (isinstance(source._format, (RepositoryFormat5,
1420
RepositoryFormat7)) and
1421
isinstance(target._format, (RepositoryFormat5,
1423
RepositoryFormat7)))
1424
except AttributeError:
1428
def copy_content(self, revision_id=None, basis=None):
1429
"""See InterRepository.copy_content()."""
1430
# weave specific optimised path:
1431
# TODO: jam 20070210 Internal, should be an assert, not translate
1432
revision_id = osutils.safe_revision_id(revision_id)
1433
if basis is not None:
1434
# copy the basis in, then fetch remaining data.
1435
basis.copy_content_into(self.target, revision_id)
1436
# the basis copy_content_into could miss-set this.
1438
self.target.set_make_working_trees(self.source.make_working_trees())
1439
except NotImplementedError:
1441
self.target.fetch(self.source, revision_id=revision_id)
1444
self.target.set_make_working_trees(self.source.make_working_trees())
1445
except NotImplementedError:
1447
# FIXME do not peek!
1448
if self.source.control_files._transport.listable():
1449
pb = ui.ui_factory.nested_progress_bar()
1451
self.target.weave_store.copy_all_ids(
1452
self.source.weave_store,
1454
from_transaction=self.source.get_transaction(),
1455
to_transaction=self.target.get_transaction())
1456
pb.update('copying inventory', 0, 1)
1457
self.target.control_weaves.copy_multi(
1458
self.source.control_weaves, ['inventory'],
1459
from_transaction=self.source.get_transaction(),
1460
to_transaction=self.target.get_transaction())
1461
self.target._revision_store.text_store.copy_all_ids(
1462
self.source._revision_store.text_store,
1467
self.target.fetch(self.source, revision_id=revision_id)
1470
def fetch(self, revision_id=None, pb=None):
1471
"""See InterRepository.fetch()."""
1472
from bzrlib.fetch import GenericRepoFetcher
1473
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1474
self.source, self.source._format, self.target, self.target._format)
1475
# TODO: jam 20070210 This should be an assert, not a translate
1476
revision_id = osutils.safe_revision_id(revision_id)
1477
f = GenericRepoFetcher(to_repository=self.target,
1478
from_repository=self.source,
1479
last_revision=revision_id,
1481
return f.count_copied, f.failed_revisions
1484
def missing_revision_ids(self, revision_id=None):
1485
"""See InterRepository.missing_revision_ids()."""
1486
# we want all revisions to satisfy revision_id in source.
1487
# but we don't want to stat every file here and there.
1488
# we want then, all revisions other needs to satisfy revision_id
1489
# checked, but not those that we have locally.
1490
# so the first thing is to get a subset of the revisions to
1491
# satisfy revision_id in source, and then eliminate those that
1492
# we do already have.
1493
# this is slow on high latency connection to self, but as as this
1494
# disk format scales terribly for push anyway due to rewriting
1495
# inventory.weave, this is considered acceptable.
1497
if revision_id is not None:
1498
source_ids = self.source.get_ancestry(revision_id)
1499
assert source_ids[0] is None
1502
source_ids = self.source._all_possible_ids()
1503
source_ids_set = set(source_ids)
1504
# source_ids is the worst possible case we may need to pull.
1505
# now we want to filter source_ids against what we actually
1506
# have in target, but don't try to check for existence where we know
1507
# we do not have a revision as that would be pointless.
1508
target_ids = set(self.target._all_possible_ids())
1509
possibly_present_revisions = target_ids.intersection(source_ids_set)
1510
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
1511
required_revisions = source_ids_set.difference(actually_present_revisions)
1512
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
1513
if revision_id is not None:
1514
# we used get_ancestry to determine source_ids then we are assured all
1515
# revisions referenced are present as they are installed in topological order.
1516
# and the tip revision was validated by get_ancestry.
1517
return required_topo_revisions
1519
# if we just grabbed the possibly available ids, then
1520
# we only have an estimate of whats available and need to validate
1521
# that against the revision records.
1522
return self.source._eliminate_revisions_not_present(required_topo_revisions)
1525
class InterKnitRepo(InterSameDataRepository):
1526
"""Optimised code paths between Knit based repositories."""
1529
def _get_repo_format_to_test(self):
1530
from bzrlib.repofmt import knitrepo
1531
return knitrepo.RepositoryFormatKnit1()
1534
def is_compatible(source, target):
1535
"""Be compatible with known Knit formats.
1537
We don't test for the stores being of specific types because that
1538
could lead to confusing results, and there is no need to be
1541
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
1543
return (isinstance(source._format, (RepositoryFormatKnit1)) and
1544
isinstance(target._format, (RepositoryFormatKnit1)))
1545
except AttributeError:
1549
def fetch(self, revision_id=None, pb=None):
1550
"""See InterRepository.fetch()."""
1551
from bzrlib.fetch import KnitRepoFetcher
1552
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1553
self.source, self.source._format, self.target, self.target._format)
1554
# TODO: jam 20070210 This should be an assert, not a translate
1555
revision_id = osutils.safe_revision_id(revision_id)
1556
f = KnitRepoFetcher(to_repository=self.target,
1557
from_repository=self.source,
1558
last_revision=revision_id,
1560
return f.count_copied, f.failed_revisions
1563
def missing_revision_ids(self, revision_id=None):
1564
"""See InterRepository.missing_revision_ids()."""
1565
if revision_id is not None:
1566
source_ids = self.source.get_ancestry(revision_id)
1567
assert source_ids[0] is None
1570
source_ids = self.source._all_possible_ids()
1571
source_ids_set = set(source_ids)
1572
# source_ids is the worst possible case we may need to pull.
1573
# now we want to filter source_ids against what we actually
1574
# have in target, but don't try to check for existence where we know
1575
# we do not have a revision as that would be pointless.
1576
target_ids = set(self.target._all_possible_ids())
1577
possibly_present_revisions = target_ids.intersection(source_ids_set)
1578
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
1579
required_revisions = source_ids_set.difference(actually_present_revisions)
1580
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
1581
if revision_id is not None:
1582
# we used get_ancestry to determine source_ids then we are assured all
1583
# revisions referenced are present as they are installed in topological order.
1584
# and the tip revision was validated by get_ancestry.
1585
return required_topo_revisions
1587
# if we just grabbed the possibly available ids, then
1588
# we only have an estimate of whats available and need to validate
1589
# that against the revision records.
1590
return self.source._eliminate_revisions_not_present(required_topo_revisions)
1593
class InterModel1and2(InterRepository):
1596
def _get_repo_format_to_test(self):
1600
def is_compatible(source, target):
1601
if not isinstance(source, Repository):
1603
if not isinstance(target, Repository):
1605
if not source._format.rich_root_data and target._format.rich_root_data:
1611
def fetch(self, revision_id=None, pb=None):
1612
"""See InterRepository.fetch()."""
1613
from bzrlib.fetch import Model1toKnit2Fetcher
1614
# TODO: jam 20070210 This should be an assert, not a translate
1615
revision_id = osutils.safe_revision_id(revision_id)
1616
f = Model1toKnit2Fetcher(to_repository=self.target,
1617
from_repository=self.source,
1618
last_revision=revision_id,
1620
return f.count_copied, f.failed_revisions
1623
def copy_content(self, revision_id=None, basis=None):
1624
"""Make a complete copy of the content in self into destination.
1626
This is a destructive operation! Do not use it on existing
1629
:param revision_id: Only copy the content needed to construct
1630
revision_id and its parents.
1631
:param basis: Copy the needed data preferentially from basis.
1634
self.target.set_make_working_trees(self.source.make_working_trees())
1635
except NotImplementedError:
1637
# TODO: jam 20070210 Internal, assert, don't translate
1638
revision_id = osutils.safe_revision_id(revision_id)
1639
# grab the basis available data
1640
if basis is not None:
1641
self.target.fetch(basis, revision_id=revision_id)
1642
# but don't bother fetching if we have the needed data now.
1643
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
1644
self.target.has_revision(revision_id)):
1646
self.target.fetch(self.source, revision_id=revision_id)
1649
class InterKnit1and2(InterKnitRepo):
1652
def _get_repo_format_to_test(self):
1656
def is_compatible(source, target):
1657
"""Be compatible with Knit1 source and Knit2 target"""
1658
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit2
1660
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1, \
1661
RepositoryFormatKnit2
1662
return (isinstance(source._format, (RepositoryFormatKnit1)) and
1663
isinstance(target._format, (RepositoryFormatKnit2)))
1664
except AttributeError:
1668
def fetch(self, revision_id=None, pb=None):
1669
"""See InterRepository.fetch()."""
1670
from bzrlib.fetch import Knit1to2Fetcher
1671
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1672
self.source, self.source._format, self.target,
1673
self.target._format)
1674
# TODO: jam 20070210 This should be an assert, not a translate
1675
revision_id = osutils.safe_revision_id(revision_id)
1676
f = Knit1to2Fetcher(to_repository=self.target,
1677
from_repository=self.source,
1678
last_revision=revision_id,
1680
return f.count_copied, f.failed_revisions
1683
InterRepository.register_optimiser(InterSameDataRepository)
1684
InterRepository.register_optimiser(InterWeaveRepo)
1685
InterRepository.register_optimiser(InterKnitRepo)
1686
InterRepository.register_optimiser(InterModel1and2)
1687
InterRepository.register_optimiser(InterKnit1and2)
1690
class RepositoryTestProviderAdapter(object):
1691
"""A tool to generate a suite testing multiple repository formats at once.
1693
This is done by copying the test once for each transport and injecting
1694
the transport_server, transport_readonly_server, and bzrdir_format and
1695
repository_format classes into each copy. Each copy is also given a new id()
1696
to make it easy to identify.
1699
def __init__(self, transport_server, transport_readonly_server, formats):
1700
self._transport_server = transport_server
1701
self._transport_readonly_server = transport_readonly_server
1702
self._formats = formats
1704
def adapt(self, test):
1705
result = unittest.TestSuite()
1706
for repository_format, bzrdir_format in self._formats:
1707
from copy import deepcopy
1708
new_test = deepcopy(test)
1709
new_test.transport_server = self._transport_server
1710
new_test.transport_readonly_server = self._transport_readonly_server
1711
new_test.bzrdir_format = bzrdir_format
1712
new_test.repository_format = repository_format
1713
def make_new_test_id():
1714
new_id = "%s(%s)" % (new_test.id(), repository_format.__class__.__name__)
1715
return lambda: new_id
1716
new_test.id = make_new_test_id()
1717
result.addTest(new_test)
1721
class InterRepositoryTestProviderAdapter(object):
1722
"""A tool to generate a suite testing multiple inter repository formats.
1724
This is done by copying the test once for each interrepo provider and injecting
1725
the transport_server, transport_readonly_server, repository_format and
1726
repository_to_format classes into each copy.
1727
Each copy is also given a new id() to make it easy to identify.
1730
def __init__(self, transport_server, transport_readonly_server, formats):
1731
self._transport_server = transport_server
1732
self._transport_readonly_server = transport_readonly_server
1733
self._formats = formats
1735
def adapt(self, test):
1736
result = unittest.TestSuite()
1737
for interrepo_class, repository_format, repository_format_to in self._formats:
1738
from copy import deepcopy
1739
new_test = deepcopy(test)
1740
new_test.transport_server = self._transport_server
1741
new_test.transport_readonly_server = self._transport_readonly_server
1742
new_test.interrepo_class = interrepo_class
1743
new_test.repository_format = repository_format
1744
new_test.repository_format_to = repository_format_to
1745
def make_new_test_id():
1746
new_id = "%s(%s)" % (new_test.id(), interrepo_class.__name__)
1747
return lambda: new_id
1748
new_test.id = make_new_test_id()
1749
result.addTest(new_test)
1753
def default_test_list():
1754
"""Generate the default list of interrepo permutations to test."""
1755
from bzrlib.repofmt import knitrepo, weaverepo
1757
# test the default InterRepository between format 6 and the current
1759
# XXX: robertc 20060220 reinstate this when there are two supported
1760
# formats which do not have an optimal code path between them.
1761
#result.append((InterRepository,
1762
# RepositoryFormat6(),
1763
# RepositoryFormatKnit1()))
1764
for optimiser_class in InterRepository._optimisers:
1765
format_to_test = optimiser_class._get_repo_format_to_test()
1766
if format_to_test is not None:
1767
result.append((optimiser_class,
1768
format_to_test, format_to_test))
1769
# if there are specific combinations we want to use, we can add them
1771
result.append((InterModel1and2,
1772
weaverepo.RepositoryFormat5(),
1773
knitrepo.RepositoryFormatKnit2()))
1774
result.append((InterKnit1and2,
1775
knitrepo.RepositoryFormatKnit1(),
1776
knitrepo.RepositoryFormatKnit2()))
1780
class CopyConverter(object):
1781
"""A repository conversion tool which just performs a copy of the content.
1783
This is slow but quite reliable.
1786
def __init__(self, target_format):
1787
"""Create a CopyConverter.
1789
:param target_format: The format the resulting repository should be.
1791
self.target_format = target_format
1793
def convert(self, repo, pb):
1794
"""Perform the conversion of to_convert, giving feedback via pb.
1796
:param to_convert: The disk object to convert.
1797
:param pb: a progress bar to use for progress information.
1802
# this is only useful with metadir layouts - separated repo content.
1803
# trigger an assertion if not such
1804
repo._format.get_format_string()
1805
self.repo_dir = repo.bzrdir
1806
self.step('Moving repository to repository.backup')
1807
self.repo_dir.transport.move('repository', 'repository.backup')
1808
backup_transport = self.repo_dir.transport.clone('repository.backup')
1809
repo._format.check_conversion_target(self.target_format)
1810
self.source_repo = repo._format.open(self.repo_dir,
1812
_override_transport=backup_transport)
1813
self.step('Creating new repository')
1814
converted = self.target_format.initialize(self.repo_dir,
1815
self.source_repo.is_shared())
1816
converted.lock_write()
1818
self.step('Copying content into repository.')
1819
self.source_repo.copy_content_into(converted)
1822
self.step('Deleting old repository content.')
1823
self.repo_dir.transport.delete_tree('repository.backup')
1824
self.pb.note('repository converted')
1826
def step(self, message):
1827
"""Update the pb by a step."""
1829
self.pb.update(message, self.count, self.total)
1832
class CommitBuilder(object):
1833
"""Provides an interface to build up a commit.
1835
This allows describing a tree to be committed without needing to
1836
know the internals of the format of the repository.
1839
record_root_entry = False
1840
def __init__(self, repository, parents, config, timestamp=None,
1841
timezone=None, committer=None, revprops=None,
1843
"""Initiate a CommitBuilder.
1845
:param repository: Repository to commit to.
1846
:param parents: Revision ids of the parents of the new revision.
1847
:param config: Configuration to use.
1848
:param timestamp: Optional timestamp recorded for commit.
1849
:param timezone: Optional timezone for timestamp.
1850
:param committer: Optional committer to set for commit.
1851
:param revprops: Optional dictionary of revision properties.
1852
:param revision_id: Optional revision id.
1854
self._config = config
1856
if committer is None:
1857
self._committer = self._config.username()
1859
assert isinstance(committer, basestring), type(committer)
1860
self._committer = committer
1862
self.new_inventory = Inventory(None)
1863
self._new_revision_id = osutils.safe_revision_id(revision_id)
1864
self.parents = parents
1865
self.repository = repository
1868
if revprops is not None:
1869
self._revprops.update(revprops)
1871
if timestamp is None:
1872
timestamp = time.time()
1873
# Restrict resolution to 1ms
1874
self._timestamp = round(timestamp, 3)
1876
if timezone is None:
1877
self._timezone = osutils.local_time_offset()
1879
self._timezone = int(timezone)
1881
self._generate_revision_if_needed()
1883
def commit(self, message):
1884
"""Make the actual commit.
1886
:return: The revision id of the recorded revision.
1888
rev = _mod_revision.Revision(
1889
timestamp=self._timestamp,
1890
timezone=self._timezone,
1891
committer=self._committer,
1893
inventory_sha1=self.inv_sha1,
1894
revision_id=self._new_revision_id,
1895
properties=self._revprops)
1896
rev.parent_ids = self.parents
1897
self.repository.add_revision(self._new_revision_id, rev,
1898
self.new_inventory, self._config)
1899
return self._new_revision_id
1901
def revision_tree(self):
1902
"""Return the tree that was just committed.
1904
After calling commit() this can be called to get a RevisionTree
1905
representing the newly committed tree. This is preferred to
1906
calling Repository.revision_tree() because that may require
1907
deserializing the inventory, while we already have a copy in
1910
return RevisionTree(self.repository, self.new_inventory,
1911
self._new_revision_id)
1913
def finish_inventory(self):
1914
"""Tell the builder that the inventory is finished."""
1915
if self.new_inventory.root is None:
1916
symbol_versioning.warn('Root entry should be supplied to'
1917
' record_entry_contents, as of bzr 0.10.',
1918
DeprecationWarning, stacklevel=2)
1919
self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
1920
self.new_inventory.revision_id = self._new_revision_id
1921
self.inv_sha1 = self.repository.add_inventory(
1922
self._new_revision_id,
1927
def _gen_revision_id(self):
1928
"""Return new revision-id."""
1929
return generate_ids.gen_revision_id(self._config.username(),
1932
def _generate_revision_if_needed(self):
1933
"""Create a revision id if None was supplied.
1935
If the repository can not support user-specified revision ids
1936
they should override this function and raise CannotSetRevisionId
1937
if _new_revision_id is not None.
1939
:raises: CannotSetRevisionId
1941
if self._new_revision_id is None:
1942
self._new_revision_id = self._gen_revision_id()
1944
def record_entry_contents(self, ie, parent_invs, path, tree):
1945
"""Record the content of ie from tree into the commit if needed.
1947
Side effect: sets ie.revision when unchanged
1949
:param ie: An inventory entry present in the commit.
1950
:param parent_invs: The inventories of the parent revisions of the
1952
:param path: The path the entry is at in the tree.
1953
:param tree: The tree which contains this entry and should be used to
1956
if self.new_inventory.root is None and ie.parent_id is not None:
1957
symbol_versioning.warn('Root entry should be supplied to'
1958
' record_entry_contents, as of bzr 0.10.',
1959
DeprecationWarning, stacklevel=2)
1960
self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
1962
self.new_inventory.add(ie)
1964
# ie.revision is always None if the InventoryEntry is considered
1965
# for committing. ie.snapshot will record the correct revision
1966
# which may be the sole parent if it is untouched.
1967
if ie.revision is not None:
1970
# In this revision format, root entries have no knit or weave
1971
if ie is self.new_inventory.root:
1972
# When serializing out to disk and back in
1973
# root.revision is always _new_revision_id
1974
ie.revision = self._new_revision_id
1976
previous_entries = ie.find_previous_heads(
1978
self.repository.weave_store,
1979
self.repository.get_transaction())
1980
# we are creating a new revision for ie in the history store
1982
ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
1984
def modified_directory(self, file_id, file_parents):
1985
"""Record the presence of a symbolic link.
1987
:param file_id: The file_id of the link to record.
1988
:param file_parents: The per-file parent revision ids.
1990
self._add_text_to_weave(file_id, [], file_parents.keys())
1992
def modified_reference(self, file_id, file_parents):
1993
"""Record the modification of a reference.
1995
:param file_id: The file_id of the link to record.
1996
:param file_parents: The per-file parent revision ids.
1998
self._add_text_to_weave(file_id, [], file_parents.keys())
2000
def modified_file_text(self, file_id, file_parents,
2001
get_content_byte_lines, text_sha1=None,
2003
"""Record the text of file file_id
2005
:param file_id: The file_id of the file to record the text of.
2006
:param file_parents: The per-file parent revision ids.
2007
:param get_content_byte_lines: A callable which will return the byte
2009
:param text_sha1: Optional SHA1 of the file contents.
2010
:param text_size: Optional size of the file contents.
2012
# mutter('storing text of file {%s} in revision {%s} into %r',
2013
# file_id, self._new_revision_id, self.repository.weave_store)
2014
# special case to avoid diffing on renames or
2016
if (len(file_parents) == 1
2017
and text_sha1 == file_parents.values()[0].text_sha1
2018
and text_size == file_parents.values()[0].text_size):
2019
previous_ie = file_parents.values()[0]
2020
versionedfile = self.repository.weave_store.get_weave(file_id,
2021
self.repository.get_transaction())
2022
versionedfile.clone_text(self._new_revision_id,
2023
previous_ie.revision, file_parents.keys())
2024
return text_sha1, text_size
2026
new_lines = get_content_byte_lines()
2027
# TODO: Rather than invoking sha_strings here, _add_text_to_weave
2028
# should return the SHA1 and size
2029
self._add_text_to_weave(file_id, new_lines, file_parents.keys())
2030
return osutils.sha_strings(new_lines), \
2031
sum(map(len, new_lines))
2033
def modified_link(self, file_id, file_parents, link_target):
2034
"""Record the presence of a symbolic link.
2036
:param file_id: The file_id of the link to record.
2037
:param file_parents: The per-file parent revision ids.
2038
:param link_target: Target location of this link.
2040
self._add_text_to_weave(file_id, [], file_parents.keys())
2042
def _add_text_to_weave(self, file_id, new_lines, parents):
2043
versionedfile = self.repository.weave_store.get_weave_or_empty(
2044
file_id, self.repository.get_transaction())
2045
versionedfile.add_lines(self._new_revision_id, parents, new_lines)
2046
versionedfile.clear_cache()
2049
class _CommitBuilder(CommitBuilder):
2050
"""Temporary class so old CommitBuilders are detected properly
2052
Note: CommitBuilder works whether or not root entry is recorded.
2055
record_root_entry = True
2058
class RootCommitBuilder(CommitBuilder):
2059
"""This commitbuilder actually records the root id"""
2061
record_root_entry = True
2063
def record_entry_contents(self, ie, parent_invs, path, tree):
2064
"""Record the content of ie from tree into the commit if needed.
2066
Side effect: sets ie.revision when unchanged
2068
:param ie: An inventory entry present in the commit.
2069
:param parent_invs: The inventories of the parent revisions of the
2071
:param path: The path the entry is at in the tree.
2072
:param tree: The tree which contains this entry and should be used to
2075
assert self.new_inventory.root is not None or ie.parent_id is None
2076
self.new_inventory.add(ie)
2078
# ie.revision is always None if the InventoryEntry is considered
2079
# for committing. ie.snapshot will record the correct revision
2080
# which may be the sole parent if it is untouched.
2081
if ie.revision is not None:
2084
previous_entries = ie.find_previous_heads(
2086
self.repository.weave_store,
2087
self.repository.get_transaction())
2088
# we are creating a new revision for ie in the history store
2090
ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
2102
def _unescaper(match, _map=_unescape_map):
2103
code = match.group(1)
2107
if not code.startswith('#'):
2109
return unichr(int(code[1:])).encode('utf8')
2115
def _unescape_xml(data):
2116
"""Unescape predefined XML entities in a string of data."""
2118
if _unescape_re is None:
2119
_unescape_re = re.compile('\&([^;]*);')
2120
return _unescape_re.sub(_unescaper, data)
added
removed
bzrlib/repository.py
