Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13244681
D15304.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D15304.diff
View Options
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
@@ -18,11 +18,13 @@
$v_name = $repository->getName();
$v_desc = $repository->getDetail('description');
$v_slug = $repository->getRepositorySlug();
+ $v_callsign = $repository->getCallsign();
$v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
$repository->getPHID(),
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
$e_name = true;
$e_slug = null;
+ $e_callsign = null;
$errors = array();
$validation_exception = null;
@@ -31,6 +33,7 @@
$v_desc = $request->getStr('description');
$v_projects = $request->getArr('projectPHIDs');
$v_slug = $request->getStr('slug');
+ $v_callsign = $request->getStr('callsign');
if (!strlen($v_name)) {
$e_name = pht('Required');
@@ -47,6 +50,7 @@
$type_desc = PhabricatorRepositoryTransaction::TYPE_DESCRIPTION;
$type_edge = PhabricatorTransactions::TYPE_EDGE;
$type_slug = PhabricatorRepositoryTransaction::TYPE_SLUG;
+ $type_callsign = PhabricatorRepositoryTransaction::TYPE_CALLSIGN;
$xactions[] = id(clone $template)
->setTransactionType($type_name)
@@ -61,6 +65,10 @@
->setNewValue($v_slug);
$xactions[] = id(clone $template)
+ ->setTransactionType($type_callsign)
+ ->setNewValue($v_callsign);
+
+ $xactions[] = id(clone $template)
->setTransactionType($type_edge)
->setMetadataValue(
'edge:type',
@@ -78,11 +86,16 @@
try {
$editor->applyTransactions($repository, $xactions);
+ // The preferred edit URI may have changed if the callsign or slug
+ // were adjusted, so grab a fresh copy.
+ $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
+
return id(new AphrontRedirectResponse())->setURI($edit_uri);
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
$e_slug = $ex->getShortMessage($type_slug);
+ $e_callsign = $ex->getShortMessage($type_callsign);
}
}
}
@@ -107,6 +120,12 @@
->setValue($v_slug)
->setError($e_slug))
->appendChild(
+ id(new AphrontFormTextControl())
+ ->setName('callsign')
+ ->setLabel(pht('Callsign'))
+ ->setValue($v_callsign)
+ ->setError($e_callsign))
+ ->appendChild(
id(new PhabricatorRemarkupControl())
->setUser($viewer)
->setName('description')
diff --git a/src/applications/repository/editor/PhabricatorRepositoryEditor.php b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
--- a/src/applications/repository/editor/PhabricatorRepositoryEditor.php
+++ b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
@@ -45,6 +45,7 @@
$types[] = PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES;
$types[] = PhabricatorRepositoryTransaction::TYPE_STAGING_URI;
$types[] = PhabricatorRepositoryTransaction::TYPE_AUTOMATION_BLUEPRINTS;
+ $types[] = PhabricatorRepositoryTransaction::TYPE_CALLSIGN;
$types[] = PhabricatorTransactions::TYPE_EDGE;
$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
@@ -110,6 +111,8 @@
return $object->getDetail('staging-uri');
case PhabricatorRepositoryTransaction::TYPE_AUTOMATION_BLUEPRINTS:
return $object->getDetail('automation.blueprintPHIDs', array());
+ case PhabricatorRepositoryTransaction::TYPE_CALLSIGN:
+ return $object->getCallsign();
}
}
@@ -148,6 +151,7 @@
case PhabricatorRepositoryTransaction::TYPE_AUTOMATION_BLUEPRINTS:
return $xaction->getNewValue();
case PhabricatorRepositoryTransaction::TYPE_SLUG:
+ case PhabricatorRepositoryTransaction::TYPE_CALLSIGN:
$name = $xaction->getNewValue();
if (strlen($name)) {
return $name;
@@ -240,6 +244,9 @@
'automation.blueprintPHIDs',
$xaction->getNewValue());
return;
+ case PhabricatorRepositoryTransaction::TYPE_CALLSIGN:
+ $object->setCallsign($xaction->getNewValue());
+ return;
case PhabricatorRepositoryTransaction::TYPE_ENCODING:
// Make sure the encoding is valid by converting to UTF-8. This tests
// that the user has mbstring installed, and also that they didn't type
@@ -468,7 +475,7 @@
}
try {
- PhabricatorRepository::asssertValidRepositorySlug($new);
+ PhabricatorRepository::assertValidRepositorySlug($new);
} catch (Exception $ex) {
$errors[] = new PhabricatorApplicationTransactionValidationError(
$type,
@@ -495,6 +502,47 @@
}
break;
+ case PhabricatorRepositoryTransaction::TYPE_CALLSIGN:
+ foreach ($xactions as $xaction) {
+ $old = $xaction->getOldValue();
+ $new = $xaction->getNewValue();
+
+ if (!strlen($new)) {
+ continue;
+ }
+
+ if ($new === $old) {
+ continue;
+ }
+
+ try {
+ PhabricatorRepository::assertValidCallsign($new);
+ } catch (Exception $ex) {
+ $errors[] = new PhabricatorApplicationTransactionValidationError(
+ $type,
+ pht('Invalid'),
+ $ex->getMessage(),
+ $xaction);
+ continue;
+ }
+
+ $other = id(new PhabricatorRepositoryQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withCallsigns(array($new))
+ ->executeOne();
+ if ($other && ($other->getID() !== $object->getID())) {
+ $errors[] = new PhabricatorApplicationTransactionValidationError(
+ $type,
+ pht('Duplicate'),
+ pht(
+ 'The selected callsign ("%s") is already in use by another '.
+ 'repository. Choose a unique callsign.',
+ $new),
+ $xaction);
+ continue;
+ }
+ }
+ break;
}
return $errors;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -317,14 +317,14 @@
public static function isValidRepositorySlug($slug) {
try {
- self::asssertValidRepositorySlug($slug);
+ self::assertValidRepositorySlug($slug);
return true;
} catch (Exception $ex) {
return false;
}
}
- public static function asssertValidRepositorySlug($slug) {
+ public static function assertValidRepositorySlug($slug) {
if (!strlen($slug)) {
throw new Exception(
pht(
@@ -391,6 +391,30 @@
}
}
+ public static function assertValidCallsign($callsign) {
+ if (!strlen($callsign)) {
+ throw new Exception(
+ pht(
+ 'A repository callsign must be at least one character long.'));
+ }
+
+ if (strlen($callsign) > 32) {
+ throw new Exception(
+ pht(
+ 'The callsign "%s" is not a valid repository callsign. Callsigns '.
+ 'must be no more than 32 bytes long.',
+ $callsign));
+ }
+
+ if (!preg_match('/^[A-Z]+\z/', $callsign)) {
+ throw new Exception(
+ pht(
+ 'The callsign "%s" is not a valid repository callsign. Callsigns '.
+ 'may only contain UPPERCASE letters.',
+ $callsign));
+ }
+ }
+
/* -( Remote Command Execution )------------------------------------------- */
diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
--- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
@@ -29,6 +29,7 @@
const TYPE_SYMBOLS_LANGUAGE = 'repo:symbol-language';
const TYPE_STAGING_URI = 'repo:staging-uri';
const TYPE_AUTOMATION_BLUEPRINTS = 'repo:automation-blueprints';
+ const TYPE_CALLSIGN = 'repo:callsign';
// TODO: Clean up these legacy transaction types.
const TYPE_SSH_LOGIN = 'repo:ssh-login';
@@ -466,6 +467,26 @@
new PhutilNumber(count($rem)),
$this->renderHandleList($rem));
}
+
+ case self::TYPE_CALLSIGN:
+ if ($old === null) {
+ return pht(
+ '%s set the callsign for this repository to "%s".',
+ $this->renderHandleLink($author_phid),
+ $new);
+ } else if ($new === null) {
+ return pht(
+ '%s removed the callsign ("%s") for this repository.',
+ $this->renderHandleLink($author_phid),
+ $old);
+ } else {
+ return pht(
+ '%s changed the callsign for this repository from "%s" to "%s".',
+ $this->renderHandleLink($author_phid),
+ $old,
+ $new);
+ }
+
}
return parent::getTitle();
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 24 2024, 5:14 AM (4 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6273695
Default Alt Text
D15304.diff (9 KB)
Attached To
Mode
D15304: Make callsigns editable on repository basic information
Attached
Detach File
Event Timeline
Log In to Comment