~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-02 10:24:02 UTC
  • mfrom: (6404.1.2 branch-fetch-tags)
  • Revision ID: pqm@pqm.ubuntu.com-20120102102402-f8tlazxhdypu44ej
(vila) Migrate the 'branch.fetch_tags' option to config stacks. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1566
1566
            heads that must be fetched if present, but no error is necessary if
1567
1567
            they are not present.
1568
1568
        """
1569
 
        # For bzr native formats must_fetch is just the tip, and if_present_fetch
1570
 
        # are the tags.
 
1569
        # For bzr native formats must_fetch is just the tip, and
 
1570
        # if_present_fetch are the tags.
1571
1571
        must_fetch = set([self.last_revision()])
1572
1572
        if_present_fetch = set()
1573
 
        c = self.get_config()
1574
 
        include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1575
 
                                                 default=False)
1576
 
        if include_tags:
 
1573
        if self.get_config_stack().get('branch.fetch_tags'):
1577
1574
            try:
1578
1575
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
1579
1576
            except errors.TagsNotSupported: