Radish alpha
r
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
bin: Introduce unknown hunk state
Erik Kundt committed 1 year ago
commit 5cbf23f253e670fe45549f405ebbf175950ce5fd
parent b399bc4
2 files changed +5 -4
modified bin/git.rs
@@ -215,6 +215,7 @@ impl From<&Hunk<Modification>> for HunkStats {
#[derive(Clone, Default, Debug, PartialEq)]
pub enum HunkState {
    #[default]
+
    Unknown,
    Rejected,
    Accepted,
}
@@ -343,8 +344,8 @@ impl StatefulHunkDiff {
    }
}

-
impl From<(&HunkDiff, &HunkState)> for StatefulHunkDiff {
-
    fn from(value: (&HunkDiff, &HunkState)) -> Self {
-
        Self(value.0.clone(), value.1.clone())
+
impl From<&HunkDiff> for StatefulHunkDiff {
+
    fn from(diff: &HunkDiff) -> Self {
+
        Self(diff.clone(), HunkState::Unknown)
    }
}
modified bin/ui/span.rs
@@ -11,8 +11,8 @@ use tui::ui::span;

pub fn hunk_state(state: &HunkState) -> Span<'static> {
    match state {
+
        HunkState::Unknown => span::secondary("?"),
        HunkState::Accepted => span::positive("✓"),
-
        // HunkState::Rejected => span::secondary("?"),
        HunkState::Rejected => span::negative("✗"),
    }
}