Rev 5980: Wrap a line that was too-long. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-cicp-add-798130

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-cicp-add-798130

------------------------------------------------------------
revno: 5980
revision-id: john at arbash-meinel.com-20110616132823-awdep2s8bt1ib4a3
parent: john at arbash-meinel.com-20110616114529-n492kmtau3dg7ozr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-cicp-add-798130
timestamp: Thu 2011-06-16 15:28:23 +0200
message:
  Wrap a line that was too-long.
-------------- next part --------------
=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py	2011-06-16 11:44:10 +0000
+++ b/bzrlib/mutabletree.py	2011-06-16 13:28:23 +0000
@@ -554,7 +554,9 @@
         entry = self._invdelta.get(inv_path)
         if entry is not None:
             return entry[3]
-        file_id = self.tree.path2id(self.tree._fix_case_of_inventory_path(inv_path))
+        # Find a 'best fit' match if the filesystem is case-insensitive
+        inv_path = self.tree._fix_case_of_inventory_path(inv_path)
+        file_id = self.tree.path2id(inv_path)
         if file_id is not None:
             return self.tree.iter_entries_by_dir([file_id]).next()[1]
         return None