← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-04 21:25:46 UTC
  • mfrom: (4409 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090604212546-dpmrzvg49q40tvnj
Merge bzr.dev 4409, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2245
2245
        while True:
2246
2246
            if next_id in (None, _mod_revision.NULL_REVISION):
2247
2247
                return
 
2248
            try:
 
2249
                parents = graph.get_parent_map([next_id])[next_id]
 
2250
            except KeyError:
 
2251
                raise errors.RevisionNotPresent(next_id, self)
2248
2252
            yield next_id
2249
 
            # Note: The following line may raise KeyError in the event of
2250
 
            # truncated history. We decided not to have a try:except:raise
2251
 
            # RevisionNotPresent here until we see a use for it, because of the
2252
 
            # cost in an inner loop that is by its very nature O(history).
2253
 
            # Robert Collins 20080326
2254
 
            parents = graph.get_parent_map([next_id])[next_id]
2255
2253
            if len(parents) == 0:
2256
2254
                return
2257
2255
            else: