Merge pull request #11375 from slarse/improve-test-mode-normalization

Generalize testsupport mode normalization by filetype

Author: Byron

crates/but-testsupport/src/lib.rs

@@ -289,6 +289,8 @@ pub fn visualize_tree(tree_id: gix::Id<'_>) -> termtree::Tree<String> {
     visualize_tree(tree_id.object().unwrap().peel_to_tree().unwrap().id(), None).unwrap()
 }
 
+const FILETYPE_MASK: u32 = 0o170000;
+
 /// Visualize a tree on disk with mode information.
 /// For convenience, skip `.git` and don't display the root.
 ///
@@ -304,20 +306,22 @@ pub fn visualize_tree(tree_id: gix::Id<'_>) -> termtree::Tree<String> {
 pub fn visualize_disk_tree_skip_dot_git(root: &Path) -> anyhow::Result<termtree::Tree<String>> {
     use std::os::unix::fs::MetadataExt;
     fn normalize_mode(mode: u32) -> u32 {
-        match mode {
-            0o40777 => 0o40755,
-            0o40775 => 0o40755,
-            0o10664 => 0o10644,
-            0o10666 => 0o10644,
-            0o100664 => 0o100644,
-            0o100666 => 0o100644,
-            0o100775 => 0o100755,
-            0o100777 => 0o100755,
-            0o120775 => 0o120755,
-            0o120777 => 0o120755,
-            other => other,
+        let normalize_permission_bits = |mode: u32| if mode & 0o100 == 0 { 0o644 } else { 0o755 };
+
+        match mode & FILETYPE_MASK {
+            // File types Git cares about
+            directory @ 0o40000 => directory | normalize_permission_bits(mode),
+            symlink @ 0o120000 => symlink | normalize_permission_bits(mode),
+            regular_file @ 0o100000 => regular_file | normalize_permission_bits(mode),
+
+            // File types Git does not care about. These may still appear in the worktree.
+            // Note: Add more file types here if needed (e.g. socket, block device, etc)
+            fifo @ 0o10000 => fifo | normalize_permission_bits(mode),
+
+            _ => panic!("Unhandled file mode {mode}"),
         }
     }
+
     fn label(p: &Path, md: &std::fs::Metadata) -> String {
         format!(
             "{name}:{mode:o}",