revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-29 10:12:41 +01:00
Code Issues Releases Wiki Activity

Improve some messaging in arc which for autodetection of repositories

Browse source 
Summary:
  - The modern name for the config is "project.name".
  - Missing parameter in a pht().
  - When the value is set, but not valid, we gave you a misleading error message.

Test Plan: Ran `arc which`.

Reviewers: talshiri, btrahan

Reviewed By: talshiri

CC: aran

Differential Revision: https://secure.phabricator.com/D8081
This commit is contained in:
epriestley 2014-01-27 19:45:18 -08:00
parent 1daa719ace
commit 7116659289
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/workflow/ArcanistBaseWorkflow.php
View file

@ -1650,6 +1650,7 @@ abstract class ArcanistBaseWorkflow extends Phobject {
} }
$project_info = $this->getProjectInfo(); $project_info = $this->getProjectInfo();
$project_name = $this->getWorkingCopy()->getProjectID();
if ($this->getProjectInfo()) { if ($this->getProjectInfo()) {
if (!empty($project_info['repository']['callsign'])) { if (!empty($project_info['repository']['callsign'])) {
$callsign = $project_info['repository']['callsign']; $callsign = $project_info['repository']['callsign'];
@ -1657,19 +1658,25 @@ abstract class ArcanistBaseWorkflow extends Phobject {
'callsigns' => array($callsign), 'callsigns' => array($callsign),
); );
$reasons[] = pht( $reasons[] = pht(
'Configuration value "project.id" is set to "%s"; this project '. 'Configuration value "project.name" is set to "%s"; this project '.
'is associated with the "%s" repository.', 'is associated with the "%s" repository.',
$this->getWorkingCopy()->getProjectID(), $project_name,
$callsign); $callsign);
return array($query, $reasons); return array($query, $reasons);
} else { } else {
$reasons[] = pht( $reasons[] = pht(
'Configuration value "project.id" is set to "%s", but this '. 'Configuration value "project.name" is set to "%s", but this '.
'project is not associated with a repository.'); 'project is not associated with a repository.',
$project_name);
} }
} else if (strlen($project_name)) {
$reasons[] = pht(
'Configuration value "project.name" is set to "%s", but that '.
'project does not exist.',
$project_name);
} else { } else {
$reasons[] = pht( $reasons[] = pht(
'Configuration value "project.id" is empty.'); 'Configuration value "project.name" is empty.');
} }
$uuid = $this->getRepositoryAPI()->getRepositoryUUID(); $uuid = $this->getRepositoryAPI()->getRepositoryUUID();