Merge lp:~jelmer/brz/path2ie-more into lp:brz

[Jelmer Vernooij]

Use _path2ie in a couple more places.

Use _path2ie in a couple more places.

[Martin Packman (gz)]

Thanks, looks good.

review: Approve

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-09-14 14:35:18 +0000
+++ breezy/bzr/workingtree.py	2018-09-17 13:35:59 +0000
@@ -731,12 +731,12 @@
             raise
 
     def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
-        inv, file_id = self._path2inv_file_id(path)
-        if file_id is None:
+        try:
+            return self._path2ie(path).executable
+        except errors.NoSuchFile:
             # For unversioned files on win32, we just assume they are not
             # executable
             return False
-        return inv.get_entry(file_id).executable
 
     def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
         mode = stat_result.st_mode
@@ -744,8 +744,8 @@
 
     def is_executable(self, path, file_id=None):
         if not self._supports_executable():
-            inv, inv_file_id = self._path2inv_file_id(path)
-            return inv.get_entry(inv_file_id).executable
+            ie = self._path2ie(path)
+            return ie.executable
         else:
             mode = os.lstat(self.abspath(path)).st_mode
             return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
@@ -1455,10 +1455,7 @@
 
     def stored_kind(self, path, file_id=None):
         """See Tree.stored_kind"""
-        inv, inv_file_id = self._path2inv_file_id(path)
-        if inv_file_id is None:
-            raise errors.NoSuchFile(self, path)
-        return inv.get_entry(inv_file_id).kind
+        return self._path2ie(path).kind
 
     def extras(self):
         """Yield all unversioned files in this WorkingTree.