← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: John Arbash Meinel
  • Date: 2011-06-16 13:28:23 UTC
  • mto: This revision was merged to the branch mainline in revision 5978.
  • Revision ID: john@arbash-meinel.com-20110616132823-awdep2s8bt1ib4a3
Wrap a line that was too-long.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
554
554
        entry = self._invdelta.get(inv_path)
555
555
        if entry is not None:
556
556
            return entry[3]
557
 
        file_id = self.tree.path2id(self.tree._fix_case_of_inventory_path(inv_path))
 
557
        # Find a 'best fit' match if the filesystem is case-insensitive
 
558
        inv_path = self.tree._fix_case_of_inventory_path(inv_path)
 
559
        file_id = self.tree.path2id(inv_path)
558
560
        if file_id is not None:
559
561
            return self.tree.iter_entries_by_dir([file_id]).next()[1]
560
562
        return None