id: use BString internally for branch names

This eliminates the need for some redundant conversions.

Author: jonathantanmy2

crates/but/src/id.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, fmt::Display};
 
-use bstr::{BString, ByteSlice};
+use bstr::{BStr, BString, ByteSlice};
 use but_core::ref_metadata::StackId;
 use but_ctx::Context;
 use but_hunk_assignment::HunkAssignment;
@@ -22,7 +22,7 @@ fn branch_names(ctx: &Context) -> anyhow::Result<Vec<BString>> {
 }
 
 pub struct IdDb {
-    branch_name_to_cli_id: HashMap<String, CliId>,
+    branch_name_to_cli_id: HashMap<BString, CliId>,
     unassigned: CliId,
 }
 
@@ -56,8 +56,8 @@ impl IdDb {
             }
         }
 
-        let mut branch_name_to_cli_id: HashMap<String, CliId> = HashMap::new();
-        'branch_name: for branch_name in &branch_names {
+        let mut branch_name_to_cli_id: HashMap<BString, CliId> = HashMap::new();
+        'branch_name: for branch_name in branch_names {
             // Find first non-conflicting pair and use it as CliId.
             for pair in branch_name.windows(2) {
                 let pair: [u8; 2] = pair.try_into()?;
@@ -67,7 +67,7 @@ impl IdDb {
                     let id = str::from_utf8(&pair)
                         .expect("if we stored it, it's ascii-alphanum")
                         .to_owned();
-                    branch_name_to_cli_id.insert(name.clone(), CliId::Branch { name, id });
+                    branch_name_to_cli_id.insert(branch_name, CliId::Branch { name, id });
                     continue 'branch_name;
                 }
             }
@@ -80,15 +80,14 @@ impl IdDb {
         })
     }
 
-    fn find_branches_by_name(&mut self, ctx: &Context, name: &str) -> anyhow::Result<Vec<CliId>> {
+    fn find_branches_by_name(&mut self, ctx: &Context, name: &BStr) -> anyhow::Result<Vec<CliId>> {
         let branch_names = branch_names(ctx)?;
         let mut matches = Vec::new();
 
         for branch_name in branch_names {
-            let branch_name = branch_name.to_string();
-            // Exact match or partial match
-            if branch_name == name || branch_name.contains(name) {
-                matches.push(self.branch(&branch_name).clone())
+            // Partial match is fine
+            if branch_name.contains_str(name) {
+                matches.push(self.branch(branch_name.as_ref()).clone())
             }
         }
 
@@ -97,12 +96,13 @@ impl IdDb {
 
     /// Returns the ID for a branch of the given name. If no such ID exists,
     /// generate one.
-    pub fn branch(&mut self, name: &str) -> &CliId {
+    pub fn branch(&mut self, name: &BStr) -> &CliId {
         self.branch_name_to_cli_id
             .entry(name.to_owned())
-            .or_insert_with(|| CliId::Branch {
-                name: name.to_owned(),
-                id: hash(name),
+            .or_insert_with(|| {
+                let name = name.to_string();
+                let id = hash(&name);
+                CliId::Branch { name, id }
             })
     }
 
@@ -214,7 +214,7 @@ impl CliId {
         let mut matches = Vec::new();
 
         // First, try exact branch name match
-        if let Ok(branch_matches) = id_db.find_branches_by_name(ctx, s) {
+        if let Ok(branch_matches) = id_db.find_branches_by_name(ctx, s.into()) {
             matches.extend(branch_matches);
         }
 

crates/but/src/status/json.rs

@@ -330,7 +330,7 @@ fn convert_branch_to_json(
     review_map: &std::collections::HashMap<String, Vec<but_forge::ForgeReview>>,
     id_db: &mut crate::id::IdDb,
 ) -> anyhow::Result<Branch> {
-    let cli_id = id_db.branch(&branch.name.to_string()).to_string();
+    let cli_id = id_db.branch(branch.name.as_ref()).to_string();
 
     let review_id = if review {
         crate::forge::review::get_review_numbers(
@@ -379,7 +379,7 @@ pub(super) fn build_workspace_status_json(
             let stack_cli_id = details
                 .branch_details
                 .first()
-                .map(|b| id_db.branch(&b.name.to_string()).to_string())
+                .map(|b| id_db.branch(b.name.as_ref()).to_string())
                 .unwrap_or_else(|| "unknown".to_string());
 
             let json_assigned_changes = convert_file_assignments(assignments, worktree_changes);

crates/but/src/status/mod.rs

@@ -385,7 +385,7 @@ pub fn print_group(
         let mut first = true;
         for branch in &group.branch_details {
             let id = id_db
-                .branch(branch.name.to_str()?)
+                .branch(branch.name.as_ref())
                 .to_string()
                 .underline()
                 .blue();
@@ -550,7 +550,7 @@ pub(crate) fn all_branches(ctx: &Context) -> anyhow::Result<Vec<CliId>> {
     let mut branches = Vec::new();
     for stack in stacks {
         for head in stack.heads {
-            branches.push(id_db.branch(&head.name.to_string()).clone());
+            branches.push(id_db.branch(head.name.as_ref()).clone());
         }
     }
     Ok(branches)