refactor

Author: Byron

Cargo.lock

@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3", features = [
 tracing-forest = { version = "0.2.0" }
 ratatui = "0.29.0"
 crossterm = "0.29.0"
-open.workspace = true
+atty = "0.2.0"
 
 [dev-dependencies]
 but-core = { workspace = true, features = ["testing"] }

crates/but/Cargo.toml

@@ -1,9 +1,9 @@
-use std::io::{self, Write};
-
+use atty::Stream;
 use but_settings::AppSettings;
 use but_workspace::{StackId, ui::StackEntry};
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
+use std::io::{self, Write};
 
 mod list;
 
@@ -126,7 +126,11 @@ pub async fn handle(
                     anchor,
                 },
             )?;
-            println!("{branch_name}");
+            if atty::is(Stream::Stdout) {
+                println!("Created branch {branch_name}");
+            } else {
+                println!("{branch_name}");
+            }
             Ok(())
         }
         Some(Subcommands::Delete { branch_name, force }) => {

crates/but/src/branch/mod.rs

@@ -1,4 +1,5 @@
 use crate::utils::{Sandbox, setup_metadata};
+use snapbox::str;
 
 #[test]
 fn branch_new_outputs_branch_name() -> anyhow::Result<()> {
@@ -11,41 +12,22 @@ fn branch_new_outputs_branch_name() -> anyhow::Result<()> {
 
     setup_metadata(&env, &["A"])?;
 
-    // Create a new branch and capture the output
-    let output = env
-        .but("branch new my-feature")
+    env.but("branch new my-feature")
         .assert()
         .success()
-        .get_output()
-        .stdout
-        .clone();
+        .stderr_eq(str![])
+        .stdout_eq(str![[r#"
+my-feature
 
-    let output_str = String::from_utf8(output)?;
+"#]]);
 
-    // The output should be just the branch name (with newline)
-    assert_eq!(output_str.trim(), "my-feature");
-
-    Ok(())
-}
-
-#[test]
-fn branch_new_with_anchor() -> anyhow::Result<()> {
-    let env = Sandbox::init_scenario_with_target("one-stack")?;
-    setup_metadata(&env, &["A"])?;
-
-    // Create a new branch with an anchor (using longer ID)
-    let output = env
-        .but("branch new my-feature --anchor 9477ae7")
+    env.but("branch new --anchor 9477ae7 my-anchored-feature")
         .assert()
         .success()
-        .get_output()
-        .stdout
-        .clone();
-
-    let output_str = String::from_utf8(output)?;
-
-    // The output should be just the branch name (with newline)
-    assert_eq!(output_str.trim(), "my-feature");
+        .stderr_eq(str![])
+        .stdout_eq(str![[r#"
+my-anchored-feature
 
+"#]]);
     Ok(())
 }