← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-09 12:34:00 UTC
  • mfrom: (6056.2.5 option-registry)
  • Revision ID: pqm@pqm.ubuntu.com-20110809123400-x521f2j9jkxx8ze2
(vila) Introduce OptionRegistry (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

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