feat: commit info overlay with `m` key by pablospe · Pull Request #103 · dlvhdr/diffnav

pablospe · 2026-03-13T09:26:41Z

Summary

Add m key to open a floating overlay showing the full commit preamble (hash, author, date, message body)
Display commit metadata in the header bar: DIFFNAV • hash date author • [branch] subject
Clicking the header bar opens the overlay; clicking outside closes it
Scrollable viewport with scrollbar when content overflows (mouse wheel, j/k, up/down, ctrl+d/ctrl+u for half-page)
Branch detection via git branch --points-at for any commit
Does nothing for plain diffs without commit metadata

pablospe · 2026-03-13T09:49:52Z

@dlvhdr I was wondering if this makes more sense to added in the Header instead of the Footer? The message is also shown when we are at /.

Btw, the scrollbar is visible in this overlay, maybe we can do something similar in the right panel to see where we are or if there are more data below.

pablospe · 2026-03-13T09:53:44Z

In the Header I was thinking to put something like a navigation between commits:
< > : Previous Next commits in the current branch

Maybe also something to indicate in which worktree you are, but not sure if all this makes sense for diffnav, it will start to get close to tig :) But I would love to have it also running in a tmux windows and I could switch between worktrees. Need to think about the workflow. Maybe we chat for this.

pkg/ui/tui.go

Add a floating overlay (toggled with m key) that shows the commit preamble (hash, author, date, message) and file list with status indicators (A/D/R/C/M) when diffnav is used as a pager for git show or tig. The commit subject also appears in the footer bar and is clickable to open the overlay. Does nothing for plain diffs without commit metadata.

Use a viewport for the message overlay so long content (many files or lengthy commit messages) can be scrolled with mouse wheel, j/k, up/down, and ctrl+d/ctrl+u. The overlay height is capped at half the terminal and resizes with the window.

Clicking outside the help or message overlay now closes it. Clicks inside the overlay are consumed, and mouse scroll still works for the message overlay.

Clicking a file name in the message overlay navigates to that file in the file tree, shows its diff, and closes the overlay.

Clicking anywhere on the footer bar (except the F1/? help label) now opens the commit info overlay when a preamble is available.

Show a scrollbar on the right side of the message overlay when the content overflows. The thumb size and position reflect the visible portion and scroll offset.

Fix overlayBounds to use rendered (styled) dimensions instead of content dimensions, matching View()'s centering logic. This fixes click-outside detection being misaligned by border+padding offsets, and also accounts for the scrollbar width when visible. Also use scrollLines constant instead of hardcoded 3 for mouse wheel scroll in the message overlay.

Display commit hash, abbreviated author, and subject in the header bar (DIFFNAV • hash author • subject). Clicking the header opens the commit info overlay. Remove file listing from overlay and footer clickability.

Use gruvbox colors from tig for commit hash (132), date (172), author (109), and branch ref (072). Detect branch at startup via git rev-parse. Fix zone constant alignment.

- Use utils.TruncateString for UTF-8 safe subject truncation - Fix overlay centering to use rendered (post-border) width - Block non-left-click mouse events while overlay is open - Prefer preamble branch decoration over git rev-parse fallback - Use rune-safe author initial extraction

…back

…name" This reverts commit 2312493.

- Move resolveBranch to standalone function called in fetchFileTree (async tea.Cmd) instead of synchronously in Update - Deduplicate overlay rendering: extract overlayStyle(), renderOverlay(), and messageViewContent() shared by View() and handleMouse() - Cache parseCommitMeta result on model instead of re-parsing every render frame - Strip +/* prefixes from git branch --points-at output - Remove branch field from commitMeta (now resolved separately)

- Split overlay scroll cases: arrows scroll 1 line, ctrl+d/u scroll half a page to match vim convention - Pass full commit hash to git branch --points-at instead of truncating to 7 chars - Update stale comment about ctrl+d/u routing

…idth for truncation - Clamp overlay row/col to zero to prevent negative coordinates on small terminals - Move GotoTop() out of updateMessageVp() into the two open-overlay call sites so resize doesn't reset scroll position - Use runewidth.StringWidth instead of len() in TruncateString guard to correctly handle non-ASCII characters

pablospe · 2026-03-16T08:40:54Z

@dlvhdr PTAL

dlvhdr · 2026-03-16T08:51:50Z

In the Header I was thinking to put something like a navigation between commits:

< > : Previous Next commits in the current branch

Maybe also something to indicate in which worktree you are, but not sure if all this makes sense for diffnav, it will start to get close to tig :) But I would love to have it also running in a tmux windows and I could switch between worktrees. Need to think about the workflow. Maybe we chat for this.

Yeah definitely up for chatting about it. Also recommend joining the discord server, there are other folks there that can chime in.

I love tig btw. Maybe we should turn diffnav into a modern tig :)

pkg/ui/tui.go

- Extract viewHeader() from View() for readability - Return overlayResult struct from renderOverlay() instead of 5 values - Wrap long lines in overlay viewport instead of truncating - Use GetVerticalFrameSize() instead of hardcoded border/padding math - Add nerdfont branch icon with ASCII/Unicode fallback - Fix scrollbar thumb staying at top after small scroll

dlvhdr

thank you!

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dlvhdr/diffnav](https://github.com/dlvhdr/diffnav) | minor | `v0.10.0` → `v0.11.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dlvhdr/diffnav (dlvhdr/diffnav)</summary> ### [`v0.11.0`](https://github.com/dlvhdr/diffnav/releases/tag/v0.11.0) [Compare Source](dlvhdr/diffnav@v0.10.0...v0.11.0) ### v0.11.0 #### Notable Features - Search (accessed via <kbd>t</kbd>) now shows the filename first and has icons - <kbd>n/p/N</kbd> is used to navigate to next/previous file - If used with `git show`, and there's a commit preamble present, pressing <kbd>m</kbd> will show the commit info. It's also shown in the header - There's finally a scrollbar in the diffview - Thanks to new contributor [@vertti](https://github.com/vertti) `diffnav` now supports a `watch` flag which will run `git diff` by default (but can be controlled). It will run the command while maintaining the UI state Once again, thanks to [@pablospe](https://github.com/pablospe) for his awesome contributions! #### Changelog - [`0957bb1`](dlvhdr/diffnav@0957bb1) chore: upgrade deps ([#114](dlvhdr/diffnav#114)) - [`4a31deb`](dlvhdr/diffnav@4a31deb) ci: add basic CI workflow ([#113](dlvhdr/diffnav#113)) - [`dc735a5`](dlvhdr/diffnav@dc735a5) feat(search): show filename first + icons ([#105](dlvhdr/diffnav#105)) - [`822adc6`](dlvhdr/diffnav@822adc6) feat: Add shift+tab as alias for tab to switch panels ([#109](dlvhdr/diffnav#109)) - [`41f1c16`](dlvhdr/diffnav@41f1c16) feat: add F1 key to toggle help overlay ([#101](dlvhdr/diffnav#101)) - [`c899b9e`](dlvhdr/diffnav@c899b9e) feat: add n (next file) and p/N (previous file) shortcuts to jump between files ([#98](dlvhdr/diffnav#98)) - [`e651360`](dlvhdr/diffnav@e651360) feat: add scrollbar to diff viewer ([#112](dlvhdr/diffnav#112)) - [`e616b2a`](dlvhdr/diffnav@e616b2a) feat: add watch mode for auto-refreshing diffs ([#96](dlvhdr/diffnav#96)) - [`19503d8`](dlvhdr/diffnav@19503d8) feat: commit info overlay with `m` key ([#103](dlvhdr/diffnav#103)) - [`e215560`](dlvhdr/diffnav@e215560) feat: show commit info when used as a pager for git show ([#97](dlvhdr/diffnav#97)) - [`2898ff7`](dlvhdr/diffnav@2898ff7) fix: sidebar search crashes ([#95](dlvhdr/diffnav#95)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

dlvhdr reviewed Mar 13, 2026

View reviewed changes

pkg/ui/tui.go Outdated Show resolved Hide resolved

pkg/ui/tui.go Outdated Show resolved Hide resolved

pablospe added 19 commits March 15, 2026 17:09

feat: add scrolling to commit info overlay

d6ec7a7

Use a viewport for the message overlay so long content (many files or lengthy commit messages) can be scrolled with mouse wheel, j/k, up/down, and ctrl+d/ctrl+u. The overlay height is capped at half the terminal and resizes with the window.

feat: close overlays on click outside

690001c

Clicking outside the help or message overlay now closes it. Clicks inside the overlay are consumed, and mouse scroll still works for the message overlay.

feat: click file in commit info overlay to navigate

86e2b4b

Clicking a file name in the message overlay navigates to that file in the file tree, shows its diff, and closes the overlay.

feat: make entire footer bar clickable for commit info

98434b3

Clicking anywhere on the footer bar (except the F1/? help label) now opens the commit info overlay when a preamble is available.

feat: add scrollbar to commit info overlay

b0724da

Show a scrollbar on the right side of the message overlay when the content overflows. The thumb size and position reflect the visible portion and scroll offset.

feat: show commit info in header with tig-style format

fe8a8ff

Display commit hash, abbreviated author, and subject in the header bar (DIFFNAV • hash author • subject). Clicking the header opens the commit info overlay. Remove file listing from overlay and footer clickability.

fix: initialize message viewport on header click

47f0ec0

feat: add relative date to commit info in header

49aeb63

feat: tig-style header with colored metadata and branch info

4524217

Use gruvbox colors from tig for commit hash (132), date (172), author (109), and branch ref (072). Detect branch at startup via git rev-parse. Fix zone constant alignment.

fix: only show branch from preamble decoration, remove rev-parse fall…

dffa2c6

…back

fix: show branch only when preamble commit matches HEAD

28f8d14

fix: resolve branch via git branch --points-at for any commit

d2267fe

fix: strip worktree (+) and current (*) prefixes from branch name

2312493

Revert "fix: strip worktree (+) and current (*) prefixes from branch …

77e4657

…name" This reverts commit 2312493.

pablospe force-pushed the msg-preamble branch from 6c58d7d to 6fec546 Compare March 15, 2026 21:02

pablospe added 3 commits March 15, 2026 22:11

chore: remove tig gruvbox comment

1946498

fix: extract email username as author fallback when no name is set

757db7c

pablospe changed the title ~~feat: commit info overlay with m key~~ feat: commit info overlay with m key Mar 16, 2026

dlvhdr reviewed Mar 17, 2026

View reviewed changes

pablospe added 2 commits March 17, 2026 23:57

fix: use actual nerd font branch icon U+E0A0 with bracket fallback

2c7d0ac

dlvhdr approved these changes Mar 18, 2026

View reviewed changes

dlvhdr merged commit 19503d8 into dlvhdr:main Mar 18, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: commit info overlay with `m` key#103

feat: commit info overlay with `m` key#103
dlvhdr merged 24 commits intodlvhdr:mainfrom
pablospe:msg-preamble

pablospe commented Mar 13, 2026 •

edited

Loading

Uh oh!

pablospe commented Mar 13, 2026 •

edited

Loading

Uh oh!

pablospe commented Mar 13, 2026

Uh oh!

Uh oh!

Uh oh!

pablospe commented Mar 16, 2026

Uh oh!

dlvhdr commented Mar 16, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dlvhdr left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

pablospe commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

pablospe commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pablospe commented Mar 13, 2026

Uh oh!

Uh oh!

Uh oh!

pablospe commented Mar 16, 2026

Uh oh!

dlvhdr commented Mar 16, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dlvhdr left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

pablospe commented Mar 13, 2026 •

edited

Loading

pablospe commented Mar 13, 2026 •

edited

Loading