← 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-12 16:12:23 UTC
  • mfrom: (6060.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110812161223-hfvwsgbtb9vype5r
(vila) Merge 2.4 into trunk (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1540
1540
        # For bzr native formats must_fetch is just the tip, and if_present_fetch
1541
1541
        # are the tags.
1542
1542
        must_fetch = set([self.last_revision()])
1543
 
        try:
1544
 
            if_present_fetch = set(self.tags.get_reverse_tag_dict())
1545
 
        except errors.TagsNotSupported:
1546
 
            if_present_fetch = set()
 
1543
        if_present_fetch = set()
 
1544
        c = self.get_config()
 
1545
        include_tags = c.get_user_option_as_bool('branch.fetch_tags',
 
1546
                                                 default=False)
 
1547
        if include_tags:
 
1548
            try:
 
1549
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
 
1550
            except errors.TagsNotSupported:
 
1551
                pass
1547
1552
        must_fetch.discard(_mod_revision.NULL_REVISION)
1548
1553
        if_present_fetch.discard(_mod_revision.NULL_REVISION)
1549
1554
        return must_fetch, if_present_fetch