← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Martin Pool
  • Date: 2006-05-17 07:09:13 UTC
  • mfrom: (1668.1.15 bzr-0.8.mbp)
  • mto: This revision was merged to the branch mainline in revision 1710.
  • Revision ID: mbp@sourcefrog.net-20060517070913-723e387ac91d55c0
merge 0.8 fix branch, including register-branch plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1463
1463
        target_ids = set(self.target.all_revision_ids())
1464
1464
        if revision_id is not None:
1465
1465
            source_ids = self.source.get_ancestry(revision_id)
1466
 
            assert source_ids.pop(0) == None
 
1466
            assert source_ids[0] == None
 
1467
            source_ids.pop(0)
1467
1468
        else:
1468
1469
            source_ids = self.source.all_revision_ids()
1469
1470
        result_set = set(source_ids).difference(target_ids)
1572
1573
        # - RBC 20060209
1573
1574
        if revision_id is not None:
1574
1575
            source_ids = self.source.get_ancestry(revision_id)
1575
 
            assert source_ids.pop(0) == None
 
1576
            assert source_ids[0] == None
 
1577
            source_ids.pop(0)
1576
1578
        else:
1577
1579
            source_ids = self.source._all_possible_ids()
1578
1580
        source_ids_set = set(source_ids)
1634
1636
        """See InterRepository.missing_revision_ids()."""
1635
1637
        if revision_id is not None:
1636
1638
            source_ids = self.source.get_ancestry(revision_id)
1637
 
            assert source_ids.pop(0) == None
 
1639
            assert source_ids[0] == None
 
1640
            source_ids.pop(0)
1638
1641
        else:
1639
1642
            source_ids = self.source._all_possible_ids()
1640
1643
        source_ids_set = set(source_ids)