← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_pyx.pyx

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:08:35 UTC
  • mfrom: (4634.108.10 2.0)
  • mto: This revision was merged to the branch mainline in revision 4933.
  • Revision ID: john@arbash-meinel.com-20100105040835-sq0zrv5dte8sqqib
Merge stable, including bug #495023

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_pyx.pyx
1392
1392
            # provide.
1393
1393
            self.search_specific_file_parents.add('')
1394
1394
 
1395
 
    cdef void _update_current_block(self):
 
1395
    cdef int _update_current_block(self) except -1:
1396
1396
        if (self.block_index < len(self.state._dirblocks) and
1397
1397
            osutils.is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):
1398
1398
            self.current_block = self.state._dirblocks[self.block_index]
1401
1401
        else:
1402
1402
            self.current_block = None
1403
1403
            self.current_block_list = None
 
1404
        return 0
1404
1405
 
1405
1406
    def __next__(self):
1406
1407
        # Simple thunk to allow tail recursion without pyrex confusion