Release 1.5.0: add configurable picker colors.

Add the display crate for per-field branch listing colors from
~/.git-b/config.toml, with --no-color and --color CLI overrides.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: jharrilim

Cargo.lock

@@ -1,9 +1,9 @@
 [workspace]
-members = [".", "crates/cli", "crates/parse", "crates/algo"]
+members = [".", "crates/cli", "crates/parse", "crates/algo", "crates/display"]
 resolver = "2"
 
 [workspace.package]
-version = "1.4.0"
+version = "1.5.0"
 edition = "2021"
 
 [package]
@@ -17,6 +17,7 @@ build = "build.rs"
 [dependencies]
 algo = { path = "crates/algo" }
 cli = { path = "crates/cli" }
+display = { path = "crates/display" }
 parse = { path = "crates/parse" }
 skim = "4.6.3"
 

Cargo.toml

@@ -7,9 +7,12 @@
 | `cli` | [`crates/cli`](crates/cli) | Clap CLI definition |
 | `parse` | [`crates/parse`](crates/parse) | Load branches via `git for-each-ref` (name, hash, subject) |
 | `algo` | [`crates/algo`](crates/algo) | Weighted fuzzy match (name preferred over commit subject); `BranchItem` for Skim |
+| `display` | [`crates/display`](crates/display) | Picker colors from `~/.git-b/config.toml`; CLI `--no-color` / `--color` overrides |
 
 Tune name vs subject ranking in [`crates/algo/src/lib.rs`](crates/algo/src/lib.rs): `NAME_WEIGHT`, `EXACT_NAME_BONUS`, `PREFIX_NAME_BONUS`.
 
+User-facing color config lives in `~/.git-b/config.toml` under `[colors]` (see README). Precedence: defaults → config file → CLI flags.
+
 ## Man page
 
 The man page is generated at build time with [clap_mangen](https://crates.io/crates/clap_mangen) and written to `man/git-b.1`.

DEVELOPMENT.md

@@ -38,8 +38,27 @@ git-b              # open the fuzzy branch picker
 git-b feature      # checkout the first branch matching "feature"
 git-b -b new-name  # git checkout -b new-name
 man git-b          # after installing the man page (see below)
+git-b --no-color   # disable picker colors for this run
 ```
 
+### Colors
+
+Picker lines show the branch name, short hash, and commit subject in separate colors. Defaults are cyan, yellow, and white.
+
+Create `~/.git-b/config.toml`:
+
+```toml
+[colors]
+enabled = true
+name = "cyan"
+hash = "yellow"
+subject = "white"
+```
+
+Set `enabled = false` to turn colors off globally. Supported color names include `red`, `green`, `blue`, `magenta`, `cyan`, `gray`, and `bright-*` variants (for example `bright-green`). Use `default` or `none` to leave a field unstyled.
+
+CLI flags override the config file for a single run: `--no-color`, or `--color NAME:HASH:SUBJECT` (for example `cyan:yellow:white`).
+
 ### Man page
 
 Building from source generates `man/git-b.1` via [clap_mangen](https://crates.io/crates/clap_mangen). Install it with:

README.md

@@ -6,5 +6,6 @@ description = "Weighted branch matching for git-b"
 publish = false
 
 [dependencies]
+display = { path = "../display" }
 parse = { path = "../parse" }
 skim = "4.6.3"

crates/algo/Cargo.toml

@@ -1,10 +1,12 @@
 //! Weighted fuzzy matching for branches (name preferred over commit subject).
 
 use std::borrow::Cow;
+use std::collections::HashSet;
 
+use display::{colored_line, field_ranges, DisplayColors, FieldRanges, Line};
 use parse::Branch;
 use skim::prelude::*;
-use skim::{MatchEngine, MatchEngineFactory, SkimItem};
+use skim::{DisplayContext, MatchEngine, MatchEngineFactory, Matches, SkimItem};
 
 /// Multiply name-field fuzzy scores so name matches outrank subject-only matches.
 pub const NAME_WEIGHT: i32 = 1_000;
@@ -21,18 +23,23 @@ pub struct BranchItem {
     branch: Branch,
     display: String,
     matching_ranges: [(usize, usize); 2],
+    field_ranges: FieldRanges,
+    colors: DisplayColors,
 }
 
 impl BranchItem {
-    pub fn new(branch: Branch) -> Self {
+    pub fn new(branch: Branch, colors: DisplayColors) -> Self {
         let display = branch.display_line();
         let name_end = branch.name.len();
         let subject_start = name_end + 1 + branch.short_hash.len() + 1;
         let subject_end = display.len();
+        let field = field_ranges(&branch.name, &branch.short_hash, &branch.subject);
         Self {
             branch,
             display,
-            matching_ranges: [(0, name_end), (subject_start, subject_end)],
+            matching_ranges: [(0, name_end), (subject_start, subject_end)], // byte ranges for skim
+            field_ranges: field, // char ranges for display colors
+            colors,
         }
     }
 
@@ -43,7 +50,26 @@ impl BranchItem {
 
 impl From<Branch> for BranchItem {
     fn from(branch: Branch) -> Self {
-        Self::new(branch)
+        Self::new(branch, DisplayColors::default())
+    }
+}
+
+fn highlight_chars(text: &str, matches: &Matches) -> HashSet<usize> {
+    match matches {
+        Matches::None => HashSet::new(),
+        Matches::CharIndices(indices) => indices.iter().copied().collect(),
+        Matches::CharRange(start, end) => (*start..*end).collect(),
+        Matches::ByteRange(start, end) => {
+            let mut set = HashSet::new();
+            let mut ci = 0;
+            for (bi, _) in text.char_indices() {
+                if bi >= *start && bi < *end {
+                    set.insert(ci);
+                }
+                ci += 1;
+            }
+            set
+        }
     }
 }
 
@@ -59,6 +85,21 @@ impl SkimItem for BranchItem {
     fn get_matching_ranges(&self) -> Option<&[(usize, usize)]> {
         Some(&self.matching_ranges)
     }
+
+    fn display(&self, context: DisplayContext) -> Line<'_> {
+        if !self.colors.enabled {
+            return context.to_line(Cow::Borrowed(&self.display));
+        }
+        let highlight = highlight_chars(&self.display, &context.matches);
+        colored_line(
+            &self.display,
+            self.field_ranges,
+            self.colors,
+            context.base_style,
+            context.matched_style,
+            &highlight,
+        )
+    }
 }
 
 struct Scored<'a> {
@@ -132,6 +173,7 @@ pub fn find_first_matching<'a>(query: &str, branches: &'a [Branch]) -> Option<&'
 #[cfg(test)]
 mod tests {
     use super::*;
+    use display::DisplayColors;
     use parse::Branch;
 
     fn branch(name: &str, subject: &str) -> Branch {
@@ -164,16 +206,24 @@ mod tests {
 
     #[test]
     fn branch_item_output_is_checkout_name() {
-        let item = BranchItem::new(branch("foo/bar", "subject"));
+        let item = BranchItem::new(branch("foo/bar", "subject"), DisplayColors::disabled());
         assert_eq!(item.output(), "foo/bar");
         assert_eq!(item.text(), "foo/bar abc1234 subject");
     }
 
     #[test]
     fn branch_item_matching_ranges_name_before_subject() {
-        let item = BranchItem::new(branch("my-branch", "my subject"));
+        let item = BranchItem::new(branch("my-branch", "my subject"), DisplayColors::disabled());
         let ranges = item.get_matching_ranges().unwrap();
         assert_eq!(ranges[0], (0, "my-branch".len()));
         assert!(ranges[1].0 > ranges[0].1);
     }
+
+    #[test]
+    fn colored_display_when_enabled() {
+        let item = BranchItem::new(branch("main", "init"), DisplayColors::default());
+        assert!(item.colors.enabled);
+        let line = item.display(DisplayContext::default());
+        assert!(!line.spans.is_empty());
+    }
 }

crates/algo/src/lib.rs

@@ -18,4 +18,12 @@ pub struct Args {
     /// Branch name to fuzzy-match and checkout directly (skips the picker).
     #[arg()]
     pub branch: Option<String>,
+
+    /// Disable colored branch listing in the picker.
+    #[arg(long = "no-color")]
+    pub no_color: bool,
+
+    /// Set field colors as NAME:HASH:SUBJECT (e.g. cyan:yellow:white).
+    #[arg(long = "color", value_name = "NAME:HASH:SUBJECT")]
+    pub color: Option<String>,
 }

crates/cli/src/lib.rs

@@ -0,0 +1,11 @@
+[package]
+name = "display"
+version.workspace = true
+edition.workspace = true
+description = "Display colors for git-b branch picker"
+publish = false
+
+[dependencies]
+ratatui = "0.30"
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.8"