@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Continue reducing callers to getCallsign()
Summary: Ref T4245. More of the same, just narrowing down the easy cases.
Test Plan:
- Called `diffusion.querycommit`.
- Browsed branches.
- Browsed repository.
- Browsed directory.
- Searched for stuff.
- Viewed a commit.
- Viewed a file diff.
- Edited a commit.
- Viewed history.
- Viewed tags.
- Viewed push log.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T4245
Differential Revision: https://secure.phabricator.com/D14929
+54
-74
+2
-4
src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
+2
-4
src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
···
70
70
foreach ($commits as $commit) {
71
71
$commit_data = $commit->getCommitData();
72
72
73
-
$callsign = $commit->getRepository()->getCallsign();
74
-
$identifier = $commit->getCommitIdentifier();
75
-
$uri = '/r'.$callsign.$identifier;
73
+
$uri = $commit->getURI();
76
74
$uri = PhabricatorEnv::getProductionURI($uri);
77
75
78
76
$dict = array(
79
77
'id' => $commit->getID(),
80
78
'phid' => $commit->getPHID(),
81
79
'repositoryPHID' => $commit->getRepository()->getPHID(),
82
-
'identifier' => $identifier,
80
+
'identifier' => $commit->getCommitIdentifier(),
83
81
'epoch' => $commit->getEpoch(),
84
82
'uri' => $uri,
85
83
'isImporting' => !$commit->isImported(),
+1
-1
src/applications/diffusion/controller/DiffusionBranchTableController.php
+1
-1
src/applications/diffusion/controller/DiffusionBranchTableController.php
-1
src/applications/diffusion/controller/DiffusionBrowseController.php
-1
src/applications/diffusion/controller/DiffusionBrowseController.php
+1
-3
src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
+1
-3
src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
+1
-3
src/applications/diffusion/controller/DiffusionBrowseSearchController.php
+1
-3
src/applications/diffusion/controller/DiffusionBrowseSearchController.php
-1
src/applications/diffusion/controller/DiffusionChangeController.php
-1
src/applications/diffusion/controller/DiffusionChangeController.php
+6
-12
src/applications/diffusion/controller/DiffusionCommitController.php
+6
-12
src/applications/diffusion/controller/DiffusionCommitController.php
···
181
181
id(new PhabricatorRepository())->establishConnection('r'),
182
182
'SELECT * FROM %T WHERE fullCommitName = %s',
183
183
PhabricatorRepository::TABLE_BADCOMMIT,
184
-
'r'.$callsign.$commit->getCommitIdentifier());
184
+
$commit->getMonogram());
185
185
}
186
186
187
187
$show_changesets = false;
···
314
314
}
315
315
}
316
316
317
-
$change_list_title = DiffusionView::nameCommit(
318
-
$repository,
319
-
$commit->getCommitIdentifier());
317
+
$change_list_title = $commit->getDisplayName();
318
+
320
319
$change_list = new DifferentialChangesetListView();
321
320
$change_list->setTitle($change_list_title);
322
321
$change_list->setChangesets($changesets);
···
344
343
345
344
$content[] = $this->renderAddCommentPanel($commit, $audit_requests);
346
345
347
-
$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
348
-
$short_name = DiffusionView::nameCommit(
349
-
$repository,
350
-
$commit->getCommitIdentifier());
351
-
352
346
$prefs = $user->loadPreferences();
353
347
$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
354
348
$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
···
357
351
358
352
if ($show_changesets && $show_filetree) {
359
353
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
360
-
->setTitle($short_name)
361
-
->setBaseURI(new PhutilURI('/'.$commit_id))
354
+
->setTitle($commit->getDisplayName())
355
+
->setBaseURI(new PhutilURI($commit->getURI()))
362
356
->build($changesets)
363
357
->setCrumbs($crumbs)
364
358
->setCollapsed((bool)$collapsed)
···
371
365
return $this->buildApplicationPage(
372
366
$content,
373
367
array(
374
-
'title' => $commit_id,
368
+
'title' => $commit->getDisplayName(),
375
369
'pageObjects' => array($commit->getPHID()),
376
370
));
377
371
}
+3
-4
src/applications/diffusion/controller/DiffusionCommitEditController.php
+3
-4
src/applications/diffusion/controller/DiffusionCommitEditController.php
···
5
5
protected function processDiffusionRequest(AphrontRequest $request) {
6
6
$user = $request->getUser();
7
7
$drequest = $this->getDiffusionRequest();
8
-
$callsign = $drequest->getRepository()->getCallsign();
9
8
$repository = $drequest->getRepository();
10
9
$commit = $drequest->loadCommit();
11
10
$data = $commit->loadCommitData();
···
34
33
->setContentSourceFromRequest($request);
35
34
$xactions = $editor->applyTransactions($commit, $xactions);
36
35
return id(new AphrontRedirectResponse())
37
-
->setURI('/r'.$callsign.$commit->getCommitIdentifier());
36
+
->setURI($commit->getURI());
38
37
}
39
38
40
39
$tokenizer_id = celerity_generate_unique_node_id();
···
95
94
96
95
$submit = id(new AphrontFormSubmitControl())
97
96
->setValue(pht('Save'))
98
-
->addCancelButton('/r'.$callsign.$commit->getCommitIdentifier());
99
-
$form->appendChild($submit);
97
+
->addCancelButton($commit->getURI());
98
+
$form->appendChild($submit);
100
99
101
100
$crumbs = $this->buildCrumbs(array(
102
101
'commit' => true,
+1
-1
src/applications/diffusion/controller/DiffusionController.php
+1
-1
src/applications/diffusion/controller/DiffusionController.php
+1
-1
src/applications/diffusion/controller/DiffusionExternalController.php
+1
-1
src/applications/diffusion/controller/DiffusionExternalController.php
+1
-2
src/applications/diffusion/controller/DiffusionHistoryController.php
+1
-2
src/applications/diffusion/controller/DiffusionHistoryController.php
···
93
93
array(
94
94
'title' => array(
95
95
pht('History'),
96
-
pht('%s Repository', $drequest->getRepository()->getCallsign()),
96
+
$drequest->getRepository()->getDisplayName(),
97
97
),
98
98
));
99
99
}
···
151
151
->setActionList($actions);
152
152
153
153
$stable_commit = $drequest->getStableCommit();
154
-
$callsign = $drequest->getRepository()->getCallsign();
155
154
156
155
$view->addProperty(
157
156
pht('Commit'),
+7
-3
src/applications/diffusion/controller/DiffusionLintController.php
+7
-3
src/applications/diffusion/controller/DiffusionLintController.php
···
80
80
$rows[] = array(
81
81
phutil_tag('a', array('href' => $href_lint), $code['n']),
82
82
phutil_tag('a', array('href' => $href_browse), $code['files']),
83
-
phutil_tag('a', array('href' => $href_repo), $drequest->getCallsign()),
83
+
phutil_tag(
84
+
'a',
85
+
array(
86
+
'href' => $href_repo,
87
+
),
88
+
$drequest->getRepository()->getDisplayName()),
84
89
ArcanistLintSeverity::getStringForSeverity($code['maxSeverity']),
85
90
$code['code'],
86
91
$code['maxName'],
···
133
138
));
134
139
135
140
if ($this->diffusionRequest) {
136
-
$title[] = $drequest->getCallsign();
141
+
$title[] = $drequest->getRepository()->getDisplayName();
137
142
} else {
138
143
$crumbs->addTextCrumb(pht('All Lint'));
139
144
}
···
314
319
->setUser($viewer)
315
320
->setActionList($actions);
316
321
317
-
$callsign = $drequest->getRepository()->getCallsign();
318
322
$lint_commit = $branch->getLintCommit();
319
323
320
324
$view->addProperty(
+4
-5
src/applications/diffusion/controller/DiffusionLintDetailsController.php
+4
-5
src/applications/diffusion/controller/DiffusionLintDetailsController.php
+2
-1
src/applications/diffusion/controller/DiffusionPushEventViewController.php
+2
-1
src/applications/diffusion/controller/DiffusionPushEventViewController.php
+1
-3
src/applications/diffusion/controller/DiffusionRepositoryController.php
+1
-3
src/applications/diffusion/controller/DiffusionRepositoryController.php
···
500
500
->setDisabled(!$can_edit));
501
501
502
502
if ($repository->isHosted()) {
503
-
$callsign = $repository->getCallsign();
504
503
$push_uri = $this->getApplicationURI(
505
-
'pushlog/?repositories=r'.$callsign);
504
+
'pushlog/?repositories='.$repository->getMonogram());
506
505
507
506
$view->addAction(
508
507
id(new PhabricatorActionView())
···
551
550
}
552
551
553
552
$history_table->setIsHead(true);
554
-
$callsign = $drequest->getRepository()->getCallsign();
555
553
556
554
$icon = id(new PHUIIconView())
557
555
->setIconFont('fa-list-alt');
+2
-2
src/applications/diffusion/controller/DiffusionRepositoryEditController.php
+2
-2
src/applications/diffusion/controller/DiffusionRepositoryEditController.php
···
8
8
9
9
if ($this->diffusionRequest) {
10
10
$repository = $this->getDiffusionRequest()->getRepository();
11
-
$repo_uri = $this->getRepositoryControllerURI($repository, '');
11
+
$repo_uri = $repository->getURI();
12
12
$edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
13
13
14
-
$crumbs->addTextCrumb('r'.$repository->getCallsign(), $repo_uri);
14
+
$crumbs->addTextCrumb($repository->getDisplayname(), $repo_uri);
15
15
16
16
if ($is_main) {
17
17
$crumbs->addTextCrumb(pht('Edit Repository'));
+1
-1
src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
+1
-1
src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
···
60
60
"web interface. To edit it, run this command:\n\n %s",
61
61
sprintf(
62
62
'phabricator/ $ ./bin/repository edit %s --as %s --local-path ...',
63
-
$repository->getCallsign(),
63
+
$repository->getMonogram(),
64
64
$user->getUsername())))
65
65
->appendChild(
66
66
id(new AphrontFormSubmitControl())
+1
-1
src/applications/diffusion/controller/DiffusionTagListController.php
+1
-1
src/applications/diffusion/controller/DiffusionTagListController.php
+1
-1
src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
+1
-1
src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
···
28
28
foreach ($repos as $repo) {
29
29
$results[] = id(new PhabricatorTypeaheadResult())
30
30
->setName($repo->getMonogram().' '.$repo->getName())
31
-
->setURI('/diffusion/'.$repo->getCallsign().'/')
31
+
->setURI($repo->getURI())
32
32
->setPHID($repo->getPHID())
33
33
->setPriorityString($repo->getMonogram());
34
34
}
+6
-5
src/applications/diffusion/view/DiffusionPushLogListView.php
+6
-5
src/applications/diffusion/view/DiffusionPushLogListView.php
···
39
39
40
40
$rows = array();
41
41
foreach ($logs as $log) {
42
+
$repository = $log->getRepository();
42
43
43
44
// Reveal this if it's valid and the user can edit the repository.
44
45
$remote_addr = '-';
···
51
52
52
53
$event_id = $log->getPushEvent()->getID();
53
54
54
-
$callsign = $log->getRepository()->getCallsign();
55
55
$old_ref_link = null;
56
56
if ($log->getRefOld() != DiffusionCommitHookEngine::EMPTY_HASH) {
57
57
$old_ref_link = phutil_tag(
58
58
'a',
59
59
array(
60
-
'href' => '/r'.$callsign.$log->getRefOld(),
60
+
'href' => $repository->getCommitURI($log->getRefOld()),
61
61
),
62
62
$log->getRefOldShort());
63
63
}
64
+
64
65
$rows[] = array(
65
66
phutil_tag(
66
67
'a',
···
71
72
phutil_tag(
72
73
'a',
73
74
array(
74
-
'href' => '/diffusion/'.$callsign.'/',
75
+
'href' => $repository->getURI(),
75
76
),
76
-
$callsign),
77
+
$repository->getDisplayName()),
77
78
$handles[$log->getPusherPHID()]->renderLink(),
78
79
$remote_addr,
79
80
$log->getPushEvent()->getRemoteProtocol(),
···
83
84
phutil_tag(
84
85
'a',
85
86
array(
86
-
'href' => '/r'.$callsign.$log->getRefNew(),
87
+
'href' => $repository->getCommitURI($log->getRefNew()),
87
88
),
88
89
$log->getRefNewShort()),
89
90
+1
-19
src/applications/diffusion/view/DiffusionView.php
+1
-19
src/applications/diffusion/view/DiffusionView.php
···
123
123
));
124
124
}
125
125
126
-
final public static function nameCommit(
127
-
PhabricatorRepository $repository,
128
-
$commit) {
129
-
130
-
switch ($repository->getVersionControlSystem()) {
131
-
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
132
-
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
133
-
$commit_name = substr($commit, 0, 12);
134
-
break;
135
-
default:
136
-
$commit_name = $commit;
137
-
break;
138
-
}
139
-
140
-
$callsign = $repository->getCallsign();
141
-
return "r{$callsign}{$commit_name}";
142
-
}
143
-
144
126
final public static function linkCommit(
145
127
PhabricatorRepository $repository,
146
128
$commit,
147
129
$summary = '') {
148
130
149
-
$commit_name = self::nameCommit($repository, $commit);
131
+
$commit_name = $repository->formatCommitName($commit);
150
132
$callsign = $repository->getCallsign();
151
133
152
134
if (strlen($summary)) {
+5
src/applications/repository/storage/PhabricatorRepository.php
+5
src/applications/repository/storage/PhabricatorRepository.php
···
601
601
return '/diffusion/'.$this->getCallsign().'/';
602
602
}
603
603
604
+
public function getCommitURI($identifier) {
605
+
$callsign = $this->getCallsign();
606
+
return "/r{$callsign}{$identifier}";
607
+
}
608
+
604
609
public function getNormalizedPath() {
605
610
$uri = (string)$this->getCloneURIObject();
606
611
+6
src/applications/repository/storage/PhabricatorRepositoryCommit.php
+6
src/applications/repository/storage/PhabricatorRepositoryCommit.php
···
256
256
return "r{$callsign}{$identifier}";
257
257
}
258
258
259
+
public function getDisplayName() {
260
+
$repository = $this->getRepository();
261
+
$identifier = $this->getCommitIdentifier();
262
+
return $repository->formatCommitName($identifier);
263
+
}
264
+
259
265
260
266
/* -( PhabricatorPolicyInterface )----------------------------------------- */
261
267