Merge main into releases/v3 #2819
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v3.28.12 refs/heads/releases/v3 into main
Co-authored-by: Andrew Eisenberg <[email protected]>
Co-authored-by: Andrew Eisenberg <[email protected]>
build: sync some utility just instructions I had locally
This commit changes overlay database creation to use the --overlay-changes flag. It also implements Git-based file change detection to generate the list of files to extract for the overlay database.
Support diff-informed queries under Default Setup
Overlay databases: use --overlay-changes
Diff-informed analysis: fix empty PR handling
There was a problem hiding this comment.
Pull Request Overview
This PR merges a commit from main into the releases/v3 branch, integrating several changes from multiple pull requests. Key updates include new and improved tests for the overlay database and Git utilities, enhancements for diff‐informed analysis through improved pull request branch extraction and handling, and adjustments to CodeQL command configuration to support overlay modes.
Reviewed Changes
Copilot reviewed 24 out of 26 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| lib/overlay-database-utils.test.js | Added tests for overlay changes file generation. |
| src/overlay-database-utils.test.ts | Introduced TypeScript tests for overlay database utilities. |
| src/git-utils.test.ts | Expanded tests for Git utilities, including encoded file path cases. |
| src/git-utils.ts and lib/git-utils.js | Updated export and stub usage for helper functions. |
| src/codeql.ts & lib/codeql.js | Modified CodeQL command construction to support overlay database modes. |
| src/analyze.ts & lib/analyze-action.ts | Added pull request branch retrieval and diff-informed analysis support. |
| CHANGELOG.md | Updated release notes for version 3.28.13 and indicated no user facing changes. |
Files not reviewed (2)
- justfile: Language not supported
- package.json: Language not supported
Comments suppressed due to low confidence (2)
src/analyze.ts:530
- [nitpick] The logic handling empty diff ranges (assigning ranges = [{ path: "", startLine: 0, endLine: 0 }]) is duplicated; consider extracting this block into a shared utility to improve maintainability.
if (ranges.length === 0) {
src/overlay-database-utils.ts:91
- [nitpick] Similar empty diff range handling logic appears here; refactoring this into a common helper could reduce code duplication and improve clarity.
if (!data) {
Tip: Copilot only keeps its highest confidence comments to reduce noise and keep you focused. Learn more
cklin
approved these changes
Mar 24, 2025
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.
Merging e0ea141 into
releases/v3.Conductor for this PR is @cklin.
Contains the following pull requests:
Please do the following:
releases/v3branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.