gh-105540: Show source files relative to root #106927
Merged
Conversation
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
4 tasks
sobolevn
reviewed
Jul 20, 2023
| @@ -1154,7 +1155,7 @@ def write_function( | |||
|
|
|||
| def from_source_files(self) -> str: | |||
| paths = f"\n{self.out.comment} ".join( | |||
| prettify_filename(filename) | |||
| prettify_filename(os.path.relpath(filename, ROOT)) | |||
There was a problem hiding this comment.
Tests fail again with ValueError: path is on mount 'C:', start on mount 'D:' because of tempdir location.
I think we can solve this by using something like:
try:
filename = os.path.relpath(filename, ROOT))
except ValueError:
# This can happen if `filename` and `ROOT` are on different disks on Win:
pass
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.
This restores a corner case: when the generator is run with working directory set to Tools/cases_generator, the source filenames listed in the generated provenance header should be relative to the repo root directory.