Collapse --acl and --xattr into --extended-filesystem-attributes to cover all...

Collapse --acl and --xattr into --extended-filesystem-attributes to cover all of these extended attributes, defaulting the new option to false (ie. to not check these very expensive external calls).

diffoscope/comparators/directory.py

@@ -194,7 +194,7 @@ def compare_meta(path1, path2):
     if os.path.islink(path1) or os.path.islink(path2):
         return [d for d in differences if d is not None]
 
-    if Config().acl:
+    if Config().extended_filesystem_attributes:
         try:
             differences.append(
                 Difference.from_operation(Getfacl, path1, path2, short=True)
@@ -204,7 +204,6 @@ def compare_meta(path1, path2):
                 "Unable to find 'getfacl', some directory metadata differences might not be noticed."
             )
 
-    if Config().xattr:
         try:
             lsattr1 = lsattr(path1)
             lsattr2 = lsattr(path2)

diffoscope/main.py

@@ -311,18 +311,13 @@ def create_parser():
         "systems.",
     )
     group3.add_argument(
-        "--acl",
-        "--no-acl",
+        "--extended-filesystem-attributes",
+        "--no-extended-filesystem-attributes",
         action=BooleanAction,
-        default=True,
-        help="Examine POSIX ACLs (default: True)",
-    )
-    group3.add_argument(
-        "--xattr",
-        "--no-xattr",
-        action=BooleanAction,
-        default=True,
-        help="Examine extended attributes (default: True)",
+        default=False,
+        help="Check potentially-expensive filesystem extended "
+        "attributes such as POSIX ACLs, lsattr(1) attributes etc. "
+        "(default: False)",
     )
     group3.add_argument(
         "--diff-mask",
@@ -659,8 +654,9 @@ def configure(parsed_args):
     Config().exclude_directory_metadata = (
         parsed_args.exclude_directory_metadata
     )
-    Config().acl = parsed_args.acl
-    Config().xattr = parsed_args.xattr
+    Config().extended_filesystem_attributes = (
+        parsed_args.extended_filesystem_attributes
+    )
     Config().diff_masks = parsed_args.diff_masks
 
     Config().compute_visual_diffs = PresenterManager().compute_visual_diffs()