Page MenuHomePhabricator
Files F13237974

D14927.id.diff
No OneTemporary
Actions

D14927.id.diff
View Options

diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
@@ -46,7 +46,7 @@
'diffusion-audit-'.$commit->getPHID(),
pht(
'Commit %s',
- 'r'.$repository->getCallsign().$commit->getCommitIdentifier()),
+ $commit->getMonogram()),
);
}
diff --git a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
--- a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
+++ b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
@@ -222,22 +222,23 @@
return $list;
}
- private function loadRepos($callsigns) {
- $callsigns = $this->parseList($callsigns);
- if (!$callsigns) {
+ private function loadRepos($identifiers) {
+ $identifiers = $this->parseList($identifiers);
+ if (!$identifiers) {
return null;
}
- $repos = id(new PhabricatorRepositoryQuery())
+ $query = id(new PhabricatorRepositoryQuery())
->setViewer($this->getViewer())
- ->withCallsigns($callsigns)
- ->execute();
- $repos = mpull($repos, null, 'getCallsign');
+ ->withIdentifiers($identifiers);
+
+ $repos = $query->execute();
- foreach ($callsigns as $sign) {
- if (empty($repos[$sign])) {
+ $map = $query->getIdentifierMap();
+ foreach ($identifiers as $identifier) {
+ if (empty($map[$identifier])) {
throw new PhutilArgumentUsageException(
- pht('No such repository with callsign "%s"!', $sign));
+ pht('No repository "%s" exists!', $identifier));
}
}
diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -130,10 +130,7 @@
}
public function getHeraldName() {
- return
- 'r'.
- $this->repository->getCallsign().
- $this->commit->getCommitIdentifier();
+ return $this->commit->getMonogram();
}
public function loadAffectedPaths() {
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -112,7 +112,7 @@
} else if ($object instanceof DifferentialDiff) {
$diff_names[] = $object->getID();
} else if ($object instanceof PhabricatorRepository) {
- $repository_names[] = 'r'.$object->getCallsign();
+ $repository_names[] = $object->getMonogram();
} else if ($object instanceof PhabricatorRepositoryCommit) {
$repository = $object->getRepository();
$commit_names[] = $repository->formatCommitName(
diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
--- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
@@ -83,7 +83,7 @@
}
}
- $repos = mpull($repos, 'getCallsign', 'getPHID');
+ $repos = mpull($repos, 'getMonogram', 'getPHID');
asort($repos);
$template = new AphrontTypeaheadTemplateView();
diff --git a/src/applications/releeph/controller/product/ReleephProductCreateController.php b/src/applications/releeph/controller/product/ReleephProductCreateController.php
--- a/src/applications/releeph/controller/product/ReleephProductCreateController.php
+++ b/src/applications/releeph/controller/product/ReleephProductCreateController.php
@@ -121,11 +121,11 @@
foreach ($repos as $repo_id => $repo) {
$repo_name = $repo->getName();
- $callsign = $repo->getCallsign();
- $choices[$repo->getPHID()] = "r{$callsign} ({$repo_name})";
+ $display = $repo->getDisplayName();
+ $choices[$repo->getPHID()] = "{$display} ({$repo_name})";
}
- ksort($choices);
+ asort($choices);
return $choices;
}
diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
@@ -372,7 +372,7 @@
'part of a Releeph branch, but also has %d path change(s) not '.
'part of a Releeph branch!',
$commit->getCommitIdentifier(),
- $repo->getCallsign(),
+ $repo->getDisplayName(),
count($in_branch),
count($ex_branch));
phlog($error);
diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php
--- a/src/applications/releeph/query/ReleephProductSearchEngine.php
+++ b/src/applications/releeph/query/ReleephProductSearchEngine.php
@@ -114,9 +114,9 @@
phutil_tag(
'a',
array(
- 'href' => '/diffusion/'.$repo->getCallsign().'/',
+ 'href' => $repo->getURI(),
),
- 'r'.$repo->getCallsign()));
+ $repo->getMonogram()));
$list->addItem($item);
}

File Metadata

Mime Type
text/plain
Expires
Wed, May 22, 4:21 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277373
Default Alt Text
D14927.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility