← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Aaron Bentley
  • Date: 2009-06-26 03:44:30 UTC
  • mfrom: (4481 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4482.
  • Revision ID: aaron@aaronbentley.com-20090626034430-5btbqa44ikywccsu
Merge bzr.dev into vpipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
2938
2938
                           False, DirState.NULLSTAT)
2939
2939
    state._dirblock_state = DirState.IN_MEMORY_MODIFIED
2940
2940
    return link_or_sha1
2941
 
update_entry = py_update_entry
2942
2941
 
2943
2942
 
2944
2943
class ProcessEntryPython(object):
3575
3574
                        current_dir_info = dir_iterator.next()
3576
3575
                    except StopIteration:
3577
3576
                        current_dir_info = None
3578
 
_process_entry = ProcessEntryPython
3579
3577
 
3580
3578
 
3581
3579
# Try to load the compiled form if possible
3582
3580
try:
3583
 
    from bzrlib._dirstate_helpers_c import (
3584
 
        _read_dirblocks_c as _read_dirblocks,
3585
 
        bisect_dirblock_c as bisect_dirblock,
3586
 
        _bisect_path_left_c as _bisect_path_left,
3587
 
        _bisect_path_right_c as _bisect_path_right,
3588
 
        cmp_by_dirs_c as cmp_by_dirs,
 
3581
    from bzrlib._dirstate_helpers_pyx import (
 
3582
        _read_dirblocks,
 
3583
        bisect_dirblock,
 
3584
        _bisect_path_left,
 
3585
        _bisect_path_right,
 
3586
        cmp_by_dirs,
3589
3587
        ProcessEntryC as _process_entry,
3590
3588
        update_entry as update_entry,
3591
3589
        )
3592
3590
except ImportError:
3593
3591
    from bzrlib._dirstate_helpers_py import (
3594
 
        _read_dirblocks_py as _read_dirblocks,
3595
 
        bisect_dirblock_py as bisect_dirblock,
3596
 
        _bisect_path_left_py as _bisect_path_left,
3597
 
        _bisect_path_right_py as _bisect_path_right,
3598
 
        cmp_by_dirs_py as cmp_by_dirs,
 
3592
        _read_dirblocks,
 
3593
        bisect_dirblock,
 
3594
        _bisect_path_left,
 
3595
        _bisect_path_right,
 
3596
        cmp_by_dirs,
3599
3597
        )
 
3598
    # FIXME: It would be nice to be able to track moved lines so that the
 
3599
    # corresponding python code can be moved to the _dirstate_helpers_py
 
3600
    # module. I don't want to break the history for this important piece of
 
3601
    # code so I left the code here -- vila 20090622
 
3602
    update_entry = py_update_entry
 
3603
    _process_entry = ProcessEntryPython