build: upgrade scm-record to v0.4.0

Note that `scm-diff-editor` is now a separate crate rather than a feature of `scm-record`, so this adds a dependency on `scm-diff-editor` as well.

Cargo.toml

@@ -87,7 +87,8 @@ rayon = "1.10.0"
 regex = "1.10.5"
 rusqlite = { version = "0.29.0", features = ["bundled"] }
 scm-bisect = { version = "0.2.0", path = "scm-bisect" }
-scm-record = "0.3.0"
+scm-diff-editor = "0.4.0"
+scm-record = "0.4.0"
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.120"
 shell-words = "1.1.0"

git-branchless-opts/Cargo.toml

@@ -11,4 +11,4 @@ clap = { workspace = true, features = ["derive"] }
 clap_mangen = { workspace = true }
 itertools = { workspace = true }
 lib = { workspace = true }
-scm-record = { workspace = true, features = ["scm-diff-editor"] }
+scm-diff-editor = { workspace = true }

git-branchless-opts/src/lib.rs

@@ -454,7 +454,7 @@ pub enum Command {
 
     /// Use the partial commit selector UI as a Git-compatible difftool; see
     /// git-difftool(1) for more information on Git difftools.
-    Difftool(scm_record::scm_diff_editor::Opts),
+    Difftool(scm_diff_editor::Opts),
 
     /// Run internal garbage collection.
     Gc,

git-branchless-record/tests/test_record.rs

@@ -99,7 +99,7 @@ fn test_record_unstaged_changes_interactive() -> eyre::Result<()> {
                 PtyAction::Write("f"), // expand files
                 PtyAction::WaitUntilContains("contents1"),
                 PtyAction::Write(" "),
-                PtyAction::WaitUntilContains("(×)"),
+                PtyAction::WaitUntilContains("(●)"),
                 PtyAction::Write("c"),
             ],
         )?;

git-branchless/Cargo.toml

@@ -49,7 +49,7 @@ path-slash = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true }
-scm-record = { workspace = true, features = ["scm-diff-editor"] }
+scm-diff-editor = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-chrome = { workspace = true }

git-branchless/src/commands/mod.rs

@@ -45,9 +45,9 @@ fn command_main(ctx: CommandContext, opts: Opts) -> EyreExitOr<()> {
         Command::BugReport => bug_report::bug_report(&effects, &git_run_info)?,
 
         Command::Difftool(opts) => {
-            let result = scm_record::scm_diff_editor::scm_diff_editor_main(opts);
+            let result = scm_diff_editor::run(opts);
             match result {
-                Ok(()) | Err(scm_record::scm_diff_editor::Error::Cancelled) => Ok(()),
+                Ok(()) | Err(scm_diff_editor::Error::Cancelled) => Ok(()),
                 Err(err) => {
                     eprintln!("Error: {err}");
                     Err(ExitCode(1))