Skip to content

Feature/kiri explicit commits#946

Merged
set-soft merged 2 commits into
INTI-CMNB:devfrom
hamletg:feature/kiri-explicit-commits
Jul 13, 2026
Merged

Feature/kiri explicit commits#946
set-soft merged 2 commits into
INTI-CMNB:devfrom
hamletg:feature/kiri-explicit-commits

Conversation

@hamletg

@hamletg hamletg commented Jul 10, 2026

Copy link
Copy Markdown

Summary

This PR extends the KiRi output with explicit revision lists for release comparisons, and adds control over whether uncommitted local changes appear in the commit list.

Motivation

KiRi’s default mode uses revision + max_commits to collect commits from git log. That works for “recent changes” views, but not for release-to-release comparisons where you want exactly two (or more) tagged board versions, in a specific order, with readable labels.

We also need a way to omit local from CI-generated KiRi pages when KiBot temporarily dirties the working tree during the run.

Output example

One PCB I started working on

@set-soft

Copy link
Copy Markdown
Member

Hi @hamletg !
Please rebase it to the dev branch.

Michel Gillet and others added 2 commits July 13, 2026 16:48
Add commits and labels options to the KiRi output so users can compare specific git revisions (tags, hashes, branches) instead of only the last N commits from a revision range.

When commits is not empty it takes precedence over max_commits and revision. Optional labels replace commit subjects in the KiRI UI.

Co-authored-by: Cursor <cursoragent@cursor.com>
When include_dirty is false, uncommitted schematic/PCB changes are not prepended to the KiRI commit list.

Co-authored-by: Cursor <cursoragent@cursor.com>
@hamletg
hamletg force-pushed the feature/kiri-explicit-commits branch from 5db69bd to b7a4ebd Compare July 13, 2026 13:51
@hamletg

hamletg commented Jul 13, 2026

Copy link
Copy Markdown
Author

I rebased it on dev. I was not entirely sure what to do with the change log, but I did what I could.

@set-soft

Copy link
Copy Markdown
Member

You have to use the -i option and remove extra commits, just let yours.

@hamletg
hamletg changed the base branch from master to dev July 13, 2026 14:36
@hamletg

hamletg commented Jul 13, 2026

Copy link
Copy Markdown
Author

The problem was that I made the PR against master, not dev. After changing the target of the PR to dev, only 2 commits are seen in the PR, as it was in my branch.

@set-soft
set-soft merged commit 793641c into INTI-CMNB:dev Jul 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants