Skip to content

Fix regression in Move-Item to only fallback to CopyAndDelete in specific cases #16029

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
iSazonov merged 4 commits into from
Sep 8, 2021
Merged

Fix regression in Move-Item to only fallback to CopyAndDelete in specific cases #16029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99ec8a7
Fix regression in `Move-Item` to only fallback to CopyAndDelete in sp…
SteveL-MSFT Aug 31, 2021
604febf
address Ilya's feedback
SteveL-MSFT Sep 1, 2021
7df5ce1
remove unnecessary allocation
SteveL-MSFT Sep 2, 2021
f69f9d4
fix handling case where volume root differs on Unix and test
SteveL-MSFT Sep 2, 2021
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
11 changes: 10 additions & 1 deletion src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6121,7 +6121,16 @@ private void MoveDirectoryInfoUnchecked(DirectoryInfo directory, string destinat

directory.MoveTo(destinationPath);
}
catch (IOException)
#if UNIX
// This is the errno returned by the rename() syscall
// when an item is attempted to be renamed across filesystem mount boundaries.
// 0x80131620 is returned if the source and destination do not have the same root path
catch (IOException e) when (e.HResult == 18 || e.HResult == -2146232800)
#else
// 0x80070005 ACCESS_DENIED is returned when trying to move files across volumes like DFS
// 0x80131620 is returned if the source and destination do not have the same root path
catch (IOException e) when (e.HResult == -2147024891 || e.HResult == -2146232800)
#endif
{
// Rather than try to ascertain whether we can rename a directory ahead of time,
// it's both faster and more correct to try to rename it and fall back to copy/deleting it
Expand Down
16 changes: 14 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,23 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
}

It "Verify Move-Item will not move to an existing file" {
{ Move-Item -Path $testDir -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'DirectoryExist,Microsoft.PowerShell.Commands.MoveItemCommand'
$error[0].Exception | Should -BeOfType System.IO.IOException
if ($IsWindows) {
$expectedError = 'MoveDirectoryItemIOError,Microsoft.PowerShell.Commands.MoveItemCommand'
}
else {
$expectedError = 'DirectoryExist,Microsoft.PowerShell.Commands.MoveItemCommand'
}

$e = { Move-Item -Path $testDir -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId $expectedError -PassThru
$e.Exception | Should -BeOfType System.IO.IOException
$testDir | Should -Exist
}

It 'Verify Move-Item fails for non-existing destination path' {
$e = { Move-Item -Path $testDir -Destination TestDrive:/0/2/0 -ErrorAction Stop } | Should -Throw -ErrorId 'MoveDirectoryItemIOError,Microsoft.PowerShell.Commands.MoveItemCommand' -PassThru
$e.Exception | Should -BeOfType System.IO.IOException
}

It "Verify Move-Item throws correct error for non-existent source" {
{ Move-Item -Path /does/not/exist -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'PathNotFound,Microsoft.PowerShell.Commands.MoveItemCommand'
}
Expand Down