mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-12-22 21:40:54 +01:00
On Windows, implement "Filesystem::copyFile()" with "copy()"
Summary: Ref T13562. Currently, "Filesystem::copyFile()" uses "copy", which doesn't work now that we no longer invoke "cmd.exe" by default. Use "copy()" instead. Note that this whole function is probably nonsense, but I'll follow up on T13562. Test Plan: - Created a standalone script which runs "Filesystem::copyFile()". - Before: failed to copy any file. - After: succesfully copied normal files. - After: failed to copy a file over an existing directory with a reasonable error. - After: failed to copy a file over itself with a reasonable error. Maniphest Tasks: T13562 Differential Revision: https://secure.phabricator.com/D21643
This commit is contained in:
parent
cc23551a7d
commit
f0f95e5b26
1 changed files with 23 additions and 1 deletions
|
@ -269,7 +269,29 @@ final class Filesystem extends Phobject {
|
|||
self::assertReadable($from);
|
||||
|
||||
if (phutil_is_windows()) {
|
||||
execx('copy /Y %s %s', $from, $to);
|
||||
$trap = new PhutilErrorTrap();
|
||||
$ok = @copy($from, $to);
|
||||
$err = $trap->getErrorsAsString();
|
||||
$trap->destroy();
|
||||
|
||||
if (!$ok) {
|
||||
if (strlen($err)) {
|
||||
throw new FilesystemException(
|
||||
$to,
|
||||
pht(
|
||||
'Failed to copy file from "%s" to "%s": %s',
|
||||
$from,
|
||||
$to,
|
||||
$err));
|
||||
} else {
|
||||
throw new FilesystemException(
|
||||
$to,
|
||||
pht(
|
||||
'Failed to copy file from "%s" to "%s".',
|
||||
$from,
|
||||
$to));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
execx('cp -p %s %s', $from, $to);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue