← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

(vila) Output time stamps while running ``make check`` to get better
 timings from pqm (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
785
785
                                  other_branch=None):
786
786
        """See Branch.generate_revision_history"""
787
787
        graph = self.repository.get_graph()
 
788
        (last_revno, last_revid) = self.last_revision_info()
788
789
        known_revision_ids = [
789
 
            self.last_revision_info(),
 
790
            (last_revid, last_revno),
790
791
            (_mod_revision.NULL_REVISION, 0),
791
792
            ]
792
793
        if last_rev is not None:
1545
1546
        # For bzr native formats must_fetch is just the tip, and if_present_fetch
1546
1547
        # are the tags.
1547
1548
        must_fetch = set([self.last_revision()])
1548
 
        try:
1549
 
            if_present_fetch = set(self.tags.get_reverse_tag_dict())
1550
 
        except errors.TagsNotSupported:
1551
 
            if_present_fetch = set()
 
1549
        if_present_fetch = set()
 
1550
        c = self.get_config()
 
1551
        include_tags = c.get_user_option_as_bool('branch.fetch_tags',
 
1552
                                                 default=False)
 
1553
        if include_tags:
 
1554
            try:
 
1555
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
 
1556
            except errors.TagsNotSupported:
 
1557
                pass
1552
1558
        must_fetch.discard(_mod_revision.NULL_REVISION)
1553
1559
        if_present_fetch.discard(_mod_revision.NULL_REVISION)
1554
1560
        return must_fetch, if_present_fetch