Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15413293
D17186.id41329.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D17186.id41329.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -642,6 +642,7 @@
'DiffusionCommitHintQuery' => 'applications/diffusion/query/DiffusionCommitHintQuery.php',
'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php',
'DiffusionCommitHookRejectException' => 'applications/diffusion/exception/DiffusionCommitHookRejectException.php',
+ 'DiffusionCommitListController' => 'applications/diffusion/controller/DiffusionCommitListController.php',
'DiffusionCommitMergeHeraldField' => 'applications/diffusion/herald/DiffusionCommitMergeHeraldField.php',
'DiffusionCommitMessageHeraldField' => 'applications/diffusion/herald/DiffusionCommitMessageHeraldField.php',
'DiffusionCommitPackageAuditHeraldField' => 'applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php',
@@ -1873,7 +1874,6 @@
'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
'PhabricatorAuditEditor' => 'applications/audit/editor/PhabricatorAuditEditor.php',
'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
- 'PhabricatorAuditListController' => 'applications/audit/controller/PhabricatorAuditListController.php',
'PhabricatorAuditListView' => 'applications/audit/view/PhabricatorAuditListView.php',
'PhabricatorAuditMailReceiver' => 'applications/audit/mail/PhabricatorAuditMailReceiver.php',
'PhabricatorAuditManagementDeleteWorkflow' => 'applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php',
@@ -5346,6 +5346,7 @@
'DiffusionCommitHintQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'DiffusionCommitHookEngine' => 'Phobject',
'DiffusionCommitHookRejectException' => 'Exception',
+ 'DiffusionCommitListController' => 'DiffusionController',
'DiffusionCommitMergeHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitMessageHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitPackageAuditHeraldField' => 'DiffusionCommitHeraldField',
@@ -6764,7 +6765,6 @@
'Phobject',
'PhabricatorInlineCommentInterface',
),
- 'PhabricatorAuditListController' => 'PhabricatorAuditController',
'PhabricatorAuditListView' => 'AphrontView',
'PhabricatorAuditMailReceiver' => 'PhabricatorObjectMailReceiver',
'PhabricatorAuditManagementDeleteWorkflow' => 'PhabricatorAuditManagementWorkflow',
diff --git a/src/applications/audit/application/PhabricatorAuditApplication.php b/src/applications/audit/application/PhabricatorAuditApplication.php
--- a/src/applications/audit/application/PhabricatorAuditApplication.php
+++ b/src/applications/audit/application/PhabricatorAuditApplication.php
@@ -3,7 +3,7 @@
final class PhabricatorAuditApplication extends PhabricatorApplication {
public function getBaseURI() {
- return '/audit/';
+ return '/diffusion/commit/';
}
public function getIcon() {
@@ -18,25 +18,16 @@
return pht('Browse and Audit Commits');
}
- public function isPinnedByDefault(PhabricatorUser $viewer) {
- return true;
- }
-
- public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
- return array(
- array(
- 'name' => pht('Audit User Guide'),
- 'href' => PhabricatorEnv::getDoclink('Audit User Guide'),
- ),
- );
+ public function canUninstall() {
+ // Audit was once a separate application, but has largely merged with
+ // Diffusion.
+ return false;
}
- public function getRoutes() {
- return array(
- '/audit/' => array(
- '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorAuditListController',
- ),
- );
+ public function isPinnedByDefault(PhabricatorUser $viewer) {
+ return parent::isClassInstalledForViewer(
+ 'PhabricatorDiffusionApplication',
+ $viewer);
}
public function getApplicationOrder() {
diff --git a/src/applications/audit/conduit/AuditConduitAPIMethod.php b/src/applications/audit/conduit/AuditConduitAPIMethod.php
--- a/src/applications/audit/conduit/AuditConduitAPIMethod.php
+++ b/src/applications/audit/conduit/AuditConduitAPIMethod.php
@@ -3,7 +3,8 @@
abstract class AuditConduitAPIMethod extends ConduitAPIMethod {
final public function getApplication() {
- return PhabricatorApplication::getByClass('PhabricatorAuditApplication');
+ return PhabricatorApplication::getByClass(
+ 'PhabricatorDiffusionApplication');
}
}
diff --git a/src/applications/audit/controller/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php
deleted file mode 100644
--- a/src/applications/audit/controller/PhabricatorAuditListController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-final class PhabricatorAuditListController
- extends PhabricatorAuditController {
-
- public function shouldAllowPublic() {
- return true;
- }
-
- public function handleRequest(AphrontRequest $request) {
- $controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($request->getURIData('queryKey'))
- ->setSearchEngine(new PhabricatorCommitSearchEngine())
- ->setNavigation($this->buildSideNavView());
-
- return $this->delegateToController($controller);
- }
-
-}
diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -42,7 +42,7 @@
}
public function getEditorApplicationClass() {
- return 'PhabricatorAuditApplication';
+ return 'PhabricatorDiffusionApplication';
}
public function getEditorObjectsDescription() {
diff --git a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
--- a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
+++ b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
@@ -4,7 +4,7 @@
public function isEnabled() {
return PhabricatorApplication::isClassInstalled(
- 'PhabricatorAuditApplication');
+ 'PhabricatorDiffusionApplication');
}
protected function getObjectPattern() {
diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -73,7 +73,7 @@
}
protected function getURI($path) {
- return '/audit/'.$path;
+ return '/diffusion/commit/'.$path;
}
protected function getBuiltinQueryNames() {
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -28,6 +28,10 @@
'name' => pht('Diffusion User Guide'),
'href' => PhabricatorEnv::getDoclink('Diffusion User Guide'),
),
+ array(
+ 'name' => pht('Audit User Guide'),
+ 'href' => PhabricatorEnv::getDoclink('Audit User Guide'),
+ ),
);
}
@@ -131,6 +135,8 @@
'lint/' => 'DiffusionLintController',
'commit/' => array(
+ $this->getQueryRoutePattern() =>
+ 'DiffusionCommitListController',
$this->getEditRoutePattern('edit/') =>
'DiffusionCommitEditController',
),
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionCommitListController.php
copy from src/applications/diffusion/controller/DiffusionRepositoryListController.php
copy to src/applications/diffusion/controller/DiffusionCommitListController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitListController.php
@@ -1,13 +1,14 @@
<?php
-final class DiffusionRepositoryListController extends DiffusionController {
+final class DiffusionCommitListController
+ extends DiffusionController {
public function shouldAllowPublic() {
return true;
}
public function handleRequest(AphrontRequest $request) {
- return id(new PhabricatorRepositorySearchEngine())
+ return id(new PhabricatorCommitSearchEngine())
->setController($this)
->buildResponse();
}
@@ -15,9 +16,9 @@
protected function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs();
- id(new DiffusionRepositoryEditEngine())
- ->setViewer($this->getViewer())
- ->addActionToCrumbs($crumbs);
+ $crumbs->addTextCrumb(
+ pht('Commits'),
+ $this->getApplicationURI('commit/'));
return $crumbs;
}
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
@@ -7,8 +7,19 @@
}
public function handleRequest(AphrontRequest $request) {
+ $items = array();
+
+ $items[] = id(new PHUIListItemView())
+ ->setType(PHUIListItemView::TYPE_LABEL)
+ ->setName(pht('Commits'));
+
+ $items[] = id(new PHUIListItemView())
+ ->setName('Browse Commits')
+ ->setHref($this->getApplicationURI('commit/'));
+
return id(new PhabricatorRepositorySearchEngine())
->setController($this)
+ ->setNavigationItems($items)
->buildResponse();
}
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -65,7 +65,7 @@
$commit_views = array();
- $commit_uri = id(new PhutilURI('/audit/'))
+ $commit_uri = id(new PhutilURI('/diffusion/commit/'))
->setQueryParams(
array(
'auditorPHIDs' => $package->getPHID(),
diff --git a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
--- a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
+++ b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
@@ -63,7 +63,7 @@
$viewer);
if ($have_diffusion) {
$uri = urisprintf(
- '/audit/?authors=%s#R',
+ '/diffusion/commit/?authors=%s#R',
$object->getPHID());
$items[] = $this->newItem()
diff --git a/src/applications/search/engine/PhabricatorJumpNavHandler.php b/src/applications/search/engine/PhabricatorJumpNavHandler.php
--- a/src/applications/search/engine/PhabricatorJumpNavHandler.php
+++ b/src/applications/search/engine/PhabricatorJumpNavHandler.php
@@ -6,7 +6,7 @@
$jump = trim($jump);
$patterns = array(
- '/^a$/i' => 'uri:/audit/',
+ '/^a$/i' => 'uri:/diffusion/commit/',
'/^f$/i' => 'uri:/feed/',
'/^d$/i' => 'uri:/differential/',
'/^r$/i' => 'uri:/diffusion/',
diff --git a/src/docs/book/phabricator.book b/src/docs/book/phabricator.book
--- a/src/docs/book/phabricator.book
+++ b/src/docs/book/phabricator.book
@@ -37,10 +37,6 @@
"name": "Arcanist Integration",
"include": "(^src/applications/arcanist/)"
},
- "audit": {
- "name": "Audit",
- "include": "(^src/applications/audit/)"
- },
"auth": {
"name": "Auth",
"include": "(^src/applications/auth/)"
diff --git a/src/docs/user/userguide/audit.diviner b/src/docs/user/userguide/audit.diviner
--- a/src/docs/user/userguide/audit.diviner
+++ b/src/docs/user/userguide/audit.diviner
@@ -23,8 +23,8 @@
- **Audit Requests** which ask a user (or some other entity) to audit a
commit. These can be triggered in a number of ways (see below).
-In the Audit tool's home screen (at `/audit/`) and on the homepage you can see
-commits and requests that require your action:
+In the Audit tool's home screen and on the homepage you can see commits and
+requests that require your action:
- **Required Audits** are open audit requests that require you, a project
you are a member of, or a package you own to audit a commit. An audit
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 20, 5:52 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7332291
Default Alt Text
D17186.id41329.diff (12 KB)
Attached To
Mode
D17186: Merge "Audit" more completely into "Diffusion"
Attached
Detach File
Event Timeline
Log In to Comment