gitux 0.1.0__py3-none-any.whl

gitux/ui/widgets/commit_log.py

@@ -0,0 +1,197 @@
+"""Commit log widget — renders ``git log --oneline --graph --decorate`` output."""
+
+from typing import Self, override
+
+from rich.text import Text
+from textual.widgets import RichLog
+
+_GRAPH_CHARS: str = "*|/\\ -_`"
+
+
+def extract_commit_hash(line: str) -> str | None:
+    """First hex token after the graph prefix, or None for graph-only lines."""
+    for i, ch in enumerate(line):
+        if ch not in _GRAPH_CHARS:
+            line = line[i:]
+            break
+    token = line.split(" ", 1)[0] if line else ""
+    if len(token) >= 7 and all(c in "0123456789abcdef" for c in token):
+        return token
+    return None
+
+
+class CommitLogWidget(RichLog):
+    """Displays the git commit graph with ASCII art, refs, and cursor navigation.
+
+    Parses the output of ``git log --all --oneline --graph --decorate`` and renders:
+    - Graph lines (``|``, ``/``, ``\\``) in secondary colours
+    - Commit nodes (``*``) in primary colour
+    - Branch/tag refs (``(...)``) in accent colour
+    - Commit hashes and messages in default text
+    """
+
+    can_focus = False
+
+    def __init__(self, **kwargs) -> None:
+        super().__init__(
+            highlight=False, markup=False, auto_scroll=False, max_lines=None, **kwargs
+        )
+        self._log_lines: list[str] = []
+        self._cursor_index: int = 0
+        self._detail_hash: str | None = None
+        self._detail_text: str | None = None
+        _ = self.write(Text("  (loading...)", style="italic #c7c4d7"))
+
+    @property
+    def is_detail_mode(self) -> bool:
+        """True while a commit detail view is shown instead of the log."""
+        return self._detail_hash is not None
+
+    @property
+    def cursor_line(self) -> str | None:
+        """The raw graph line under the cursor, or None when the log is empty."""
+        if 0 <= self._cursor_index < len(self._log_lines):
+            return self._log_lines[self._cursor_index]
+        return None
+
+    def show_details(self, commit_hash: str, text: str) -> None:
+        """Enter detail mode: render `text` (raw) and scroll to top."""
+        self._detail_hash = commit_hash
+        self._detail_text = text
+        self._refresh_content()
+        _ = self.scroll_home(animate=False)
+
+    def exit_details(self) -> None:
+        """Leave detail mode and restore the log at the cursor."""
+        self._detail_hash = None
+        self._detail_text = None
+        self._refresh_content()
+        self._scroll_to_cursor()
+
+    def show_log(self, log_text: str) -> None:
+        """Set the log text from raw git output, resetting cursor if needed."""
+        self._detail_hash = None
+        self._detail_text = None
+        if not log_text:
+            _ = self.clear()
+            return
+
+        self._log_lines = log_text.splitlines()
+        if self._cursor_index >= len(self._log_lines):
+            self._cursor_index = max(0, len(self._log_lines) - 1)
+        self._refresh_content()
+
+    @override
+    def clear(self) -> Self:
+        """Clear the log and show an empty-state placeholder."""
+        self._detail_hash = None
+        self._detail_text = None
+        self._log_lines = []
+        self._cursor_index = 0
+        _ = super().clear()
+        _ = self.write(Text("  No commits yet", style="italic #c7c4d7"))
+        return self
+
+    def action_cursor_down(self) -> None:
+        """Move the cursor down one commit in the log."""
+        if self.is_detail_mode:
+            return
+        if self._cursor_index < len(self._log_lines) - 1:
+            self._cursor_index += 1
+            self._refresh_content()
+            self._scroll_to_cursor()
+
+    def action_cursor_up(self) -> None:
+        """Move the cursor up one commit in the log."""
+        if self.is_detail_mode:
+            return
+        if self._cursor_index > 0:
+            self._cursor_index -= 1
+            self._refresh_content()
+            self._scroll_to_cursor()
+
+    def _scroll_to_cursor(self) -> None:
+        """Ensure the cursor line is visible in the viewport."""
+        _ = self.scroll_to(y=self._cursor_index, animate=False)
+
+    def _refresh_content(self) -> None:
+        """Re-render either the detail view or the graph log."""
+        if self._detail_text is not None:
+            _ = super().clear()
+            _ = self.write(self._detail_text)
+            return
+        text = Text()
+        for i, line in enumerate(self._log_lines):
+            if not line:
+                text.append("\n")
+                continue
+            rendered = self._render_log_line(line, cursor=i == self._cursor_index)
+            text.append(rendered)
+            text.append("\n")
+        _ = super().clear()
+        _ = self.write(text)
+
+    @staticmethod
+    def _render_log_line(line: str, cursor: bool = False) -> Text:
+        """Render one raw graph line with graph/ref/message coloring."""
+        result = Text()
+
+        if cursor:
+            result.append(" \u276f", style="bold #c0c1ff")
+        else:
+            result.append("  ")
+
+        graph_part = ""
+        content_part = line
+
+        for i, ch in enumerate(line):
+            if ch not in "*|/\\ -_`":
+                graph_part = line[:i]
+                content_part = line[i:]
+                break
+        else:
+            result.append(line, style="#908fa0")
+            return result
+
+        for ch in graph_part:
+            if ch == "*":
+                result.append("*", style="bold #c0c1ff")
+            elif ch in "|/\\":
+                result.append(ch, style="#908fa0")
+            else:
+                result.append(ch, style="#c7c4d7")
+
+        content = content_part.strip()
+        if not content:
+            return result
+
+        parts = content.split(" ", 1)
+        # Skip the hash (parts[0]), only show the rest (message + refs)
+        rest = parts[1] if len(parts) > 1 else ""
+
+        if rest:
+            rest_text = Text()
+            i = 0
+            while i < len(rest):
+                if rest[i] == "(":
+                    paren_depth = 0
+                    paren_start = i
+                    while i < len(rest):
+                        if rest[i] == "(":
+                            paren_depth += 1
+                        elif rest[i] == ")":
+                            paren_depth -= 1
+                            if paren_depth == 0:
+                                i += 1
+                                break
+                        i += 1
+                    refs_content = rest[paren_start:i]
+                    rest_text.append(refs_content, style="bold #ffb783")
+                else:
+                    rest_text.append(rest[i], style="#e4e1ed")
+                    i += 1
+
+            result.append(" ")
+            result.append(rest_text)
+
+        return result

gitux/ui/widgets/commit_screen.py

@@ -0,0 +1,110 @@
+"""Commit screen modal — centered overlay for writing commit messages."""
+
+import re
+from typing import override
+
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Horizontal, Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Button, Input, Static
+
+from gitux.presenter.commit_presenter import CommitPresenter
+
+_COMMIT_TYPES: tuple[str, ...] = (
+    "feat", "fix", "chore", "docs", "style", "refactor", "perf", "test",
+    "build", "ci", "other",
+)
+_PREFIX_RE: re.Pattern[str] = re.compile(r"^([a-z]+):\s*(.*)$", re.DOTALL)
+
+
+class CommitScreen(ModalScreen[str]):
+    """Modal screen for entering a commit message.
+
+    Opens centered when pressing 'c'.
+    Returns the commit hash on success, or None if cancelled/failed.
+    """
+
+    BINDINGS: list[Binding] = [
+        Binding("escape", "cancel", "Cancel"),
+        Binding("enter", "submit", "Commit"),
+        Binding("tab", "cycle_type", "Next type", show=False),
+    ]
+
+    def __init__(self, presenter: CommitPresenter) -> None:
+        super().__init__()
+        self.presenter: CommitPresenter = presenter
+        self._commit_type_index: int = 0
+
+    @override
+    def compose(self) -> ComposeResult:
+        """Build the modal: title, type row, message input, and buttons."""
+        with Vertical(id="commit-modal"):
+            yield Static("Commit Changes", id="commit-modal-title")
+            yield Static(f"type: {_COMMIT_TYPES[0]}", id="commit-modal-type")
+            yield Input(
+                placeholder="Commit message...",
+                id="commit-modal-input",
+            )
+            with Horizontal(id="commit-modal-buttons"):
+                yield Button("Commit (Enter)", id="commit-modal-btn-commit")
+                yield Button("Cancel (Esc)", id="commit-modal-btn-cancel")
+
+    def on_mount(self) -> None:
+        """Focus the commit input immediately."""
+        _ = self.query_one("#commit-modal-input", Input).focus()
+
+    def action_cancel(self) -> None:
+        """Dismiss the modal without committing."""
+        _ = self.dismiss(None)
+
+    def action_submit(self) -> None:
+        """Commit the current message."""
+        self._do_commit()
+
+    def action_cycle_type(self) -> None:
+        """Advance the type forward only; wraps from 'other' back to 'feat'."""
+        self._commit_type_index = (self._commit_type_index + 1) % len(_COMMIT_TYPES)
+        _ = self.query_one("#commit-modal-type", Static).update(
+            f"type: {_COMMIT_TYPES[self._commit_type_index]}"
+        )
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Commit or cancel based on the pressed button."""
+        if event.button.id == "commit-modal-btn-commit":
+            self._do_commit()
+        elif event.button.id == "commit-modal-btn-cancel":
+            self.action_cancel()
+
+    def on_input_submitted(self, _event: Input.Submitted) -> None:
+        """Submit the commit when Enter is pressed in the message input."""
+        self._do_commit()
+
+    def _do_commit(self) -> None:
+        """Validate the message and run the commit, dismissing on success."""
+        commit_input = self.query_one("#commit-modal-input", Input)
+        message = commit_input.value.strip()
+
+        if not message:
+            _ = self.notify("Commit message cannot be empty", severity="error")
+            return
+
+        commit_type = _COMMIT_TYPES[self._commit_type_index]
+        message = self._strip_type_prefix(message)
+        if commit_type != "other":
+            message = f"{commit_type}: {message}"
+
+        result = self.presenter.commit(message)
+
+        if result.success:
+            _ = self.dismiss(result.commit_hash)
+        else:
+            _ = self.notify(result.error or "Commit failed", severity="error")
+
+    @staticmethod
+    def _strip_type_prefix(message: str) -> str:
+        """Remove a leading '<known-type>:' so selecting that type does not duplicate it."""
+        match = _PREFIX_RE.match(message)
+        if match and match.group(1) in _COMMIT_TYPES:
+            return match.group(2)
+        return message

gitux/ui/widgets/diff_viewer.py

@@ -0,0 +1,149 @@
+"""Diff viewer widget — shows unified diffs with line numbers."""
+
+import re
+from typing import Self, override
+
+from rich.text import Text
+from textual.widgets import RichLog
+
+_MAX_DIFF_LINES: int = 500
+
+_COLORS: dict[str, str] = {
+    "addition": "#10b981",
+    "deletion": "#ffb4ab",
+    "header": "#c0c1ff",
+    "default": "#e4e1ed",
+    "dim": "#c7c4d7",
+    "line_num": "#464554",
+}
+
+_DIFF_METADATA_PREFIXES: tuple[str, ...] = (
+    "diff --",
+    "index ",
+    "--- ",
+    "+++ ",
+    "new file mode ",
+    "deleted file mode ",
+    "old mode ",
+    "new mode ",
+    "copy from ",
+    "copy to ",
+    "rename from ",
+    "rename to ",
+    "similarity index ",
+    "dissimilarity index ",
+)
+
+
+def _is_diff_metadata(line: str) -> bool:
+    """Return True if ``line`` is git diff metadata (``diff --``, ``index``, ...)."""
+    return line.startswith(_DIFF_METADATA_PREFIXES)
+
+
+def _parse_hunk_header(line: str) -> tuple[int, int]:
+    """Parse @@ -old_start,old_count +new_start,new_count @@.
+
+    Returns (old_start, new_start).
+    """
+    match = re.search(r"\-(\d+)", line)
+    old_start = int(match.group(1)) if match else 0
+    match = re.search(r"\+(\d+)", line)
+    new_start = int(match.group(1)) if match else 0
+    return old_start, new_start
+
+
+class DiffViewerWidget(RichLog):
+    """Displays unified diffs with line numbers and semantic coloring.
+
+    Shows:
+        - Hunk headers (@@ ... @@) in primary color
+        - Added lines (+) in green with new file line number
+        - Removed lines (-) in red with old file line number
+        - Context lines in default with both line numbers
+        - Git metadata headers are hidden (redundant)
+    """
+
+    can_focus = False
+
+    def __init__(self, **kwargs) -> None:
+        super().__init__(
+            highlight=False, markup=False, auto_scroll=False, max_lines=None, **kwargs
+        )
+        self._current_diff: str = ""
+
+    def show_diff(self, diff_text: str) -> None:
+        """Display a unified diff with line numbers and truncation."""
+        self._current_diff = diff_text
+        if not diff_text:
+            self._show_placeholder("Select a file to view diff")
+            return
+
+        lines = diff_text.splitlines()
+        total = len(lines)
+
+        if total > _MAX_DIFF_LINES:
+            lines = lines[:_MAX_DIFF_LINES]
+            truncated = True
+        else:
+            truncated = False
+
+        text = Text()
+        old_lineno = 0
+        new_lineno = 0
+
+        for line in lines:
+            if line.startswith("@@"):
+                old_lineno, new_lineno = _parse_hunk_header(line)
+                text.append(f"  {line}\n", style=_COLORS["header"])
+            elif line.startswith("+"):
+                content = line[1:]  # strip leading +
+                text.append(
+                    f"  {new_lineno:>4} +{content}\n",
+                    style=_COLORS["addition"],
+                )
+                new_lineno += 1
+            elif line.startswith("-"):
+                content = line[1:]  # strip leading -
+                text.append(
+                    f"  {old_lineno:>4} -{content}\n",
+                    style=_COLORS["deletion"],
+                )
+                old_lineno += 1
+            elif _is_diff_metadata(line):
+                continue  # skip metadata headers
+            else:
+                # Context line (starts with space)
+                content = line[1:] if line.startswith(" ") else line
+                text.append(
+                    f"  {new_lineno:>4} {content}\n",
+                    style=_COLORS["default"],
+                )
+                old_lineno += 1
+                new_lineno += 1
+
+        if truncated:
+            text.append(
+                f"\n  [{_MAX_DIFF_LINES} of {total} lines shown]",
+                style=f"italic {_COLORS['dim']}",
+            )
+
+        _ = super().clear()
+        _ = self.write(text)
+        _ = self.scroll_home(animate=False)
+
+    def show_binary_placeholder(self) -> None:
+        """Show placeholder for binary files."""
+        self._show_placeholder("Binary file, no diff available")
+
+    @override
+    def clear(self) -> Self:
+        """Clear the diff display."""
+        self._current_diff = ""
+        _ = self._show_placeholder("Select a file to view diff")
+        return self
+
+    def _show_placeholder(self, message: str) -> None:
+        """Show a dim placeholder message and scroll to top."""
+        _ = super().clear()
+        _ = self.write(Text(f"  {message}", style=f"italic {_COLORS['dim']}"))
+        _ = self.scroll_home(animate=False)

gitux/ui/widgets/gitux_footer.py

@@ -0,0 +1,44 @@
+"""Application footer — shows version, keyboard shortcuts, encoding, and sync status."""
+
+from rich.text import Text
+from textual.widgets import Static
+
+from gitux import __version__
+
+
+class GituxFooter(Static):
+    """Bottom status bar with version info, keybinding hints, and sync indicator.
+
+    Layout:
+    - Version tag (e.g. ``GITUX v1.0.4``)
+    - List of common keyboard shortcuts
+    - File encoding
+    - Sync status icon (✓ / ✗)
+    """
+
+    def __init__(self, **kwargs) -> None:
+        super().__init__("", **kwargs)
+        self._sync_ok: bool = True
+        self._encoding: str = "UTF-8"
+
+    def on_mount(self) -> None:
+        """Render the footer on initial mount."""
+        self._refresh()
+
+    def update_sync(self, ok: bool = True, encoding: str = "UTF-8") -> None:
+        """Update the sync indicator and encoding display."""
+        self._sync_ok = ok
+        self._encoding = encoding
+        self._refresh()
+
+    def _refresh(self) -> None:
+        """Re-render the footer content from the current state."""
+        t = Text()
+
+        t.append(" \u25a0", style="bold #ffb783")
+        t.append(f" GITUX v{__version__} \u2502", style="bold #c7c4d7")
+        t.append(" [C] Commit [P] Push [R] Refresh [S] Stage [A] Stage All [B] Branches [?] Help [Q] Quit \u2502", style="#b7c8e1")
+        t.append(f" {self._encoding} ", style="#c7c4d7")
+        t.append("\u2713" if self._sync_ok else "\u2717", style="bold #10b981" if self._sync_ok else "bold #ffb4ab")
+
+        self.update(t)

gitux/ui/widgets/header.py

@@ -0,0 +1,81 @@
+"""Top application bar — displays repo name, owner, branch badge, and WIP state."""
+
+from rich.text import Text
+from textual.widgets import Static
+
+from gitux.domain import WipState
+
+_MAX_OWNER_CHARS: int = 24
+_MAX_REPO_CHARS: int = 32
+_MAX_BRANCH_CHARS: int = 24
+
+_WIP_DOT_STYLE: dict[WipState, str] = {
+    WipState.CLEAN: "#10b981",    # green
+    WipState.DIRTY: "#ffb783",    # yellow
+    WipState.CONFLICT: "#ffb4ab",  # red
+    WipState.UNKNOWN: "#908fa0",   # gray
+}
+
+
+class TopAppBar(Static):
+    """Header bar showing repository identity and current branch.
+
+    Renders a compact one-line header with:
+    - Circled dot icon + "GITUX //" prefix
+    - Owner/repo name
+    - Branch name in a styled badge (with ``*`` on the default branch), or
+      detached-HEAD warning in red
+    - Work-in-progress dot
+    - Gear icon suffix
+    """
+
+    def __init__(self, **kwargs) -> None:
+        super().__init__("", **kwargs)
+        self._repo_name: str = ""
+        self._owner: str = ""
+        self._branch: str = ""
+        self._is_detached: bool = False
+        self._default_branch: str = ""
+        self._wip_state: WipState = WipState.UNKNOWN
+
+    def update_display(
+        self,
+        repo_name: str = "",
+        owner: str = "",
+        branch: str = "",
+        is_detached: bool = False,
+        default_branch: str = "",
+        wip_state: WipState = WipState.UNKNOWN,
+    ) -> None:
+        """Update the header with current repo and branch information."""
+        self._repo_name = repo_name or "..."
+        self._owner = owner
+        self._branch = branch
+        self._is_detached = is_detached
+        self._default_branch = default_branch
+        self._wip_state = wip_state
+        self.update(self._render_text())
+
+    def _render_text(self) -> Text:
+        """Render the header line as rich text."""
+        text = Text()
+        text.append(" \u25c9", style="bold #c0c1ff")
+        text.append(" GITUX // ", style="#e4e1ed")
+        repo = self._repo_name[:_MAX_REPO_CHARS]
+        if self._owner:
+            text.append(
+                f"{self._owner[:_MAX_OWNER_CHARS]}/{repo}", style="#e4e1ed"
+            )
+        else:
+            text.append(repo, style="#e4e1ed")
+        if self._branch:
+            branch = self._branch[:_MAX_BRANCH_CHARS]
+            star = "*" if self._branch == self._default_branch else ""
+            if self._is_detached:
+                text.append(f" ({branch})", style="#ffb4ab on #93000a")
+            else:
+                text.append(f" [{branch}{star}]", style="#1000a9 on #c0c1ff")
+        text.append(" \u25cf", style=_WIP_DOT_STYLE[self._wip_state])
+        text.append("  ", style="")
+        text.append("\u2699", style="#c7c4d7")
+        return text

gitux/ui/widgets/help_screen.py

@@ -0,0 +1,74 @@
+"""Help screen modal — shows all keyboard shortcuts."""
+
+from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Static
+
+
+class HelpScreen(ModalScreen[None]):
+    """Modal screen displaying all keyboard shortcuts."""
+
+    BINDINGS = [
+        Binding("escape", "dismiss", "Close"),
+        Binding("q", "dismiss", "Close"),
+        Binding("?", "dismiss", "Close"),
+    ]
+
+    def compose(self) -> ComposeResult:
+        """Build the modal: title, help body, and close hint."""
+        with Vertical(id="help-container"):
+            yield Static("GITUX — Keyboard Shortcuts", id="help-title")
+            yield Static(self._build_help_text(), id="help-body")
+            yield Static("Press ? or Esc to close", id="help-close-hint")
+
+    @staticmethod
+    def _build_help_text() -> Text:
+        """Build the keyboard-shortcut reference as rich text."""
+        t = Text()
+
+        def _section(title: str) -> None:
+            """Append a section header line."""
+            t.append(f"\n  {title}\n", style="bold #6366f1")
+
+        def _shortcut(key: str, desc: str) -> None:
+            """Append a shortcut row line."""
+            t.append(f"    {key:<14}", style="bold #f59e0b")
+            t.append(f"{desc}\n", style="#e2e8f0")
+
+        # ── Navigation ──
+        _section("Navigation")
+        _shortcut("Tab", "Next section (Files/Commits/Diff)")
+        _shortcut("\u2191 / \u2193", "Scroll active section content")
+        _shortcut("Enter", "Activate selected section")
+        _shortcut("j / k", "Scroll down / up")
+
+        # ── File Actions ──
+        _section("Files")
+        _shortcut("s / Enter", "Stage / Unstage file")
+        _shortcut("a", "Stage all files")
+        _shortcut("A", "Unstage all files")
+
+        # ── Commit & Push ──
+        _section("Commit & Push")
+        _shortcut("c", "Focus commit message")
+        _shortcut("Ctrl+Enter", "Create commit")
+        _shortcut("Ctrl+p", "Push to remote")
+
+        # ── General ──
+        _section("General")
+        _shortcut("r", "Refresh status")
+        _shortcut("b", "Branches panel")
+        _shortcut("?", "Show this help")
+        _shortcut("q", "Quit GITUX")
+        _shortcut("Escape", "Cancel / Go back")
+
+        # ── Upcoming (dimmed) ──
+        _section("Coming Soon")
+        t.append("    /              Search files\n", style="dim #64748b")
+        t.append("    L              Commit log\n", style="dim #64748b")
+        t.append("    S              Stash panel\n", style="dim #64748b")
+
+        return t