Page MenuHomePhabricator
Files F15413932

D8706.diff
No OneTemporary
Actions

D8706.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -694,6 +694,7 @@
}
$binaries = array();
+ $svnlook_check = false;
switch ($repository->getVersionControlSystem()) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
$binaries[] = 'git';
@@ -715,6 +716,8 @@
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
$binaries[] = 'svnserve';
$binaries[] = 'svnadmin';
+ $binaries[] = 'svnlook';
+ $svnlook_check = true;
break;
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
$binaries[] = 'hg';
@@ -730,6 +733,8 @@
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
$binaries[] = 'svnserve';
$binaries[] = 'svnadmin';
+ $binaries[] = 'svnlook';
+ $svnlook_check = true;
break;
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
$binaries[] = 'hg';
@@ -742,14 +747,6 @@
foreach ($binaries as $binary) {
$where = Filesystem::resolveBinary($binary);
if (!$where) {
- $config_href = '/config/edit/environment.append-paths/';
- $config_link = phutil_tag(
- 'a',
- array(
- 'href' => $config_href,
- ),
- 'environment.append-paths');
-
$view->addItem(
id(new PHUIStatusItemView())
->setIcon('warning-red')
@@ -758,7 +755,7 @@
->setNote(pht(
"Unable to find this binary in the webserver's PATH. You may ".
"need to configure %s.",
- $config_link)));
+ $this->getEnvConfigLink())));
} else {
$view->addItem(
id(new PHUIStatusItemView())
@@ -769,6 +766,36 @@
}
}
+ // This gets checked generically above. However, for svn commit hooks, we
+ // need this to be in environment.append-paths because subversion strips
+ // PATH.
+ if ($svnlook_check) {
+ $where = Filesystem::resolveBinary('svnlook');
+ if ($where) {
+ $path = substr($where, 0, strlen($where) - strlen('svnlook'));
+ $dirs = PhabricatorEnv::getEnvConfig('environment.append-paths');
+ $in_path = false;
+ foreach ($dirs as $dir) {
+ if (Filesystem::isDescendant($path, $dir)) {
+ $in_path = true;
+ break;
+ }
+ }
+ if (!$in_path) {
+ $view->addItem(
+ id(new PHUIStatusItemView())
+ ->setIcon('warning-red')
+ ->setTarget(
+ pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
+ ->setNote(pht(
+ 'Unable to find this binary in `environment.append-paths`. '.
+ 'You need to configure %s and include %s.',
+ $this->getEnvConfigLink(),
+ $path)));
+ }
+ }
+ }
+
$doc_href = PhabricatorEnv::getDocLink('Managing Daemons with phd');
$daemon_instructions = pht(
@@ -1078,5 +1105,14 @@
return $mirror_list;
}
+ private function getEnvConfigLink() {
+ $config_href = '/config/edit/environment.append-paths/';
+ return phutil_tag(
+ 'a',
+ array(
+ 'href' => $config_href,
+ ),
+ 'environment.append-paths');
+ }
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 10:04 PM (2 w, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707030
Default Alt Text
D8706.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility