Make "changed" tasks work with deleted files #4546
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
kwlzn
reviewed
May 3, 2017
|
|
||
| def glob_to_regex(pattern): | ||
| """Given a glob pattern, return an equivalent regex expression. | ||
| :param string glob: The glob pattern. "**" matches 0 or more dirs recursively. |
There was a problem hiding this comment.
this should already be provided by the pathspec 3rdparty dep?
There was a problem hiding this comment.
glob syntax used in file matching is not equivalent to gitignore syntax. For example, "src" in gitignore will match everything inside "src", but in glob syntax, it should only match "src".
stuhood
approved these changes
May 3, 2017
| @@ -48,20 +49,27 @@ def _unique_dirs_for_sources(self, sources): | |||
| def target_addresses_for_source(self, source): | |||
| return list(self.iter_target_addresses_for_sources([source])) | |||
|
|
|||
| def _iter_owned_files_from_hydrated_target(self, legacy_target): | |||
| def _match_source(self, source, fileset): | |||
| if os.path.exists(source): | |||
There was a problem hiding this comment.
Rather than always checking whether it exists, maybe first check whether it is in the fileset... if it is, then it's definitely owned, and that's cheaper than a syscall. If it's not in the fileset, can use matches_filespec.
| else: | ||
| return matches_filespec(source, fileset.filespec) | ||
|
|
||
| def _own_source(self, source, legacy_target): | ||
| """Given a `HydratedTarget` instance, yield all files owned by the target.""" |
There was a problem hiding this comment.
Comment out of date. I think this method is probably _owns_source since it returns a boolean?
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.
Problem
#4529
There are 2 kinds of "changed" tasks in pants currently. Neither of them output correct result if a file is deleted.
Solution
I restored the removed file matching logic (using regular expression). In both SpecSourceMapper and EngineSourceMapper, first check if a file exists. It it exists, then check if it's in target's file set. If not, then it is a deleted file, and use re matching logic on it. Fixes #4529