/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: Aaron Bentley
  • Date: 2007-06-28 16:50:06 UTC
  • mfrom: (2561 +trunk)
  • mto: (2520.4.116 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2572.
  • Revision ID: abentley@panoramicfeedback.com-20070628165006-m7bd56ngqs26rd91
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
847
847
    _formats = {}
848
848
    """The known formats."""
849
849
 
 
850
    def __eq__(self, other):
 
851
        return self.__class__ is other.__class__
 
852
 
 
853
    def __ne__(self, other):
 
854
        return not (self == other)
 
855
 
850
856
    @classmethod
851
857
    def find_format(klass, a_bzrdir):
852
858
        """Return the format for the branch object in a_bzrdir."""
1448
1454
            # we fetch here regardless of whether we need to so that we pickup
1449
1455
            # filled in ghosts.
1450
1456
            self.fetch(other, stop_revision)
1451
 
            my_ancestry = self.repository.get_ancestry(last_rev)
 
1457
            my_ancestry = self.repository.get_ancestry(last_rev,
 
1458
                                                       topo_sorted=False)
1452
1459
            if stop_revision in my_ancestry:
1453
1460
                # last_revision is a descendant of stop_revision
1454
1461
                return
1807
1814
        if master is not None:
1808
1815
            old_tip = self.last_revision()
1809
1816
            self.pull(master, overwrite=True)
1810
 
            if old_tip in self.repository.get_ancestry(self.last_revision()):
 
1817
            if old_tip in self.repository.get_ancestry(self.last_revision(),
 
1818
                                                       topo_sorted=False):
1811
1819
                return None
1812
1820
            return old_tip
1813
1821
        return None