1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 06:42:41 +01:00

Merge branch 'patch'

This commit is contained in:
epriestley 2011-03-07 22:09:11 -08:00
commit 12aa487790

View file

@ -237,6 +237,21 @@ EOTEXT
} }
} }
// Before we start doing anything, create all the directories we're going
// to add files to if they don't already exist.
foreach ($copies as $copy) {
list($src, $dst) = $copy;
$this->createParentDirectoryOf($dst);
}
foreach ($patches as $path => $patch) {
$this->createParentDirectoryOf($path);
}
foreach ($adds as $add) {
$this->createParentDirectoryOf($add);
}
foreach ($copies as $copy) { foreach ($copies as $copy) {
list($src, $dst) = $copy; list($src, $dst) = $copy;
passthru( passthru(
@ -336,4 +351,28 @@ EOTEXT
// TODO: Pull open diffs from 'arc list'? // TODO: Pull open diffs from 'arc list'?
return array('ARGUMENT'); return array('ARGUMENT');
} }
/**
* Create parent directories one at a time, since we need to "svn add" each
* one. (Technically we could "svn add" just the topmost new directory.)
*/
private function createParentDirectoryOf($path) {
$repository_api = $this->getRepositoryAPI();
$dir = dirname($path);
if (Filesystem::pathExists($dir)) {
return;
} else {
// Make sure the parent directory exists before we make this one.
$this->createParentDirectoryOf($dir);
execx(
'(cd %s && mkdir %s)',
$repository_api->getPath(),
$dir);
passthru(
csprintf(
'(cd %s && svn add %s)',
$repository_api->getPath(),
$dir));
}
}
} }