Conversation
Add a 'files touched by more than one open PR' section (sorted with the most-contested files first) so overlapping PRs -- the likely merge-conflict hot spots -- are visible at a glance when deciding what to land. Also report two distinct file totals: 'file touches' (every PR x file pair) and 'distinct files touched'. Only the distinct total equals existing + missing, which fixes the earlier single count that double-counted files edited by multiple PRs.
14 tasks
mindaugl
approved these changes
Sep 14, 2026
Member
|
I think we can remove DIRECTORY.md since many PRs torch that file. |
cclauss
approved these changes
Sep 14, 2026
| @@ -113,12 +130,27 @@ def main() -> None: | |||
| print(f"- Script: `{Path(__file__).resolve()}`") | |||
Member
There was a problem hiding this comment.
Suggested change
| print(f"- Script: `{Path(__file__).resolve()}`") | |
| print(f"- Script: `{Path(__file__)}`") |
| contested: dict[str, list[int]] = {} | ||
|
|
||
| for path, pr_numbers in file_to_prs.items(): | ||
| deduped = sorted(set(pr_numbers)) |
Member
There was a problem hiding this comment.
Suggested change
| deduped = sorted(set(pr_numbers)) | |
| if str(path) == "DIRECTORY.md": | |
| continue | |
| deduped = sorted(set(pr_numbers)) |
Contributor
Author
|
Thanks for the merge, @cclauss! On removing DIRECTORY.md — agreed it's a frequent source of noisy conflicts. Happy to open a separate PR to drop it from the repo and adjust the build_directory_md workflow if you'd like; just say the word so we don't surprise anyone relying on it. |
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
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.
Describe your change
Follow-up to #15317, as suggested by @cclauss, to make
scripts/pr_file_map.pymore useful for landing pull requests.What changed
Number of filessummedlen(pr_files)across every PR, so a file edited by three PRs was counted three times and the total could exceedexisting + missing. It now reports:File touches (PR x file)-- every (PR, file) pair, andDistinct files touched-- each path once (this one equalsexisting + missing).No new dependencies; only
scripts/pr_file_map.pychanges.Checklist