Merge pull request #11042 from gitbutlerapp/copilot/fix-user-profile-update-issue-again

Default `but branch` to `list` subcommand

Author: Byron

crates/but/src/branch/mod.rs

@@ -10,7 +10,7 @@ mod list;
 #[derive(Debug, clap::Parser)]
 pub struct Platform {
     #[clap(subcommand)]
-    pub cmd: Subcommands,
+    pub cmd: Option<Subcommands>,
 }
 
 #[derive(Debug, clap::Subcommand)]
@@ -48,12 +48,21 @@ pub enum Subcommands {
     },
 }
 
-pub async fn handle(cmd: &Subcommands, project: &Project, _json: bool) -> anyhow::Result<()> {
+pub async fn handle(
+    cmd: &Option<Subcommands>,
+    project: &Project,
+    _json: bool,
+) -> anyhow::Result<()> {
     match cmd {
-        Subcommands::New {
+        None => {
+            let local = false;
+            list::list(project, local).await
+        }
+        Some(Subcommands::List { local }) => list::list(project, *local).await,
+        Some(Subcommands::New {
             branch_name,
             anchor,
-        } => {
+        }) => {
             let ctx =
                 CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
             // Get branch name or use canned name
@@ -120,7 +129,7 @@ pub async fn handle(cmd: &Subcommands, project: &Project, _json: bool) -> anyhow
             println!("Created branch {branch_name}");
             Ok(())
         }
-        Subcommands::Delete { branch_name, force } => {
+        Some(Subcommands::Delete { branch_name, force }) => {
             let stacks = but_api::workspace::stacks(
                 project.id,
                 Some(but_workspace::StacksFilter::InWorkspace),
@@ -141,8 +150,7 @@ pub async fn handle(cmd: &Subcommands, project: &Project, _json: bool) -> anyhow
             println!("Branch '{}' not found in any stack", branch_name);
             Ok(())
         }
-        Subcommands::List { local } => list::list(project, *local).await,
-        Subcommands::Unapply { branch_name, force } => {
+        Some(Subcommands::Unapply { branch_name, force }) => {
             let stacks = but_api::workspace::stacks(
                 project.id,
                 Some(but_workspace::StacksFilter::InWorkspace),

crates/but/src/lib.rs

@@ -154,10 +154,10 @@ pub async fn handle_args(args: impl Iterator<Item = OsString>) -> Result<()> {
             let project = get_or_init_project(&args.current_dir)?;
             let result = branch::handle(cmd, &project, args.json).await;
             let metrics_command = match cmd {
-                branch::Subcommands::New { .. } => CommandName::BranchNew,
-                branch::Subcommands::Delete { .. } => CommandName::BranchDelete,
-                branch::Subcommands::List { .. } => CommandName::BranchList,
-                branch::Subcommands::Unapply { .. } => CommandName::BranchUnapply,
+                None | Some(branch::Subcommands::List { .. }) => CommandName::BranchList,
+                Some(branch::Subcommands::New { .. }) => CommandName::BranchNew,
+                Some(branch::Subcommands::Delete { .. }) => CommandName::BranchDelete,
+                Some(branch::Subcommands::Unapply { .. }) => CommandName::BranchUnapply,
             };
             metrics_if_configured(app_settings, metrics_command, props(start, &result)).ok();
             result

crates/but/tests/but/journey.rs

@@ -118,6 +118,18 @@ fn from_workspace() -> anyhow::Result<()> {
         "snapshots/from-workspace/status01-verbose.stdout.term.svg"
     ]);
 
+    // List is the default
+    env.but("branch")
+        .assert()
+        .success()
+        .stdout_eq(file!["snapshots/from-workspace/branch01.stdout.term.svg"]);
+
+    // But list is also explicit.
+    env.but("branch list")
+        .assert()
+        .success()
+        .stdout_eq(file!["snapshots/from-workspace/branch01.stdout.term.svg"]);
+
     // TODO: more operations on the repository!
     Ok(())
 }