Fix relpath when path and startpath are in the same drive #40323
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
When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs.
vtjnash
reviewed
Apr 3, 2021
base/path.jl
Outdated
Comment on lines
525
to
530
| path_drive = uppercase(path_drive) # canonicalize drive letters to uppercasing for comparison | ||
| startpath_drive = uppercase(startpath_drive) | ||
|
|
||
| path_drive != startpath_drive && return abspath(path) # if drives differ return first path | ||
| path_arr = split(abspath(path_drive * path_without_drive), path_separator_re) | ||
| start_arr = split(abspath(startpath_drive * startpath_without_drive), path_separator_re) |
There was a problem hiding this comment.
Since path_drive may involve a DNS lookup, I think we should preserve the input case:
Suggested change
| path_drive = uppercase(path_drive) # canonicalize drive letters to uppercasing for comparison | |
| startpath_drive = uppercase(startpath_drive) | |
| path_drive != startpath_drive && return abspath(path) # if drives differ return first path | |
| path_arr = split(abspath(path_drive * path_without_drive), path_separator_re) | |
| start_arr = split(abspath(startpath_drive * startpath_without_drive), path_separator_re) | |
| startpath_drive = uppercase(startpath_drive) # canonicalize drive letters to uppercasing for comparison | |
| uppercase(path_drive) == startpath_drive || return abspath(path) # if drives differ return first path | |
| path_arr = split(abspath(path_drive * path_without_drive), path_separator_re) | |
| start_arr = split(abspath(path_drive * startpath_without_drive), path_separator_re) |
There was a problem hiding this comment.
Even better, thank you for the review. PR updated.
vtjnash
approved these changes
Apr 3, 2021
KristofferC
pushed a commit
that referenced
this pull request
Apr 4, 2021
* Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs. (cherry picked from commit 89fff18)
KristofferC
pushed a commit
that referenced
this pull request
Apr 4, 2021
* Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs. (cherry picked from commit 89fff18)
KristofferC
pushed a commit
that referenced
this pull request
Apr 4, 2021
* Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs. (cherry picked from commit 89fff18)
ElOceanografo
pushed a commit
to ElOceanografo/julia
that referenced
this pull request
May 4, 2021
…40323) * Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs.
antoine-levitt
pushed a commit
to antoine-levitt/julia
that referenced
this pull request
May 9, 2021
…40323) * Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs.
johanmon
pushed a commit
to johanmon/julia
that referenced
this pull request
Jul 5, 2021
…40323) * Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs.
staticfloat
pushed a commit
that referenced
this pull request
Dec 23, 2022
* Fix relpath when path and startpath are in the same drive When startpath == ".", assume the startpath is in the same drive. This subsequently required tweaking the existing logic to then canonicalize the drive casing in instances where the drive casing differs. (cherry picked from commit 89fff18)
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.
When startpath == ".", assume the startpath is in the same drive.
This subsequently required tweaking the existing logic to then
canonicalize the drive letter casing (uppercased) in instances where the drive casing
differs.
close #40237