Gazelle: split merging into two stages #1099
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
We need to merge some attributes on rules before indexing them. In particular, we need to merge "importpath" and "srcs", since these become keys in the index. It's important to account for '# keep' comments and '# gazelle:ignore' directives so we need to use the regular merging algorithm instead of something ad hoc in the indexer. However, we also need to merge deps after they're resolved. This means that we need to merge rules in two separate phases. Right after rules are generated, we merge everything except "deps". Then we resolve dependencies. Then we merge "deps" only. This should also prevent us from indexing rules that are deleted. Related bazel-contrib#859
|
Jenkins test this please |
1 similar comment
|
Jenkins test this please |
|
The Travis CI failure is because run_non_bazel_tests.bash is missing. I believe Travis CI is reading the configuration from master instead of this branch. Since the tests actually did run and pass, I'm force submitting. |
codesuki
added a commit
to codesuki/rules_go
that referenced
this pull request
Dec 8, 2017
bazel-contrib#1099 introduced a nil pointer exception happening when BUILD files contain a # keep note.
jayconrod
pushed a commit
that referenced
this pull request
Dec 8, 2017
#1099 introduced a nil pointer exception happening when BUILD files contain a # keep note.
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.
We need to merge some attributes on rules before indexing them. In
particular, we need to merge "importpath" and "srcs", since these
become keys in the index. It's important to account for '# keep'
comments and '# gazelle:ignore' directives so we need to use the
regular merging algorithm instead of something ad hoc in the indexer.
However, we also need to merge deps after they're resolved.
This means that we need to merge rules in two separate phases. Right
after rules are generated, we merge everything except "deps". Then we
resolve dependencies. Then we merge "deps" only.
This should also prevent us from indexing rules that are deleted.
Related #859