support for merge related options in config tree

Author: Byron

gix/src/config/tree/sections/diff.rs

@@ -165,7 +165,7 @@ mod renames {
     }
 }
 
-mod validate {
+pub(super) mod validate {
     use crate::{
         bstr::BStr,
         config::tree::{keys, Diff},

gix/src/config/tree/sections/merge.rs

@@ -1,11 +1,21 @@
 use crate::config;
 use crate::config::tree::SubSectionRequirement;
 use crate::config::{
-    tree::{keys, Key, Merge, Section},
+    tree::{diff, keys, Key, Merge, Section},
     Tree,
 };
 
 impl Merge {
+    /// The `merge.renameLimit` key.
+    pub const RENAME_LIMIT: keys::UnsignedInteger = keys::UnsignedInteger::new_unsigned_integer(
+        "renameLimit",
+        &config::Tree::MERGE,
+    )
+    .with_note(
+        "The limit is actually squared, so 1000 stands for up to 1 million diffs if fuzzy rename tracking is enabled",
+    );
+    /// The `merge.renames` key.
+    pub const RENAMES: diff::Renames = diff::Renames::new_renames("renames", &config::Tree::MERGE);
     /// The `merge.renormalize` key
     pub const RENORMALIZE: keys::Boolean = keys::Boolean::new_boolean("renormalize", &Tree::MERGE);
     /// The `merge.default` key
@@ -32,11 +42,15 @@ impl Section for Merge {
 
     fn keys(&self) -> &[&dyn Key] {
         &[
+            &Self::RENAME_LIMIT,
+            &Self::RENAMES,
             &Self::RENORMALIZE,
             &Self::DEFAULT,
             &Self::DRIVER_NAME,
             &Self::DRIVER_COMMAND,
             &Self::DRIVER_RECURSIVE,
+            #[cfg(feature = "blob-merge")]
+            &Self::CONFLICT_STYLE,
         ]
     }
 }

src/plumbing/progress.rs

@@ -29,7 +29,7 @@ impl Display for Usage {
             }
             InUse(deviation) => {
                 if !deviation.is_empty() {
-                    write!(f, "❗️❗️❗️{deviation}")?;
+                    write!(f, "❗️{deviation}")?;
                 }
             }
         }
@@ -411,12 +411,12 @@ static GIT_CONFIG: &[Record] = &[
         usage: Planned("Required for big monorepos, and typically used in conjunction with sparse indices")
     },
     Record {
-        config: "merge.renameLimit",
-        usage: Planned("The same as 'diff.renameLimit'")
+        config: "merge.directoryRenames",
+        usage: NotPlanned("On demand")
     },
     Record {
-        config: "merge.renames",
-        usage: Planned("The same as 'diff.renames'")
+        config: "merge.verbosity",
+        usage: NotApplicable("Only useful for Git CLI")
     },
     Record {
         config: "status.renameLimit",
@@ -431,7 +431,7 @@ static GIT_CONFIG: &[Record] = &[
         usage: Planned("Currently we are likely to expose passwords in errors or in other places, and it's better to by default not do that")
     },
     Record {
-        config: "diff.*.cachetextconv",
+        config: "diff.*.cacheTextConv",
         usage: NotPlanned("It seems to slow to do that, and persisting results to save a relatively cheap computation doesn't seem right")
     },
 ];