← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-06 16:48:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4522.
  • Revision ID: john@arbash-meinel.com-20090706164802-xkggaivxyykbgira
Track down why the annotate retry code was failing.
It was just that we were re-using a variable name, which was causing us to
retry and annotate the wrong text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
3426
3426
        while True:
3427
3427
            try:
3428
3428
                records = self._get_build_graph(key)
3429
 
                for idx, (key, text, num_lines) in enumerate(
 
3429
                for idx, (sub_key, text, num_lines) in enumerate(
3430
3430
                                                self._extract_texts(records)):
3431
3431
                    if pb is not None:
3432
3432
                        pb.update('annotating', idx, len(records))
3433
 
                    yield key, text, num_lines
 
3433
                    yield sub_key, text, num_lines
3434
3434
                return
3435
3435
            except errors.RetryWithNewPacks, e:
3436
3436
                self._vf._access.reload_or_raise(e)