← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-09-13 09:34:31 UTC
  • mto: (1185.8.2) (974.1.91)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: mbp@sourcefrog.net-20050913093431-9f8dd22d28d6510d
- merge pull & missing-revision improvements from aaron

aaron.bentley@utoronto.ca-20050913024207-489d573af4b76c4d

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
584
584
        try:
585
585
            try:
586
586
                return self.revision_store[revision_id]
587
 
            except IndexError:
 
587
            except KeyError:
588
588
                raise bzrlib.errors.NoSuchRevision(self, revision_id)
589
589
        finally:
590
590
            self.unlock()
834
834
        if hasattr(other.revision_store, "prefetch"):
835
835
            other.revision_store.prefetch(revision_ids)
836
836
        if hasattr(other.inventory_store, "prefetch"):
837
 
            inventory_ids = [other.get_revision(r).inventory_id
838
 
                             for r in revision_ids]
 
837
            inventory_ids = []
 
838
            for rev_id in revision_ids:
 
839
                try:
 
840
                    revision = other.get_revision(rev_id).inventory_id
 
841
                    inventory_ids.append(revision)
 
842
                except bzrlib.errors.NoSuchRevision:
 
843
                    pass
839
844
            other.inventory_store.prefetch(inventory_ids)
840
845
 
841
846
        if pb is None: