/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 16:49:28 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205164928-nmcybzip5kdhiwon
Use 2to3 set_literal fixer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1538
1538
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1539
1539
        """
1540
1540
        heads = graph.heads([revision_a, revision_b])
1541
 
        if heads == set([revision_b]):
 
1541
        if heads == {revision_b}:
1542
1542
            return 'b_descends_from_a'
1543
 
        elif heads == set([revision_a, revision_b]):
 
1543
        elif heads == {revision_a, revision_b}:
1544
1544
            # These branches have diverged
1545
1545
            return 'diverged'
1546
 
        elif heads == set([revision_a]):
 
1546
        elif heads == {revision_a}:
1547
1547
            return 'a_descends_from_b'
1548
1548
        else:
1549
1549
            raise AssertionError("invalid heads: %r" % (heads,))
1559
1559
        """
1560
1560
        # For bzr native formats must_fetch is just the tip, and
1561
1561
        # if_present_fetch are the tags.
1562
 
        must_fetch = set([self.last_revision()])
 
1562
        must_fetch = {self.last_revision()}
1563
1563
        if_present_fetch = set()
1564
1564
        if self.get_config_stack().get('branch.fetch_tags'):
1565
1565
            try: