cli: replace --config-toml=TOML with --config=NAME=VALUE

cli/src/cli_util.rs

@@ -2609,7 +2609,7 @@ pub fn print_snapshot_stats(
               - Adding the file to `.gitignore`
               - Run `jj config set --repo snapshot.max-new-file-size {size}`
                 This will increase the maximum file size allowed for new files, in this repository only.
-              - Run `jj --config-toml 'snapshot.max-new-file-size={size}' st`
+              - Run `jj --config snapshot.max-new-file-size={size} st`
                 This will increase the maximum file size allowed for new files, for this command only.
             "
         )?;
@@ -3682,11 +3682,11 @@ impl CliRunner {
             maybe_cwd_workspace_loader
         };
 
-        // Apply workspace configs and --config-toml arguments.
+        // Apply workspace configs and --config arguments.
         ui.reset(&config)?;
 
         // If -R is specified, check if the expanded arguments differ. Aliases
-        // can also be injected by --config-toml, but that's obviously wrong.
+        // can also be injected by --config, but that's obviously wrong.
         if args.global_args.repository.is_some() {
             let new_string_args = expand_args(ui, &self.app, env::args_os(), &config).ok();
             if new_string_args.as_ref() != Some(&string_args) {

cli/src/complete.rs

@@ -35,9 +35,7 @@ use crate::config::ConfigEnv;
 use crate::config::CONFIG_SCHEMA;
 use crate::ui::Ui;
 
-const BOOKMARK_HELP_TEMPLATE: &str = r#"
-[template-aliases]
-"bookmark_help()" = """
+const BOOKMARK_HELP_TEMPLATE: &str = r#"template-aliases.'bookmark_help()'='''
 " " ++
 if(normal_target,
     if(normal_target.description(),
@@ -46,8 +44,7 @@ if(normal_target,
     ),
     "(conflicted bookmark)",
 )
-"""
-"#;
+'''"#;
 
 /// A helper function for various completer functions. It returns
 /// (candidate, help) assuming they are separated by a space.
@@ -64,7 +61,7 @@ pub fn local_bookmarks() -> Vec<CompletionCandidate> {
             .build()
             .arg("bookmark")
             .arg("list")
-            .arg("--config-toml")
+            .arg("--config")
             .arg(BOOKMARK_HELP_TEMPLATE)
             .arg("--template")
             .arg(r#"if(!remote, name ++ bookmark_help()) ++ "\n""#)
@@ -86,7 +83,7 @@ pub fn tracked_bookmarks() -> Vec<CompletionCandidate> {
             .arg("bookmark")
             .arg("list")
             .arg("--tracked")
-            .arg("--config-toml")
+            .arg("--config")
             .arg(BOOKMARK_HELP_TEMPLATE)
             .arg("--template")
             .arg(r#"if(remote, name ++ '@' ++ remote ++ bookmark_help() ++ "\n")"#)
@@ -108,7 +105,7 @@ pub fn untracked_bookmarks() -> Vec<CompletionCandidate> {
             .arg("bookmark")
             .arg("list")
             .arg("--all-remotes")
-            .arg("--config-toml")
+            .arg("--config")
             .arg(BOOKMARK_HELP_TEMPLATE)
             .arg("--template")
             .arg(
@@ -146,7 +143,7 @@ pub fn bookmarks() -> Vec<CompletionCandidate> {
             .arg("bookmark")
             .arg("list")
             .arg("--all-remotes")
-            .arg("--config-toml")
+            .arg("--config")
             .arg(BOOKMARK_HELP_TEMPLATE)
             .arg("--template")
             .arg(
@@ -238,7 +235,7 @@ fn revisions(revisions: Option<&str>) -> Vec<CompletionCandidate> {
         cmd.arg("bookmark")
             .arg("list")
             .arg("--all-remotes")
-            .arg("--config-toml")
+            .arg("--config")
             .arg(BOOKMARK_HELP_TEMPLATE)
             .arg("--template")
             .arg(
@@ -278,7 +275,7 @@ fn revisions(revisions: Option<&str>) -> Vec<CompletionCandidate> {
                 .build()
                 .arg("tag")
                 .arg("list")
-                .arg("--config-toml")
+                .arg("--config")
                 .arg(BOOKMARK_HELP_TEMPLATE)
                 .arg("--template")
                 .arg(r#"name ++ bookmark_help() ++ "\n""#)
@@ -370,8 +367,8 @@ pub fn workspaces() -> Vec<CompletionCandidate> {
     with_jj(|jj, _| {
         let output = jj
             .build()
-            .arg("--config-toml")
-            .arg(r#"templates.commit_summary = 'if(description, description.first_line(), "(no description set)")'"#)
+            .arg("--config")
+            .arg(r#"templates.commit_summary='if(description, description.first_line(), "(no description set)")'"#)
             .arg("workspace")
             .arg("list")
             .output()
@@ -472,8 +469,7 @@ fn all_files_from_rev(rev: String, current: &std::ffi::OsStr) -> Vec<CompletionC
             .arg("list")
             .arg("--revision")
             .arg(rev)
-            .arg("--config-toml")
-            .arg("ui.allow-filesets = true")
+            .arg("--config=ui.allow-filesets=true")
             .arg(current_prefix_to_fileset(current))
             .stdout(std::process::Stdio::piped())
             .spawn()
@@ -505,8 +501,7 @@ fn modified_files_from_rev_with_jj_cmd(
     };
     cmd.arg("diff")
         .arg("--summary")
-        .arg("--config-toml")
-        .arg("ui.allow-filesets = true")
+        .arg("--config=ui.allow-filesets=true")
         .arg(current_prefix_to_fileset(current));
     match rev {
         (rev, None) => cmd.arg("--revision").arg(rev),
@@ -558,8 +553,7 @@ fn conflicted_files_from_rev(rev: &str, current: &std::ffi::OsStr) -> Vec<Comple
             .arg("--list")
             .arg("--revision")
             .arg(rev)
-            .arg("--config-toml")
-            .arg("ui.allow-filesets = true")
+            .arg("--config=ui.allow-filesets=true")
             .arg(current_prefix_to_fileset(current))
             .output()
             .map_err(user_error)?;

cli/tests/test_builtin_aliases.rs

@@ -37,7 +37,7 @@ fn set_up(trunk_name: &str) -> (TestEnvironment, PathBuf) {
         &[
             "git",
             "clone",
-            "--config-toml=git.auto-local-bookmark=true",
+            "--config=git.auto-local-bookmark=true",
             origin_git_repo_path.to_str().unwrap(),
             "local",
         ],

cli/tests/test_commit_command.rs

@@ -136,7 +136,7 @@ fn test_commit_interactive() {
         &workspace_path,
         &[
             "commit",
-            "--config-toml=ui.diff-editor='false'",
+            "--config=ui.diff-editor='false'",
             "--tool=fake-diff-editor",
         ],
     );
@@ -357,9 +357,8 @@ fn test_commit_reset_author() {
         &repo_path,
         &[
             "commit",
-            "--config-toml",
-            r#"user.name = "Ove Ridder"
-            user.email = "[email protected]""#,
+            "--config=user.name=Ove Ridder",
+            "[email protected]",
             "--reset-author",
             "-m1",
         ],

cli/tests/test_commit_template.rs

@@ -192,8 +192,8 @@ fn test_mine_is_true_when_author_is_user() {
     test_env.jj_cmd_ok(
         &repo_path,
         &[
-            "--config-toml=user.email='[email protected]'",
-            "--config-toml=user.name='John Doe'",
+            "[email protected]",
+            "--config=user.name=John Doe",
             "new",
         ],
     );
@@ -280,11 +280,7 @@ fn test_log_builtin_templates() {
 
     test_env.jj_cmd_ok(
         &repo_path,
-        &[
-            "--config-toml=user.email=''",
-            "--config-toml=user.name=''",
-            "new",
-        ],
+        &["--config=user.email=''", "--config=user.name=''", "new"],
     );
     test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]);
 
@@ -353,11 +349,7 @@ fn test_log_builtin_templates_colored() {
 
     test_env.jj_cmd_ok(
         &repo_path,
-        &[
-            "--config-toml=user.email=''",
-            "--config-toml=user.name=''",
-            "new",
-        ],
+        &["--config=user.email=''", "--config=user.name=''", "new"],
     );
     test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]);
 
@@ -421,11 +413,7 @@ fn test_log_builtin_templates_colored_debug() {
 
     test_env.jj_cmd_ok(
         &repo_path,
-        &[
-            "--config-toml=user.email=''",
-            "--config-toml=user.name=''",
-            "new",
-        ],
+        &["--config=user.email=''", "--config=user.name=''", "new"],
     );
     test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]);
 
@@ -751,7 +739,7 @@ fn test_log_customize_short_id() {
         &repo_path,
         &[
             "log",
-            "--config-toml",
+            "--config",
             &format!(r#"{decl}='id.shortest(5).prefix().upper() ++ "_" ++ id.shortest(5).rest()'"#),
         ],
     );
@@ -766,11 +754,7 @@ fn test_log_customize_short_id() {
         &repo_path,
         &[
             "log",
-            "--config-toml",
-            r#"
-                [template-aliases]
-                'format_short_change_id(id)'='format_short_id(id).upper()'
-            "#,
+            "--config=template-aliases.'format_short_change_id(id)'='format_short_id(id).upper()'",
         ],
     );
     insta::assert_snapshot!(stdout, @r###"

cli/tests/test_completion.rs

@@ -337,14 +337,13 @@ fn test_aliases_are_completed() {
     );
     insta::assert_snapshot!(stdout, @"repo-alias");
 
-    // cannot load aliases from --config-toml flag
+    // cannot load aliases from --config flag
     let stdout = test_env.jj_cmd_success(
         test_env.env_root(),
         &[
             "--",
             "jj",
-            "--config-toml",
-            "aliases.cli-alias = ['bookmark']",
+            "--config=aliases.cli-alias=['bookmark']",
             "cli-al",
         ],
     );

cli/tests/test_config_command.rs

@@ -185,7 +185,7 @@ bar
             "list",
             "multiline",
             "--include-overridden",
-            "--config-toml=multiline='single'",
+            "--config=multiline='single'",
         ],
     );
     insta::assert_snapshot!(stdout, @r"
@@ -293,7 +293,7 @@ fn test_config_layer_override_default() {
             "config",
             "list",
             config_key,
-            "--config-toml",
+            "--config",
             &format!("{config_key}={value:?}", value = "command-arg"),
         ],
     );
@@ -309,7 +309,7 @@ fn test_config_layer_override_default() {
             "list",
             config_key,
             "--include-overridden",
-            "--config-toml",
+            "--config",
             &format!("{config_key}={value:?}", value = "command-arg"),
         ],
     );
@@ -381,7 +381,7 @@ fn test_config_layer_override_env() {
             "config",
             "list",
             config_key,
-            "--config-toml",
+            "--config",
             &format!("{config_key}={value:?}", value = "command-arg"),
         ],
     );
@@ -397,7 +397,7 @@ fn test_config_layer_override_env() {
             "list",
             config_key,
             "--include-overridden",
-            "--config-toml",
+            "--config",
             &format!("{config_key}={value:?}", value = "command-arg"),
         ],
     );

cli/tests/test_describe_command.rs

@@ -602,9 +602,8 @@ fn test_describe_author() {
         &repo_path,
         &[
             "describe",
-            "--config-toml",
-            r#"user.name = "Ove Ridder"
-            user.email = "[email protected]""#,
+            "--config=user.name=Ove Ridder",
+            "[email protected]",
             "--no-edit",
             "--reset-author",
         ],
@@ -628,9 +627,8 @@ fn test_describe_author() {
             "describe",
             "@---",
             "@-",
-            "--config-toml",
-            r#"user.name = "Ove Ridder"
-            user.email = "[email protected]""#,
+            "--config=user.name=Ove Ridder",
+            "[email protected]",
             "--reset-author",
         ],
     );