← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-09 17:04:46 UTC
  • mfrom: (6055.1.3 822571-bzr-home-unicode)
  • Revision ID: pqm@pqm.ubuntu.com-20110809170446-f1wc1a8fhgnxi4cn
(vila) Decode BZR_HOME with fs encoding to allow unicode homes. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
 
19
import itertools
19
20
import time
20
21
 
21
22
from bzrlib import (
31
32
    revision as _mod_revision,
32
33
    testament as _mod_testament,
33
34
    tsort,
 
35
    gpg,
34
36
    )
35
37
from bzrlib.bundle import serializer
36
38
""")
338
340
        """
339
341
        self.control_files.break_lock()
340
342
 
341
 
    @needs_read_lock
342
 
    def _eliminate_revisions_not_present(self, revision_ids):
343
 
        """Check every revision id in revision_ids to see if we have it.
344
 
 
345
 
        Returns a set of the present revisions.
346
 
        """
347
 
        result = []
348
 
        graph = self.get_graph()
349
 
        parent_map = graph.get_parent_map(revision_ids)
350
 
        # The old API returned a list, should this actually be a set?
351
 
        return parent_map.keys()
352
 
 
353
343
    @staticmethod
354
344
    def create(a_bzrdir):
355
345
        """Construct the current default format repository in a_bzrdir."""
521
511
        if revid and committers:
522
512
            result['committers'] = 0
523
513
        if revid and revid != _mod_revision.NULL_REVISION:
 
514
            graph = self.get_graph()
524
515
            if committers:
525
516
                all_committers = set()
526
 
            revisions = self.get_ancestry(revid)
527
 
            # pop the leading None
528
 
            revisions.pop(0)
529
 
            first_revision = None
 
517
            revisions = [r for (r, p) in graph.iter_ancestry([revid])
 
518
                        if r != _mod_revision.NULL_REVISION]
 
519
            last_revision = None
530
520
            if not committers:
531
521
                # ignore the revisions in the middle - just grab first and last
532
522
                revisions = revisions[0], revisions[-1]
533
523
            for revision in self.get_revisions(revisions):
534
 
                if not first_revision:
535
 
                    first_revision = revision
 
524
                if not last_revision:
 
525
                    last_revision = revision
536
526
                if committers:
537
527
                    all_committers.add(revision.committer)
538
 
            last_revision = revision
 
528
            first_revision = revision
539
529
            if committers:
540
530
                result['committers'] = len(all_committers)
541
531
            result['firstrev'] = (first_revision.timestamp,
584
574
    @needs_read_lock
585
575
    def search_missing_revision_ids(self, other,
586
576
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
587
 
            find_ghosts=True, revision_ids=None, if_present_ids=None):
 
577
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
578
            limit=None):
588
579
        """Return the revision ids that other has that this does not.
589
580
 
590
581
        These are returned in topological order.
603
594
                revision_ids = [revision_id]
604
595
        return InterRepository.get(other, self).search_missing_revision_ids(
605
596
            find_ghosts=find_ghosts, revision_ids=revision_ids,
606
 
            if_present_ids=if_present_ids)
 
597
            if_present_ids=if_present_ids, limit=limit)
607
598
 
608
599
    @staticmethod
609
600
    def open(base):
1000
991
            raise AssertionError('_iter_for_revno returned too much history')
1001
992
        return (True, partial_history[-1])
1002
993
 
 
994
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1003
995
    def iter_reverse_revision_history(self, revision_id):
1004
996
        """Iterate backwards through revision ids in the lefthand history
1005
997
 
1053
1045
        raise NotImplementedError(self.revision_trees)
1054
1046
 
1055
1047
    @needs_read_lock
 
1048
    @symbol_versioning.deprecated_method(
 
1049
        symbol_versioning.deprecated_in((2, 4, 0)))
1056
1050
    def get_ancestry(self, revision_id, topo_sorted=True):
1057
1051
        """Return a list of revision-ids integrated by a revision.
1058
1052
 
1062
1056
 
1063
1057
        This is topologically sorted.
1064
1058
        """
 
1059
        if 'evil' in debug.debug_flags:
 
1060
            mutter_callsite(2, "get_ancestry is linear with history.")
1065
1061
        if _mod_revision.is_null(revision_id):
1066
1062
            return [None]
1067
1063
        if not self.has_revision(revision_id):
1198
1194
        plaintext = testament.as_short_text()
1199
1195
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1200
1196
 
 
1197
    @needs_read_lock
 
1198
    def verify_revision(self, revision_id, gpg_strategy):
 
1199
        """Verify the signature on a revision.
 
1200
        
 
1201
        :param revision_id: the revision to verify
 
1202
        :gpg_strategy: the GPGStrategy object to used
 
1203
        
 
1204
        :return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
 
1205
        """
 
1206
        if not self.has_signature_for_revision_id(revision_id):
 
1207
            return gpg.SIGNATURE_NOT_SIGNED, None
 
1208
        signature = self.get_signature_text(revision_id)
 
1209
 
 
1210
        testament = _mod_testament.Testament.from_revision(self, revision_id)
 
1211
        plaintext = testament.as_short_text()
 
1212
 
 
1213
        return gpg_strategy.verify(signature, plaintext)
 
1214
 
1201
1215
    def has_signature_for_revision_id(self, revision_id):
1202
1216
        """Query for a revision signature for revision_id in the repository."""
1203
1217
        raise NotImplementedError(self.has_signature_for_revision_id)
1402
1416
    revision_graph_can_have_wrong_parents = None
1403
1417
    # Does this format support rich root data?
1404
1418
    rich_root_data = None
 
1419
    # Does this format support explicitly versioned directories?
 
1420
    supports_versioned_directories = None
1405
1421
 
1406
1422
    def __repr__(self):
1407
1423
        return "%s()" % self.__class__.__name__
1711
1727
    @needs_read_lock
1712
1728
    def search_missing_revision_ids(self,
1713
1729
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
1714
 
            find_ghosts=True, revision_ids=None, if_present_ids=None):
 
1730
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1731
            limit=None):
1715
1732
        """Return the revision ids that source has that target does not.
1716
1733
 
1717
1734
        :param revision_id: only return revision ids included by this
1725
1742
            to fetch for tags, which may reference absent revisions.
1726
1743
        :param find_ghosts: If True find missing revisions in deep history
1727
1744
            rather than just finding the surface difference.
 
1745
        :param limit: Maximum number of revisions to return, topologically
 
1746
            ordered
1728
1747
        :return: A bzrlib.graph.SearchResult.
1729
1748
        """
1730
1749
        raise NotImplementedError(self.search_missing_revision_ids)
1828
1847
        it is encountered, history extension will stop.
1829
1848
    """
1830
1849
    start_revision = partial_history_cache[-1]
1831
 
    iterator = repo.iter_reverse_revision_history(start_revision)
 
1850
    graph = repo.get_graph()
 
1851
    iterator = graph.iter_lefthand_ancestry(start_revision,
 
1852
        (_mod_revision.NULL_REVISION,))
1832
1853
    try:
1833
 
        #skip the last revision in the list
 
1854
        # skip the last revision in the list
1834
1855
        iterator.next()
1835
1856
        while True:
1836
1857
            if (stop_index is not None and