Repository navigation
chore(pstack): flag lines of ours that name a path upstream deletes - #40
Merged
Merged
Conversation
The sync for upstream cursor#1043 deleted scripts/orch, and the report said nothing about the fork's own references to it: the harness's bun note and the verify-orch-store-lock project skill. #39 found them by hand. merge-upstream.py now reports each file of ours with a line that names a path the merge deletes, with that line. - A line is ours when upstream's version of the file lacks it, so upstream's own text in a pointer-only skill never counts. - A path is named by any ending of two or more of its parts, such as scripts/orch. An ending that a path left in the port shares is skipped, so scripts/package.json never matches. - A folder the merge empties counts as deleted, and so does a renamed file. Over the last 12 syncs, this flags the three references #39 removed and nothing else. Two other syncs deleted 29 files, and no file of ours named any of them.
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.
The sync for upstream cursor#1043 deleted
scripts/orch, andmerge-upstream.pysaid nothing about the fork's own references to it: the harness'sbunnote and theverify-orch-store-lockproject skill. #39 found them by hand. This adds the check that would have caught them.What changes
merge-upstream.pyreports each file of ours with a line that names a path the merge deletes, with that line:scripts/orchororch/store.ts. An ending that a path left in the port shares is skipped, soscripts/package.jsonnever matches. The excerpt starts just before the match, so a long line still shows the name.--no-renames, so a renamed file counts as deleted too, and a reference to its old name is flagged.sync-upstream.shneeds no change. A new item goes under "Needs porting" in the sync issue, and on a clean merge it labels the sync pull requestneeds-porting.port/README.mdand the script's docstring describe the check.Risk
scripts/orchcould match a path outside the repository with the same ending. The replay below found none.`orch`orstore.tsisn't a path ending, so it isn't flagged. chore(upstream): merge cursor/plugins #39's--store to every orch callline was like that. Its file still gets flagged, because the same file namesscripts/orchelsewhere.Proof
--refat its second:3b99a9d): the three references chore(upstream): merge cursor/plugins #39 removed:verify-orch-store-lock/SKILL.mdandStoreLock.tlaforstore.ts, andpstack-harness/SKILL.mdforscripts/orch.323d97fand 3 in914da34, and agit grepfor each file's basename acrosspstack/port,pstack-harness, both READMEs,.agents, and.githubfinds no reference.triage, all three fail.check.py: 0 problems, 0 warnings.