Add run_interdiff #35
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bmastbergen
requested review from
PlaidCat,
kerneltoast,
roxanan1996 and
shreeya-patel98
PlaidCat
reviewed
Oct 17, 2025
Collaborator
PlaidCat
left a comment
PlaidCat
left a comment
There was a problem hiding this comment.
I have some nitpicks, but they're the same hole I fell into using Claude as well.
| print("Please install patchutils or specify path with --interdiff") | ||
| sys.exit(1) | ||
|
|
||
| # Validate that all required refs exist |
Collaborator
There was a problem hiding this comment.
This will be interesting to see if this works with remote fork PRs
Contributor
|
The final version of the fuzzy feature that I submitted as a PR upstream (twaugh/patchutils#147) requires passing |
bmastbergen
force-pushed
the
interdiff
branch
2 times, most recently
from
e2d3547 to
9da07b2
Compare
This is a wrapper for running interdiff on pr commits that are backports of upstream kernel commits. The calling convention is similar to check_kernel_commits, where you pass the kernel-src-tree repo, the pr branch, and base branch as arguments. The script then looks though each pr commit looking for backported upstream commits, and calls interdiff to check for differences between the referenced upstream commit and the pr commit itself. As with check_kernel_commits the --markdown argument adds a little flair for embedding the output in a github comment The --interdiff argument allows for passing an alternative path for which interdiff executable is used. This will likely be used by the calling github action to use a custom built interdiff until mainline interdiff can do the fuzzy matching we like.
bmastbergen
force-pushed
the
interdiff
branch
from
9da07b2 to
272a7e8
Compare
Collaborator
Author
Cool. Added --fuzzy to interdiff call |
PlaidCat
approved these changes
Oct 22, 2025
Collaborator
PlaidCat
left a comment
PlaidCat
left a comment
There was a problem hiding this comment.
I'm good with this first pass and getting a 80%+ code in place
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a wrapper for running interdiff on pr commits that are backports of upstream kernel commits. The calling convention is similar to check_kernel_commits, where you pass the kernel-src-tree repo, the pr branch, and base branch as arguments. The script then looks though each pr commit looking for backported upstream commits, and calls interdiff to check for differences between the referenced upstream commit and the pr commit itself.
As with check_kernel_commits the --markdown argument adds a little flair for embedding the output in a github comment
The --interdiff argument allows for passing an alternative path for which interdiff executable is used. This will likely be used by the calling github action to use a custom built interdiff until mainline interdiff can do the fuzzy matching we like.
An example of how this could be integrated into our existing upstream_commit_check github action workflow is available here:
ctrliq/kernel-src-tree@f8718c0
An example of its output as a github comment is available here:
ctrliq/kernel-src-tree#621 (comment)
This was written by claude BTW. Claude used check_kernel_commits as inspiration so the calling convention and code would be similar. Hopefully similar code could be pulled out into a library and shared some day.