feat: make rebasing status header look nicer

altsem · Feb 11, 2024 · 9467277 · 9467277
1 parent 4545a7d
commit 9467277
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/src/git/mod.rs b/src/git/mod.rs
@@ -31,6 +31,7 @@ pub(crate) fn rebase_status(dir: &Path) -> Res<Option<RebaseStatus>> {
             Ok(Some(RebaseStatus {
                 onto: branch_name(dir, &onto_hash)?.unwrap_or_else(|| onto_hash[..7].to_string()),
                 head_name: fs::read_to_string(rebase_head_name_file)?
+                    .trim()
                     .strip_prefix("refs/heads/")
                     .unwrap()
                     .to_string(),

diff --git a/src/screen/status.rs b/src/screen/status.rs
@@ -57,10 +57,10 @@ pub(crate) fn create(config: &Config, size: Rect) -> Res<Screen> {
                     let rebase = rebase;
                     Item {
                         id: "rebase_status".into(),
-                        display: Text::raw(format!(
-                            "Rebasing {} onto {}",
-                            rebase.head_name, &rebase.onto
-                        )),
+                        display: Text::styled(
+                            format!("Rebasing {} onto {}", rebase.head_name, &rebase.onto),
+                            Style::new().fg(CURRENT_THEME.section).bold(),
+                        ),
                         ..Default::default()
                     }
                 })

diff --git a/src/snapshots/gitu__tests__rebase_conflict.snap b/src/snapshots/gitu__tests__rebase_conflict.snap
@@ -5,8 +5,7 @@ expression: "redact_hashes(terminal, dir)"
 Buffer {
     area: Rect { x: 0, y: 0, width: 60, height: 20 },
     content: [
-        " Rebasing other-branch                                      ",
-        "  onto master                                               ",
+        " Rebasing other-branch onto master                          ",
         "                                                            ",
         "🢒Unmerged                                                   ",
         " new-file                                                   ",
@@ -25,25 +24,28 @@ Buffer {
         "                                                            ",
         "                                                            ",
         "                                                            ",
+        "                                                            ",
     ],
     styles: [
         x: 0, y: 0, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
-        x: 0, y: 3, fg: Reset, bg: Rgb(80, 73, 69), underline: Reset, modifier: NONE,
-        x: 1, y: 3, fg: Rgb(216, 166, 87), bg: Rgb(80, 73, 69), underline: Reset, modifier: BOLD,
-        x: 9, y: 3, fg: Reset, bg: Rgb(80, 73, 69), underline: Reset, modifier: NONE,
-        x: 0, y: 4, fg: Reset, bg: Rgb(42, 40, 39), underline: Reset, modifier: NONE,
-        x: 1, y: 4, fg: Rgb(234, 105, 98), bg: Rgb(42, 40, 39), underline: Reset, modifier: BOLD,
-        x: 9, y: 4, fg: Reset, bg: Rgb(42, 40, 39), underline: Reset, modifier: NONE,
-        x: 0, y: 5, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
-        x: 1, y: 6, fg: Rgb(216, 166, 87), bg: Reset, underline: Reset, modifier: BOLD,
-        x: 15, y: 6, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
+        x: 1, y: 0, fg: Rgb(216, 166, 87), bg: Reset, underline: Reset, modifier: BOLD,
+        x: 34, y: 0, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
+        x: 0, y: 2, fg: Reset, bg: Rgb(80, 73, 69), underline: Reset, modifier: NONE,
+        x: 1, y: 2, fg: Rgb(216, 166, 87), bg: Rgb(80, 73, 69), underline: Reset, modifier: BOLD,
+        x: 9, y: 2, fg: Reset, bg: Rgb(80, 73, 69), underline: Reset, modifier: NONE,
+        x: 0, y: 3, fg: Reset, bg: Rgb(42, 40, 39), underline: Reset, modifier: NONE,
+        x: 1, y: 3, fg: Rgb(234, 105, 98), bg: Rgb(42, 40, 39), underline: Reset, modifier: BOLD,
+        x: 9, y: 3, fg: Reset, bg: Rgb(42, 40, 39), underline: Reset, modifier: NONE,
+        x: 0, y: 4, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
+        x: 1, y: 5, fg: Rgb(216, 166, 87), bg: Reset, underline: Reset, modifier: BOLD,
+        x: 15, y: 5, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
+        x: 1, y: 6, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
+        x: 10, y: 6, fg: Cyan, bg: Reset, underline: Reset, modifier: BOLD,
+        x: 14, y: 6, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
+        x: 16, y: 6, fg: Green, bg: Reset, underline: Reset, modifier: BOLD,
+        x: 22, y: 6, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
+        x: 23, y: 6, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
         x: 1, y: 7, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
-        x: 10, y: 7, fg: Cyan, bg: Reset, underline: Reset, modifier: BOLD,
-        x: 14, y: 7, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
-        x: 16, y: 7, fg: Green, bg: Reset, underline: Reset, modifier: BOLD,
-        x: 22, y: 7, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
-        x: 23, y: 7, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
-        x: 1, y: 8, fg: Yellow, bg: Reset, underline: Reset, modifier: NONE,
-        x: 8, y: 8, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
+        x: 8, y: 7, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
     ]
 }