feat: use parent type/name to match file moves with identical name/hash #631
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
mshanemc
commented
Jul 18, 2024
| @@ -161,6 +153,11 @@ export class ShadowRepo { | |||
| filter: fileFilter(this.packageDirs), | |||
| }); | |||
|
|
|||
| // isomorphic-git stores things in unix-style tree. Convert to windows-style if necessary | |||
| if (IS_WINDOWS) { | |||
There was a problem hiding this comment.
this needed to be above moveDetection so that all of that code could have deterministic paths based on the OS (because SDR Resolver is os-dependent)
mshanemc
commented
Jul 18, 2024
| excludeNonMatchingTypes(isWindows)(registry)( | ||
| compareHashes( | ||
| await buildMaps( | ||
| async ({ added, deleted }: AddedAndDeletedFilenames): Promise<StringMapsForMatches> => { |
There was a problem hiding this comment.
simplify some functions;
we only need to do resolving once since it happens earlier
mshanemc
commented
Jul 18, 2024
| ); | ||
| return { fullMatches: matches, deleteOnly }; | ||
| } | ||
| return { fullMatches: matches, deleteOnly: new Map<string, string>() }; | ||
| }; | ||
|
|
||
| /** given a StringMap, resolve the metadata types and return things that having matching type/parent */ | ||
| const excludeNonMatchingTypes = |
There was a problem hiding this comment.
type, parent name and parent type are now part of the key. So all this is moot
mshanemc
changed the title
iowillhoit
approved these changes
Jul 23, 2024
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.
What does this PR do?
allow identical basename and file hash to match when they have the same type and parent (expanding the key)
What issues does this PR fix or reference?
@W-16150330@
forcedotcom/cli#2945
the first local NUT run for the new test should fail. The next commit includes the fix, which should make the test green.