Skip to content

Do not trigger reviews when rebasing #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesm merged 2 commits into from
Jan 8, 2026
Merged

Do not trigger reviews when rebasing #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ab82c0
Make TUI ID column width dynamic based on max job ID
wesm Jan 8, 2026
2dfab54
Skip post-commit hook during rebase operations
wesm Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cmd/roborev/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,13 @@ func initCmd() *cobra.Command {
hookPath := filepath.Join(hooksDir, "post-commit")
hookContent := `#!/bin/sh
# RoboRev post-commit hook - auto-reviews every commit

# Skip during rebase to avoid reviewing every replayed commit
git_dir=$(git rev-parse --git-dir 2>/dev/null)
if [ -d "$git_dir/rebase-merge" ] || [ -d "$git_dir/rebase-apply" ]; then
exit 0
fi

roborev enqueue --sha HEAD 2>/dev/null &
`
// Ensure hooks directory exists
Expand Down Expand Up @@ -726,6 +733,13 @@ func installHookCmd() *cobra.Command {

hookContent := `#!/bin/sh
# RoboRev post-commit hook - auto-reviews every commit

# Skip during rebase to avoid reviewing every replayed commit
git_dir=$(git rev-parse --git-dir 2>/dev/null)
if [ -d "$git_dir/rebase-merge" ] || [ -d "$git_dir/rebase-apply" ]; then
exit 0
fi

roborev enqueue --sha HEAD 2>/dev/null &
`

Expand Down
21 changes: 15 additions & 6 deletions cmd/roborev/tui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,18 @@ func (m tuiModel) renderQueueView() string {
if len(m.jobs) == 0 {
b.WriteString("No jobs in queue\n")
} else {
// Calculate ID column width based on max ID
idWidth := 2 // minimum width
for _, job := range m.jobs {
w := len(fmt.Sprintf("%d", job.ID))
if w > idWidth {
idWidth = w
}
}

// Header (with 2-char prefix to align with row selector)
header := fmt.Sprintf(" %-4s %-17s %-15s %-8s %-10s %-12s %-8s %s",
"ID", "Ref", "Repo", "Agent", "Status", "Queued", "Elapsed", "Addr'd")
header := fmt.Sprintf(" %-*s %-17s %-15s %-8s %-10s %-12s %-8s %s",
idWidth, "ID", "Ref", "Repo", "Agent", "Status", "Queued", "Elapsed", "Addr'd")
b.WriteString(tuiStatusStyle.Render(header))
b.WriteString("\n")
b.WriteString(" " + strings.Repeat("-", min(m.width-4, 80)))
Expand Down Expand Up @@ -759,7 +768,7 @@ func (m tuiModel) renderQueueView() string {
for i := start; i < end; i++ {
job := m.jobs[i]
selected := i == m.selectedIdx
line := m.renderJobLine(job, selected)
line := m.renderJobLine(job, selected, idWidth)
if selected {
line = tuiSelectedStyle.Render("> " + line)
} else {
Expand All @@ -785,7 +794,7 @@ func (m tuiModel) renderQueueView() string {
return b.String()
}

func (m tuiModel) renderJobLine(job storage.ReviewJob, selected bool) string {
func (m tuiModel) renderJobLine(job storage.ReviewJob, selected bool, idWidth int) string {
ref := shortRef(job.GitRef)

repo := job.RepoName
Expand Down Expand Up @@ -854,8 +863,8 @@ func (m tuiModel) renderJobLine(job storage.ReviewJob, selected bool) string {
}
}

return fmt.Sprintf("%-4d %-17s %-15s %-8s %s %-12s %-8s %s",
job.ID, ref, repo, agent, styledStatus, enqueued, elapsed, addr)
return fmt.Sprintf("%-*d %-17s %-15s %-8s %s %-12s %-8s %s",
idWidth, job.ID, ref, repo, agent, styledStatus, enqueued, elapsed, addr)
}

// wrapText wraps text to the specified width, preserving existing line breaks
Expand Down
Loading