Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15407775
D14929.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
19 KB
Referenced Files
None
Subscribers
None
D14929.diff
View Options
diff --git a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
@@ -70,16 +70,14 @@
foreach ($commits as $commit) {
$commit_data = $commit->getCommitData();
- $callsign = $commit->getRepository()->getCallsign();
- $identifier = $commit->getCommitIdentifier();
- $uri = '/r'.$callsign.$identifier;
+ $uri = $commit->getURI();
$uri = PhabricatorEnv::getProductionURI($uri);
$dict = array(
'id' => $commit->getID(),
'phid' => $commit->getPHID(),
'repositoryPHID' => $commit->getRepository()->getPHID(),
- 'identifier' => $identifier,
+ 'identifier' => $commit->getCommitIdentifier(),
'epoch' => $commit->getEpoch(),
'uri' => $uri,
'isImporting' => !$commit->isImported(),
diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -66,7 +66,7 @@
array(
'title' => array(
pht('Branches'),
- 'r'.$repository->getCallsign(),
+ $repository->getDisplayName(),
),
));
}
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -125,7 +125,6 @@
->setActionList($actions);
$stable_commit = $drequest->getStableCommit();
- $callsign = $drequest->getRepository()->getCallsign();
$view->addProperty(
pht('Commit'),
diff --git a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
@@ -98,9 +98,7 @@
array(
'title' => array(
nonempty(basename($drequest->getPath()), '/'),
- pht(
- '%s Repository',
- $drequest->getRepository()->getCallsign()),
+ $drequest->getRepository()->getDisplayName(),
),
));
}
diff --git a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
@@ -33,9 +33,7 @@
array(
'title' => array(
nonempty(basename($drequest->getPath()), '/'),
- pht(
- '%s Repository',
- $drequest->getRepository()->getCallsign()),
+ $drequest->getRepository()->getDisplayName(),
),
));
}
diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php
--- a/src/applications/diffusion/controller/DiffusionChangeController.php
+++ b/src/applications/diffusion/controller/DiffusionChangeController.php
@@ -142,7 +142,6 @@
->setActionList($actions);
$stable_commit = $drequest->getStableCommit();
- $callsign = $drequest->getRepository()->getCallsign();
$view->addProperty(
pht('Commit'),
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -181,7 +181,7 @@
id(new PhabricatorRepository())->establishConnection('r'),
'SELECT * FROM %T WHERE fullCommitName = %s',
PhabricatorRepository::TABLE_BADCOMMIT,
- 'r'.$callsign.$commit->getCommitIdentifier());
+ $commit->getMonogram());
}
$show_changesets = false;
@@ -314,9 +314,8 @@
}
}
- $change_list_title = DiffusionView::nameCommit(
- $repository,
- $commit->getCommitIdentifier());
+ $change_list_title = $commit->getDisplayName();
+
$change_list = new DifferentialChangesetListView();
$change_list->setTitle($change_list_title);
$change_list->setChangesets($changesets);
@@ -344,11 +343,6 @@
$content[] = $this->renderAddCommentPanel($commit, $audit_requests);
- $commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
- $short_name = DiffusionView::nameCommit(
- $repository,
- $commit->getCommitIdentifier());
-
$prefs = $user->loadPreferences();
$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
@@ -357,8 +351,8 @@
if ($show_changesets && $show_filetree) {
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
- ->setTitle($short_name)
- ->setBaseURI(new PhutilURI('/'.$commit_id))
+ ->setTitle($commit->getDisplayName())
+ ->setBaseURI(new PhutilURI($commit->getURI()))
->build($changesets)
->setCrumbs($crumbs)
->setCollapsed((bool)$collapsed)
@@ -371,7 +365,7 @@
return $this->buildApplicationPage(
$content,
array(
- 'title' => $commit_id,
+ 'title' => $commit->getDisplayName(),
'pageObjects' => array($commit->getPHID()),
));
}
diff --git a/src/applications/diffusion/controller/DiffusionCommitEditController.php b/src/applications/diffusion/controller/DiffusionCommitEditController.php
--- a/src/applications/diffusion/controller/DiffusionCommitEditController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitEditController.php
@@ -5,7 +5,6 @@
protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->getDiffusionRequest();
- $callsign = $drequest->getRepository()->getCallsign();
$repository = $drequest->getRepository();
$commit = $drequest->loadCommit();
$data = $commit->loadCommitData();
@@ -34,7 +33,7 @@
->setContentSourceFromRequest($request);
$xactions = $editor->applyTransactions($commit, $xactions);
return id(new AphrontRedirectResponse())
- ->setURI('/r'.$callsign.$commit->getCommitIdentifier());
+ ->setURI($commit->getURI());
}
$tokenizer_id = celerity_generate_unique_node_id();
@@ -95,8 +94,8 @@
$submit = id(new AphrontFormSubmitControl())
->setValue(pht('Save'))
- ->addCancelButton('/r'.$callsign.$commit->getCommitIdentifier());
- $form->appendChild($submit);
+ ->addCancelButton($commit->getURI());
+ $form->appendChild($submit);
$crumbs = $this->buildCrumbs(array(
'commit' => true,
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -235,7 +235,7 @@
}
}
} else {
- $links[] = 'r'.$drequest->getRepository()->getCallsign();
+ $links[] = $drequest->getRepository()->getDisplayName();
$links[] = $divider;
}
diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
--- a/src/applications/diffusion/controller/DiffusionExternalController.php
+++ b/src/applications/diffusion/controller/DiffusionExternalController.php
@@ -109,7 +109,7 @@
array(
'href' => $href,
),
- 'r'.$repo->getCallsign().$commit->getCommitIdentifier()),
+ $commit->getMonogram()),
$commit->loadCommitData()->getSummary(),
);
}
diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
@@ -93,7 +93,7 @@
array(
'title' => array(
pht('History'),
- pht('%s Repository', $drequest->getRepository()->getCallsign()),
+ $drequest->getRepository()->getDisplayName(),
),
));
}
@@ -151,7 +151,6 @@
->setActionList($actions);
$stable_commit = $drequest->getStableCommit();
- $callsign = $drequest->getRepository()->getCallsign();
$view->addProperty(
pht('Commit'),
diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php
--- a/src/applications/diffusion/controller/DiffusionLintController.php
+++ b/src/applications/diffusion/controller/DiffusionLintController.php
@@ -80,7 +80,12 @@
$rows[] = array(
phutil_tag('a', array('href' => $href_lint), $code['n']),
phutil_tag('a', array('href' => $href_browse), $code['files']),
- phutil_tag('a', array('href' => $href_repo), $drequest->getCallsign()),
+ phutil_tag(
+ 'a',
+ array(
+ 'href' => $href_repo,
+ ),
+ $drequest->getRepository()->getDisplayName()),
ArcanistLintSeverity::getStringForSeverity($code['maxSeverity']),
$code['code'],
$code['maxName'],
@@ -133,7 +138,7 @@
));
if ($this->diffusionRequest) {
- $title[] = $drequest->getCallsign();
+ $title[] = $drequest->getRepository()->getDisplayName();
} else {
$crumbs->addTextCrumb(pht('All Lint'));
}
@@ -314,7 +319,6 @@
->setUser($viewer)
->setActionList($actions);
- $callsign = $drequest->getRepository()->getCallsign();
$lint_commit = $branch->getLintCommit();
$view->addProperty(
diff --git a/src/applications/diffusion/controller/DiffusionLintDetailsController.php b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
--- a/src/applications/diffusion/controller/DiffusionLintDetailsController.php
+++ b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
@@ -90,11 +90,10 @@
$pager,
),
array(
- 'title' =>
- array(
- pht('Lint'),
- $drequest->getRepository()->getCallsign(),
- ),
+ 'title' => array(
+ pht('Lint'),
+ $drequest->getRepository()->getDisplayName(),
+ ),
));
}
diff --git a/src/applications/diffusion/controller/DiffusionPushEventViewController.php b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
--- a/src/applications/diffusion/controller/DiffusionPushEventViewController.php
+++ b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
@@ -25,7 +25,8 @@
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(
$repository->getName(),
- $this->getApplicationURI($repository->getCallsign().'/'));
+ $repository->getURI());
+
$crumbs->addTextCrumb(
pht('Push Logs'),
$this->getApplicationURI(
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -500,9 +500,8 @@
->setDisabled(!$can_edit));
if ($repository->isHosted()) {
- $callsign = $repository->getCallsign();
$push_uri = $this->getApplicationURI(
- 'pushlog/?repositories=r'.$callsign);
+ 'pushlog/?repositories='.$repository->getMonogram());
$view->addAction(
id(new PhabricatorActionView())
@@ -551,7 +550,6 @@
}
$history_table->setIsHead(true);
- $callsign = $drequest->getRepository()->getCallsign();
$icon = id(new PHUIIconView())
->setIconFont('fa-list-alt');
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
@@ -8,10 +8,10 @@
if ($this->diffusionRequest) {
$repository = $this->getDiffusionRequest()->getRepository();
- $repo_uri = $this->getRepositoryControllerURI($repository, '');
+ $repo_uri = $repository->getURI();
$edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
- $crumbs->addTextCrumb('r'.$repository->getCallsign(), $repo_uri);
+ $crumbs->addTextCrumb($repository->getDisplayname(), $repo_uri);
if ($is_main) {
$crumbs->addTextCrumb(pht('Edit Repository'));
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
@@ -60,7 +60,7 @@
"web interface. To edit it, run this command:\n\n %s",
sprintf(
'phabricator/ $ ./bin/repository edit %s --as %s --local-path ...',
- $repository->getCallsign(),
+ $repository->getMonogram(),
$user->getUsername())))
->appendChild(
id(new AphrontFormSubmitControl())
diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
--- a/src/applications/diffusion/controller/DiffusionTagListController.php
+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
@@ -88,7 +88,7 @@
array(
'title' => array(
pht('Tags'),
- pht('%s Repository', $repository->getCallsign()),
+ $repository->getDisplayName(),
),
));
}
diff --git a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
--- a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
+++ b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
@@ -28,7 +28,7 @@
foreach ($repos as $repo) {
$results[] = id(new PhabricatorTypeaheadResult())
->setName($repo->getMonogram().' '.$repo->getName())
- ->setURI('/diffusion/'.$repo->getCallsign().'/')
+ ->setURI($repo->getURI())
->setPHID($repo->getPHID())
->setPriorityString($repo->getMonogram());
}
diff --git a/src/applications/diffusion/view/DiffusionPushLogListView.php b/src/applications/diffusion/view/DiffusionPushLogListView.php
--- a/src/applications/diffusion/view/DiffusionPushLogListView.php
+++ b/src/applications/diffusion/view/DiffusionPushLogListView.php
@@ -39,6 +39,7 @@
$rows = array();
foreach ($logs as $log) {
+ $repository = $log->getRepository();
// Reveal this if it's valid and the user can edit the repository.
$remote_addr = '-';
@@ -51,16 +52,16 @@
$event_id = $log->getPushEvent()->getID();
- $callsign = $log->getRepository()->getCallsign();
$old_ref_link = null;
if ($log->getRefOld() != DiffusionCommitHookEngine::EMPTY_HASH) {
$old_ref_link = phutil_tag(
'a',
array(
- 'href' => '/r'.$callsign.$log->getRefOld(),
+ 'href' => $repository->getCommitURI($log->getRefOld()),
),
$log->getRefOldShort());
}
+
$rows[] = array(
phutil_tag(
'a',
@@ -71,9 +72,9 @@
phutil_tag(
'a',
array(
- 'href' => '/diffusion/'.$callsign.'/',
+ 'href' => $repository->getURI(),
),
- $callsign),
+ $repository->getDisplayName()),
$handles[$log->getPusherPHID()]->renderLink(),
$remote_addr,
$log->getPushEvent()->getRemoteProtocol(),
@@ -83,7 +84,7 @@
phutil_tag(
'a',
array(
- 'href' => '/r'.$callsign.$log->getRefNew(),
+ 'href' => $repository->getCommitURI($log->getRefNew()),
),
$log->getRefNewShort()),
diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
--- a/src/applications/diffusion/view/DiffusionView.php
+++ b/src/applications/diffusion/view/DiffusionView.php
@@ -123,30 +123,12 @@
));
}
- final public static function nameCommit(
- PhabricatorRepository $repository,
- $commit) {
-
- switch ($repository->getVersionControlSystem()) {
- case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
- case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
- $commit_name = substr($commit, 0, 12);
- break;
- default:
- $commit_name = $commit;
- break;
- }
-
- $callsign = $repository->getCallsign();
- return "r{$callsign}{$commit_name}";
- }
-
final public static function linkCommit(
PhabricatorRepository $repository,
$commit,
$summary = '') {
- $commit_name = self::nameCommit($repository, $commit);
+ $commit_name = $repository->formatCommitName($commit);
$callsign = $repository->getCallsign();
if (strlen($summary)) {
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
@@ -601,6 +601,11 @@
return '/diffusion/'.$this->getCallsign().'/';
}
+ public function getCommitURI($identifier) {
+ $callsign = $this->getCallsign();
+ return "/r{$callsign}{$identifier}";
+ }
+
public function getNormalizedPath() {
$uri = (string)$this->getCloneURIObject();
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -256,6 +256,12 @@
return "r{$callsign}{$identifier}";
}
+ public function getDisplayName() {
+ $repository = $this->getRepository();
+ $identifier = $this->getCommitIdentifier();
+ return $repository->formatCommitName($identifier);
+ }
+
/* -( PhabricatorPolicyInterface )----------------------------------------- */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Mar 19, 7:30 PM (1 d, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705964
Default Alt Text
D14929.diff (19 KB)
Attached To
Mode
D14929: Continue reducing callers to getCallsign()
Attached
Detach File
Event Timeline
Log In to Comment