Merge pull request #10559 from Byron/fix

Fix branch listing to show all local branches

Author: Byron

crates/but-testing/src/args.rs

@@ -154,6 +154,8 @@ pub enum Subcommands {
         /// A resolvable reference name.
         ref_name: String,
     },
+    /// List all available branches for which details can be obtained.
+    BranchList,
     /// Returns everything we know about the given ref, or `HEAD`.
     RefInfo {
         /// Perform all possible computations.

crates/but-testing/src/command/mod.rs

@@ -108,6 +108,7 @@ pub fn parse_diff_spec(arg: &Option<String>) -> Result<Option<Vec<DiffSpec>>, an
 mod commit;
 use crate::command::discard_change::IndicesOrHeaders;
 pub use commit::commit;
+use gitbutler_branch_actions::BranchListingFilter;
 use gitbutler_command_context::CommandContext;
 
 pub mod diff;
@@ -727,3 +728,16 @@ fn path_to_rela_path(path: &Path) -> anyhow::Result<BString> {
             .into_owned();
     Ok(rela_path)
 }
+
+pub fn branch_list(project: Option<Project>) -> anyhow::Result<()> {
+    let project = project.context("legacy code needs project")?;
+    let ctx = CommandContext::open(&project, AppSettings::default())?;
+    debug_print(gitbutler_branch_actions::list_branches(
+        &ctx,
+        Some(BranchListingFilter {
+            local: None,
+            applied: None,
+        }),
+        None,
+    )?)
+}

crates/but-testing/src/main.rs

@@ -133,6 +133,10 @@ async fn main() -> Result<()> {
         args::Subcommands::Stacks { workspace_only } => {
             command::stacks::list(&args.current_dir, args.json, args.v3, *workspace_only)
         }
+        args::Subcommands::BranchList => {
+            let (_repo, project) = repo_and_maybe_project(&args, RepositoryOpenMode::Merge)?;
+            command::branch_list(project)
+        }
         args::Subcommands::BranchDetails { ref_name } => {
             command::stacks::branch_details(ref_name, &args.current_dir, args.v3)
         }

crates/gitbutler-branch-actions/src/branch.rs

@@ -104,7 +104,7 @@ pub fn list_branches(
             )?;
             info.stacks
                 .into_iter()
-                .map(|s| GitButlerStack::new(s, &remote_names))
+                .filter_map(|s| GitButlerStack::try_new(s, &remote_names).transpose())
                 .collect::<Result<Vec<_>, _>>()?
         } else {
             Vec::new()
@@ -392,13 +392,14 @@ impl GitbutlerStackSegment {
 }
 
 impl GitButlerStack {
-    fn new(
+    fn try_new(
         stack: but_workspace::branch::Stack,
         names: &gix::remote::Names,
-    ) -> anyhow::Result<Self> {
+    ) -> anyhow::Result<Option<Self>> {
+        let Some(id) = stack.id else { return Ok(None) };
         let first_segment = stack.segments.first();
-        Ok(GitButlerStack {
-            id: stack.id.context("Can't handle stacks without ID yet")?,
+        Ok(Some(GitButlerStack {
+            id,
             // The ones we have reachable are never
             in_workspace: true,
             name: stack
@@ -436,7 +437,7 @@ impl GitButlerStack {
                     pr_or_mr: s.metadata.as_ref().and_then(|md| md.review.pull_request),
                 })
                 .collect(),
-        })
+        }))
     }
     fn new_from_old(stack: &Stack, names: &gix::remote::Names) -> anyhow::Result<Self> {
         Ok(GitButlerStack {