Skip to content

Make Resolve-Path -Relative return useful path when $PWD and -Path is on different drive #5740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 11 commits into from
Mar 16, 2018
Merged

Make Resolve-Path -Relative return useful path when $PWD and -Path is on different drive #5740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6cc21cb
commands: make rvpa -relative do not return ./absolute_path
kwkam Dec 22, 2017
8ee29ba
[Feature] add test
kwkam Feb 13, 2018
2529663
fixup! [Feature] add test
kwkam Feb 22, 2018
e30fbf5
only return relative path inside current root
kwkam Feb 23, 2018
ca6f977
change test
kwkam Feb 23, 2018
095ccd5
[Feature] update test
kwkam Mar 3, 2018
d7d18d9
[feature] remove drive after test
kwkam Mar 10, 2018
ee4faa0
[feature] use named parameters
kwkam Mar 10, 2018
9d6c156
[feature] fix parameter and test
kwkam Mar 15, 2018
dd76ce8
[Feature] More fixes for test
kwkam Mar 15, 2018
4c5d450
[Feature] Check if Drive is null
kwkam Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,26 @@ protected override void ProcessRecord()
{
foreach (PathInfo currentPath in result)
{
// When result path and base path is on different PSDrive
// (../)*path should not go beyond the root of base path
if (currentPath.Drive != SessionState.Path.CurrentLocation.Drive &&
SessionState.Path.CurrentLocation.Drive != null &&
!currentPath.ProviderPath.StartsWith(
SessionState.Path.CurrentLocation.Drive.Root, StringComparison.OrdinalIgnoreCase))
{
WriteObject(currentPath.Path, enumerateCollection: false);
continue;
}
string adjustedPath = SessionState.Path.NormalizeRelativePath(currentPath.Path,
SessionState.Path.CurrentLocation.ProviderPath);
if (!adjustedPath.StartsWith(".", StringComparison.OrdinalIgnoreCase))
// Do not insert './' if result path is not relative
if (!adjustedPath.StartsWith(
currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&
!adjustedPath.StartsWith(".", StringComparison.OrdinalIgnoreCase))
{
adjustedPath = SessionState.Path.Combine(".", adjustedPath);
}
WriteObject(adjustedPath, false);
WriteObject(adjustedPath, enumerateCollection: false);
}
}
}
Expand Down Expand Up @@ -152,7 +165,7 @@ protected override void ProcessRecord()

if (!_relative)
{
WriteObject(result, true);
WriteObject(result, enumerateCollection: true);
}
}
} // ProcessRecord
Expand Down
29 changes: 29 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
Describe "Resolve-Path returns proper path" -Tag "CI" {
BeforeAll {
$driveName = "RvpaTest"
$root = Join-Path $TestDrive "fakeroot"
$file = Join-Path $root "file.txt"
$null = New-Item -Path $root -ItemType Directory -Force
$null = New-Item -Path $file -ItemType File -Force
$null = New-PSDrive -Name $driveName -PSProvider FileSystem -Root $root

$testRoot = Join-Path $TestDrive ""
$fakeRoot = Join-Path "$driveName`:" ""

$relCases = @(
@{ wd = $fakeRoot; target = $testRoot; expected = $testRoot }
@{ wd = $testRoot; target = Join-Path $fakeRoot "file.txt"; expected = Join-Path "." "fakeroot" "file.txt" }
)
}
AfterAll {
Remove-PSDrive -Name $driveName -Force
}
It "Resolve-Path returns resolved paths" {
Resolve-Path $TESTDRIVE | Should be "$TESTDRIVE"
}
Expand All @@ -23,4 +42,14 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
$result = Resolve-Path -LiteralPath "TestDrive:\\\\\"
($result.Path.TrimEnd('/\')) | Should Be "TestDrive:"
}
It "Resolve-Path -Relative '<target>' should return correct path on '<wd>'" -TestCases $relCases {
param($wd, $target, $expected)
try {
Push-Location -Path $wd
Resolve-Path -Path $target -Relative | Should -BeExactly $expected
}
finally {
Pop-Location
}
}
}