diff --git a/resources/sql/autopatches/20140218.passwords.4.vcs.php b/resources/sql/autopatches/20140218.passwords.4.vcs.php --- a/resources/sql/autopatches/20140218.passwords.4.vcs.php +++ b/resources/sql/autopatches/20140218.passwords.4.vcs.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository_vcspassword'); $conn_w = $table->establishConnection('w'); echo pht('Upgrading password hashing for VCS passwords.')."\n"; diff --git a/resources/sql/autopatches/20140325.push.3.groups.php b/resources/sql/autopatches/20140325.push.3.groups.php --- a/resources/sql/autopatches/20140325.push.3.groups.php +++ b/resources/sql/autopatches/20140325.push.3.groups.php @@ -1,6 +1,9 @@ establishConnection('w'); +$table = id(new DiffusionRepository()) + ->setApplicationName('repository') + ->setTableName('repository'); +$conn_w = $table->establishConnection('w'); echo pht('Adding transaction log event groups...')."\n"; @@ -15,7 +18,7 @@ continue; } - $event_phid = id(new PhabricatorRepositoryPushEvent())->generatePHID(); + $event_phid = id(new DiffusionRepositoryPushEvent())->generatePHID(); queryfx( $conn_w, diff --git a/resources/sql/autopatches/20140722.audit.3.miginlines.php b/resources/sql/autopatches/20140722.audit.3.miginlines.php --- a/resources/sql/autopatches/20140722.audit.3.miginlines.php +++ b/resources/sql/autopatches/20140722.audit.3.miginlines.php @@ -22,14 +22,14 @@ if ($row['auditCommentID']) { $xaction_phid = PhabricatorPHID::generateNewPHID( PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST, - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); } else { $xaction_phid = null; } $comment_phid = PhabricatorPHID::generateNewPHID( PhabricatorPHIDConstants::PHID_TYPE_XCMT, - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); queryfx( $conn_w, diff --git a/resources/sql/autopatches/20140722.audit.4.migtext.php b/resources/sql/autopatches/20140722.audit.4.migtext.php --- a/resources/sql/autopatches/20140722.audit.4.migtext.php +++ b/resources/sql/autopatches/20140722.audit.4.migtext.php @@ -18,11 +18,11 @@ $xaction_phid = PhabricatorPHID::generateNewPHID( PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST, - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); $comment_phid = PhabricatorPHID::generateNewPHID( PhabricatorPHIDConstants::PHID_TYPE_XCMT, - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); queryfx( $conn_w, diff --git a/resources/sql/autopatches/20140725.audit.1.migxactions.php b/resources/sql/autopatches/20140725.audit.1.migxactions.php --- a/resources/sql/autopatches/20140725.audit.1.migxactions.php +++ b/resources/sql/autopatches/20140725.audit.1.migxactions.php @@ -99,7 +99,7 @@ if (!$xaction_phid) { $xaction_phid = PhabricatorPHID::generateNewPHID( PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST, - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); } unset($xaction['phid']); diff --git a/resources/sql/autopatches/20140731.audit.1.subscribers.php b/resources/sql/autopatches/20140731.audit.1.subscribers.php --- a/resources/sql/autopatches/20140731.audit.1.subscribers.php +++ b/resources/sql/autopatches/20140731.audit.1.subscribers.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository_auditrequest'); $conn_w = $table->establishConnection('w'); echo pht('Migrating Audit subscribers to subscriptions...')."\n"; diff --git a/resources/sql/autopatches/20141113.auditdupes.php b/resources/sql/autopatches/20141113.auditdupes.php --- a/resources/sql/autopatches/20141113.auditdupes.php +++ b/resources/sql/autopatches/20141113.auditdupes.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository_auditrequest'); $conn_w = $table->establishConnection('w'); echo pht('Removing duplicate Audit requests...')."\n"; diff --git a/resources/sql/autopatches/20150503.repositorysymbols.2.php b/resources/sql/autopatches/20150503.repositorysymbols.2.php --- a/resources/sql/autopatches/20150503.repositorysymbols.2.php +++ b/resources/sql/autopatches/20150503.repositorysymbols.2.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository_symbol'); $conn_w = $table->establishConnection('w'); $projects = queryfx_all( @@ -9,7 +11,7 @@ 'repository_arcanistproject'); foreach ($projects as $project) { - $repo = id(new PhabricatorRepositoryQuery()) + $repo = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs(array($project['repositoryID'])) ->executeOne(); diff --git a/resources/sql/autopatches/20150504.symbolsproject.1.php b/resources/sql/autopatches/20150504.symbolsproject.1.php --- a/resources/sql/autopatches/20150504.symbolsproject.1.php +++ b/resources/sql/autopatches/20150504.symbolsproject.1.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository'); $conn_w = $table_w->establishConnection('w'); // Repository and Project share a database. @@ -15,7 +17,7 @@ return; } -$repositories = id(new PhabricatorRepositoryQuery()) +$repositories = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs($repository_ids) ->execute(); diff --git a/resources/sql/autopatches/20150625.diffusion.1.sql b/resources/sql/autopatches/20150625.diffusion.1.sql new file mode 100644 --- /dev/null +++ b/resources/sql/autopatches/20150625.diffusion.1.sql @@ -0,0 +1,48 @@ +RENAME TABLE {$NAMESPACE}_repository.edge + TO {$NAMESPACE}_diffusion.edge; +RENAME TABLE {$NAMESPACE}_repository.edgedata + TO {$NAMESPACE}_diffusion.diffusion_edgedata; +RENAME TABLE {$NAMESPACE}_repository.repository + TO {$NAMESPACE}_diffusion.diffusion_repository; +RENAME TABLE {$NAMESPACE}_repository.repository_arcanistproject + TO {$NAMESPACE}_diffusion.diffusion_arcanistproject; +RENAME TABLE {$NAMESPACE}_repository.repository_auditrequest + TO {$NAMESPACE}_diffusion.diffusion_auditrequest; +RENAME TABLE {$NAMESPACE}_repository.repository_badcommit + TO {$NAMESPACE}_diffusion.diffusion_badcommit; +RENAME TABLE {$NAMESPACE}_repository.repository_branch + TO {$NAMESPACE}_diffusion.diffusion_branch; +RENAME TABLE {$NAMESPACE}_repository.repository_commit + TO {$NAMESPACE}_diffusion.diffusion_commit; +RENAME TABLE {$NAMESPACE}_repository.repository_commitdata + TO {$NAMESPACE}_diffusion.diffusion_commitdata; +RENAME TABLE {$NAMESPACE}_repository.repository_coverage + TO {$NAMESPACE}_diffusion.diffusion_repository_coverage; +RENAME TABLE {$NAMESPACE}_repository.repository_filesystem + TO {$NAMESPACE}_diffusion.diffusion_repositoryfilesystem; +RENAME TABLE {$NAMESPACE}_repository.repository_lintmessage + TO {$NAMESPACE}_diffusion.diffusion_repositorylintmessage; +RENAME TABLE {$NAMESPACE}_repository.repository_mirror + TO {$NAMESPACE}_diffusion.diffusion_repositorymirror; +RENAME TABLE {$NAMESPACE}_repository.repository_parents + TO {$NAMESPACE}_diffusion.diffusion_repositoryparents; +RENAME TABLE {$NAMESPACE}_repository.repository_path + TO {$NAMESPACE}_diffusion.diffusion_repositorypath; +RENAME TABLE {$NAMESPACE}_repository.repository_pathchange + TO {$NAMESPACE}_diffusion.diffusion_repositorypathchange; +RENAME TABLE {$NAMESPACE}_repository.repository_pushevent + TO {$NAMESPACE}_diffusion.diffusion_repositorypushevent; +RENAME TABLE {$NAMESPACE}_repository.repository_pushlog + TO {$NAMESPACE}_diffusion.diffusion_repositorypushlog; +RENAME TABLE {$NAMESPACE}_repository.repository_refcursor + TO {$NAMESPACE}_diffusion.diffusion_repositoryrefcursor; +RENAME TABLE {$NAMESPACE}_repository.repository_statusmessage + TO {$NAMESPACE}_diffusion.diffusion_repositorystatusmessage; +RENAME TABLE {$NAMESPACE}_repository.repository_summary + TO {$NAMESPACE}_diffusion.diffusion_repositorysummary; +RENAME TABLE {$NAMESPACE}_repository.repository_symbol + TO {$NAMESPACE}_diffusion.diffusion_symbol; +RENAME TABLE {$NAMESPACE}_repository.repository_transaction + TO {$NAMESPACE}_diffusion.diffusion_repository_transaction; +RENAME TABLE {$NAMESPACE}_repository.repository_vcspassword + TO {$NAMESPACE}_diffusion.diffusion_vcspassword; diff --git a/resources/sql/autopatches/20150625.diffusion.2.sql b/resources/sql/autopatches/20150625.diffusion.2.sql new file mode 100644 --- /dev/null +++ b/resources/sql/autopatches/20150625.diffusion.2.sql @@ -0,0 +1 @@ +DROP DATABASE {$NAMESPACE}_repository; diff --git a/resources/sql/patches/093.gitremotes.php b/resources/sql/patches/093.gitremotes.php --- a/resources/sql/patches/093.gitremotes.php +++ b/resources/sql/patches/093.gitremotes.php @@ -2,7 +2,9 @@ echo pht('Stripping remotes from repository default branches...')."\n"; -$table = new PhabricatorRepository(); +$table = id(new DiffusionRepository()) + ->setApplicationName('repository') + ->setTableName('repository'); $table->openTransaction(); $conn_w = $table->establishConnection('w'); diff --git a/resources/sql/patches/111.commitauditmigration.php b/resources/sql/patches/111.commitauditmigration.php --- a/resources/sql/patches/111.commitauditmigration.php +++ b/resources/sql/patches/111.commitauditmigration.php @@ -1,11 +1,15 @@ setApplicationName('repository') + ->setTableName('repository_commit'); $table->openTransaction(); $conn = $table->establishConnection('w'); -$data = new PhabricatorRepositoryCommitData(); +$data = id(new DiffusionCommitData()) + ->setApplicationName('repository') + ->setTableName('repository_commitdata'); $commits = queryfx_all( $conn, 'SELECT c.id id, c.authorPHID authorPHID, d.commitDetails details diff --git a/resources/sql/patches/117.repositorydescription.php b/resources/sql/patches/117.repositorydescription.php --- a/resources/sql/patches/117.repositorydescription.php +++ b/resources/sql/patches/117.repositorydescription.php @@ -1,6 +1,9 @@ establishConnection('w'); +$table = id(new DiffusionRepository()) + ->setApplicationName('repository') + ->setTableName('repository'); +$conn = $table->establishConnection('w'); if (queryfx_one($conn, "SHOW COLUMNS FROM `repository` LIKE 'description'")) { queryfx($conn, 'ALTER TABLE `repository` DROP `description`'); } diff --git a/resources/sql/patches/20130219.commitsummarymig.php b/resources/sql/patches/20130219.commitsummarymig.php --- a/resources/sql/patches/20130219.commitsummarymig.php +++ b/resources/sql/patches/20130219.commitsummarymig.php @@ -2,7 +2,9 @@ echo pht('Backfilling commit summaries...')."\n"; -$table = new PhabricatorRepositoryCommit(); +$table = id(new DiffusionCommit()) + ->setApplicationName('repository') + ->setTableName('repository_commit'); $conn_w = $table->establishConnection('w'); $commits = new LiskMigrationIterator($table); foreach ($commits as $commit) { @@ -13,7 +15,9 @@ } $data = $commit->loadOneRelative( - new PhabricatorRepositoryCommitData(), + id(new DiffusionCommitData()) + ->setApplicationName('repository') + ->setTableName('repository_commitdata'), 'commitID'); if (!$data) { diff --git a/resources/sql/patches/20130409.commitdrev.php b/resources/sql/patches/20130409.commitdrev.php --- a/resources/sql/patches/20130409.commitdrev.php +++ b/resources/sql/patches/20130409.commitdrev.php @@ -1,8 +1,12 @@ setApplicationName('repository') + ->setTableName('repository_commit'); +$data_table = id(new DiffusionCommitData()) + ->setApplicationName('repository') + ->setTableName('repository_commitdata'); $editor = new PhabricatorEdgeEditor(); $commit_table->establishConnection('w'); $edges = 0; diff --git a/resources/sql/patches/20131121.repocredentials.2.mig.php b/resources/sql/patches/20131121.repocredentials.2.mig.php --- a/resources/sql/patches/20131121.repocredentials.2.mig.php +++ b/resources/sql/patches/20131121.repocredentials.2.mig.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository'); $conn_w = $table->establishConnection('w'); $viewer = PhabricatorUser::getOmnipotentUser(); diff --git a/resources/sql/patches/20131217.pushlogphid.2.mig.php b/resources/sql/patches/20131217.pushlogphid.2.mig.php --- a/resources/sql/patches/20131217.pushlogphid.2.mig.php +++ b/resources/sql/patches/20131217.pushlogphid.2.mig.php @@ -1,6 +1,8 @@ setApplicationName('repository') + ->setTableName('repository_pushlog'); $conn_w = $table->establishConnection('w'); echo pht('Assigning PHIDs to push logs...')."\n"; diff --git a/scripts/repository/commit_hook.php b/scripts/repository/commit_hook.php --- a/scripts/repository/commit_hook.php +++ b/scripts/repository/commit_hook.php @@ -37,7 +37,7 @@ $engine = new DiffusionCommitHookEngine(); -$repository = id(new PhabricatorRepositoryQuery()) +$repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withCallsigns(array($argv[1])) ->needProjectPHIDs(true) diff --git a/scripts/repository/manage_repositories.php b/scripts/repository/manage_repositories.php --- a/scripts/repository/manage_repositories.php +++ b/scripts/repository/manage_repositories.php @@ -16,7 +16,7 @@ $args->parseStandardArguments(); $workflows = id(new PhutilSymbolLoader()) - ->setAncestorClass('PhabricatorRepositoryManagementWorkflow') + ->setAncestorClass('DiffusionRepositoryManagementWorkflow') ->loadObjects(); $workflows[] = new PhutilHelpArgumentWorkflow(); $args->parseWorkflows($workflows); diff --git a/scripts/repository/rebuild_summaries.php b/scripts/repository/rebuild_summaries.php --- a/scripts/repository/rebuild_summaries.php +++ b/scripts/repository/rebuild_summaries.php @@ -4,9 +4,9 @@ $root = dirname(dirname(dirname(__FILE__))); require_once $root.'/scripts/__init_script__.php'; -$commit = new PhabricatorRepositoryCommit(); +$commit = new DiffusionCommit(); -$conn_w = id(new PhabricatorRepository())->establishConnection('w'); +$conn_w = id(new DiffusionRepository())->establishConnection('w'); $sizes = queryfx_all( $conn_w, 'SELECT repositoryID, count(*) N FROM %T GROUP BY repositoryID', @@ -43,7 +43,7 @@ lastCommitID = VALUES(lastCommitID), size = VALUES(size), epoch = VALUES(epoch)', - PhabricatorRepository::TABLE_SUMMARY, + DiffusionRepository::TABLE_SUMMARY, $repository_id, $last_commit, idx($sizes, $repository_id, 0), diff --git a/scripts/symbols/clear_repository_symbols.php b/scripts/symbols/clear_repository_symbols.php --- a/scripts/symbols/clear_repository_symbols.php +++ b/scripts/symbols/clear_repository_symbols.php @@ -26,7 +26,7 @@ } $callsign = head($callsigns); -$repository = id(new PhabricatorRepositoryQuery()) +$repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withCallsigns($callsigns) ->executeOne(); @@ -42,10 +42,10 @@ // Emulate the behavior of the symbol generation scripts. $normalized[] = '/'.ltrim($path, './'); } -$paths = PhabricatorRepositoryCommitChangeParserWorker::lookupOrCreatePaths( +$paths = DiffusionCommitChangeParserWorker::lookupOrCreatePaths( $normalized); -$symbol = new PhabricatorRepositorySymbol(); +$symbol = new DiffusionSymbol(); $conn_w = $symbol->establishConnection('w'); foreach (array_chunk(array_values($paths), 128) as $chunk) { diff --git a/scripts/symbols/import_repository_symbols.php b/scripts/symbols/import_repository_symbols.php --- a/scripts/symbols/import_repository_symbols.php +++ b/scripts/symbols/import_repository_symbols.php @@ -46,7 +46,7 @@ } $callsign = head($callsigns); -$repository = id(new PhabricatorRepositoryQuery()) +$repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withCallsigns($callsigns) ->executeOne(); @@ -67,15 +67,15 @@ function commit_symbols( array $symbols, - PhabricatorRepository $repository, + DiffusionRepository $repository, $no_purge) { echo pht('Looking up path IDs...'), "\n"; $path_map = - PhabricatorRepositoryCommitChangeParserWorker::lookupOrCreatePaths( + DiffusionCommitChangeParserWorker::lookupOrCreatePaths( ipull($symbols, 'path')); - $symbol = new PhabricatorRepositorySymbol(); + $symbol = new DiffusionSymbol(); $conn_w = $symbol->establishConnection('w'); echo pht('Preparing queries...'), "\n"; 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 @@ -464,7 +464,12 @@ 'DifferentialUpdateRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php', 'DifferentialUpdateUnitResultsConduitAPIMethod' => 'applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php', 'DifferentialViewPolicyField' => 'applications/differential/customfield/DifferentialViewPolicyField.php', + 'DiffusionArcanistProject' => 'applications/diffusion/storage/DiffusionArcanistProject.php', + 'DiffusionArcanistProjectPHIDType' => 'applications/diffusion/phid/DiffusionArcanistProjectPHIDType.php', + 'DiffusionArcanistProjectQuery' => 'applications/diffusion/query/DiffusionArcanistProjectQuery.php', + 'DiffusionAuditRequest' => 'applications/diffusion/storage/DiffusionAuditRequest.php', 'DiffusionAuditorDatasource' => 'applications/diffusion/typeahead/DiffusionAuditorDatasource.php', + 'DiffusionBranch' => 'applications/diffusion/storage/DiffusionBranch.php', 'DiffusionBranchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php', 'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php', 'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php', @@ -478,27 +483,37 @@ 'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php', 'DiffusionCachedResolveRefsQuery' => 'applications/diffusion/query/DiffusionCachedResolveRefsQuery.php', 'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php', + 'DiffusionCommit' => 'applications/diffusion/storage/DiffusionCommit.php', 'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php', + 'DiffusionCommitChangeParserWorker' => 'applications/diffusion/worker/commitchangeparser/DiffusionCommitChangeParserWorker.php', 'DiffusionCommitChangeTableView' => 'applications/diffusion/view/DiffusionCommitChangeTableView.php', 'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php', + 'DiffusionCommitData' => 'applications/diffusion/storage/DiffusionCommitData.php', 'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php', 'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php', 'DiffusionCommitHasTaskEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasTaskEdgeType.php', 'DiffusionCommitHash' => 'applications/diffusion/data/DiffusionCommitHash.php', + 'DiffusionCommitHeraldWorker' => 'applications/diffusion/worker/DiffusionCommitHeraldWorker.php', 'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php', 'DiffusionCommitHookRejectException' => 'applications/diffusion/exception/DiffusionCommitHookRejectException.php', + 'DiffusionCommitMessageParserWorker' => 'applications/diffusion/worker/commitmessageparser/DiffusionCommitMessageParserWorker.php', + 'DiffusionCommitOwnersWorker' => 'applications/diffusion/worker/DiffusionCommitOwnersWorker.php', + 'DiffusionCommitPHIDType' => 'applications/diffusion/phid/DiffusionCommitPHIDType.php', 'DiffusionCommitParentsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php', + 'DiffusionCommitParserWorker' => 'applications/diffusion/worker/DiffusionCommitParserWorker.php', 'DiffusionCommitQuery' => 'applications/diffusion/query/DiffusionCommitQuery.php', 'DiffusionCommitRef' => 'applications/diffusion/data/DiffusionCommitRef.php', 'DiffusionCommitRemarkupRule' => 'applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php', 'DiffusionCommitRemarkupRuleTestCase' => 'applications/diffusion/remarkup/__tests__/DiffusionCommitRemarkupRuleTestCase.php', 'DiffusionCommitRevertedByCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php', 'DiffusionCommitRevertsCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php', + 'DiffusionCommitSearchIndexer' => 'applications/diffusion/search/DiffusionCommitSearchIndexer.php', 'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php', 'DiffusionConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionConduitAPIMethod.php', 'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php', 'DiffusionCreateCommentConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php', 'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php', + 'DiffusionDAO' => 'applications/diffusion/storage/DiffusionDAO.php', 'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php', 'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php', 'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php', @@ -520,6 +535,7 @@ 'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php', 'DiffusionGitBranch' => 'applications/diffusion/data/DiffusionGitBranch.php', 'DiffusionGitBranchTestCase' => 'applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php', + 'DiffusionGitCommitChangeParserWorker' => 'applications/diffusion/worker/commitchangeparser/DiffusionGitCommitChangeParserWorker.php', 'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php', 'DiffusionGitFileContentQueryTestCase' => 'applications/diffusion/query/__tests__/DiffusionGitFileContentQueryTestCase.php', 'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php', @@ -549,6 +565,8 @@ 'DiffusionLowLevelParentsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php', 'DiffusionLowLevelQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php', 'DiffusionLowLevelResolveRefsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php', + 'DiffusionMercurialCommitChangeParserWorker' => 'applications/diffusion/worker/commitchangeparser/DiffusionMercurialCommitChangeParserWorker.php', + 'DiffusionMercurialCommitMessageParserWorker' => 'applications/diffusion/worker/commitmessageparser/DiffusionMercurialCommitMessageParserWorker.php', 'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php', 'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php', 'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php', @@ -561,6 +579,7 @@ 'DiffusionMergedCommitsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php', 'DiffusionMirrorDeleteController' => 'applications/diffusion/controller/DiffusionMirrorDeleteController.php', 'DiffusionMirrorEditController' => 'applications/diffusion/controller/DiffusionMirrorEditController.php', + 'DiffusionParsedChange' => 'applications/diffusion/data/DiffusionParsedChange.php', 'DiffusionPathChange' => 'applications/diffusion/data/DiffusionPathChange.php', 'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php', 'DiffusionPathCompleteController' => 'applications/diffusion/controller/DiffusionPathCompleteController.php', @@ -587,11 +606,13 @@ 'DiffusionRefTableController' => 'applications/diffusion/controller/DiffusionRefTableController.php', 'DiffusionRefsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php', 'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php', + 'DiffusionRepository' => 'applications/diffusion/storage/DiffusionRepository.php', 'DiffusionRepositoryByIDRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php', 'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php', 'DiffusionRepositoryCreateController' => 'applications/diffusion/controller/DiffusionRepositoryCreateController.php', 'DiffusionRepositoryDatasource' => 'applications/diffusion/typeahead/DiffusionRepositoryDatasource.php', 'DiffusionRepositoryDefaultController' => 'applications/diffusion/controller/DiffusionRepositoryDefaultController.php', + 'DiffusionRepositoryDiscoveryEngine' => 'applications/diffusion/engine/DiffusionRepositoryDiscoveryEngine.php', 'DiffusionRepositoryEditActionsController' => 'applications/diffusion/controller/DiffusionRepositoryEditActionsController.php', 'DiffusionRepositoryEditActivateController' => 'applications/diffusion/controller/DiffusionRepositoryEditActivateController.php', 'DiffusionRepositoryEditBasicController' => 'applications/diffusion/controller/DiffusionRepositoryEditBasicController.php', @@ -606,17 +627,68 @@ 'DiffusionRepositoryEditStorageController' => 'applications/diffusion/controller/DiffusionRepositoryEditStorageController.php', 'DiffusionRepositoryEditSubversionController' => 'applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php', 'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php', + 'DiffusionRepositoryEditor' => 'applications/diffusion/editor/DiffusionRepositoryEditor.php', + 'DiffusionRepositoryEngine' => 'applications/diffusion/engine/DiffusionRepositoryEngine.php', + 'DiffusionRepositoryGitGraphStream' => 'applications/diffusion/daemon/DiffusionRepositoryGitGraphStream.php', + 'DiffusionRepositoryGraphCache' => 'applications/diffusion/graphcache/DiffusionRepositoryGraphCache.php', + 'DiffusionRepositoryGraphStream' => 'applications/diffusion/daemon/DiffusionRepositoryGraphStream.php', 'DiffusionRepositoryListController' => 'applications/diffusion/controller/DiffusionRepositoryListController.php', + 'DiffusionRepositoryManagementCacheWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementCacheWorkflow.php', + 'DiffusionRepositoryManagementDiscoverWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementDiscoverWorkflow.php', + 'DiffusionRepositoryManagementEditWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementEditWorkflow.php', + 'DiffusionRepositoryManagementImportingWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementImportingWorkflow.php', + 'DiffusionRepositoryManagementListWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementListWorkflow.php', + 'DiffusionRepositoryManagementLookupUsersWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementLookupUsersWorkflow.php', + 'DiffusionRepositoryManagementMarkImportedWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementMarkImportedWorkflow.php', + 'DiffusionRepositoryManagementMirrorWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementMirrorWorkflow.php', + 'DiffusionRepositoryManagementParentsWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementParentsWorkflow.php', + 'DiffusionRepositoryManagementPullWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementPullWorkflow.php', + 'DiffusionRepositoryManagementRefsWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementRefsWorkflow.php', + 'DiffusionRepositoryManagementReparseWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementReparseWorkflow.php', + 'DiffusionRepositoryManagementUpdateWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementUpdateWorkflow.php', + 'DiffusionRepositoryManagementWorkflow' => 'applications/diffusion/management/DiffusionRepositoryManagementWorkflow.php', + 'DiffusionRepositoryMercurialGraphStream' => 'applications/diffusion/daemon/DiffusionRepositoryMercurialGraphStream.php', + 'DiffusionRepositoryMirror' => 'applications/diffusion/storage/DiffusionRepositoryMirror.php', + 'DiffusionRepositoryMirrorEngine' => 'applications/diffusion/engine/DiffusionRepositoryMirrorEngine.php', + 'DiffusionRepositoryMirrorPHIDType' => 'applications/diffusion/phid/DiffusionRepositoryMirrorPHIDType.php', + 'DiffusionRepositoryMirrorQuery' => 'applications/diffusion/query/DiffusionRepositoryMirrorQuery.php', 'DiffusionRepositoryNewController' => 'applications/diffusion/controller/DiffusionRepositoryNewController.php', + 'DiffusionRepositoryPHIDType' => 'applications/diffusion/phid/DiffusionRepositoryPHIDType.php', 'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php', + 'DiffusionRepositoryPullEngine' => 'applications/diffusion/engine/DiffusionRepositoryPullEngine.php', + 'DiffusionRepositoryPullLocalDaemon' => 'applications/diffusion/daemon/DiffusionRepositoryPullLocalDaemon.php', + 'DiffusionRepositoryPushEvent' => 'applications/diffusion/storage/DiffusionRepositoryPushEvent.php', + 'DiffusionRepositoryPushEventPHIDType' => 'applications/diffusion/phid/DiffusionRepositoryPushEventPHIDType.php', + 'DiffusionRepositoryPushEventQuery' => 'applications/diffusion/query/DiffusionRepositoryPushEventQuery.php', + 'DiffusionRepositoryPushLog' => 'applications/diffusion/storage/DiffusionRepositoryPushLog.php', + 'DiffusionRepositoryPushLogPHIDType' => 'applications/diffusion/phid/DiffusionRepositoryPushLogPHIDType.php', + 'DiffusionRepositoryPushLogQuery' => 'applications/diffusion/query/DiffusionRepositoryPushLogQuery.php', + 'DiffusionRepositoryPushLogSearchEngine' => 'applications/diffusion/query/DiffusionRepositoryPushLogSearchEngine.php', + 'DiffusionRepositoryPushMailWorker' => 'applications/diffusion/worker/DiffusionPushMailWorker.php', + 'DiffusionRepositoryPushReplyHandler' => 'applications/diffusion/mail/DiffusionRepositoryPushReplyHandler.php', + 'DiffusionRepositoryQuery' => 'applications/diffusion/query/DiffusionRepositoryQuery.php', 'DiffusionRepositoryRef' => 'applications/diffusion/data/DiffusionRepositoryRef.php', + 'DiffusionRepositoryRefCursor' => 'applications/diffusion/storage/DiffusionRepositoryRefCursor.php', + 'DiffusionRepositoryRefCursorQuery' => 'applications/diffusion/query/DiffusionRepositoryRefCursorQuery.php', + 'DiffusionRepositoryRefEngine' => 'applications/diffusion/engine/DiffusionRepositoryRefEngine.php', 'DiffusionRepositoryRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php', + 'DiffusionRepositorySearchEngine' => 'applications/diffusion/query/DiffusionRepositorySearchEngine.php', + 'DiffusionRepositoryStatusMessage' => 'applications/diffusion/storage/DiffusionRepositoryStatusMessage.php', 'DiffusionRepositorySymbolsController' => 'applications/diffusion/controller/DiffusionRepositorySymbolsController.php', 'DiffusionRepositoryTag' => 'applications/diffusion/data/DiffusionRepositoryTag.php', + 'DiffusionRepositoryTestCase' => 'applications/diffusion/storage/__tests__/DiffusionRepositoryTestCase.php', + 'DiffusionRepositoryTransaction' => 'applications/diffusion/storage/DiffusionRepositoryTransaction.php', + 'DiffusionRepositoryTransactionQuery' => 'applications/diffusion/query/DiffusionRepositoryTransactionQuery.php', + 'DiffusionRepositoryType' => 'applications/diffusion/constants/DiffusionRepositoryType.php', + 'DiffusionRepositoryURINormalizer' => 'applications/diffusion/data/DiffusionRepositoryURINormalizer.php', + 'DiffusionRepositoryURINormalizerTestCase' => 'applications/diffusion/data/__tests__/DiffusionRepositoryURINormalizerTestCase.php', + 'DiffusionRepositoryURITestCase' => 'applications/diffusion/storage/__tests__/DiffusionRepositoryURITestCase.php', + 'DiffusionRepositoryVersion' => 'applications/diffusion/constants/DiffusionRepositoryVersion.php', 'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php', 'DiffusionResolveRefsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php', 'DiffusionResolveUserQuery' => 'applications/diffusion/query/DiffusionResolveUserQuery.php', 'DiffusionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSSHWorkflow.php', + 'DiffusionSchemaSpec' => 'applications/diffusion/storage/DiffusionSchemaSpec.php', 'DiffusionSearchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php', 'DiffusionServeController' => 'applications/diffusion/controller/DiffusionServeController.php', 'DiffusionSetPasswordSettingsPanel' => 'applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php', @@ -625,9 +697,12 @@ 'DiffusionSubversionServeSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php', 'DiffusionSubversionWireProtocol' => 'applications/diffusion/protocol/DiffusionSubversionWireProtocol.php', 'DiffusionSubversionWireProtocolTestCase' => 'applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php', + 'DiffusionSvnCommitChangeParserWorker' => 'applications/diffusion/worker/commitchangeparser/DiffusionSvnCommitChangeParserWorker.php', + 'DiffusionSvnCommitMessageParserWorker' => 'applications/diffusion/worker/commitmessageparser/DiffusionSvnCommitMessageParserWorker.php', 'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php', 'DiffusionSvnRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php', 'DiffusionSvnRequest' => 'applications/diffusion/request/DiffusionSvnRequest.php', + 'DiffusionSymbol' => 'applications/diffusion/storage/DiffusionSymbol.php', 'DiffusionSymbolController' => 'applications/diffusion/controller/DiffusionSymbolController.php', 'DiffusionSymbolDatasource' => 'applications/diffusion/typeahead/DiffusionSymbolDatasource.php', 'DiffusionSymbolQuery' => 'applications/diffusion/query/DiffusionSymbolQuery.php', @@ -636,7 +711,10 @@ 'DiffusionTagsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php', 'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php', 'DiffusionUpdateCoverageConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php', + 'DiffusionVCSPassword' => 'applications/diffusion/storage/DiffusionVCSPassword.php', + 'DiffusionVCSResponse' => 'applications/diffusion/response/DiffusionVCSResponse.php', 'DiffusionView' => 'applications/diffusion/view/DiffusionView.php', + 'DiffusonGitCommitMessageParserWorker' => 'applications/diffusion/worker/commitmessageparser/DiffusionGitCommitMessageParserWorker.php', 'DivinerArticleAtomizer' => 'applications/diviner/atomizer/DivinerArticleAtomizer.php', 'DivinerAtom' => 'applications/diviner/atom/DivinerAtom.php', 'DivinerAtomCache' => 'applications/diviner/cache/DivinerAtomCache.php', @@ -1573,7 +1651,7 @@ 'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php', 'PhabricatorCelerityApplication' => 'applications/celerity/application/PhabricatorCelerityApplication.php', 'PhabricatorCelerityTestCase' => '__tests__/PhabricatorCelerityTestCase.php', - 'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php', + 'PhabricatorChangeParserTestCase' => 'applications/diffusion/worker/__tests__/PhabricatorChangeParserTestCase.php', 'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php', 'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php', 'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php', @@ -1586,12 +1664,12 @@ 'PhabricatorChatLogQuery' => 'applications/chatlog/query/PhabricatorChatLogQuery.php', 'PhabricatorChunkedFileStorageEngine' => 'applications/files/engine/PhabricatorChunkedFileStorageEngine.php', 'PhabricatorClusterConfigOptions' => 'applications/config/option/PhabricatorClusterConfigOptions.php', - 'PhabricatorCommitBranchesField' => 'applications/repository/customfield/PhabricatorCommitBranchesField.php', - 'PhabricatorCommitCustomField' => 'applications/repository/customfield/PhabricatorCommitCustomField.php', - 'PhabricatorCommitMergedCommitsField' => 'applications/repository/customfield/PhabricatorCommitMergedCommitsField.php', - 'PhabricatorCommitRepositoryField' => 'applications/repository/customfield/PhabricatorCommitRepositoryField.php', + 'PhabricatorCommitBranchesField' => 'applications/diffusion/customfield/PhabricatorCommitBranchesField.php', + 'PhabricatorCommitCustomField' => 'applications/diffusion/customfield/PhabricatorCommitCustomField.php', + 'PhabricatorCommitMergedCommitsField' => 'applications/diffusion/customfield/PhabricatorCommitMergedCommitsField.php', + 'PhabricatorCommitRepositoryField' => 'applications/diffusion/customfield/PhabricatorCommitRepositoryField.php', 'PhabricatorCommitSearchEngine' => 'applications/audit/query/PhabricatorCommitSearchEngine.php', - 'PhabricatorCommitTagsField' => 'applications/repository/customfield/PhabricatorCommitTagsField.php', + 'PhabricatorCommitTagsField' => 'applications/diffusion/customfield/PhabricatorCommitTagsField.php', 'PhabricatorCommonPasswords' => 'applications/auth/constants/PhabricatorCommonPasswords.php', 'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php', 'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php', @@ -1967,7 +2045,6 @@ 'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php', 'PhabricatorGarbageCollectorConfigOptions' => 'applications/config/option/PhabricatorGarbageCollectorConfigOptions.php', 'PhabricatorGestureUIExample' => 'applications/uiexample/examples/PhabricatorGestureUIExample.php', - 'PhabricatorGitGraphStream' => 'applications/repository/daemon/PhabricatorGitGraphStream.php', 'PhabricatorGitHubAuthProvider' => 'applications/auth/provider/PhabricatorGitHubAuthProvider.php', 'PhabricatorGlobalLock' => 'infrastructure/util/PhabricatorGlobalLock.php', 'PhabricatorGlobalUploadTargetView' => 'applications/files/view/PhabricatorGlobalUploadTargetView.php', @@ -2093,7 +2170,6 @@ 'PhabricatorMemeRemarkupRule' => 'applications/macro/markup/PhabricatorMemeRemarkupRule.php', 'PhabricatorMentionRemarkupRule' => 'applications/people/markup/PhabricatorMentionRemarkupRule.php', 'PhabricatorMentionableInterface' => 'applications/transactions/interface/PhabricatorMentionableInterface.php', - 'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php', 'PhabricatorMetaMTAActor' => 'applications/metamta/query/PhabricatorMetaMTAActor.php', 'PhabricatorMetaMTAActorQuery' => 'applications/metamta/query/PhabricatorMetaMTAActorQuery.php', 'PhabricatorMetaMTAApplication' => 'applications/metamta/application/PhabricatorMetaMTAApplication.php', @@ -2447,83 +2523,8 @@ 'PhabricatorRemarkupGraphvizBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupGraphvizBlockInterpreter.php', 'PhabricatorRemarkupUIExample' => 'applications/uiexample/examples/PhabricatorRemarkupUIExample.php', 'PhabricatorRepositoriesSetupCheck' => 'applications/config/check/PhabricatorRepositoriesSetupCheck.php', - 'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php', - 'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php', - 'PhabricatorRepositoryArcanistProjectPHIDType' => 'applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php', - 'PhabricatorRepositoryArcanistProjectQuery' => 'applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php', - 'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php', - 'PhabricatorRepositoryBranch' => 'applications/repository/storage/PhabricatorRepositoryBranch.php', - 'PhabricatorRepositoryCommit' => 'applications/repository/storage/PhabricatorRepositoryCommit.php', - 'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php', - 'PhabricatorRepositoryCommitData' => 'applications/repository/storage/PhabricatorRepositoryCommitData.php', - 'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php', - 'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php', - 'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php', - 'PhabricatorRepositoryCommitPHIDType' => 'applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php', - 'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php', - 'PhabricatorRepositoryCommitRef' => 'applications/repository/engine/PhabricatorRepositoryCommitRef.php', - 'PhabricatorRepositoryCommitSearchIndexer' => 'applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php', - 'PhabricatorRepositoryConfigOptions' => 'applications/repository/config/PhabricatorRepositoryConfigOptions.php', - 'PhabricatorRepositoryDAO' => 'applications/repository/storage/PhabricatorRepositoryDAO.php', - 'PhabricatorRepositoryDiscoveryEngine' => 'applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php', - 'PhabricatorRepositoryEditor' => 'applications/repository/editor/PhabricatorRepositoryEditor.php', - 'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php', - 'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php', - 'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php', - 'PhabricatorRepositoryGraphCache' => 'applications/repository/graphcache/PhabricatorRepositoryGraphCache.php', - 'PhabricatorRepositoryGraphStream' => 'applications/repository/daemon/PhabricatorRepositoryGraphStream.php', - 'PhabricatorRepositoryManagementCacheWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php', - 'PhabricatorRepositoryManagementDiscoverWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php', - 'PhabricatorRepositoryManagementEditWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php', - 'PhabricatorRepositoryManagementImportingWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php', - 'PhabricatorRepositoryManagementListWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php', - 'PhabricatorRepositoryManagementLookupUsersWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php', - 'PhabricatorRepositoryManagementMarkImportedWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php', - 'PhabricatorRepositoryManagementMirrorWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php', - 'PhabricatorRepositoryManagementParentsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php', - 'PhabricatorRepositoryManagementPullWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php', - 'PhabricatorRepositoryManagementRefsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php', - 'PhabricatorRepositoryManagementReparseWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php', - 'PhabricatorRepositoryManagementUpdateWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php', - 'PhabricatorRepositoryManagementWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementWorkflow.php', - 'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php', - 'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php', - 'PhabricatorRepositoryMirror' => 'applications/repository/storage/PhabricatorRepositoryMirror.php', - 'PhabricatorRepositoryMirrorEngine' => 'applications/repository/engine/PhabricatorRepositoryMirrorEngine.php', - 'PhabricatorRepositoryMirrorPHIDType' => 'applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php', - 'PhabricatorRepositoryMirrorQuery' => 'applications/repository/query/PhabricatorRepositoryMirrorQuery.php', - 'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php', - 'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php', - 'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php', - 'PhabricatorRepositoryPushEvent' => 'applications/repository/storage/PhabricatorRepositoryPushEvent.php', - 'PhabricatorRepositoryPushEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php', - 'PhabricatorRepositoryPushEventQuery' => 'applications/repository/query/PhabricatorRepositoryPushEventQuery.php', - 'PhabricatorRepositoryPushLog' => 'applications/repository/storage/PhabricatorRepositoryPushLog.php', - 'PhabricatorRepositoryPushLogPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php', - 'PhabricatorRepositoryPushLogQuery' => 'applications/repository/query/PhabricatorRepositoryPushLogQuery.php', - 'PhabricatorRepositoryPushLogSearchEngine' => 'applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php', - 'PhabricatorRepositoryPushMailWorker' => 'applications/repository/worker/PhabricatorRepositoryPushMailWorker.php', - 'PhabricatorRepositoryPushReplyHandler' => 'applications/repository/mail/PhabricatorRepositoryPushReplyHandler.php', - 'PhabricatorRepositoryQuery' => 'applications/repository/query/PhabricatorRepositoryQuery.php', - 'PhabricatorRepositoryRefCursor' => 'applications/repository/storage/PhabricatorRepositoryRefCursor.php', - 'PhabricatorRepositoryRefCursorQuery' => 'applications/repository/query/PhabricatorRepositoryRefCursorQuery.php', - 'PhabricatorRepositoryRefEngine' => 'applications/repository/engine/PhabricatorRepositoryRefEngine.php', - 'PhabricatorRepositoryRepositoryPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php', - 'PhabricatorRepositorySchemaSpec' => 'applications/repository/storage/PhabricatorRepositorySchemaSpec.php', - 'PhabricatorRepositorySearchEngine' => 'applications/repository/query/PhabricatorRepositorySearchEngine.php', - 'PhabricatorRepositoryStatusMessage' => 'applications/repository/storage/PhabricatorRepositoryStatusMessage.php', - 'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php', - 'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php', - 'PhabricatorRepositorySymbol' => 'applications/repository/storage/PhabricatorRepositorySymbol.php', - 'PhabricatorRepositoryTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php', - 'PhabricatorRepositoryTransaction' => 'applications/repository/storage/PhabricatorRepositoryTransaction.php', - 'PhabricatorRepositoryTransactionQuery' => 'applications/repository/query/PhabricatorRepositoryTransactionQuery.php', - 'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php', - 'PhabricatorRepositoryURINormalizer' => 'applications/repository/data/PhabricatorRepositoryURINormalizer.php', - 'PhabricatorRepositoryURINormalizerTestCase' => 'applications/repository/data/__tests__/PhabricatorRepositoryURINormalizerTestCase.php', - 'PhabricatorRepositoryURITestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php', - 'PhabricatorRepositoryVCSPassword' => 'applications/repository/storage/PhabricatorRepositoryVCSPassword.php', - 'PhabricatorRepositoryVersion' => 'applications/repository/constants/PhabricatorRepositoryVersion.php', + 'PhabricatorRepositoryCommitRef' => 'applications/diffusion/engine/PhabricatorRepositoryCommitRef.php', + 'PhabricatorRepositoryConfigOptions' => 'applications/diffusion/config/PhabricatorRepositoryConfigOptions.php', 'PhabricatorRobotsController' => 'applications/system/controller/PhabricatorRobotsController.php', 'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php', 'PhabricatorSMS' => 'infrastructure/sms/storage/PhabricatorSMS.php', @@ -2815,7 +2816,6 @@ 'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php', 'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php', 'PhabricatorUsersPolicyRule' => 'applications/policy/rule/PhabricatorUsersPolicyRule.php', - 'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php', 'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php', 'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php', 'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php', @@ -2858,9 +2858,9 @@ 'PhabricatorWorkerTriggerPHIDType' => 'infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php', 'PhabricatorWorkerTriggerQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php', 'PhabricatorWorkerYieldException' => 'infrastructure/daemon/workers/exception/PhabricatorWorkerYieldException.php', - 'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php', - 'PhabricatorWorkingCopyPullTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php', - 'PhabricatorWorkingCopyTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php', + 'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/diffusion/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php', + 'PhabricatorWorkingCopyPullTestCase' => 'applications/diffusion/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php', + 'PhabricatorWorkingCopyTestCase' => 'applications/diffusion/engine/__tests__/PhabricatorWorkingCopyTestCase.php', 'PhabricatorXHPASTViewController' => 'applications/phpast/controller/PhabricatorXHPASTViewController.php', 'PhabricatorXHPASTViewDAO' => 'applications/phpast/storage/PhabricatorXHPASTViewDAO.php', 'PhabricatorXHPASTViewFrameController' => 'applications/phpast/controller/PhabricatorXHPASTViewFrameController.php', @@ -3300,9 +3300,9 @@ 'ReleephWorkRecordConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php', 'ReleephWorkRecordPickStatusConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php', 'RemarkupProcessConduitAPIMethod' => 'applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php', - 'RepositoryConduitAPIMethod' => 'applications/repository/conduit/RepositoryConduitAPIMethod.php', - 'RepositoryCreateConduitAPIMethod' => 'applications/repository/conduit/RepositoryCreateConduitAPIMethod.php', - 'RepositoryQueryConduitAPIMethod' => 'applications/repository/conduit/RepositoryQueryConduitAPIMethod.php', + 'RepositoryConduitAPIMethod' => 'applications/diffusion/conduit/RepositoryConduitAPIMethod.php', + 'RepositoryCreateConduitAPIMethod' => 'applications/diffusion/conduit/RepositoryCreateConduitAPIMethod.php', + 'RepositoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/RepositoryQueryConduitAPIMethod.php', 'ShellLogView' => 'applications/harbormaster/view/ShellLogView.php', 'SlowvoteConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteConduitAPIMethod.php', 'SlowvoteEmbedView' => 'applications/slowvote/view/SlowvoteEmbedView.php', @@ -3872,7 +3872,19 @@ 'DifferentialUpdateRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod', 'DifferentialUpdateUnitResultsConduitAPIMethod' => 'DifferentialConduitAPIMethod', 'DifferentialViewPolicyField' => 'DifferentialCoreCustomField', + 'DiffusionArcanistProject' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + 'PhabricatorDestructibleInterface', + ), + 'DiffusionArcanistProjectPHIDType' => 'PhabricatorPHIDType', + 'DiffusionArcanistProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DiffusionAuditRequest' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + ), 'DiffusionAuditorDatasource' => 'PhabricatorTypeaheadCompositeDatasource', + 'DiffusionBranch' => 'DiffusionDAO', 'DiffusionBranchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionBranchTableController' => 'DiffusionController', 'DiffusionBranchTableView' => 'DiffusionView', @@ -3886,27 +3898,48 @@ 'DiffusionBrowseTableView' => 'DiffusionView', 'DiffusionCachedResolveRefsQuery' => 'DiffusionLowLevelQuery', 'DiffusionChangeController' => 'DiffusionController', + 'DiffusionCommit' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + 'PhabricatorFlaggableInterface', + 'PhabricatorProjectInterface', + 'PhabricatorTokenReceiverInterface', + 'PhabricatorSubscribableInterface', + 'PhabricatorMentionableInterface', + 'HarbormasterBuildableInterface', + 'PhabricatorCustomFieldInterface', + 'PhabricatorApplicationTransactionInterface', + ), 'DiffusionCommitBranchesController' => 'DiffusionController', + 'DiffusionCommitChangeParserWorker' => 'DiffusionCommitParserWorker', 'DiffusionCommitChangeTableView' => 'DiffusionView', 'DiffusionCommitController' => 'DiffusionController', + 'DiffusionCommitData' => 'DiffusionDAO', 'DiffusionCommitEditController' => 'DiffusionController', 'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType', 'DiffusionCommitHasTaskEdgeType' => 'PhabricatorEdgeType', 'DiffusionCommitHash' => 'Phobject', + 'DiffusionCommitHeraldWorker' => 'DiffusionCommitParserWorker', 'DiffusionCommitHookEngine' => 'Phobject', 'DiffusionCommitHookRejectException' => 'Exception', + 'DiffusionCommitMessageParserWorker' => 'DiffusionCommitParserWorker', + 'DiffusionCommitOwnersWorker' => 'DiffusionCommitParserWorker', + 'DiffusionCommitPHIDType' => 'PhabricatorPHIDType', 'DiffusionCommitParentsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', + 'DiffusionCommitParserWorker' => 'PhabricatorWorker', 'DiffusionCommitQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'DiffusionCommitRef' => 'Phobject', 'DiffusionCommitRemarkupRule' => 'PhabricatorObjectRemarkupRule', 'DiffusionCommitRemarkupRuleTestCase' => 'PhabricatorTestCase', 'DiffusionCommitRevertedByCommitEdgeType' => 'PhabricatorEdgeType', 'DiffusionCommitRevertsCommitEdgeType' => 'PhabricatorEdgeType', + 'DiffusionCommitSearchIndexer' => 'PhabricatorSearchDocumentIndexer', 'DiffusionCommitTagsController' => 'DiffusionController', 'DiffusionConduitAPIMethod' => 'ConduitAPIMethod', 'DiffusionController' => 'PhabricatorController', 'DiffusionCreateCommentConduitAPIMethod' => 'DiffusionConduitAPIMethod', 'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability', + 'DiffusionDAO' => 'PhabricatorLiskDAO', 'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability', 'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability', 'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability', @@ -3928,6 +3961,7 @@ 'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'DiffusionConduitAPIMethod', 'DiffusionGitBranch' => 'Phobject', 'DiffusionGitBranchTestCase' => 'PhabricatorTestCase', + 'DiffusionGitCommitChangeParserWorker' => 'DiffusionCommitChangeParserWorker', 'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery', 'DiffusionGitFileContentQueryTestCase' => 'PhabricatorTestCase', 'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery', @@ -3957,6 +3991,8 @@ 'DiffusionLowLevelParentsQuery' => 'DiffusionLowLevelQuery', 'DiffusionLowLevelQuery' => 'Phobject', 'DiffusionLowLevelResolveRefsQuery' => 'DiffusionLowLevelQuery', + 'DiffusionMercurialCommitChangeParserWorker' => 'DiffusionCommitChangeParserWorker', + 'DiffusionMercurialCommitMessageParserWorker' => 'DiffusionCommitMessageParserWorker', 'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery', 'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery', 'DiffusionMercurialRequest' => 'DiffusionRequest', @@ -3969,6 +4005,7 @@ 'DiffusionMergedCommitsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionMirrorDeleteController' => 'DiffusionController', 'DiffusionMirrorEditController' => 'DiffusionController', + 'DiffusionParsedChange' => 'Phobject', 'DiffusionPathChange' => 'Phobject', 'DiffusionPathChangeQuery' => 'Phobject', 'DiffusionPathCompleteController' => 'DiffusionController', @@ -3995,11 +4032,22 @@ 'DiffusionRefTableController' => 'DiffusionController', 'DiffusionRefsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionRenameHistoryQuery' => 'Phobject', + 'DiffusionRepository' => array( + 'DiffusionDAO', + 'PhabricatorApplicationTransactionInterface', + 'PhabricatorPolicyInterface', + 'PhabricatorFlaggableInterface', + 'PhabricatorMarkupInterface', + 'PhabricatorDestructibleInterface', + 'PhabricatorProjectInterface', + 'PhabricatorSpacesInterface', + ), 'DiffusionRepositoryByIDRemarkupRule' => 'PhabricatorObjectRemarkupRule', 'DiffusionRepositoryController' => 'DiffusionController', 'DiffusionRepositoryCreateController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryDatasource' => 'PhabricatorTypeaheadDatasource', 'DiffusionRepositoryDefaultController' => 'DiffusionController', + 'DiffusionRepositoryDiscoveryEngine' => 'DiffusionRepositoryEngine', 'DiffusionRepositoryEditActionsController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditActivateController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditBasicController' => 'DiffusionRepositoryEditController', @@ -4014,17 +4062,80 @@ 'DiffusionRepositoryEditStorageController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditSubversionController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryEditController', + 'DiffusionRepositoryEditor' => 'PhabricatorApplicationTransactionEditor', + 'DiffusionRepositoryEngine' => 'Phobject', + 'DiffusionRepositoryGitGraphStream' => 'DiffusionRepositoryGraphStream', + 'DiffusionRepositoryGraphCache' => 'Phobject', + 'DiffusionRepositoryGraphStream' => 'Phobject', 'DiffusionRepositoryListController' => 'DiffusionController', + 'DiffusionRepositoryManagementCacheWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementDiscoverWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementEditWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementImportingWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementListWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementLookupUsersWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementMarkImportedWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementMirrorWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementParentsWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementPullWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementRefsWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementReparseWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementUpdateWorkflow' => 'DiffusionRepositoryManagementWorkflow', + 'DiffusionRepositoryManagementWorkflow' => 'PhabricatorManagementWorkflow', + 'DiffusionRepositoryMercurialGraphStream' => 'DiffusionRepositoryGraphStream', + 'DiffusionRepositoryMirror' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + ), + 'DiffusionRepositoryMirrorEngine' => 'DiffusionRepositoryEngine', + 'DiffusionRepositoryMirrorPHIDType' => 'PhabricatorPHIDType', + 'DiffusionRepositoryMirrorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'DiffusionRepositoryNewController' => 'DiffusionController', + 'DiffusionRepositoryPHIDType' => 'PhabricatorPHIDType', 'DiffusionRepositoryPath' => 'Phobject', + 'DiffusionRepositoryPullEngine' => 'DiffusionRepositoryEngine', + 'DiffusionRepositoryPullLocalDaemon' => 'PhabricatorDaemon', + 'DiffusionRepositoryPushEvent' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + ), + 'DiffusionRepositoryPushEventPHIDType' => 'PhabricatorPHIDType', + 'DiffusionRepositoryPushEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DiffusionRepositoryPushLog' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + ), + 'DiffusionRepositoryPushLogPHIDType' => 'PhabricatorPHIDType', + 'DiffusionRepositoryPushLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DiffusionRepositoryPushLogSearchEngine' => 'PhabricatorApplicationSearchEngine', + 'DiffusionRepositoryPushMailWorker' => 'PhabricatorWorker', + 'DiffusionRepositoryPushReplyHandler' => 'PhabricatorMailReplyHandler', + 'DiffusionRepositoryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'DiffusionRepositoryRef' => 'Phobject', + 'DiffusionRepositoryRefCursor' => array( + 'DiffusionDAO', + 'PhabricatorPolicyInterface', + ), + 'DiffusionRepositoryRefCursorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DiffusionRepositoryRefEngine' => 'DiffusionRepositoryEngine', 'DiffusionRepositoryRemarkupRule' => 'PhabricatorObjectRemarkupRule', + 'DiffusionRepositorySearchEngine' => 'PhabricatorApplicationSearchEngine', + 'DiffusionRepositoryStatusMessage' => 'DiffusionDAO', 'DiffusionRepositorySymbolsController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryTag' => 'Phobject', + 'DiffusionRepositoryTestCase' => 'PhabricatorTestCase', + 'DiffusionRepositoryTransaction' => 'PhabricatorApplicationTransaction', + 'DiffusionRepositoryTransactionQuery' => 'PhabricatorApplicationTransactionQuery', + 'DiffusionRepositoryType' => 'Phobject', + 'DiffusionRepositoryURINormalizer' => 'Phobject', + 'DiffusionRepositoryURINormalizerTestCase' => 'PhabricatorTestCase', + 'DiffusionRepositoryURITestCase' => 'PhabricatorTestCase', + 'DiffusionRepositoryVersion' => 'Phobject', 'DiffusionRequest' => 'Phobject', 'DiffusionResolveRefsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionResolveUserQuery' => 'Phobject', 'DiffusionSSHWorkflow' => 'PhabricatorSSHWorkflow', + 'DiffusionSchemaSpec' => 'PhabricatorConfigSchemaSpec', 'DiffusionSearchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionServeController' => 'DiffusionController', 'DiffusionSetPasswordSettingsPanel' => 'PhabricatorSettingsPanel', @@ -4033,9 +4144,12 @@ 'DiffusionSubversionServeSSHWorkflow' => 'DiffusionSubversionSSHWorkflow', 'DiffusionSubversionWireProtocol' => 'Phobject', 'DiffusionSubversionWireProtocolTestCase' => 'PhabricatorTestCase', + 'DiffusionSvnCommitChangeParserWorker' => 'DiffusionCommitChangeParserWorker', + 'DiffusionSvnCommitMessageParserWorker' => 'DiffusionCommitMessageParserWorker', 'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery', 'DiffusionSvnRawDiffQuery' => 'DiffusionRawDiffQuery', 'DiffusionSvnRequest' => 'DiffusionRequest', + 'DiffusionSymbol' => 'DiffusionDAO', 'DiffusionSymbolController' => 'DiffusionController', 'DiffusionSymbolDatasource' => 'PhabricatorTypeaheadDatasource', 'DiffusionSymbolQuery' => 'PhabricatorOffsetPagedQuery', @@ -4044,7 +4158,10 @@ 'DiffusionTagsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 'DiffusionURITestCase' => 'PhutilTestCase', 'DiffusionUpdateCoverageConduitAPIMethod' => 'DiffusionConduitAPIMethod', + 'DiffusionVCSPassword' => 'DiffusionDAO', + 'DiffusionVCSResponse' => 'AphrontResponse', 'DiffusionView' => 'AphrontView', + 'DiffusonGitCommitMessageParserWorker' => 'DiffusionCommitMessageParserWorker', 'DivinerArticleAtomizer' => 'DivinerAtomizer', 'DivinerAtom' => 'Phobject', 'DivinerAtomCache' => 'DivinerDiskCache', @@ -5623,7 +5740,6 @@ 'PhabricatorGarbageCollector' => 'Phobject', 'PhabricatorGarbageCollectorConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorGestureUIExample' => 'PhabricatorUIExample', - 'PhabricatorGitGraphStream' => 'PhabricatorRepositoryGraphStream', 'PhabricatorGitHubAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorGlobalLock' => 'PhutilLock', 'PhabricatorGlobalUploadTargetView' => 'AphrontView', @@ -5755,7 +5871,6 @@ 'PhabricatorMarkupPreviewController' => 'PhabricatorController', 'PhabricatorMemeRemarkupRule' => 'PhutilRemarkupRule', 'PhabricatorMentionRemarkupRule' => 'PhutilRemarkupRule', - 'PhabricatorMercurialGraphStream' => 'PhabricatorRepositoryGraphStream', 'PhabricatorMetaMTAActor' => 'Phobject', 'PhabricatorMetaMTAActorQuery' => 'PhabricatorQuery', 'PhabricatorMetaMTAApplication' => 'PhabricatorApplication', @@ -6177,122 +6292,8 @@ 'PhabricatorRemarkupGraphvizBlockInterpreter' => 'PhutilRemarkupBlockInterpreter', 'PhabricatorRemarkupUIExample' => 'PhabricatorUIExample', 'PhabricatorRepositoriesSetupCheck' => 'PhabricatorSetupCheck', - 'PhabricatorRepository' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorApplicationTransactionInterface', - 'PhabricatorPolicyInterface', - 'PhabricatorFlaggableInterface', - 'PhabricatorMarkupInterface', - 'PhabricatorDestructibleInterface', - 'PhabricatorProjectInterface', - 'PhabricatorSpacesInterface', - ), - 'PhabricatorRepositoryArcanistProject' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - 'PhabricatorDestructibleInterface', - ), - 'PhabricatorRepositoryArcanistProjectPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositoryArcanistProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryAuditRequest' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - ), - 'PhabricatorRepositoryBranch' => 'PhabricatorRepositoryDAO', - 'PhabricatorRepositoryCommit' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - 'PhabricatorFlaggableInterface', - 'PhabricatorProjectInterface', - 'PhabricatorTokenReceiverInterface', - 'PhabricatorSubscribableInterface', - 'PhabricatorMentionableInterface', - 'HarbormasterBuildableInterface', - 'PhabricatorCustomFieldInterface', - 'PhabricatorApplicationTransactionInterface', - ), - 'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker', - 'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO', - 'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker', - 'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker', - 'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker', - 'PhabricatorRepositoryCommitPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker', 'PhabricatorRepositoryCommitRef' => 'Phobject', - 'PhabricatorRepositoryCommitSearchIndexer' => 'PhabricatorSearchDocumentIndexer', 'PhabricatorRepositoryConfigOptions' => 'PhabricatorApplicationConfigOptions', - 'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO', - 'PhabricatorRepositoryDiscoveryEngine' => 'PhabricatorRepositoryEngine', - 'PhabricatorRepositoryEditor' => 'PhabricatorApplicationTransactionEditor', - 'PhabricatorRepositoryEngine' => 'Phobject', - 'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker', - 'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker', - 'PhabricatorRepositoryGraphCache' => 'Phobject', - 'PhabricatorRepositoryGraphStream' => 'Phobject', - 'PhabricatorRepositoryManagementCacheWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementDiscoverWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementEditWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementImportingWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementListWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementLookupUsersWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementMarkImportedWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementMirrorWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementParentsWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementPullWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementRefsWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementReparseWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementUpdateWorkflow' => 'PhabricatorRepositoryManagementWorkflow', - 'PhabricatorRepositoryManagementWorkflow' => 'PhabricatorManagementWorkflow', - 'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker', - 'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker', - 'PhabricatorRepositoryMirror' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - ), - 'PhabricatorRepositoryMirrorEngine' => 'PhabricatorRepositoryEngine', - 'PhabricatorRepositoryMirrorPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositoryMirrorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryParsedChange' => 'Phobject', - 'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine', - 'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorDaemon', - 'PhabricatorRepositoryPushEvent' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - ), - 'PhabricatorRepositoryPushEventPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositoryPushEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryPushLog' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - ), - 'PhabricatorRepositoryPushLogPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositoryPushLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryPushLogSearchEngine' => 'PhabricatorApplicationSearchEngine', - 'PhabricatorRepositoryPushMailWorker' => 'PhabricatorWorker', - 'PhabricatorRepositoryPushReplyHandler' => 'PhabricatorMailReplyHandler', - 'PhabricatorRepositoryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryRefCursor' => array( - 'PhabricatorRepositoryDAO', - 'PhabricatorPolicyInterface', - ), - 'PhabricatorRepositoryRefCursorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorRepositoryRefEngine' => 'PhabricatorRepositoryEngine', - 'PhabricatorRepositoryRepositoryPHIDType' => 'PhabricatorPHIDType', - 'PhabricatorRepositorySchemaSpec' => 'PhabricatorConfigSchemaSpec', - 'PhabricatorRepositorySearchEngine' => 'PhabricatorApplicationSearchEngine', - 'PhabricatorRepositoryStatusMessage' => 'PhabricatorRepositoryDAO', - 'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker', - 'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker', - 'PhabricatorRepositorySymbol' => 'PhabricatorRepositoryDAO', - 'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase', - 'PhabricatorRepositoryTransaction' => 'PhabricatorApplicationTransaction', - 'PhabricatorRepositoryTransactionQuery' => 'PhabricatorApplicationTransactionQuery', - 'PhabricatorRepositoryType' => 'Phobject', - 'PhabricatorRepositoryURINormalizer' => 'Phobject', - 'PhabricatorRepositoryURINormalizerTestCase' => 'PhabricatorTestCase', - 'PhabricatorRepositoryURITestCase' => 'PhabricatorTestCase', - 'PhabricatorRepositoryVCSPassword' => 'PhabricatorRepositoryDAO', - 'PhabricatorRepositoryVersion' => 'Phobject', 'PhabricatorRobotsController' => 'PhabricatorController', 'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine', 'PhabricatorSMS' => 'PhabricatorSMSDAO', @@ -6617,7 +6618,6 @@ 'PhabricatorUserTitleField' => 'PhabricatorUserCustomField', 'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction', 'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule', - 'PhabricatorVCSResponse' => 'AphrontResponse', 'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation', 'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource', 'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType', diff --git a/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php b/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php --- a/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php +++ b/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php @@ -34,7 +34,7 @@ protected function execute(ConduitAPIRequest $request) { $name = $request->getValue('name'); - $project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere( + $project = id(new DiffusionArcanistProject())->loadOneWhere( 'name = %s', $name); @@ -44,7 +44,7 @@ $repository = null; if ($project->getRepositoryID()) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withIDs(array($project->getRepositoryID())) ->executeOne(); diff --git a/src/applications/audit/controller/PhabricatorAuditPreviewController.php b/src/applications/audit/controller/PhabricatorAuditPreviewController.php --- a/src/applications/audit/controller/PhabricatorAuditPreviewController.php +++ b/src/applications/audit/controller/PhabricatorAuditPreviewController.php @@ -13,7 +13,7 @@ $request = $this->getRequest(); $user = $request->getUser(); - $commit = id(new PhabricatorRepositoryCommit())->load($this->id); + $commit = id(new DiffusionCommit())->load($this->id); if (!$commit) { return new Aphront404Response(); } 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 @@ -39,8 +39,8 @@ } public static function getMailThreading( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit) { + DiffusionRepository $repository, + DiffusionCommit $commit) { return array( 'diffusion-audit-'.$commit->getPHID(), 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 @@ -170,7 +170,7 @@ $audit_requested = PhabricatorAuditStatusConstants::AUDIT_REQUESTED; $audit_reason = $this->getAuditReasons($phid); } - $requests[] = id (new PhabricatorRepositoryAuditRequest()) + $requests[] = id (new DiffusionAuditRequest()) ->setCommitPHID($object->getPHID()) ->setAuditorPHID($phid) ->setAuditStatus($audit_requested) @@ -239,7 +239,7 @@ foreach ($xactions as $xaction) { switch ($xaction->getTransactionType()) { case PhabricatorAuditTransaction::TYPE_COMMIT: - $import_status_flag = PhabricatorRepositoryCommit::IMPORTED_HERALD; + $import_status_flag = DiffusionCommit::IMPORTED_HERALD; break; case PhabricatorAuditActionConstants::ACTION: $new = $xaction->getNewValue(); @@ -266,7 +266,7 @@ // their queue. if (!$actor_request) { - $actor_request = id(new PhabricatorRepositoryAuditRequest()) + $actor_request = id(new DiffusionAuditRequest()) ->setCommitPHID($object->getPHID()) ->setAuditorPHID($actor_phid); @@ -312,7 +312,7 @@ // If the actor has no authority over any existing requests, // create a new request for them. - $actor_request = id(new PhabricatorRepositoryAuditRequest()) + $actor_request = id(new DiffusionAuditRequest()) ->setCommitPHID($object->getPHID()) ->setAuditorPHID($actor_phid) ->setAuditStatus($new_status) @@ -410,7 +410,7 @@ } private function createAuditRequestTransactionFromCommitMessage( - PhabricatorRepositoryCommit $commit) { + DiffusionCommit $commit) { $data = $commit->getCommitData(); $message = $data->getCommitMessage(); @@ -726,7 +726,7 @@ private function attachPatch( PhabricatorMetaMTAMail $template, - PhabricatorRepositoryCommit $commit) { + DiffusionCommit $commit) { if (!$this->getRawPatch()) { return; @@ -754,7 +754,7 @@ private function inlinePatch( PhabricatorMetaMTAMailBody $body, - PhabricatorRepositoryCommit $commit) { + DiffusionCommit $commit) { if (!$this->getRawPatch()) { return; @@ -923,8 +923,8 @@ } private function isCommitMostlyImported(PhabricatorLiskDAO $object) { - $has_message = PhabricatorRepositoryCommit::IMPORTED_MESSAGE; - $has_changes = PhabricatorRepositoryCommit::IMPORTED_CHANGE; + $has_message = DiffusionCommit::IMPORTED_MESSAGE; + $has_changes = DiffusionCommit::IMPORTED_CHANGE; // Don't publish feed stories or email about events which occur during // import. In particular, this affects tasks being attached when they are diff --git a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php --- a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php +++ b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php @@ -4,11 +4,11 @@ extends PhabricatorApplicationTransactionReplyHandler { public function validateMailReceiver($mail_receiver) { - if (!($mail_receiver instanceof PhabricatorRepositoryCommit)) { + if (!($mail_receiver instanceof DiffusionCommit)) { throw new Exception( pht( 'Mail receiver is not a %s!', - 'PhabricatorRepositoryCommit')); + 'DiffusionCommit')); } } 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 @@ -228,7 +228,7 @@ return null; } - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withCallsigns($callsigns) ->execute(); 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 @@ -184,7 +184,7 @@ PhabricatorSavedQuery $query, array $handles) { - assert_instances_of($commits, 'PhabricatorRepositoryCommit'); + assert_instances_of($commits, 'DiffusionCommit'); $viewer = $this->requireViewer(); $nodata = pht('No matching audits.'); diff --git a/src/applications/audit/storage/PhabricatorAuditInlineComment.php b/src/applications/audit/storage/PhabricatorAuditInlineComment.php --- a/src/applications/audit/storage/PhabricatorAuditInlineComment.php +++ b/src/applications/audit/storage/PhabricatorAuditInlineComment.php @@ -266,7 +266,7 @@ $this->proxy->setTransactionPHID( PhabricatorPHID::generateNewPHID( PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST, - PhabricatorRepositoryCommitPHIDType::TYPECONST)); + DiffusionCommitPHIDType::TYPECONST)); return $this; } diff --git a/src/applications/audit/storage/PhabricatorAuditTransaction.php b/src/applications/audit/storage/PhabricatorAuditTransaction.php --- a/src/applications/audit/storage/PhabricatorAuditTransaction.php +++ b/src/applications/audit/storage/PhabricatorAuditTransaction.php @@ -21,7 +21,7 @@ } public function getApplicationTransactionType() { - return PhabricatorRepositoryCommitPHIDType::TYPECONST; + return DiffusionCommitPHIDType::TYPECONST; } public function getApplicationTransactionCommentObject() { diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php --- a/src/applications/audit/view/PhabricatorAuditListView.php +++ b/src/applications/audit/view/PhabricatorAuditListView.php @@ -33,7 +33,7 @@ * These commits should have both commit data and audit requests attached. */ public function setCommits(array $commits) { - assert_instances_of($commits, 'PhabricatorRepositoryCommit'); + assert_instances_of($commits, 'DiffusionCommit'); $this->commits = mpull($commits, null, 'getPHID'); return $this; } diff --git a/src/applications/config/check/PhabricatorBinariesSetupCheck.php b/src/applications/config/check/PhabricatorBinariesSetupCheck.php --- a/src/applications/config/check/PhabricatorBinariesSetupCheck.php +++ b/src/applications/config/check/PhabricatorBinariesSetupCheck.php @@ -66,7 +66,7 @@ } } - $table = new PhabricatorRepository(); + $table = new DiffusionRepository(); $vcses = queryfx_all( $table->establishConnection('r'), 'SELECT DISTINCT versionControlSystem FROM %T', @@ -74,13 +74,13 @@ foreach ($vcses as $vcs) { switch ($vcs['versionControlSystem']) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $binary = 'git'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $binary = 'svn'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $binary = 'hg'; break; default: @@ -100,13 +100,13 @@ $version = null; switch ($binary) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $minimum_version = null; $bad_versions = array(); list($err, $stdout, $stderr) = exec_manual('git --version'); $version = trim(substr($stdout, strlen('git version '))); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $minimum_version = '1.5'; $bad_versions = array( '1.7.1' => pht( @@ -117,7 +117,7 @@ list($err, $stdout, $stderr) = exec_manual('svn --version --quiet'); $version = trim($stdout); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $minimum_version = '1.9'; $bad_versions = array( '2.1' => pht( @@ -128,7 +128,7 @@ 'in 2.2.1. Pushing fails with this version as well; see %s.', 'T3046#54922'), ); - $version = PhabricatorRepositoryVersion::getMercurialVersion(); + $version = DiffusionRepositoryVersion::getMercurialVersion(); break; } @@ -228,10 +228,10 @@ $version) { switch ($binary) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $summary = pht( "The '%s' binary is version %s and Phabricator requires version ". "%s or higher.", @@ -252,10 +252,10 @@ private function raiseBadVersionWarning($binary, $bad_version) { switch ($binary) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $summary = pht( "The '%s' binary is version %s which has bugs that break ". "Phabricator.", diff --git a/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php --- a/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php +++ b/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php @@ -22,7 +22,7 @@ $ids_counter = LiskDAO::IDS_COUNTER; if ($object->getConfigOption(LiskDAO::CONFIG_IDS) == $ids_counter) { - $counters[$object->getApplicationName()] = true; + $counters[$object->getRealApplicationName()] = true; } } diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php --- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php +++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php @@ -49,7 +49,7 @@ protected function buildLiskObjectSchema(PhabricatorLiskDAO $object) { $this->buildRawSchema( - $object->getApplicationName(), + $object->getRealApplicationName(), $object->getTableName(), $object->getSchemaColumns(), $object->getSchemaKeys()); @@ -103,7 +103,7 @@ protected function buildEdgeSchemata(PhabricatorLiskDAO $object) { $this->buildRawSchema( - $object->getApplicationName(), + $object->getRealApplicationName(), PhabricatorEdgeConfig::TABLE_NAME_EDGE, array( 'src' => 'phid', @@ -128,7 +128,7 @@ )); $this->buildRawSchema( - $object->getApplicationName(), + $object->getRealApplicationName(), PhabricatorEdgeConfig::TABLE_NAME_EDGEDATA, array( 'id' => 'auto', diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php --- a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php +++ b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php @@ -356,7 +356,7 @@ $daemons = array( array( - 'class' => 'PhabricatorRepositoryPullLocalDaemon', + 'class' => 'DiffusionRepositoryPullLocalDaemon', ), array( 'class' => 'PhabricatorTriggerDaemon', diff --git a/src/applications/differential/DifferentialGetWorkingCopy.php b/src/applications/differential/DifferentialGetWorkingCopy.php --- a/src/applications/differential/DifferentialGetWorkingCopy.php +++ b/src/applications/differential/DifferentialGetWorkingCopy.php @@ -12,7 +12,7 @@ * return ArcanistGitAPI */ public static function getCleanGitWorkspace( - PhabricatorRepository $repo) { + DiffusionRepository $repo) { $origin_path = $repo->getLocalPath(); @@ -48,7 +48,7 @@ * return ArcanistMercurialAPI */ public static function getCleanMercurialWorkspace( - PhabricatorRepository $repo) { + DiffusionRepository $repo) { $origin_path = $repo->getLocalPath(); diff --git a/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php @@ -73,7 +73,7 @@ $repository_uuid = $request->getValue('repositoryUUID'); $repository_phid = $request->getValue('repositoryPHID'); if ($repository_phid) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); diff --git a/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php @@ -29,7 +29,7 @@ $repository_phid = $request->getValue('repositoryPHID'); if ($repository_phid) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php @@ -112,7 +112,7 @@ foreach ($path_pairs as $pair) { list($callsign, $path) = $pair; if (!idx($repos, $callsign)) { - $repos[$callsign] = id(new PhabricatorRepositoryQuery()) + $repos[$callsign] = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withCallsigns(array($callsign)) ->executeOne(); diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -67,7 +67,7 @@ if ($repository_phid == $revision->getRepositoryPHID()) { $repository = $revision->getRepository(); } else { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->withPHIDs(array($repository_phid)) ->executeOne(); @@ -686,7 +686,7 @@ private function loadChangesetsAndVsMap( DifferentialDiff $target, DifferentialDiff $diff_vs = null, - PhabricatorRepository $repository = null) { + DiffusionRepository $repository = null) { $load_diffs = array($target); if ($diff_vs) { @@ -742,7 +742,7 @@ } private function buildSymbolIndexes( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $visible_changesets) { assert_instances_of($visible_changesets, 'DifferentialChangeset'); @@ -785,7 +785,7 @@ private function loadOtherRevisions( array $changesets, DifferentialDiff $target, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { assert_instances_of($changesets, 'DifferentialChangeset'); $paths = array(); @@ -866,7 +866,7 @@ array $changesets, array $vs_changesets, array $vs_map, - PhabricatorRepository $repository = null) { + DiffusionRepository $repository = null) { assert_instances_of($changesets, 'DifferentialChangeset'); assert_instances_of($vs_changesets, 'DifferentialChangeset'); @@ -895,11 +895,11 @@ $vcs = $repository ? $repository->getVersionControlSystem() : null; switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $raw_diff = $bundle->toGitPatch(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: default: $raw_diff = $bundle->toUnifiedDiff(); break; diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -1745,7 +1745,7 @@ $all_paths = array_keys($all_paths); $path_ids = - PhabricatorRepositoryCommitChangeParserWorker::lookupOrCreatePaths( + DiffusionCommitChangeParserWorker::lookupOrCreatePaths( $all_paths); $table = new DifferentialAffectedPath(); diff --git a/src/applications/differential/landing/DifferentialGitHubLandingStrategy.php b/src/applications/differential/landing/DifferentialGitHubLandingStrategy.php --- a/src/applications/differential/landing/DifferentialGitHubLandingStrategy.php +++ b/src/applications/differential/landing/DifferentialGitHubLandingStrategy.php @@ -9,7 +9,7 @@ public function processLandRequest( AphrontRequest $request, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $viewer = $request->getUser(); $this->init($viewer, $repository); @@ -45,7 +45,7 @@ public function createMenuItem( PhabricatorUser $viewer, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { // TODO: This temporarily disables this action, because it doesn't work // and is confusing to users. If you want to use it, comment out this line @@ -53,7 +53,7 @@ return; $vcs = $repository->getVersionControlSystem(); - if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_GIT) { + if ($vcs !== DiffusionRepositoryType::REPOSITORY_TYPE_GIT) { return; } @@ -74,7 +74,7 @@ } public function pushWorkspaceRepository( - PhabricatorRepository $repository, + DiffusionRepository $repository, ArcanistRepositoryAPI $workspace) { $token = $this->getAccessToken(); @@ -121,7 +121,7 @@ } } - private function findGitHubRepo(PhabricatorRepository $repository) { + private function findGitHubRepo(DiffusionRepository $repository) { $repo_uri = $repository->getRemoteURIObject(); $repo_path = $repo_uri->getPath(); diff --git a/src/applications/differential/landing/DifferentialHostedGitLandingStrategy.php b/src/applications/differential/landing/DifferentialHostedGitLandingStrategy.php --- a/src/applications/differential/landing/DifferentialHostedGitLandingStrategy.php +++ b/src/applications/differential/landing/DifferentialHostedGitLandingStrategy.php @@ -6,7 +6,7 @@ public function processLandRequest( AphrontRequest $request, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $viewer = $request->getUser(); $workspace = $this->getGitWorkspace($repository); @@ -90,7 +90,7 @@ } public function pushWorkspaceRepository( - PhabricatorRepository $repository, + DiffusionRepository $repository, ArcanistRepositoryAPI $workspace, PhabricatorUser $user) { @@ -100,10 +100,10 @@ public function createMenuItem( PhabricatorUser $viewer, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $vcs = $repository->getVersionControlSystem(); - if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_GIT) { + if ($vcs !== DiffusionRepositoryType::REPOSITORY_TYPE_GIT) { return; } diff --git a/src/applications/differential/landing/DifferentialHostedMercurialLandingStrategy.php b/src/applications/differential/landing/DifferentialHostedMercurialLandingStrategy.php --- a/src/applications/differential/landing/DifferentialHostedMercurialLandingStrategy.php +++ b/src/applications/differential/landing/DifferentialHostedMercurialLandingStrategy.php @@ -6,7 +6,7 @@ public function processLandRequest( AphrontRequest $request, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $viewer = $request->getUser(); @@ -78,7 +78,7 @@ public function pushWorkspaceRepository( - PhabricatorRepository $repository, + DiffusionRepository $repository, ArcanistRepositoryAPI $workspace, PhabricatorUser $user) { @@ -88,10 +88,10 @@ public function createMenuItem( PhabricatorUser $viewer, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $vcs = $repository->getVersionControlSystem(); - if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL) { + if ($vcs !== DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL) { return; } diff --git a/src/applications/differential/landing/DifferentialLandingStrategy.php b/src/applications/differential/landing/DifferentialLandingStrategy.php --- a/src/applications/differential/landing/DifferentialLandingStrategy.php +++ b/src/applications/differential/landing/DifferentialLandingStrategy.php @@ -5,7 +5,7 @@ abstract public function processLandRequest( AphrontRequest $request, DifferentialRevision $revision, - PhabricatorRepository $repository); + DiffusionRepository $repository); /** * @return PhabricatorActionView or null. @@ -13,7 +13,7 @@ abstract public function createMenuItem( PhabricatorUser $viewer, DifferentialRevision $revision, - PhabricatorRepository $repository); + DiffusionRepository $repository); /** * @return PhabricatorActionView which can be attached to the revision view. @@ -40,7 +40,7 @@ public function isActionDisabled( PhabricatorUser $viewer, DifferentialRevision $revision, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $status = $revision->getStatus(); if ($status != ArcanistDifferentialRevisionStatus::ACCEPTED) { @@ -60,7 +60,7 @@ /** * Might break if repository is not Git. */ - protected function getGitWorkspace(PhabricatorRepository $repository) { + protected function getGitWorkspace(DiffusionRepository $repository) { try { return DifferentialGetWorkingCopy::getCleanGitWorkspace($repository); } catch (Exception $e) { @@ -73,7 +73,7 @@ /** * Might break if repository is not Mercurial. */ - protected function getMercurialWorkspace(PhabricatorRepository $repository) { + protected function getMercurialWorkspace(DiffusionRepository $repository) { try { return DifferentialGetWorkingCopy::getCleanMercurialWorkspace( $repository); diff --git a/src/applications/differential/query/DifferentialRepositoryLookup.php b/src/applications/differential/query/DifferentialRepositoryLookup.php --- a/src/applications/differential/query/DifferentialRepositoryLookup.php +++ b/src/applications/differential/query/DifferentialRepositoryLookup.php @@ -24,7 +24,7 @@ // Look for a repository UUID. if ($diff->getRepositoryUUID()) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withUUIDs(array($diff->getRepositoryUUID())) ->execute(); @@ -35,8 +35,8 @@ // Look for the base commit in Git and Mercurial. $vcs = $diff->getSourceControlSystem(); - $vcs_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; - $vcs_hg = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL; + $vcs_git = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; + $vcs_hg = DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL; if ($vcs == $vcs_git || $vcs == $vcs_hg) { $base = $diff->getSourceControlBaseRevision(); if ($base) { @@ -47,7 +47,7 @@ $commits = mgroup($commits, 'getRepositoryID'); if (count($commits) == 1) { $repository_id = key($commits); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withIDs(array($repository_id)) ->execute(); diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -395,7 +395,7 @@ $repositories = array(); if ($repository_phids) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs($repository_phids) ->execute(); diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php --- a/src/applications/differential/storage/DifferentialChangeset.php +++ b/src/applications/differential/storage/DifferentialChangeset.php @@ -164,7 +164,7 @@ } public function getAbsoluteRepositoryPath( - PhabricatorRepository $repository = null, + DiffusionRepository $repository = null, DifferentialDiff $diff = null) { $base = '/'; @@ -175,7 +175,7 @@ $path = $this->getFilename(); $path = rtrim($base, '/').'/'.ltrim($path, '/'); - $svn = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN; + $svn = DiffusionRepositoryType::REPOSITORY_TYPE_SVN; if ($repository && $repository->getVersionControlSystem() == $svn) { $prefix = $repository->getDetail('remote-uri'); $prefix = id(new PhutilURI($prefix))->getPath(); diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php --- a/src/applications/differential/storage/DifferentialRevision.php +++ b/src/applications/differential/storage/DifferentialRevision.php @@ -400,7 +400,7 @@ return $this->assertAttached($this->repository); } - public function attachRepository(PhabricatorRepository $repository = null) { + public function attachRepository(DiffusionRepository $repository = null) { $this->repository = $repository; return $this; } diff --git a/src/applications/differential/storage/DifferentialSchemaSpec.php b/src/applications/differential/storage/DifferentialSchemaSpec.php --- a/src/applications/differential/storage/DifferentialSchemaSpec.php +++ b/src/applications/differential/storage/DifferentialSchemaSpec.php @@ -6,7 +6,7 @@ $this->buildEdgeSchemata(new DifferentialRevision()); $this->buildRawSchema( - id(new DifferentialRevision())->getApplicationName(), + id(new DifferentialRevision())->getRealApplicationName(), DifferentialChangeset::TABLE_CACHE, array( 'id' => 'id', @@ -24,7 +24,7 @@ )); $this->buildRawSchema( - id(new DifferentialRevision())->getApplicationName(), + id(new DifferentialRevision())->getRealApplicationName(), DifferentialRevision::TABLE_COMMIT, array( 'revisionID' => 'id', @@ -42,7 +42,7 @@ )); $this->buildRawSchema( - id(new DifferentialRevision())->getApplicationName(), + id(new DifferentialRevision())->getRealApplicationName(), ArcanistDifferentialRevisionHash::TABLE_NAME, array( 'revisionID' => 'id', diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -62,7 +62,7 @@ return $this; } - public function setRepository(PhabricatorRepository $repository) { + public function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php --- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php +++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php @@ -27,7 +27,7 @@ return $this; } - public function setRepository(PhabricatorRepository $repository) { + public function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php --- a/src/applications/differential/view/DifferentialLocalCommitsView.php +++ b/src/applications/differential/view/DifferentialLocalCommitsView.php @@ -11,7 +11,7 @@ } public function setCommitsForLinks(array $commits) { - assert_instances_of($commits, 'PhabricatorRepositoryCommit'); + assert_instances_of($commits, 'DiffusionCommit'); $this->commitsForLinks = $commits; return $this; } diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php --- a/src/applications/differential/view/DifferentialRevisionDetailView.php +++ b/src/applications/differential/view/DifferentialRevisionDetailView.php @@ -79,21 +79,21 @@ $next_step = null; if ($status == ArcanistDifferentialRevisionStatus::ACCEPTED) { switch ($local_vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $bookmark = $this->getDiff()->getBookmark(); $next_step = ($bookmark != '' ? csprintf('arc land %s', $bookmark) : 'arc land'); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $branch = $this->getDiff()->getBranch(); $next_step = ($branch != '' ? csprintf('arc land %s', $branch) : 'arc land'); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $next_step = 'arc commit'; break; } diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php --- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php +++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php @@ -30,7 +30,7 @@ } public function setCommitsForLinks(array $commits) { - assert_instances_of($commits, 'PhabricatorRepositoryCommit'); + assert_instances_of($commits, 'DiffusionCommit'); $this->commitsForLinks = $commits; return $this; } diff --git a/src/applications/diffusion/DiffusionLintSaveRunner.php b/src/applications/diffusion/DiffusionLintSaveRunner.php --- a/src/applications/diffusion/DiffusionLintSaveRunner.php +++ b/src/applications/diffusion/DiffusionLintSaveRunner.php @@ -63,7 +63,7 @@ $uuid = $api->getRepositoryUUID(); $remote_uri = $api->getRemoteURI(); - $repository_query = id(new PhabricatorRepositoryQuery()) + $repository_query = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()); if ($callsign) { @@ -81,7 +81,7 @@ throw new Exception(pht('No repository was found.')); } - $this->branch = PhabricatorRepositoryBranch::loadOrCreateBranch( + $this->branch = DiffusionBranch::loadOrCreateBranch( $repository->getID(), $branch_name); $this->conn = $this->branch->establishConnection('w'); @@ -111,7 +111,7 @@ queryfx( $this->conn, 'DELETE FROM %T WHERE branchID = %d %Q', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $this->branch->getID(), $where); $all_files = $api->getAllFiles(); @@ -219,7 +219,7 @@ queryfx( $this->conn, 'DELETE FROM %T WHERE branchID = %d AND path IN (%Ls)', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $this->branch->getID(), $paths); } @@ -230,7 +230,7 @@ 'INSERT INTO %T (branchID, path, line, code, severity, name, description) VALUES %Q', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, implode(', ', $values)); } @@ -242,7 +242,7 @@ private function blameAuthors() { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs(array($this->branch->getRepositoryID())) ->executeOne(); @@ -294,7 +294,7 @@ queryfx( $this->conn, 'UPDATE %T SET authorPHID = %s WHERE %Q', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $author, implode(' OR ', $where)); } 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 @@ -33,7 +33,7 @@ public function getFactObjectsForAnalysis() { return array( - new PhabricatorRepositoryCommit(), + new DiffusionCommit(), ); } @@ -141,16 +141,16 @@ protected function getCustomCapabilities() { return array( DiffusionDefaultViewCapability::CAPABILITY => array( - 'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + 'template' => DiffusionRepositoryPHIDType::TYPECONST, 'capability' => PhabricatorPolicyCapability::CAN_VIEW, ), DiffusionDefaultEditCapability::CAPABILITY => array( 'default' => PhabricatorPolicies::POLICY_ADMIN, - 'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + 'template' => DiffusionRepositoryPHIDType::TYPECONST, 'capability' => PhabricatorPolicyCapability::CAN_EDIT, ), DiffusionDefaultPushCapability::CAPABILITY => array( - 'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + 'template' => DiffusionRepositoryPHIDType::TYPECONST, ), DiffusionCreateRepositoriesCapability::CAPABILITY => array( 'default' => PhabricatorPolicies::POLICY_ADMIN, @@ -163,7 +163,7 @@ 'commit' => array( 'name' => pht('Email Commands: Commits'), 'header' => pht('Interacting with Commits'), - 'object' => new PhabricatorRepositoryCommit(), + 'object' => new DiffusionCommit(), 'summary' => pht( 'This page documents the commands you can use to interact with '. 'commits and audits in Diffusion.'), @@ -173,7 +173,7 @@ public function getApplicationSearchDocumentTypes() { return array( - PhabricatorRepositoryCommitPHIDType::TYPECONST, + DiffusionCommitPHIDType::TYPECONST, ); } diff --git a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php @@ -308,7 +308,7 @@ 'SELECT pathID, max(svnCommit) maxCommit FROM %T WHERE repositoryID = %d AND parentID = %d %Q GROUP BY pathID', - PhabricatorRepository::TABLE_FILESYSTEM, + DiffusionRepository::TABLE_FILESYSTEM, $repository->getID(), $path_id, $slice_clause); @@ -330,7 +330,7 @@ AND parentID = %d AND pathID = %d %Q ORDER BY svnCommit DESC LIMIT 2', - PhabricatorRepository::TABLE_FILESYSTEM, + DiffusionRepository::TABLE_FILESYSTEM, $repository->getID(), $parent_path_id, $path_id, @@ -383,8 +383,8 @@ AND existed = 1 AND (%Q) ORDER BY pathName', - PhabricatorRepository::TABLE_FILESYSTEM, - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_FILESYSTEM, + DiffusionRepository::TABLE_PATH, $repository->getID(), $path_id, implode(' OR ', $sql)); @@ -404,13 +404,13 @@ if ($loadable_commits) { // NOTE: Even though these are integers, use '%Ls' because MySQL doesn't // use the second part of the key otherwise! - $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere( + $commits = id(new DiffusionCommit())->loadAllWhere( 'repositoryID = %d AND commitIdentifier IN (%Ls)', $repository->getID(), $loadable_commits); $commits = mpull($commits, null, 'getCommitIdentifier'); if ($commits) { - $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $commit_data = id(new DiffusionCommitData())->loadAllWhere( 'commitID in (%Ld)', mpull($commits, 'getID')); $commit_data = mpull($commit_data, null, 'getCommitID'); diff --git a/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php @@ -55,7 +55,7 @@ $callsigns = ipull($commits, 'callsign'); $callsigns = array_unique($callsigns); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withCallsigns($callsigns) ->execute(); @@ -88,7 +88,7 @@ // to select it, which might be a git prefix rather than a full identifier. $ref_map = ipull($cdata, 'commitIdentifier', 'commitRef'); - $cobjs = id(new PhabricatorRepositoryCommit())->loadAllFromArray($cdata); + $cobjs = id(new DiffusionCommit())->loadAllFromArray($cdata); $cobjs = mgroup($cobjs, 'getRepositoryID', 'getCommitIdentifier'); foreach ($commits as $name => $commit) { @@ -145,8 +145,8 @@ * Retrieve primary commit information for all referenced commits. */ private function queryCommitInformation(array $commits, array $repos) { - assert_instances_of($repos, 'PhabricatorRepository'); - $conn_r = id(new PhabricatorRepositoryCommit())->establishConnection('r'); + assert_instances_of($repos, 'DiffusionRepository'); + $conn_r = id(new DiffusionCommit())->establishConnection('r'); $repos = mpull($repos, null, 'getID'); $groups = array(); @@ -159,11 +159,11 @@ // attempt to reduce the craziness here. METANOTE: The addition of prefix // selection for Git further complicates matters. $query = array(); - $commit_table = id(new PhabricatorRepositoryCommit())->getTableName(); + $commit_table = id(new DiffusionCommit())->getTableName(); foreach ($groups as $repository_id => $identifiers) { $vcs = $repos[$repository_id]->getVersionControlSystem(); - $is_git = ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT); + $is_git = ($vcs == DiffusionRepositoryType::REPOSITORY_TYPE_GIT); if ($is_git) { foreach ($identifiers as $identifier) { if (strlen($identifier) < 7) { @@ -209,7 +209,7 @@ private function addRepositoryCommitDataInformation(array $commits) { $commit_ids = ipull($commits, 'commitID'); - $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $data = id(new DiffusionCommitData())->loadAllWhere( 'commitID in (%Ld)', $commit_ids); $data = mpull($data, null, 'getCommitID'); diff --git a/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php @@ -32,7 +32,7 @@ $viewer = $request->getUser(); $repository_phid = $request->getValue('repositoryPHID'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); @@ -44,14 +44,14 @@ $branch_name = $request->getValue('branch'); if ($branch_name == '') { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withIDs(array($repository->getID())) ->executeOne(); $branch_name = $repository->getDefaultArcanistBranch(); } - $branch = id(new PhabricatorRepositoryBranch())->loadOneWhere( + $branch = id(new DiffusionBranch())->loadOneWhere( 'repositoryID = %d AND name = %s', $repository->getID(), $branch_name); @@ -62,7 +62,7 @@ $lint_messages = queryfx_all( $branch->establishConnection('r'), 'SELECT path, line, code FROM %T WHERE branchID = %d AND path IN (%Ls)', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $branch->getID(), $request->getValue('files')); diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php @@ -131,7 +131,7 @@ hgsprintf('reverse(ancestors(%s))', $commit_hash), $path_arg); - $stdout = PhabricatorRepository::filterMercurialDebugOutput($stdout); + $stdout = DiffusionRepository::filterMercurialDebugOutput($stdout); $lines = explode("\n", trim($stdout)); $lines = array_slice($lines, $offset); @@ -194,7 +194,7 @@ $paths = queryfx_all( $conn_r, 'SELECT id, path FROM %T WHERE pathHash IN (%Ls)', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, array(md5('/'.trim($path, '/')))); $paths = ipull($paths, 'id', 'path'); $path_id = idx($paths, '/'.trim($path, '/')); @@ -220,7 +220,7 @@ %Q ORDER BY commitSequence DESC LIMIT %d, %d', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $repository->getID(), $path_id, $commit ? $commit : 0x7FFFFFFF, @@ -233,11 +233,11 @@ $commit_ids = ipull($history_data, 'commitID'); if ($commit_ids) { - $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere( + $commits = id(new DiffusionCommit())->loadAllWhere( 'id IN (%Ld)', $commit_ids); if ($commits) { - $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $commit_data = id(new DiffusionCommitData())->loadAllWhere( 'commitID in (%Ld)', $commit_ids); $commit_data = mpull($commit_data, null, 'getCommitID'); diff --git a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php @@ -112,7 +112,7 @@ $commit_map = $commit_query->getIdentifierMap(); $commit_map = mpull($commit_map, 'getID'); - $graph_cache = new PhabricatorRepositoryGraphCache(); + $graph_cache = new DiffusionRepositoryGraphCache(); $results = array(); foreach ($map as $path => $commit) { diff --git a/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php @@ -38,15 +38,15 @@ return null; } - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withCallsigns($callsigns) ->execute(); foreach ($repositories as $repository) { $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::CODE_OKAY); } return null; 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 @@ -36,7 +36,7 @@ $repository_phid = $request->getValue('repositoryPHID'); if ($repository_phid) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withPHIDs(array($repository_phid)) ->executeOne(); diff --git a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php @@ -140,13 +140,13 @@ $repository = $this->getRepository($request); $result = null; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $result = $this->getGitResult($request); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->getMercurialResult($request); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $result = $this->getSVNResult($request); break; default: diff --git a/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php @@ -32,7 +32,7 @@ $viewer = $request->getUser(); $repository_phid = $request->getValue('repositoryPHID'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); @@ -53,7 +53,7 @@ pht('No commit exists with identifier "%s".', $commit_name)); } - $branch = PhabricatorRepositoryBranch::loadOrCreateBranch( + $branch = DiffusionBranch::loadOrCreateBranch( $repository->getID(), $request->getValue('branch')); diff --git a/src/applications/repository/conduit/RepositoryConduitAPIMethod.php b/src/applications/diffusion/conduit/RepositoryConduitAPIMethod.php rename from src/applications/repository/conduit/RepositoryConduitAPIMethod.php rename to src/applications/diffusion/conduit/RepositoryConduitAPIMethod.php diff --git a/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php b/src/applications/diffusion/conduit/RepositoryCreateConduitAPIMethod.php rename from src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php rename to src/applications/diffusion/conduit/RepositoryCreateConduitAPIMethod.php --- a/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/RepositoryCreateConduitAPIMethod.php @@ -71,7 +71,7 @@ // stabilizes. Specifically, this should move to transactions since they // work properly now. - $repository = PhabricatorRepository::initializeNewRepository( + $repository = DiffusionRepository::initializeNewRepository( $request->getUser()); $repository->setName($request->getValue('name')); @@ -91,9 +91,9 @@ $vcs = $request->getValue('vcs'); $map = array( - 'git' => PhabricatorRepositoryType::REPOSITORY_TYPE_GIT, - 'hg' => PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL, - 'svn' => PhabricatorRepositoryType::REPOSITORY_TYPE_SVN, + 'git' => DiffusionRepositoryType::REPOSITORY_TYPE_GIT, + 'hg' => DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL, + 'svn' => DiffusionRepositoryType::REPOSITORY_TYPE_SVN, ); if (empty($map[$vcs])) { throw new ConduitException('ERR-UNKNOWN-REPOSITORY-VCS'); @@ -103,7 +103,7 @@ $repository->setCredentialPHID($request->getValue('credentialPHID')); $remote_uri = $request->getValue('uri'); - PhabricatorRepository::assertValidRemoteURI($remote_uri); + DiffusionRepository::assertValidRemoteURI($remote_uri); $details = array( 'encoding' => $request->getValue('encoding'), diff --git a/src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/RepositoryQueryConduitAPIMethod.php rename from src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php rename to src/applications/diffusion/conduit/RepositoryQueryConduitAPIMethod.php --- a/src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/RepositoryQueryConduitAPIMethod.php @@ -20,7 +20,7 @@ } public function newQueryObject() { - return new PhabricatorRepositoryQuery(); + return new DiffusionRepositoryQuery(); } protected function defineParamTypes() { diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php --- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php +++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php @@ -142,7 +142,7 @@ 'is an advanced option.')), $this->newOption('diffusion.fields', $custom_field_type, $default_fields) ->setCustomData( - id(new PhabricatorRepositoryCommit()) + id(new DiffusionCommit()) ->getCustomFieldBaseClass()) ->setDescription( pht('Select and reorder Diffusion fields.')), diff --git a/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php b/src/applications/diffusion/config/PhabricatorRepositoryConfigOptions.php rename from src/applications/repository/config/PhabricatorRepositoryConfigOptions.php rename to src/applications/diffusion/config/PhabricatorRepositoryConfigOptions.php diff --git a/src/applications/repository/constants/PhabricatorRepositoryType.php b/src/applications/diffusion/constants/DiffusionRepositoryType.php rename from src/applications/repository/constants/PhabricatorRepositoryType.php rename to src/applications/diffusion/constants/DiffusionRepositoryType.php --- a/src/applications/repository/constants/PhabricatorRepositoryType.php +++ b/src/applications/diffusion/constants/DiffusionRepositoryType.php @@ -1,6 +1,6 @@ setMethod('GET'); switch ($drequest->getRepository()->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $forms[] = id(clone $form) ->appendChild(pht('Search is not available in Subversion.')); break; diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -199,7 +199,7 @@ $this->lintCommit = $branch->getLintCommit(); - $conn = id(new PhabricatorRepository())->establishConnection('r'); + $conn = id(new DiffusionRepository())->establishConnection('r'); $where = ''; if ($drequest->getLint()) { @@ -212,7 +212,7 @@ $this->lintMessages = queryfx_all( $conn, 'SELECT * FROM %T WHERE branchID = %d %Q AND path = %s', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $branch->getID(), $where, '/'.$drequest->getPath()); @@ -1115,7 +1115,7 @@ } private function renderCommitTooltip( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, array $handles, $author) { 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 @@ -55,7 +55,7 @@ $search_mode = null; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $results = array(); break; default: diff --git a/src/applications/diffusion/controller/DiffusionCommitBranchesController.php b/src/applications/diffusion/controller/DiffusionCommitBranchesController.php --- a/src/applications/diffusion/controller/DiffusionCommitBranchesController.php +++ b/src/applications/diffusion/controller/DiffusionCommitBranchesController.php @@ -11,7 +11,7 @@ $repository = $drequest->getRepository(); switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $branches = array(); break; default: 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 @@ -203,9 +203,9 @@ $bad_commit = null; if ($count == 0) { $bad_commit = queryfx_one( - id(new PhabricatorRepository())->establishConnection('r'), + id(new DiffusionRepository())->establishConnection('r'), 'SELECT * FROM %T WHERE fullCommitName = %s', - PhabricatorRepository::TABLE_BADCOMMIT, + DiffusionRepository::TABLE_BADCOMMIT, 'r'.$callsign.$commit->getCommitIdentifier()); } @@ -274,11 +274,11 @@ $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $vcs_supports_directory_changes = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $vcs_supports_directory_changes = false; break; default: @@ -396,12 +396,12 @@ } private function loadCommitProperties( - PhabricatorRepositoryCommit $commit, - PhabricatorRepositoryCommitData $data, + DiffusionCommit $commit, + DiffusionCommitData $data, array $parents, array $audit_requests) { - assert_instances_of($parents, 'PhabricatorRepositoryCommit'); + assert_instances_of($parents, 'DiffusionCommit'); $viewer = $this->getRequest()->getUser(); $commit_phid = $commit->getPHID(); $drequest = $this->getDiffusionRequest(); @@ -457,11 +457,11 @@ $push_logs = array(); if ($repository->isHosted() && !$repository->isSVN()) { - $push_logs = id(new PhabricatorRepositoryPushLogQuery()) + $push_logs = id(new DiffusionRepositoryPushLogQuery()) ->setViewer($viewer) ->withRepositoryPHIDs(array($repository->getPHID())) ->withNewRefs(array($commit->getCommitIdentifier())) - ->withRefTypes(array(PhabricatorRepositoryPushLog::REFTYPE_COMMIT)) + ->withRefTypes(array(DiffusionRepositoryPushLog::REFTYPE_COMMIT)) ->execute(); foreach ($push_logs as $log) { $phids[] = $log->getPusherPHID(); @@ -636,7 +636,7 @@ return $props; } - private function buildComments(PhabricatorRepositoryCommit $commit) { + private function buildComments(DiffusionCommit $commit) { $timeline = $this->buildTransactionTimeline( $commit, new PhabricatorAuditTransactionQuery()); @@ -645,9 +645,9 @@ } private function renderAddCommentPanel( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, array $audit_requests) { - assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest'); + assert_instances_of($audit_requests, 'DiffusionAuditRequest'); $request = $this->getRequest(); $user = $request->getUser(); @@ -799,9 +799,9 @@ * you have no association with). */ private function getAuditActions( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, array $audit_requests) { - assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest'); + assert_instances_of($audit_requests, 'DiffusionAuditRequest'); $user = $this->getRequest()->getUser(); $user_is_author = ($commit->getAuthorPHID() == $user->getPHID()); @@ -871,13 +871,13 @@ return $actions; } - private function buildMergesTable(PhabricatorRepositoryCommit $commit) { + private function buildMergesTable(DiffusionCommit $commit) { $drequest = $this->getDiffusionRequest(); $repository = $drequest->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // These aren't supported under SVN. return null; } @@ -929,8 +929,8 @@ } private function renderHeadsupActionList( - PhabricatorRepositoryCommit $commit, - PhabricatorRepository $repository) { + DiffusionCommit $commit, + DiffusionRepository $repository) { $request = $this->getRequest(); $user = $request->getUser(); @@ -982,7 +982,7 @@ private function buildRefs(DiffusionRequest $request) { // this is git-only, so save a conduit round trip and just get out of // here if the repository isn't git - $type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $type_git = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; $repository = $request->getRepository(); if ($repository->getVersionControlSystem() != $type_git) { return null; @@ -1024,7 +1024,7 @@ } private function renderAuditStatusView(array $audit_requests) { - assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest'); + assert_instances_of($audit_requests, 'DiffusionAuditRequest'); $viewer = $this->getViewer(); $authority_map = array_fill_keys($this->auditAuthorityPHIDs, true); 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 @@ -59,19 +59,19 @@ ->setDatasource(new PhabricatorProjectDatasource())); $reason = $data->getCommitDetail('autocloseReason', false); - $reason = PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED; + $reason = DiffusionRepository::BECAUSE_AUTOCLOSE_FORCED; if ($reason !== false) { switch ($reason) { - case PhabricatorRepository::BECAUSE_REPOSITORY_IMPORTING: + case DiffusionRepository::BECAUSE_REPOSITORY_IMPORTING: $desc = pht('No, Repository Importing'); break; - case PhabricatorRepository::BECAUSE_AUTOCLOSE_DISABLED: + case DiffusionRepository::BECAUSE_AUTOCLOSE_DISABLED: $desc = pht('No, Autoclose Disabled'); break; - case PhabricatorRepository::BECAUSE_NOT_ON_AUTOCLOSE_BRANCH: + case DiffusionRepository::BECAUSE_NOT_ON_AUTOCLOSE_BRANCH: $desc = pht('No, Not On Autoclose Branch'); break; - case PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED: + case DiffusionRepository::BECAUSE_AUTOCLOSE_FORCED: $desc = pht('Yes, Forced Via bin/repository CLI Tool.'); break; case null: diff --git a/src/applications/diffusion/controller/DiffusionCommitTagsController.php b/src/applications/diffusion/controller/DiffusionCommitTagsController.php --- a/src/applications/diffusion/controller/DiffusionCommitTagsController.php +++ b/src/applications/diffusion/controller/DiffusionCommitTagsController.php @@ -12,7 +12,7 @@ $tag_limit = 10; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $tags = array(); break; default: 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 @@ -185,7 +185,7 @@ } protected function getRepositoryControllerURI( - PhabricatorRepository $repository, + DiffusionRepository $repository, $path) { return $this->getApplicationURI($repository->getCallsign().'/'.$path); } 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 @@ -15,7 +15,7 @@ $uri = $request->getStr('uri'); $id = $request->getStr('id'); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->execute(); @@ -58,7 +58,7 @@ // TODO: This is a rare query but does a table scan, add a key? - $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere( + $commits = id(new DiffusionCommit())->loadAllWhere( 'commitIdentifier = %s', $id); diff --git a/src/applications/diffusion/controller/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php --- a/src/applications/diffusion/controller/DiffusionInlineCommentController.php +++ b/src/applications/diffusion/controller/DiffusionInlineCommentController.php @@ -28,9 +28,9 @@ // TODO: Write a real PathQuery object? $path_id = $this->getChangesetID(); $path = queryfx_one( - id(new PhabricatorRepository())->establishConnection('r'), + id(new DiffusionRepository())->establishConnection('r'), 'SELECT path FROM %T WHERE id = %d', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, $path_id); if (!$path) { throw new Exception(pht('Invalid path ID!')); diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php --- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php +++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php @@ -88,7 +88,7 @@ private function renderColumns( DiffusionRequest $drequest, array $handles, - PhabricatorRepositoryCommit $commit = null, + DiffusionCommit $commit = null, $lint = null) { assert_instances_of($handles, 'PhabricatorObjectHandle'); $viewer = $this->getRequest()->getUser(); 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 @@ -31,11 +31,11 @@ if ($codes && !$drequest) { // TODO: Build some real Query classes for this stuff. - $branches = id(new PhabricatorRepositoryBranch())->loadAllWhere( + $branches = id(new DiffusionBranch())->loadAllWhere( 'id IN (%Ld)', array_unique(ipull($codes, 'branchID'))); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->withIDs(mpull($branches, 'getRepositoryID')) ->execute(); @@ -173,7 +173,7 @@ private function loadLintCodes(array $owner_phids) { $drequest = $this->diffusionRequest; - $conn = id(new PhabricatorRepository())->establishConnection('r'); + $conn = id(new DiffusionRepository())->establishConnection('r'); $where = array('1 = 1'); if ($drequest) { @@ -207,13 +207,13 @@ } if ($paths) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getRequest()->getUser()) ->withPHIDs(mpull($paths, 'getRepositoryPHID')) ->execute(); $repositories = mpull($repositories, 'getID', 'getPHID'); - $branches = id(new PhabricatorRepositoryBranch())->loadAllWhere( + $branches = id(new DiffusionBranch())->loadAllWhere( 'repositoryID IN (%Ld)', $repositories); $branches = mgroup($branches, 'getRepositoryID'); @@ -255,7 +255,7 @@ WHERE %Q GROUP BY branchID, code ORDER BY n DESC', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, implode(' AND ', $where)); } @@ -304,7 +304,7 @@ protected function buildPropertyView( DiffusionRequest $drequest, - PhabricatorRepositoryBranch $branch, + DiffusionBranch $branch, $total, PhabricatorActionListView $actions) { 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 @@ -99,7 +99,7 @@ } private function loadLintMessages( - PhabricatorRepositoryBranch $branch, + DiffusionBranch $branch, $limit, $offset) { @@ -135,7 +135,7 @@ FROM %T WHERE %Q ORDER BY path, code, line LIMIT %d OFFSET %d', - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, implode(' AND ', $where), $limit, $offset); diff --git a/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php b/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php --- a/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php +++ b/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $mirror = id(new PhabricatorRepositoryMirrorQuery()) + $mirror = id(new DiffusionRepositoryMirrorQuery()) ->setViewer($viewer) ->withIDs(array($request->getURIData('id'))) ->requireCapabilities( diff --git a/src/applications/diffusion/controller/DiffusionMirrorEditController.php b/src/applications/diffusion/controller/DiffusionMirrorEditController.php --- a/src/applications/diffusion/controller/DiffusionMirrorEditController.php +++ b/src/applications/diffusion/controller/DiffusionMirrorEditController.php @@ -14,7 +14,7 @@ PhabricatorPolicyCapability::CAN_EDIT); if ($request->getURIData('id')) { - $mirror = id(new PhabricatorRepositoryMirrorQuery()) + $mirror = id(new DiffusionRepositoryMirrorQuery()) ->setViewer($viewer) ->withIDs(array($request->getURIData('id'))) ->requireCapabilities( @@ -28,7 +28,7 @@ } $is_new = false; } else { - $mirror = PhabricatorRepositoryMirror::initializeNewMirror($viewer) + $mirror = DiffusionRepositoryMirror::initializeNewMirror($viewer) ->setRepositoryPHID($repository->getPHID()) ->attachRepository($repository); $is_new = true; @@ -52,7 +52,7 @@ $v_remote = $request->getStr('remoteURI'); if (strlen($v_remote)) { try { - PhabricatorRepository::assertValidRemoteURI($v_remote); + DiffusionRepository::assertValidRemoteURI($v_remote); $e_remote = null; } catch (Exception $ex) { $e_remote = pht('Invalid'); diff --git a/src/applications/diffusion/controller/DiffusionPathCompleteController.php b/src/applications/diffusion/controller/DiffusionPathCompleteController.php --- a/src/applications/diffusion/controller/DiffusionPathCompleteController.php +++ b/src/applications/diffusion/controller/DiffusionPathCompleteController.php @@ -9,7 +9,7 @@ protected function processDiffusionRequest(AphrontRequest $request) { $repository_phid = $request->getStr('repositoryPHID'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withPHIDs(array($repository_phid)) ->executeOne(); diff --git a/src/applications/diffusion/controller/DiffusionPathValidateController.php b/src/applications/diffusion/controller/DiffusionPathValidateController.php --- a/src/applications/diffusion/controller/DiffusionPathValidateController.php +++ b/src/applications/diffusion/controller/DiffusionPathValidateController.php @@ -9,7 +9,7 @@ protected function processDiffusionRequest(AphrontRequest $request) { $repository_phid = $request->getStr('repositoryPHID'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withPHIDs(array($repository_phid)) ->executeOne(); 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 @@ -10,7 +10,7 @@ protected function processDiffusionRequest(AphrontRequest $request) { $viewer = $request->getUser(); - $event = id(new PhabricatorRepositoryPushEventQuery()) + $event = id(new DiffusionRepositoryPushEventQuery()) ->setViewer($viewer) ->withIDs(array($request->getURIData('id'))) ->needLogs(true) @@ -68,7 +68,7 @@ )); } - private function buildPropertyList(PhabricatorRepositoryPushEvent $event) { + private function buildPropertyList(DiffusionRepositoryPushEvent $event) { $viewer = $this->getRequest()->getUser(); $view = new PHUIPropertyListView(); @@ -87,12 +87,12 @@ return $view; } - private function loadCommits(PhabricatorRepositoryPushEvent $event) { + private function loadCommits(DiffusionRepositoryPushEvent $event) { $viewer = $this->getRequest()->getUser(); $identifiers = array(); foreach ($event->getLogs() as $log) { - if ($log->getRefType() == PhabricatorRepositoryPushLog::REFTYPE_COMMIT) { + if ($log->getRefType() == DiffusionRepositoryPushLog::REFTYPE_COMMIT) { $identifiers[] = $log->getRefNew(); } } @@ -122,7 +122,7 @@ } private function renderCommitsTable( - PhabricatorRepositoryPushEvent $event, + DiffusionRepositoryPushEvent $event, array $commits) { $viewer = $this->getRequest()->getUser(); @@ -131,8 +131,8 @@ $rows = array(); foreach ($commits as $identifier => $commit) { if ($commit) { - $partial_import = PhabricatorRepositoryCommit::IMPORTED_MESSAGE | - PhabricatorRepositoryCommit::IMPORTED_CHANGE; + $partial_import = DiffusionCommit::IMPORTED_MESSAGE | + DiffusionCommit::IMPORTED_CHANGE; if ($commit->isPartiallyImported($partial_import)) { $summary = AphrontTableView::renderSingleDisplayLine( $commit->getSummary()); diff --git a/src/applications/diffusion/controller/DiffusionPushLogListController.php b/src/applications/diffusion/controller/DiffusionPushLogListController.php --- a/src/applications/diffusion/controller/DiffusionPushLogListController.php +++ b/src/applications/diffusion/controller/DiffusionPushLogListController.php @@ -10,7 +10,7 @@ $request = $this->getRequest(); $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($request->getURIData('queryKey')) - ->setSearchEngine(new PhabricatorRepositoryPushLogSearchEngine()) + ->setSearchEngine(new DiffusionRepositoryPushLogSearchEngine()) ->setNavigation($this->buildSideNavView()); return $this->delegateToController($controller); @@ -22,7 +22,7 @@ $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI($this->getApplicationURI())); - id(new PhabricatorRepositoryPushLogSearchEngine()) + id(new DiffusionRepositoryPushLogSearchEngine()) ->setViewer($viewer) ->addNavigationItems($nav->getMenu()); 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 @@ -29,10 +29,10 @@ // exists. if ($drequest->supportsBranches()) { // NOTE: Mercurial may have multiple branch heads with the same name. - $ref_cursors = id(new PhabricatorRepositoryRefCursorQuery()) + $ref_cursors = id(new DiffusionRepositoryRefCursorQuery()) ->setViewer($viewer) ->withRepositoryPHIDs(array($repository->getPHID())) - ->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH)) + ->withRefTypes(array(DiffusionRepositoryRefCursor::TYPE_BRANCH)) ->withRefNames(array($drequest->getBranch())) ->execute(); if ($ref_cursors) { @@ -207,7 +207,7 @@ return $content; } - private function buildPropertiesTable(PhabricatorRepository $repository) { + private function buildPropertiesTable(DiffusionRepository $repository) { $user = $this->getRequest()->getUser(); $header = id(new PHUIHeaderView()) @@ -272,15 +272,15 @@ } } else { switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $view->addProperty( pht('Clone'), $this->renderCloneCommand( $repository, $repository->getPublicCloneURI())); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $view->addProperty( pht('Checkout'), $this->renderCloneCommand( @@ -406,7 +406,7 @@ $repository = $drequest->getRepository(); switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // no tags in SVN return null; } @@ -474,7 +474,7 @@ return $panel; } - private function buildActionList(PhabricatorRepository $repository) { + private function buildActionList(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view_uri = $this->getApplicationURI($repository->getCallsign().'/'); @@ -663,7 +663,7 @@ } private function renderCloneCommand( - PhabricatorRepository $repository, + DiffusionRepository $repository, $uri, $serve_mode = null, $manage_uri = null) { @@ -673,17 +673,17 @@ Javelin::initBehavior('select-on-click'); switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $command = csprintf( 'git clone %R', $uri); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $command = csprintf( 'hg clone %R', $uri); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: if ($repository->isHosted()) { $command = csprintf( 'svn checkout %R %R', @@ -709,7 +709,7 @@ $extras = array(); if ($serve_mode) { - if ($serve_mode === PhabricatorRepository::SERVE_READONLY) { + if ($serve_mode === DiffusionRepository::SERVE_READONLY) { $extras[] = pht('(Read Only)'); } } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php @@ -120,26 +120,26 @@ $is_init = ($this->edit == 'create'); if ($is_create) { - $repository = PhabricatorRepository::initializeNewRepository( + $repository = DiffusionRepository::initializeNewRepository( $viewer); } - $template = id(new PhabricatorRepositoryTransaction()); - - $type_name = PhabricatorRepositoryTransaction::TYPE_NAME; - $type_vcs = PhabricatorRepositoryTransaction::TYPE_VCS; - $type_activate = PhabricatorRepositoryTransaction::TYPE_ACTIVATE; - $type_local_path = PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH; - $type_remote_uri = PhabricatorRepositoryTransaction::TYPE_REMOTE_URI; - $type_hosting = PhabricatorRepositoryTransaction::TYPE_HOSTING; - $type_http = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP; - $type_ssh = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH; - $type_credential = PhabricatorRepositoryTransaction::TYPE_CREDENTIAL; + $template = id(new DiffusionRepositoryTransaction()); + + $type_name = DiffusionRepositoryTransaction::TYPE_NAME; + $type_vcs = DiffusionRepositoryTransaction::TYPE_VCS; + $type_activate = DiffusionRepositoryTransaction::TYPE_ACTIVATE; + $type_local_path = DiffusionRepositoryTransaction::TYPE_LOCAL_PATH; + $type_remote_uri = DiffusionRepositoryTransaction::TYPE_REMOTE_URI; + $type_hosting = DiffusionRepositoryTransaction::TYPE_HOSTING; + $type_http = DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP; + $type_ssh = DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH; + $type_credential = DiffusionRepositoryTransaction::TYPE_CREDENTIAL; $type_view = PhabricatorTransactions::TYPE_VIEW_POLICY; $type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY; $type_space = PhabricatorTransactions::TYPE_SPACE; - $type_push = PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY; - $type_service = PhabricatorRepositoryTransaction::TYPE_SERVICE; + $type_push = DiffusionRepositoryTransaction::TYPE_PUSH_POLICY; + $type_service = DiffusionRepositoryTransaction::TYPE_SERVICE; $xactions = array(); @@ -191,11 +191,11 @@ ->setTransactionType($type_hosting) ->setNewValue(true); $vcs = $form->getPage('vcs')->getControl('vcs')->getValue(); - if ($vcs != PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) { + if ($vcs != DiffusionRepositoryType::REPOSITORY_TYPE_SVN) { if (PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')) { - $v_http_mode = PhabricatorRepository::SERVE_READWRITE; + $v_http_mode = DiffusionRepository::SERVE_READWRITE; } else { - $v_http_mode = PhabricatorRepository::SERVE_OFF; + $v_http_mode = DiffusionRepository::SERVE_OFF; } $xactions[] = id(clone $template) ->setTransactionType($type_http) @@ -203,9 +203,9 @@ } if (PhabricatorEnv::getEnvConfig('diffusion.ssh-user')) { - $v_ssh_mode = PhabricatorRepository::SERVE_READWRITE; + $v_ssh_mode = DiffusionRepository::SERVE_READWRITE; } else { - $v_ssh_mode = PhabricatorRepository::SERVE_OFF; + $v_ssh_mode = DiffusionRepository::SERVE_OFF; } $xactions[] = id(clone $template) ->setTransactionType($type_ssh) @@ -248,7 +248,7 @@ $policy_page->getControl('viewPolicy')->getSpacePHID()); } - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer) @@ -311,21 +311,21 @@ ->setName('vcs') ->setLabel(pht('Type')) ->addButton( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT, + DiffusionRepositoryType::REPOSITORY_TYPE_GIT, pht('Git'), $git_str) ->addButton( - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL, + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL, pht('Mercurial'), $hg_str) ->addButton( - PhabricatorRepositoryType::REPOSITORY_TYPE_SVN, + DiffusionRepositoryType::REPOSITORY_TYPE_SVN, pht('Subversion'), $svn_str); if ($is_import) { $control->addButton( - PhabricatorRepositoryType::REPOSITORY_TYPE_PERFORCE, + DiffusionRepositoryType::REPOSITORY_TYPE_PERFORCE, pht('Perforce'), pht( 'Perforce is not directly supported, but you can import '. @@ -351,9 +351,9 @@ public function validateVCSPage(PHUIFormPageView $page) { $valid = array( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => true, - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => true, - PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => true, + DiffusionRepositoryType::REPOSITORY_TYPE_GIT => true, + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL => true, + DiffusionRepositoryType::REPOSITORY_TYPE_SVN => true, ); $c_vcs = $page->getControl('vcs'); @@ -429,7 +429,7 @@ } else { $exists = false; try { - $repo = id(new PhabricatorRepositoryQuery()) + $repo = id(new DiffusionRepositoryQuery()) ->setViewer($this->getRequest()->getUser()) ->withCallsigns(array($v_call)) ->executeOne(); @@ -479,13 +479,13 @@ } switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $is_git = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $is_svn = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $is_mercurial = true; break; default: @@ -550,7 +550,7 @@ pht('You must specify a URI.')); } else { try { - PhabricatorRepository::assertValidRemoteURI($v_remote); + DiffusionRepository::assertValidRemoteURI($v_remote); } catch (Exception $ex) { $c_remote->setError(pht('Invalid')); $page->addPageError($ex->getMessage()); @@ -588,7 +588,7 @@ ->getControl('remoteURI') ->getValue(); - $proto = PhabricatorRepository::getRemoteURIProtocol($remote_uri); + $proto = DiffusionRepository::getRemoteURIProtocol($remote_uri); $remote_user = $this->getRemoteURIUser($remote_uri); $c_credential = $page->getControl('credential'); @@ -705,7 +705,7 @@ if ($this->getRepository()) { $repository = $this->getRepository(); } else { - $repository = PhabricatorRepository::initializeNewRepository($viewer); + $repository = DiffusionRepository::initializeNewRepository($viewer); } $policies = id(new PhabricatorPolicyQuery()) @@ -774,7 +774,7 @@ if ($this->getRepository()) { $repository = $this->getRepository(); } else { - $repository = PhabricatorRepository::initializeNewRepository($viewer); + $repository = DiffusionRepository::initializeNewRepository($viewer); } $proxy = clone $repository; @@ -897,7 +897,7 @@ return ($proto == 'http' || $proto == 'https' || $proto == 'svn'); } - private function setRepository(PhabricatorRepository $repository) { + private function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( @@ -33,10 +33,10 @@ $v_autoclose = $request->getBool('autoclose'); $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_notify = PhabricatorRepositoryTransaction::TYPE_NOTIFY; - $type_autoclose = PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE; + $type_notify = DiffusionRepositoryTransaction::TYPE_NOTIFY; + $type_autoclose = DiffusionRepositoryTransaction::TYPE_AUTOCLOSE; $xactions[] = id(clone $template) ->setTransactionType($type_notify) @@ -46,7 +46,7 @@ ->setTransactionType($type_autoclose) ->setNewValue($v_autoclose); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( @@ -25,11 +25,11 @@ $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/'); if ($request->isFormPost()) { - $xaction = id(new PhabricatorRepositoryTransaction()) - ->setTransactionType(PhabricatorRepositoryTransaction::TYPE_ACTIVATE) + $xaction = id(new DiffusionRepositoryTransaction()) + ->setTransactionType(DiffusionRepositoryTransaction::TYPE_ACTIVATE) ->setNewValue(!$repository->isTracked()); - $editor = id(new PhabricatorRepositoryEditor()) + $editor = id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer) 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 @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( @@ -49,12 +49,12 @@ if (!$errors) { $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_name = PhabricatorRepositoryTransaction::TYPE_NAME; - $type_desc = PhabricatorRepositoryTransaction::TYPE_DESCRIPTION; + $type_name = DiffusionRepositoryTransaction::TYPE_NAME; + $type_desc = DiffusionRepositoryTransaction::TYPE_DESCRIPTION; $type_edge = PhabricatorTransactions::TYPE_EDGE; - $type_clone_name = PhabricatorRepositoryTransaction::TYPE_CLONE_NAME; + $type_clone_name = DiffusionRepositoryTransaction::TYPE_CLONE_NAME; $xactions[] = id(clone $template) ->setTransactionType($type_name) @@ -78,7 +78,7 @@ '=' => array_fuse($v_projects), )); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php @@ -9,7 +9,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( @@ -26,13 +26,13 @@ $is_hg = false; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $is_git = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $is_hg = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: throw new Exception( pht('Subversion does not support branches!')); default: @@ -65,11 +65,11 @@ } $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_default = PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH; - $type_track = PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY; - $type_autoclose = PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY; + $type_default = DiffusionRepositoryTransaction::TYPE_DEFAULT_BRANCH; + $type_track = DiffusionRepositoryTransaction::TYPE_TRACK_ONLY; + $type_autoclose = DiffusionRepositoryTransaction::TYPE_AUTOCLOSE_ONLY; $xactions[] = id(clone $template) ->setTransactionType($type_default) @@ -85,7 +85,7 @@ ->setNewValue($v_autoclose); } - $editor = id(new PhabricatorRepositoryEditor()) + $editor = id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( @@ -29,11 +29,11 @@ $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/'); if ($request->isFormPost()) { - $xaction = id(new PhabricatorRepositoryTransaction()) - ->setTransactionType(PhabricatorRepositoryTransaction::TYPE_DANGEROUS) + $xaction = id(new DiffusionRepositoryTransaction()) + ->setTransactionType(DiffusionRepositoryTransaction::TYPE_DANGEROUS) ->setNewValue(!$repository->shouldAllowDangerousChanges()); - $editor = id(new PhabricatorRepositoryEditor()) + $editor = id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( @@ -33,16 +33,16 @@ if (!$errors) { $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_encoding = PhabricatorRepositoryTransaction::TYPE_ENCODING; + $type_encoding = DiffusionRepositoryTransaction::TYPE_ENCODING; $xactions[] = id(clone $template) ->setTransactionType($type_encoding) ->setNewValue($v_encoding); try { - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php @@ -11,7 +11,7 @@ $repository = $drequest->getRepository(); $this->serve = $request->getURIData('serve'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( @@ -31,7 +31,7 @@ } } - public function handleHosting(PhabricatorRepository $repository) { + public function handleHosting(DiffusionRepository $repository) { $request = $this->getRequest(); $user = $request->getUser(); @@ -44,15 +44,15 @@ $v_hosting = $request->getBool('hosting'); $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_hosting = PhabricatorRepositoryTransaction::TYPE_HOSTING; + $type_hosting = DiffusionRepositoryTransaction::TYPE_HOSTING; $xactions[] = id(clone $template) ->setTransactionType($type_hosting) ->setNewValue($v_hosting); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) @@ -117,19 +117,19 @@ )); } - public function handleProtocols(PhabricatorRepository $repository) { + public function handleProtocols(DiffusionRepository $repository) { $request = $this->getRequest(); $user = $request->getUser(); $type = $repository->getVersionControlSystem(); - $is_svn = ($type == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN); + $is_svn = ($type == DiffusionRepositoryType::REPOSITORY_TYPE_SVN); $v_http_mode = $repository->getDetail( 'serve-over-http', - PhabricatorRepository::SERVE_OFF); + DiffusionRepository::SERVE_OFF); $v_ssh_mode = $repository->getDetail( 'serve-over-ssh', - PhabricatorRepository::SERVE_OFF); + DiffusionRepository::SERVE_OFF); $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/'); $prev_uri = $this->getRepositoryControllerURI($repository, 'edit/hosting/'); @@ -139,10 +139,10 @@ $v_ssh_mode = $request->getStr('ssh'); $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_http = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP; - $type_ssh = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH; + $type_http = DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP; + $type_ssh = DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH; if (!$is_svn) { $xactions[] = id(clone $template) @@ -154,7 +154,7 @@ ->setTransactionType($type_ssh) ->setNewValue($v_ssh_mode); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) @@ -191,21 +191,21 @@ ->setLabel(pht('SSH')) ->setValue($v_ssh_mode) ->addButton( - PhabricatorRepository::SERVE_OFF, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_OFF), + DiffusionRepository::SERVE_OFF, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_OFF), pht('Phabricator will not serve this repository over SSH.')) ->addButton( - PhabricatorRepository::SERVE_READONLY, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_READONLY), + DiffusionRepository::SERVE_READONLY, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_READONLY), pht( 'Phabricator will serve a read-only copy of this repository '. 'over SSH.')) ->addButton( - PhabricatorRepository::SERVE_READWRITE, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_READWRITE), + DiffusionRepository::SERVE_READWRITE, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_READWRITE), $rw_message); $http_control = @@ -214,21 +214,21 @@ ->setLabel(pht('HTTP')) ->setValue($v_http_mode) ->addButton( - PhabricatorRepository::SERVE_OFF, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_OFF), + DiffusionRepository::SERVE_OFF, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_OFF), pht('Phabricator will not serve this repository over HTTP.')) ->addButton( - PhabricatorRepository::SERVE_READONLY, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_READONLY), + DiffusionRepository::SERVE_READONLY, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_READONLY), pht( 'Phabricator will serve a read-only copy of this repository '. 'over HTTP.')) ->addButton( - PhabricatorRepository::SERVE_READWRITE, - PhabricatorRepository::getProtocolAvailabilityName( - PhabricatorRepository::SERVE_READWRITE), + DiffusionRepository::SERVE_READWRITE, + DiffusionRepository::getProtocolAvailabilityName( + DiffusionRepository::SERVE_READWRITE), $rw_message); if ($is_svn) { diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php @@ -17,13 +17,13 @@ $is_git = false; $is_hg = false; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $is_git = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $is_svn = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $is_hg = true; break; } @@ -106,7 +106,7 @@ $timeline = $this->buildTransactionTimeline( $repository, - new PhabricatorRepositoryTransactionQuery()); + new DiffusionRepositoryTransactionQuery()); $timeline->setShouldTerminate(true); $boxes = array(); @@ -129,7 +129,7 @@ $repository, $mirror_actions); - $mirrors = id(new PhabricatorRepositoryMirrorQuery()) + $mirrors = id(new DiffusionRepositoryMirrorQuery()) ->setViewer($viewer) ->withRepositoryPHIDs(array($repository->getPHID())) ->execute(); @@ -206,7 +206,7 @@ )); } - private function buildBasicActions(PhabricatorRepository $repository) { + private function buildBasicActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -257,7 +257,7 @@ } private function buildBasicProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -266,7 +266,7 @@ ->setUser($viewer) ->setActionList($actions); - $type = PhabricatorRepositoryType::getNameForRepositoryType( + $type = DiffusionRepositoryType::getNameForRepositoryType( $repository->getVersionControlSystem()); $view->addProperty(pht('Type'), $type); @@ -318,7 +318,7 @@ return $view; } - private function buildEncodingActions(PhabricatorRepository $repository) { + private function buildEncodingActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -336,7 +336,7 @@ } private function buildEncodingProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -355,7 +355,7 @@ return $view; } - private function buildPolicyActions(PhabricatorRepository $repository) { + private function buildPolicyActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -373,7 +373,7 @@ } private function buildPolicyProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -410,7 +410,7 @@ return $view; } - private function buildBranchesActions(PhabricatorRepository $repository) { + private function buildBranchesActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -428,7 +428,7 @@ } private function buildBranchesProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -460,7 +460,7 @@ return $view; } - private function buildSubversionActions(PhabricatorRepository $repository) { + private function buildSubversionActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -478,7 +478,7 @@ } private function buildSubversionProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -500,7 +500,7 @@ return $view; } - private function buildActionsActions(PhabricatorRepository $repository) { + private function buildActionsActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -518,7 +518,7 @@ } private function buildActionsProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -542,7 +542,7 @@ return $view; } - private function buildRemoteActions(PhabricatorRepository $repository) { + private function buildRemoteActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -560,7 +560,7 @@ } private function buildRemoteProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -583,7 +583,7 @@ return $view; } - private function buildStorageActions(PhabricatorRepository $repository) { + private function buildStorageActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -601,7 +601,7 @@ } private function buildStorageProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -632,7 +632,7 @@ } - private function buildStagingActions(PhabricatorRepository $repository) { + private function buildStagingActions(DiffusionRepository $repository) { $viewer = $this->getViewer(); $view = id(new PhabricatorActionListView()) @@ -650,7 +650,7 @@ } private function buildStagingProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getViewer(); @@ -670,7 +670,7 @@ return $view; } - private function buildHostingActions(PhabricatorRepository $repository) { + private function buildHostingActions(DiffusionRepository $repository) { $user = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -707,7 +707,7 @@ } private function buildHostingProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $user = $this->getRequest()->getUser(); @@ -726,7 +726,7 @@ phutil_tag( 'em', array(), - PhabricatorRepository::getProtocolAvailabilityName( + DiffusionRepository::getProtocolAvailabilityName( $repository->getServeOverHTTP()))); $view->addProperty( @@ -734,7 +734,7 @@ phutil_tag( 'em', array(), - PhabricatorRepository::getProtocolAvailabilityName( + DiffusionRepository::getProtocolAvailabilityName( $repository->getServeOverSSH()))); if ($repository->canAllowDangerousChanges()) { @@ -753,14 +753,14 @@ } private function buildRepositoryStatus( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $is_cluster = $repository->getAlmanacServicePHID(); $view = new PHUIStatusListView(); - $messages = id(new PhabricatorRepositoryStatusMessage()) + $messages = id(new DiffusionRepositoryStatusMessage()) ->loadAllWhere('repositoryID = %d', $repository->getID()); $messages = mpull($messages, null, 'getStatusType'); @@ -782,47 +782,47 @@ $binaries = array(); $svnlook_check = false; switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $binaries[] = 'git'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $binaries[] = 'svn'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $binaries[] = 'hg'; break; } if ($repository->isHosted()) { - if ($repository->getServeOverHTTP() != PhabricatorRepository::SERVE_OFF) { + if ($repository->getServeOverHTTP() != DiffusionRepository::SERVE_OFF) { switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $binaries[] = 'git-http-backend'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $binaries[] = 'svnserve'; $binaries[] = 'svnadmin'; $binaries[] = 'svnlook'; $svnlook_check = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $binaries[] = 'hg'; break; } } - if ($repository->getServeOverSSH() != PhabricatorRepository::SERVE_OFF) { + if ($repository->getServeOverSSH() != DiffusionRepository::SERVE_OFF) { switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $binaries[] = 'git-receive-pack'; $binaries[] = 'git-upload-pack'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $binaries[] = 'svnserve'; $binaries[] = 'svnadmin'; $binaries[] = 'svnlook'; $svnlook_check = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $binaries[] = 'hg'; break; } @@ -906,7 +906,7 @@ $pull_daemon = id(new PhabricatorDaemonLogQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE) - ->withDaemonClasses(array('PhabricatorRepositoryPullLocalDaemon')) + ->withDaemonClasses(array('DiffusionRepositoryPullLocalDaemon')) ->setLimit(1) ->execute(); @@ -976,17 +976,17 @@ } $local_path = $repository->getLocalPath(); - $message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_INIT); + $message = idx($messages, DiffusionRepositoryStatusMessage::TYPE_INIT); if ($message) { switch ($message->getStatusCode()) { - case PhabricatorRepositoryStatusMessage::CODE_ERROR: + case DiffusionRepositoryStatusMessage::CODE_ERROR: $view->addItem( id(new PHUIStatusItemView()) ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') ->setTarget(pht('Initialization Error')) ->setNote($message->getParameter('message'))); return $view; - case PhabricatorRepositoryStatusMessage::CODE_OKAY: + case DiffusionRepositoryStatusMessage::CODE_OKAY: if (Filesystem::pathExists($local_path)) { $view->addItem( id(new PHUIStatusItemView()) @@ -1008,7 +1008,7 @@ return $view; } break; - case PhabricatorRepositoryStatusMessage::CODE_WORKING: + case DiffusionRepositoryStatusMessage::CODE_WORKING: $view->addItem( id(new PHUIStatusItemView()) ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green') @@ -1034,10 +1034,10 @@ } } - $message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_FETCH); + $message = idx($messages, DiffusionRepositoryStatusMessage::TYPE_FETCH); if ($message) { switch ($message->getStatusCode()) { - case PhabricatorRepositoryStatusMessage::CODE_ERROR: + case DiffusionRepositoryStatusMessage::CODE_ERROR: $message = $message->getParameter('message'); $suggestion = null; @@ -1067,7 +1067,7 @@ ->setTarget(pht('Update Error')) ->setNote($message)); return $view; - case PhabricatorRepositoryStatusMessage::CODE_OKAY: + case DiffusionRepositoryStatusMessage::CODE_OKAY: $ago = (PhabricatorTime::getNow() - $message->getEpoch()); $view->addItem( id(new PHUIStatusItemView()) @@ -1094,7 +1094,7 @@ $repository->establishConnection('r'), 'SELECT importStatus, count(*) N FROM %T WHERE repositoryID = %d GROUP BY importStatus', - id(new PhabricatorRepositoryCommit())->getTableName(), + id(new DiffusionCommit())->getTableName(), $repository->getID()); $done = 0; @@ -1102,16 +1102,16 @@ foreach ($progress as $row) { $total += $row['N'] * 4; $status = $row['importStatus']; - if ($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE) { + if ($status & DiffusionCommit::IMPORTED_MESSAGE) { $done += $row['N']; } - if ($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE) { + if ($status & DiffusionCommit::IMPORTED_CHANGE) { $done += $row['N']; } - if ($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS) { + if ($status & DiffusionCommit::IMPORTED_OWNERS) { $done += $row['N']; } - if ($status & PhabricatorRepositoryCommit::IMPORTED_HERALD) { + if ($status & DiffusionCommit::IMPORTED_HERALD) { $done += $row['N']; } } @@ -1143,7 +1143,7 @@ ->setTarget(pht('Fully Imported'))); } - if (idx($messages, PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) { + if (idx($messages, DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) { $view->addItem( id(new PHUIStatusItemView()) ->setIcon(PHUIStatusItemView::ICON_UP, 'indigo') @@ -1155,7 +1155,7 @@ } private function buildRepositoryUpdateInterval( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $smart_wait = $repository->loadUpdateInterval(); @@ -1177,7 +1177,7 @@ private function buildMirrorActions( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); @@ -1200,7 +1200,7 @@ } private function buildMirrorProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); @@ -1220,9 +1220,9 @@ } private function buildMirrorList( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $mirrors) { - assert_instances_of($mirrors, 'PhabricatorRepositoryMirror'); + assert_instances_of($mirrors, 'DiffusionRepositoryMirror'); $mirror_list = id(new PHUIObjectItemListView()) ->setNoDataString(pht('This repository has no configured mirrors.')); @@ -1257,7 +1257,7 @@ return $mirror_list; } - private function buildSymbolsActions(PhabricatorRepository $repository) { + private function buildSymbolsActions(DiffusionRepository $repository) { $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) @@ -1275,7 +1275,7 @@ } private function buildSymbolsProperties( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorActionListView $actions) { $viewer = $this->getRequest()->getUser(); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditStagingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditStagingController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditStagingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditStagingController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( @@ -32,15 +32,15 @@ $v_area = $request->getStr('area'); $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_encoding = PhabricatorRepositoryTransaction::TYPE_STAGING_URI; + $type_encoding = DiffusionRepositoryTransaction::TYPE_STAGING_URI; $xactions[] = id(clone $template) ->setTransactionType($type_encoding) ->setNewValue($v_area); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) 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 @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( @@ -23,11 +23,11 @@ } switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: throw new Exception( pht('Git and Mercurial do not support editing SVN properties!')); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: break; default: throw new Exception( @@ -44,10 +44,10 @@ $v_uuid = $request->getStr('uuid'); $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_subpath = PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH; - $type_uuid = PhabricatorRepositoryTransaction::TYPE_UUID; + $type_subpath = DiffusionRepositoryTransaction::TYPE_SVN_SUBPATH; + $type_uuid = DiffusionRepositoryTransaction::TYPE_UUID; $xactions[] = id(clone $template) ->setTransactionType($type_subpath) @@ -57,7 +57,7 @@ ->setTransactionType($type_uuid) ->setNewValue($v_uuid); - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($viewer) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( 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 @@ -9,7 +9,7 @@ protected function processDiffusionRequest(AphrontRequest $request) { $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($request->getURIData('queryKey')) - ->setSearchEngine(new PhabricatorRepositorySearchEngine()) + ->setSearchEngine(new DiffusionRepositorySearchEngine()) ->setNavigation($this->buildSideNavView()); return $this->delegateToController($controller); @@ -21,7 +21,7 @@ $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI($this->getApplicationURI())); - id(new PhabricatorRepositorySearchEngine()) + id(new DiffusionRepositorySearchEngine()) ->setViewer($viewer) ->addNavigationItems($nav->getMenu()); diff --git a/src/applications/diffusion/controller/DiffusionRepositorySymbolsController.php b/src/applications/diffusion/controller/DiffusionRepositorySymbolsController.php --- a/src/applications/diffusion/controller/DiffusionRepositorySymbolsController.php +++ b/src/applications/diffusion/controller/DiffusionRepositorySymbolsController.php @@ -8,7 +8,7 @@ $drequest = $this->diffusionRequest; $repository = $drequest->getRepository(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($user) ->requireCapabilities( array( @@ -38,10 +38,10 @@ if (!$errors) { $xactions = array(); - $template = id(new PhabricatorRepositoryTransaction()); + $template = id(new DiffusionRepositoryTransaction()); - $type_sources = PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES; - $type_lang = PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE; + $type_sources = DiffusionRepositoryTransaction::TYPE_SYMBOLS_SOURCES; + $type_lang = DiffusionRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE; $xactions[] = id(clone $template) ->setTransactionType($type_sources) @@ -52,7 +52,7 @@ ->setNewValue($v_languages); try { - id(new PhabricatorRepositoryEditor()) + id(new DiffusionRepositoryEditor()) ->setContinueOnNoEffect(true) ->setContentSourceFromRequest($request) ->setActor($user) diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php --- a/src/applications/diffusion/controller/DiffusionServeController.php +++ b/src/applications/diffusion/controller/DiffusionServeController.php @@ -19,20 +19,20 @@ $service = $request->getStr('service'); // We get this initially for `info/refs`. // Git also gives us a User-Agent like "git/1.8.2.3". - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; } else if (strncmp($user_agent, 'git/', 4) === 0) { - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; } else if ($content_type == 'application/x-git-upload-pack-request') { // We get this for `git-upload-pack`. - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; } else if ($content_type == 'application/x-git-receive-pack-request') { // We get this for `git-receive-pack`. - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; } else if ($request->getExists('cmd')) { // Mercurial also sends an Accept header like // "application/mercurial-0.1", and a User-Agent like // "mercurial/proto-1.0". - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL; } else { // Subversion also sends an initial OPTIONS request (vs GET/POST), and // has a User-Agent like "SVN/1.8.3 (x86_64-apple-darwin11.4.2) @@ -40,7 +40,7 @@ $dav = $request->getHTTPHeader('DAV'); $dav = new PhutilURI($dav); if ($dav->getDomain() === 'subversion.tigris.org') { - $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN; + $vcs = DiffusionRepositoryType::REPOSITORY_TYPE_SVN; } } @@ -70,7 +70,7 @@ $viewer = $this->authenticateHTTPRepositoryUser($username, $password); if (!$viewer) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('Invalid credentials.')); } @@ -85,11 +85,11 @@ if (!$allow_public) { if (!$viewer->isLoggedIn()) { if ($allow_auth) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 401, pht('You must log in to access repositories.')); } else { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('Public and authenticated HTTP access are both forbidden.')); } @@ -97,27 +97,27 @@ } try { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withCallsigns(array($callsign)) ->executeOne(); if (!$repository) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 404, pht('No such repository exists.')); } } catch (PhabricatorPolicyException $ex) { if ($viewer->isLoggedIn()) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('You do not have permission to access this repository.')); } else { if ($allow_auth) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 401, pht('You must log in to access this repository.')); } else { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht( 'This repository requires authentication, which is forbidden '. @@ -127,7 +127,7 @@ } if (!$repository->isTracked()) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('This repository is inactive.')); } @@ -135,14 +135,14 @@ $is_push = !$this->isReadOnlyRequest($repository); switch ($repository->getServeOverHTTP()) { - case PhabricatorRepository::SERVE_READONLY: + case DiffusionRepository::SERVE_READONLY: if ($is_push) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('This repository is read-only over HTTP.')); } break; - case PhabricatorRepository::SERVE_READWRITE: + case DiffusionRepository::SERVE_READWRITE: if ($is_push) { $can_push = PhabricatorPolicyFilter::hasCapability( $viewer, @@ -150,16 +150,16 @@ DiffusionPushCapability::CAPABILITY); if (!$can_push) { if ($viewer->isLoggedIn()) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('You do not have permission to push to this repository.')); } else { if ($allow_auth) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 401, pht('You must log in to push to this repository.')); } else { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht( 'Pushing to this repository requires authentication, '. @@ -169,9 +169,9 @@ } } break; - case PhabricatorRepository::SERVE_OFF: + case DiffusionRepository::SERVE_OFF: default: - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 403, pht('This repository is not available over HTTP.')); } @@ -181,42 +181,42 @@ if ($vcs_type != $req_type) { switch ($req_type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $result = new PhabricatorVCSResponse( + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + $result = new DiffusionVCSResponse( 500, pht('This is not a Git repository.')); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: - $result = new PhabricatorVCSResponse( + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $result = new DiffusionVCSResponse( 500, pht('This is not a Mercurial repository.')); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $result = new PhabricatorVCSResponse( + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $result = new DiffusionVCSResponse( 500, pht('This is not a Subversion repository.')); break; default: - $result = new PhabricatorVCSResponse( + $result = new DiffusionVCSResponse( 500, pht('Unknown request type.')); break; } } else { switch ($vcs_type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->serveVCSRequest($repository, $viewer); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $result = new PhabricatorVCSResponse( + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $result = new DiffusionVCSResponse( 500, pht( 'Phabricator does not support HTTP access to Subversion '. 'repositories.')); break; default: - $result = new PhabricatorVCSResponse( + $result = new DiffusionVCSResponse( 500, pht('Unknown version control system.')); break; @@ -228,8 +228,8 @@ if ($is_push && ($code == 200)) { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::CODE_OKAY); unset($unguarded); } @@ -237,7 +237,7 @@ } private function serveVCSRequest( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorUser $viewer) { // If this repository is hosted on a service, we need to proxy the request @@ -261,10 +261,10 @@ $vcs_type = $repository->getVersionControlSystem(); switch ($vcs_type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $result = $this->serveGitRequest($repository, $viewer); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->serveMercurialRequest($repository, $viewer); break; } @@ -273,14 +273,14 @@ } private function isReadOnlyRequest( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $request = $this->getRequest(); $method = $_SERVER['REQUEST_METHOD']; // TODO: This implementation is safe by default, but very incomplete. switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $service = $request->getStr('service'); $path = $this->getRequestDirectoryPath($repository); // NOTE: Service names are the reverse of what you might expect, as they @@ -298,14 +298,14 @@ } break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $cmd = $request->getStr('cmd'); if ($cmd == 'batch') { $cmds = idx($this->getMercurialArguments(), 'cmds'); return DiffusionMercurialWireProtocol::isReadOnlyBatchCommand($cmds); } return DiffusionMercurialWireProtocol::isReadOnlyCommand($cmd); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: break; } @@ -316,7 +316,7 @@ * @phutil-external-symbol class PhabricatorStartup */ private function serveGitRequest( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorUser $viewer) { $request = $this->getRequest(); @@ -385,7 +385,7 @@ } if ($err) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 500, pht('Error %d: %s', $err, $stderr)); } @@ -393,7 +393,7 @@ return id(new DiffusionGitResponse())->setGitData($stdout); } - private function getRequestDirectoryPath(PhabricatorRepository $repository) { + private function getRequestDirectoryPath(DiffusionRepository $repository) { $request = $this->getRequest(); $request_path = $request->getRequestURI()->getPath(); $base_path = preg_replace('@^/diffusion/[A-Z]+@', '', $request_path); @@ -455,7 +455,7 @@ return null; } - $password_entry = id(new PhabricatorRepositoryVCSPassword()) + $password_entry = id(new DiffusionVCSPassword()) ->loadOneWhere('userPHID = %s', $user->getPHID()); if (!$password_entry) { // User doesn't have a password set. @@ -483,7 +483,7 @@ } private function serveMercurialRequest( - PhabricatorRepository $repository, + DiffusionRepository $repository, PhabricatorUser $viewer) { $request = $this->getRequest(); @@ -518,7 +518,7 @@ ->resolve(); if ($err) { - return new PhabricatorVCSResponse( + return new DiffusionVCSResponse( 500, pht('Error %d: %s', $err, $stderr)); } diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php --- a/src/applications/diffusion/controller/DiffusionSymbolController.php +++ b/src/applications/diffusion/controller/DiffusionSymbolController.php @@ -30,7 +30,7 @@ $phids = array_filter($phids); if ($phids) { - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withPHIDs($phids) ->execute(); 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 @@ -29,7 +29,7 @@ } switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $tags = array(); break; default: diff --git a/src/applications/repository/customfield/PhabricatorCommitBranchesField.php b/src/applications/diffusion/customfield/PhabricatorCommitBranchesField.php rename from src/applications/repository/customfield/PhabricatorCommitBranchesField.php rename to src/applications/diffusion/customfield/PhabricatorCommitBranchesField.php diff --git a/src/applications/repository/customfield/PhabricatorCommitCustomField.php b/src/applications/diffusion/customfield/PhabricatorCommitCustomField.php rename from src/applications/repository/customfield/PhabricatorCommitCustomField.php rename to src/applications/diffusion/customfield/PhabricatorCommitCustomField.php diff --git a/src/applications/repository/customfield/PhabricatorCommitMergedCommitsField.php b/src/applications/diffusion/customfield/PhabricatorCommitMergedCommitsField.php rename from src/applications/repository/customfield/PhabricatorCommitMergedCommitsField.php rename to src/applications/diffusion/customfield/PhabricatorCommitMergedCommitsField.php diff --git a/src/applications/repository/customfield/PhabricatorCommitRepositoryField.php b/src/applications/diffusion/customfield/PhabricatorCommitRepositoryField.php rename from src/applications/repository/customfield/PhabricatorCommitRepositoryField.php rename to src/applications/diffusion/customfield/PhabricatorCommitRepositoryField.php diff --git a/src/applications/repository/customfield/PhabricatorCommitTagsField.php b/src/applications/diffusion/customfield/PhabricatorCommitTagsField.php rename from src/applications/repository/customfield/PhabricatorCommitTagsField.php rename to src/applications/diffusion/customfield/PhabricatorCommitTagsField.php diff --git a/src/applications/repository/daemon/PhabricatorGitGraphStream.php b/src/applications/diffusion/daemon/DiffusionRepositoryGitGraphStream.php rename from src/applications/repository/daemon/PhabricatorGitGraphStream.php rename to src/applications/diffusion/daemon/DiffusionRepositoryGitGraphStream.php --- a/src/applications/repository/daemon/PhabricatorGitGraphStream.php +++ b/src/applications/diffusion/daemon/DiffusionRepositoryGitGraphStream.php @@ -1,7 +1,7 @@ repository = $repository; diff --git a/src/applications/repository/daemon/PhabricatorRepositoryGraphStream.php b/src/applications/diffusion/daemon/DiffusionRepositoryGraphStream.php rename from src/applications/repository/daemon/PhabricatorRepositoryGraphStream.php rename to src/applications/diffusion/daemon/DiffusionRepositoryGraphStream.php --- a/src/applications/repository/daemon/PhabricatorRepositoryGraphStream.php +++ b/src/applications/diffusion/daemon/DiffusionRepositoryGraphStream.php @@ -1,6 +1,6 @@ repository = $repository; $future = $repository->getLocalCommandFuture( diff --git a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/diffusion/daemon/DiffusionRepositoryPullLocalDaemon.php rename from src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php rename to src/applications/diffusion/daemon/DiffusionRepositoryPullLocalDaemon.php --- a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php +++ b/src/applications/diffusion/daemon/DiffusionRepositoryPullLocalDaemon.php @@ -24,7 +24,7 @@ * * @task pull Pulling Repositories */ -final class PhabricatorRepositoryPullLocalDaemon +final class DiffusionRepositoryPullLocalDaemon extends PhabricatorDaemon { private $statusMessageCursor = 0; @@ -218,7 +218,7 @@ * @task pull */ private function buildUpdateFuture( - PhabricatorRepository $repository, + DiffusionRepository $repository, $no_discovery) { $bin = dirname(phutil_get_library_root('phabricator')).'/bin/repository'; @@ -270,8 +270,8 @@ * @task pull */ private function loadRepositoryUpdateMessages($consume = false) { - $type_need_update = PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE; - $messages = id(new PhabricatorRepositoryStatusMessage())->loadAllWhere( + $type_need_update = DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE; + $messages = id(new DiffusionRepositoryStatusMessage())->loadAllWhere( 'statusType = %s AND id > %d', $type_need_update, $this->statusMessageCursor); @@ -299,7 +299,7 @@ * @task pull */ private function loadPullableRepositories(array $include, array $exclude) { - $query = id(new PhabricatorRepositoryQuery()) + $query = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()); if ($include) { @@ -349,7 +349,7 @@ * @task pull */ private function resolveUpdateFuture( - PhabricatorRepository $repository, + DiffusionRepository $repository, ExecFuture $future, $min_sleep) { diff --git a/src/applications/diffusion/data/DiffusionCommitRef.php b/src/applications/diffusion/data/DiffusionCommitRef.php --- a/src/applications/diffusion/data/DiffusionCommitRef.php +++ b/src/applications/diffusion/data/DiffusionCommitRef.php @@ -95,7 +95,7 @@ } public function getSummary() { - return PhabricatorRepositoryCommitData::summarizeCommitMessage( + return DiffusionCommitData::summarizeCommitMessage( $this->getMessage()); } diff --git a/src/applications/repository/data/PhabricatorRepositoryParsedChange.php b/src/applications/diffusion/data/DiffusionParsedChange.php rename from src/applications/repository/data/PhabricatorRepositoryParsedChange.php rename to src/applications/diffusion/data/DiffusionParsedChange.php --- a/src/applications/repository/data/PhabricatorRepositoryParsedChange.php +++ b/src/applications/diffusion/data/DiffusionParsedChange.php @@ -1,6 +1,6 @@ setPath($dict['path']) diff --git a/src/applications/diffusion/data/DiffusionRepositoryPath.php b/src/applications/diffusion/data/DiffusionRepositoryPath.php --- a/src/applications/diffusion/data/DiffusionRepositoryPath.php +++ b/src/applications/diffusion/data/DiffusionRepositoryPath.php @@ -40,7 +40,7 @@ } public function setLastModifiedCommit( - PhabricatorRepositoryCommit $commit) { + DiffusionCommit $commit) { $this->lastModifiedCommit = $commit; return $this; } @@ -50,7 +50,7 @@ } public function setLastCommitData( - PhabricatorRepositoryCommitData $last_commit_data) { + DiffusionCommitData $last_commit_data) { $this->lastCommitData = $last_commit_data; return $this; } @@ -116,12 +116,12 @@ ->setFileSize($dict['fileSize']) ->setExternalURI($dict['externalURI']); if ($dict['lastModifiedCommit']) { - $last_modified_commit = PhabricatorRepositoryCommit::newFromDictionary( + $last_modified_commit = DiffusionCommit::newFromDictionary( $dict['lastModifiedCommit']); $path->setLastModifiedCommit($last_modified_commit); } if ($dict['lastCommitData']) { - $last_commit_data = PhabricatorRepositoryCommitData::newFromDictionary( + $last_commit_data = DiffusionCommitData::newFromDictionary( $dict['lastCommitData']); $path->setLastCommitData($last_commit_data); } diff --git a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php b/src/applications/diffusion/data/DiffusionRepositoryURINormalizer.php rename from src/applications/repository/data/PhabricatorRepositoryURINormalizer.php rename to src/applications/diffusion/data/DiffusionRepositoryURINormalizer.php --- a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php +++ b/src/applications/diffusion/data/DiffusionRepositoryURINormalizer.php @@ -18,8 +18,8 @@ * * ...for all of these URIs. Generally, usage looks like this: * - * $norm_a = new PhabricatorRepositoryURINormalizer($type, $uri_a); - * $norm_b = new PhabricatorRepositoryURINormalizer($type, $uri_b); + * $norm_a = new DiffusionRepositoryURINormalizer($type, $uri_a); + * $norm_b = new DiffusionRepositoryURINormalizer($type, $uri_b); * * if ($norm_a->getNormalizedPath() == $norm_b->getNormalizedPath()) { * // URIs appear to point at the same repository. @@ -36,7 +36,7 @@ * * @task normal Normalizing URIs */ -final class PhabricatorRepositoryURINormalizer extends Phobject { +final class DiffusionRepositoryURINormalizer extends Phobject { const TYPE_GIT = 'git'; const TYPE_SVN = 'svn'; diff --git a/src/applications/repository/data/__tests__/PhabricatorRepositoryURINormalizerTestCase.php b/src/applications/diffusion/data/__tests__/DiffusionRepositoryURINormalizerTestCase.php rename from src/applications/repository/data/__tests__/PhabricatorRepositoryURINormalizerTestCase.php rename to src/applications/diffusion/data/__tests__/DiffusionRepositoryURINormalizerTestCase.php --- a/src/applications/repository/data/__tests__/PhabricatorRepositoryURINormalizerTestCase.php +++ b/src/applications/diffusion/data/__tests__/DiffusionRepositoryURINormalizerTestCase.php @@ -1,6 +1,6 @@ 'diffusion/X', ); - $type_git = PhabricatorRepositoryURINormalizer::TYPE_GIT; + $type_git = DiffusionRepositoryURINormalizer::TYPE_GIT; foreach ($cases as $input => $expect) { - $normal = new PhabricatorRepositoryURINormalizer($type_git, $input); + $normal = new DiffusionRepositoryURINormalizer($type_git, $input); $this->assertEqual( $expect, $normal->getNormalizedPath(), @@ -37,10 +37,10 @@ 'file:///path/to/repo/' => 'path/to/repo', ); - $type_svn = PhabricatorRepositoryURINormalizer::TYPE_SVN; + $type_svn = DiffusionRepositoryURINormalizer::TYPE_SVN; foreach ($cases as $input => $expect) { - $normal = new PhabricatorRepositoryURINormalizer($type_svn, $input); + $normal = new DiffusionRepositoryURINormalizer($type_svn, $input); $this->assertEqual( $expect, $normal->getNormalizedPath(), diff --git a/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php b/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php --- a/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php +++ b/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php @@ -14,7 +14,7 @@ public function canPublishStory(PhabricatorFeedStory $story, $object) { return ($story instanceof PhabricatorApplicationTransactionFeedStory) && - ($object instanceof PhabricatorRepositoryCommit); + ($object instanceof DiffusionCommit); } public function isStoryAboutObjectCreation($object) { @@ -180,7 +180,7 @@ return pht('%s Audit', $prefix); } - private function getTitlePrefix(PhabricatorRepositoryCommit $commit) { + private function getTitlePrefix(DiffusionCommit $commit) { $prefix_key = 'metamta.diffusion.subject-prefix'; return PhabricatorEnv::getEnvConfig($prefix_key); } diff --git a/src/applications/repository/editor/PhabricatorRepositoryEditor.php b/src/applications/diffusion/editor/DiffusionRepositoryEditor.php rename from src/applications/repository/editor/PhabricatorRepositoryEditor.php rename to src/applications/diffusion/editor/DiffusionRepositoryEditor.php --- a/src/applications/repository/editor/PhabricatorRepositoryEditor.php +++ b/src/applications/diffusion/editor/DiffusionRepositoryEditor.php @@ -1,6 +1,6 @@ getTransactionType()) { - case PhabricatorRepositoryTransaction::TYPE_VCS: + case DiffusionRepositoryTransaction::TYPE_VCS: return $object->getVersionControlSystem(); - case PhabricatorRepositoryTransaction::TYPE_ACTIVATE: + case DiffusionRepositoryTransaction::TYPE_ACTIVATE: return $object->isTracked(); - case PhabricatorRepositoryTransaction::TYPE_NAME: + case DiffusionRepositoryTransaction::TYPE_NAME: return $object->getName(); - case PhabricatorRepositoryTransaction::TYPE_DESCRIPTION: + case DiffusionRepositoryTransaction::TYPE_DESCRIPTION: return $object->getDetail('description'); - case PhabricatorRepositoryTransaction::TYPE_ENCODING: + case DiffusionRepositoryTransaction::TYPE_ENCODING: return $object->getDetail('encoding'); - case PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH: + case DiffusionRepositoryTransaction::TYPE_DEFAULT_BRANCH: return $object->getDetail('default-branch'); - case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY: + case DiffusionRepositoryTransaction::TYPE_TRACK_ONLY: return array_keys($object->getDetail('branch-filter', array())); - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: return array_keys($object->getDetail('close-commits-filter', array())); - case PhabricatorRepositoryTransaction::TYPE_UUID: + case DiffusionRepositoryTransaction::TYPE_UUID: return $object->getUUID(); - case PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH: + case DiffusionRepositoryTransaction::TYPE_SVN_SUBPATH: return $object->getDetail('svn-subpath'); - case PhabricatorRepositoryTransaction::TYPE_NOTIFY: + case DiffusionRepositoryTransaction::TYPE_NOTIFY: return (int)!$object->getDetail('herald-disabled'); - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE: return (int)!$object->getDetail('disable-autoclose'); - case PhabricatorRepositoryTransaction::TYPE_REMOTE_URI: + case DiffusionRepositoryTransaction::TYPE_REMOTE_URI: return $object->getDetail('remote-uri'); - case PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH: + case DiffusionRepositoryTransaction::TYPE_LOCAL_PATH: return $object->getDetail('local-path'); - case PhabricatorRepositoryTransaction::TYPE_HOSTING: + case DiffusionRepositoryTransaction::TYPE_HOSTING: return $object->isHosted(); - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP: return $object->getServeOverHTTP(); - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH: return $object->getServeOverSSH(); - case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY: + case DiffusionRepositoryTransaction::TYPE_PUSH_POLICY: return $object->getPushPolicy(); - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: return $object->getCredentialPHID(); - case PhabricatorRepositoryTransaction::TYPE_DANGEROUS: + case DiffusionRepositoryTransaction::TYPE_DANGEROUS: return $object->shouldAllowDangerousChanges(); - case PhabricatorRepositoryTransaction::TYPE_CLONE_NAME: + case DiffusionRepositoryTransaction::TYPE_CLONE_NAME: return $object->getDetail('clone-name'); - case PhabricatorRepositoryTransaction::TYPE_SERVICE: + case DiffusionRepositoryTransaction::TYPE_SERVICE: return $object->getAlmanacServicePHID(); - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: return $object->getSymbolLanguages(); - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_SOURCES: return $object->getSymbolSources(); - case PhabricatorRepositoryTransaction::TYPE_STAGING_URI: + case DiffusionRepositoryTransaction::TYPE_STAGING_URI: return $object->getDetail('staging-uri'); } } @@ -115,37 +115,37 @@ PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { - case PhabricatorRepositoryTransaction::TYPE_ACTIVATE: - case PhabricatorRepositoryTransaction::TYPE_NAME: - case PhabricatorRepositoryTransaction::TYPE_DESCRIPTION: - case PhabricatorRepositoryTransaction::TYPE_ENCODING: - case PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH: - case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY: - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: - case PhabricatorRepositoryTransaction::TYPE_UUID: - case PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH: - case PhabricatorRepositoryTransaction::TYPE_REMOTE_URI: - case PhabricatorRepositoryTransaction::TYPE_SSH_LOGIN: - case PhabricatorRepositoryTransaction::TYPE_SSH_KEY: - case PhabricatorRepositoryTransaction::TYPE_SSH_KEYFILE: - case PhabricatorRepositoryTransaction::TYPE_HTTP_LOGIN: - case PhabricatorRepositoryTransaction::TYPE_HTTP_PASS: - case PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH: - case PhabricatorRepositoryTransaction::TYPE_VCS: - case PhabricatorRepositoryTransaction::TYPE_HOSTING: - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP: - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH: - case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY: - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: - case PhabricatorRepositoryTransaction::TYPE_DANGEROUS: - case PhabricatorRepositoryTransaction::TYPE_CLONE_NAME: - case PhabricatorRepositoryTransaction::TYPE_SERVICE: - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES: - case PhabricatorRepositoryTransaction::TYPE_STAGING_URI: + case DiffusionRepositoryTransaction::TYPE_ACTIVATE: + case DiffusionRepositoryTransaction::TYPE_NAME: + case DiffusionRepositoryTransaction::TYPE_DESCRIPTION: + case DiffusionRepositoryTransaction::TYPE_ENCODING: + case DiffusionRepositoryTransaction::TYPE_DEFAULT_BRANCH: + case DiffusionRepositoryTransaction::TYPE_TRACK_ONLY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: + case DiffusionRepositoryTransaction::TYPE_UUID: + case DiffusionRepositoryTransaction::TYPE_SVN_SUBPATH: + case DiffusionRepositoryTransaction::TYPE_REMOTE_URI: + case DiffusionRepositoryTransaction::TYPE_SSH_LOGIN: + case DiffusionRepositoryTransaction::TYPE_SSH_KEY: + case DiffusionRepositoryTransaction::TYPE_SSH_KEYFILE: + case DiffusionRepositoryTransaction::TYPE_HTTP_LOGIN: + case DiffusionRepositoryTransaction::TYPE_HTTP_PASS: + case DiffusionRepositoryTransaction::TYPE_LOCAL_PATH: + case DiffusionRepositoryTransaction::TYPE_VCS: + case DiffusionRepositoryTransaction::TYPE_HOSTING: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH: + case DiffusionRepositoryTransaction::TYPE_PUSH_POLICY: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_DANGEROUS: + case DiffusionRepositoryTransaction::TYPE_CLONE_NAME: + case DiffusionRepositoryTransaction::TYPE_SERVICE: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_SOURCES: + case DiffusionRepositoryTransaction::TYPE_STAGING_URI: return $xaction->getNewValue(); - case PhabricatorRepositoryTransaction::TYPE_NOTIFY: - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE: + case DiffusionRepositoryTransaction::TYPE_NOTIFY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE: return (int)$xaction->getNewValue(); } } @@ -155,78 +155,78 @@ PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { - case PhabricatorRepositoryTransaction::TYPE_VCS: + case DiffusionRepositoryTransaction::TYPE_VCS: $object->setVersionControlSystem($xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_ACTIVATE: + case DiffusionRepositoryTransaction::TYPE_ACTIVATE: $object->setDetail('tracking-enabled', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_NAME: + case DiffusionRepositoryTransaction::TYPE_NAME: $object->setName($xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_DESCRIPTION: + case DiffusionRepositoryTransaction::TYPE_DESCRIPTION: $object->setDetail('description', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH: + case DiffusionRepositoryTransaction::TYPE_DEFAULT_BRANCH: $object->setDetail('default-branch', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY: + case DiffusionRepositoryTransaction::TYPE_TRACK_ONLY: $object->setDetail( 'branch-filter', array_fill_keys($xaction->getNewValue(), true)); break; - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: $object->setDetail( 'close-commits-filter', array_fill_keys($xaction->getNewValue(), true)); break; - case PhabricatorRepositoryTransaction::TYPE_UUID: + case DiffusionRepositoryTransaction::TYPE_UUID: $object->setUUID($xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH: + case DiffusionRepositoryTransaction::TYPE_SVN_SUBPATH: $object->setDetail('svn-subpath', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_NOTIFY: + case DiffusionRepositoryTransaction::TYPE_NOTIFY: $object->setDetail('herald-disabled', (int)!$xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE: $object->setDetail('disable-autoclose', (int)!$xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_REMOTE_URI: + case DiffusionRepositoryTransaction::TYPE_REMOTE_URI: $object->setDetail('remote-uri', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH: + case DiffusionRepositoryTransaction::TYPE_LOCAL_PATH: $object->setDetail('local-path', $xaction->getNewValue()); break; - case PhabricatorRepositoryTransaction::TYPE_HOSTING: + case DiffusionRepositoryTransaction::TYPE_HOSTING: return $object->setHosted($xaction->getNewValue()); - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP: return $object->setServeOverHTTP($xaction->getNewValue()); - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH: return $object->setServeOverSSH($xaction->getNewValue()); - case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY: + case DiffusionRepositoryTransaction::TYPE_PUSH_POLICY: return $object->setPushPolicy($xaction->getNewValue()); - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: return $object->setCredentialPHID($xaction->getNewValue()); - case PhabricatorRepositoryTransaction::TYPE_DANGEROUS: + case DiffusionRepositoryTransaction::TYPE_DANGEROUS: $object->setDetail('allow-dangerous-changes', $xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_CLONE_NAME: + case DiffusionRepositoryTransaction::TYPE_CLONE_NAME: $object->setDetail('clone-name', $xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_SERVICE: + case DiffusionRepositoryTransaction::TYPE_SERVICE: $object->setAlmanacServicePHID($xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: $object->setDetail('symbol-languages', $xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_SOURCES: $object->setDetail('symbol-sources', $xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_STAGING_URI: + case DiffusionRepositoryTransaction::TYPE_STAGING_URI: $object->setDetail('staging-uri', $xaction->getNewValue()); return; - case PhabricatorRepositoryTransaction::TYPE_ENCODING: + case DiffusionRepositoryTransaction::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 // a garbage encoding name. Note that we're converting from UTF-8 to @@ -255,7 +255,7 @@ PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: // Adjust the object <-> credential edge for this repository. $old_phid = $xaction->getOldValue(); @@ -308,36 +308,36 @@ PhabricatorApplicationTransaction $xaction) { switch ($xaction->getTransactionType()) { - case PhabricatorRepositoryTransaction::TYPE_ACTIVATE: - case PhabricatorRepositoryTransaction::TYPE_NAME: - case PhabricatorRepositoryTransaction::TYPE_DESCRIPTION: - case PhabricatorRepositoryTransaction::TYPE_ENCODING: - case PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH: - case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY: - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: - case PhabricatorRepositoryTransaction::TYPE_UUID: - case PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH: - case PhabricatorRepositoryTransaction::TYPE_REMOTE_URI: - case PhabricatorRepositoryTransaction::TYPE_SSH_LOGIN: - case PhabricatorRepositoryTransaction::TYPE_SSH_KEY: - case PhabricatorRepositoryTransaction::TYPE_SSH_KEYFILE: - case PhabricatorRepositoryTransaction::TYPE_HTTP_LOGIN: - case PhabricatorRepositoryTransaction::TYPE_HTTP_PASS: - case PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH: - case PhabricatorRepositoryTransaction::TYPE_VCS: - case PhabricatorRepositoryTransaction::TYPE_NOTIFY: - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE: - case PhabricatorRepositoryTransaction::TYPE_HOSTING: - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP: - case PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH: - case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY: - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: - case PhabricatorRepositoryTransaction::TYPE_DANGEROUS: - case PhabricatorRepositoryTransaction::TYPE_CLONE_NAME: - case PhabricatorRepositoryTransaction::TYPE_SERVICE: - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES: - case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: - case PhabricatorRepositoryTransaction::TYPE_STAGING_URI: + case DiffusionRepositoryTransaction::TYPE_ACTIVATE: + case DiffusionRepositoryTransaction::TYPE_NAME: + case DiffusionRepositoryTransaction::TYPE_DESCRIPTION: + case DiffusionRepositoryTransaction::TYPE_ENCODING: + case DiffusionRepositoryTransaction::TYPE_DEFAULT_BRANCH: + case DiffusionRepositoryTransaction::TYPE_TRACK_ONLY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE_ONLY: + case DiffusionRepositoryTransaction::TYPE_UUID: + case DiffusionRepositoryTransaction::TYPE_SVN_SUBPATH: + case DiffusionRepositoryTransaction::TYPE_REMOTE_URI: + case DiffusionRepositoryTransaction::TYPE_SSH_LOGIN: + case DiffusionRepositoryTransaction::TYPE_SSH_KEY: + case DiffusionRepositoryTransaction::TYPE_SSH_KEYFILE: + case DiffusionRepositoryTransaction::TYPE_HTTP_LOGIN: + case DiffusionRepositoryTransaction::TYPE_HTTP_PASS: + case DiffusionRepositoryTransaction::TYPE_LOCAL_PATH: + case DiffusionRepositoryTransaction::TYPE_VCS: + case DiffusionRepositoryTransaction::TYPE_NOTIFY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE: + case DiffusionRepositoryTransaction::TYPE_HOSTING: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_HTTP: + case DiffusionRepositoryTransaction::TYPE_PROTOCOL_SSH: + case DiffusionRepositoryTransaction::TYPE_PUSH_POLICY: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_DANGEROUS: + case DiffusionRepositoryTransaction::TYPE_CLONE_NAME: + case DiffusionRepositoryTransaction::TYPE_SERVICE: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_SOURCES: + case DiffusionRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE: + case DiffusionRepositoryTransaction::TYPE_STAGING_URI: PhabricatorPolicyFilter::requireCapability( $this->requireActor(), $object, @@ -354,12 +354,12 @@ $errors = parent::validateTransaction($object, $type, $xactions); switch ($type) { - case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE: - case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY: + case DiffusionRepositoryTransaction::TYPE_AUTOCLOSE: + case DiffusionRepositoryTransaction::TYPE_TRACK_ONLY: foreach ($xactions as $xaction) { foreach ($xaction->getNewValue() as $pattern) { // Check for invalid regular expressions. - $regexp = PhabricatorRepository::extractBranchRegexp($pattern); + $regexp = DiffusionRepository::extractBranchRegexp($pattern); if ($regexp !== null) { $ok = @preg_match($regexp, ''); if ($ok === false) { @@ -400,11 +400,11 @@ } break; - case PhabricatorRepositoryTransaction::TYPE_REMOTE_URI: + case DiffusionRepositoryTransaction::TYPE_REMOTE_URI: foreach ($xactions as $xaction) { $new_uri = $xaction->getNewValue(); try { - PhabricatorRepository::assertValidRemoteURI($new_uri); + DiffusionRepository::assertValidRemoteURI($new_uri); } catch (Exception $ex) { $errors[] = new PhabricatorApplicationTransactionValidationError( $type, @@ -415,7 +415,7 @@ } break; - case PhabricatorRepositoryTransaction::TYPE_CREDENTIAL: + case DiffusionRepositoryTransaction::TYPE_CREDENTIAL: $ok = PassphraseCredentialControl::validateTransactions( $this->getActor(), $xactions); diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php --- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php +++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php @@ -30,7 +30,7 @@ private $gitCommits = array(); private $heraldViewerProjects; - private $rejectCode = PhabricatorRepositoryPushLog::REJECT_BROKEN; + private $rejectCode = DiffusionRepositoryPushLog::REJECT_BROKEN; private $rejectDetails; private $emailPHIDs = array(); @@ -89,7 +89,7 @@ return $this->originalArgv; } - public function setRepository(PhabricatorRepository $repository) { + public function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } @@ -132,7 +132,7 @@ } catch (DiffusionCommitHookRejectException $ex) { // If we're rejecting dangerous changes, flag everything that we've // seen as rejected so it's clear that none of it was accepted. - $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_DANGEROUS; + $this->rejectCode = DiffusionRepositoryPushLog::REJECT_DANGEROUS; throw $ex; } @@ -148,7 +148,7 @@ // If we make it this far, we're accepting these changes. Mark all the // logs as accepted. - $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_ACCEPT; + $this->rejectCode = DiffusionRepositoryPushLog::REJECT_ACCEPT; } catch (Exception $ex) { // We'll throw this again in a minute, but we want to save all the logs // first. @@ -199,7 +199,7 @@ // may not exist yet when this worker runs, which could be immediately.) PhabricatorWorker::scheduleTask( - 'PhabricatorRepositoryPushMailWorker', + 'DiffusionRepositoryPushMailWorker', array( 'eventPHID' => $event->getPHID(), 'emailPHIDs' => array_values($this->emailPHIDs), @@ -216,11 +216,11 @@ private function findRefUpdates() { $type = $this->getRepository()->getVersionControlSystem(); switch ($type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: return $this->findGitRefUpdates(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return $this->findMercurialRefUpdates(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: return $this->findSubversionRefUpdates(); default: throw new Exception(pht('Unsupported repository type "%s"!', $type)); @@ -228,14 +228,14 @@ } private function rejectDangerousChanges(array $ref_updates) { - assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog'); + assert_instances_of($ref_updates, 'DiffusionRepositoryPushLog'); $repository = $this->getRepository(); if ($repository->shouldAllowDangerousChanges()) { return; } - $flag_dangerous = PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS; + $flag_dangerous = DiffusionRepositoryPushLog::CHANGEFLAG_DANGEROUS; foreach ($ref_updates as $ref_update) { if (!$ref_update->hasChangeFlags($flag_dangerous)) { @@ -257,15 +257,15 @@ } private function findContentUpdates(array $ref_updates) { - assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog'); + assert_instances_of($ref_updates, 'DiffusionRepositoryPushLog'); $type = $this->getRepository()->getVersionControlSystem(); switch ($type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: return $this->findGitContentUpdates($ref_updates); - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return $this->findMercurialContentUpdates($ref_updates); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: return $this->findSubversionContentUpdates($ref_updates); default: throw new Exception(pht('Unsupported repository type "%s"!', $type)); @@ -339,7 +339,7 @@ if ($blocking_effect) { $rule = $blocking_effect->getRule(); - $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_HERALD; + $this->rejectCode = DiffusionRepositoryPushLog::REJECT_HERALD; $this->rejectDetails = $rule->getPHID(); $message = $blocking_effect->getTarget(); @@ -403,10 +403,10 @@ $ref_raw = $parts[2]; if (preg_match('(^refs/heads/)', $ref_raw)) { - $ref_type = PhabricatorRepositoryPushLog::REFTYPE_BRANCH; + $ref_type = DiffusionRepositoryPushLog::REFTYPE_BRANCH; $ref_raw = substr($ref_raw, strlen('refs/heads/')); } else if (preg_match('(^refs/tags/)', $ref_raw)) { - $ref_type = PhabricatorRepositoryPushLog::REFTYPE_TAG; + $ref_type = DiffusionRepositoryPushLog::REFTYPE_TAG; $ref_raw = substr($ref_raw, strlen('refs/tags/')); } else { throw new Exception( @@ -432,7 +432,7 @@ private function findGitMergeBases(array $ref_updates) { - assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog'); + assert_instances_of($ref_updates, 'DiffusionRepositoryPushLog'); $futures = array(); foreach ($ref_updates as $key => $ref_update) { @@ -483,7 +483,7 @@ private function findGitChangeFlags(array $ref_updates) { - assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog'); + assert_instances_of($ref_updates, 'DiffusionRepositoryPushLog'); foreach ($ref_updates as $key => $ref_update) { $ref_old = $ref_update->getRefOld(); @@ -497,13 +497,13 @@ // This happens if you try to delete a tag or branch which does not // exist by pushing directly to the ref. Git will warn about it but // allow it. Just call it a delete, without flagging it as dangerous. - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DELETE; } else if ($ref_old === self::EMPTY_HASH) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_ADD; } else if ($ref_new === self::EMPTY_HASH) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE; - if ($ref_type == PhabricatorRepositoryPushLog::REFTYPE_BRANCH) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DELETE; + if ($ref_type == DiffusionRepositoryPushLog::REFTYPE_BRANCH) { + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DANGEROUS; $dangerous = pht( "The change you're attempting to push deletes the branch '%s'.", $ref_update->getRefName()); @@ -513,17 +513,17 @@ if ($merge_base == $ref_old) { // This is a fast-forward update to an existing branch. // These are safe. - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_APPEND; } else { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_REWRITE; // For now, we don't consider deleting or moving tags to be a // "dangerous" update. It's way harder to get wrong and should be easy // to recover from once we have better logging. Only add the dangerous // flag if this ref is a branch. - if ($ref_type == PhabricatorRepositoryPushLog::REFTYPE_BRANCH) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS; + if ($ref_type == DiffusionRepositoryPushLog::REFTYPE_BRANCH) { + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DANGEROUS; $dangerous = pht( "The change you're attempting to push updates the branch '%s' ". @@ -547,7 +547,7 @@ private function findGitContentUpdates(array $ref_updates) { - $flag_delete = PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE; + $flag_delete = DiffusionRepositoryPushLog::CHANGEFLAG_DELETE; $futures = array(); foreach ($ref_updates as $key => $ref_update) { @@ -585,7 +585,7 @@ // since any other branch heads are necessarily behind them. $branch_name = null; $ref_update = $ref_updates[$key]; - $type_branch = PhabricatorRepositoryPushLog::REFTYPE_BRANCH; + $type_branch = DiffusionRepositoryPushLog::REFTYPE_BRANCH; if ($ref_update->getRefType() == $type_branch) { $branch_name = $ref_update->getRefName(); } @@ -595,9 +595,9 @@ $this->gitCommits[$commit][] = $branch_name; } $content_updates[$commit] = $this->newPushLog() - ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT) + ->setRefType(DiffusionRepositoryPushLog::REFTYPE_COMMIT) ->setRefNew($commit) - ->setChangeFlags(PhabricatorRepositoryPushLog::CHANGEFLAG_ADD); + ->setChangeFlags(DiffusionRepositoryPushLog::CHANGEFLAG_ADD); } } @@ -638,7 +638,7 @@ continue; } - $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_EXTERNAL; + $this->rejectCode = DiffusionRepositoryPushLog::REJECT_EXTERNAL; $this->rejectDetails = basename($hook); throw new DiffusionCommitHookRejectException( @@ -839,9 +839,9 @@ $ref_flags = 0; $dangerous = null; if ($old_head == self::EMPTY_HASH) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_ADD; } else { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_APPEND; } @@ -856,7 +856,7 @@ $readable_child_heads[] = substr($child_head, 0, 12); } - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DANGEROUS; if ($splits_existing_head) { // We're splitting an existing head into two or more heads. @@ -892,11 +892,11 @@ // Mercurial does not prompt you for any special flags when pushing // a `--close-branch` commit by default. - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DELETE; } $ref_update = $this->newPushLog() - ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_BRANCH) + ->setRefType(DiffusionRepositoryPushLog::REFTYPE_BRANCH) ->setRefName($ref) ->setRefOld($old_head) ->setRefNew($new_head) @@ -956,9 +956,9 @@ $ref_flags = 0; $merge_base = null; if ($key_old === null) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_ADD; } else if ($key_new === null) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_DELETE; } else { list($merge_base_raw) = $this->getRepository()->execxLocalCommand( 'log --template %s --rev %s', @@ -970,14 +970,14 @@ } if ($merge_base && ($merge_base === $key_old)) { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_APPEND; } else { - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_REWRITE; } } $ref_update = $this->newPushLog() - ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK) + ->setRefType(DiffusionRepositoryPushLog::REFTYPE_BOOKMARK) ->setRefName($key_name) ->setRefOld(coalesce($key_old, self::EMPTY_HASH)) ->setRefNew(coalesce($key_new, self::EMPTY_HASH)) @@ -991,9 +991,9 @@ foreach ($this->mercurialCommits as $commit => $branches) { $content_updates[$commit] = $this->newPushLog() - ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT) + ->setRefType(DiffusionRepositoryPushLog::REFTYPE_COMMIT) ->setRefNew($commit) - ->setChangeFlags(PhabricatorRepositoryPushLog::CHANGEFLAG_ADD); + ->setChangeFlags(DiffusionRepositoryPushLog::CHANGEFLAG_ADD); } return $content_updates; @@ -1040,11 +1040,11 @@ $ref_new = (int)$youngest + 1; $ref_flags = 0; - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD; - $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_ADD; + $ref_flags |= DiffusionRepositoryPushLog::CHANGEFLAG_APPEND; $ref_content = $this->newPushLog() - ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT) + ->setRefType(DiffusionRepositoryPushLog::REFTYPE_COMMIT) ->setRefNew($ref_new) ->setChangeFlags($ref_flags); @@ -1058,9 +1058,9 @@ private function newPushLog() { // NOTE: We generate PHIDs up front so the Herald transcripts can pick them // up. - $phid = id(new PhabricatorRepositoryPushLog())->generatePHID(); + $phid = id(new DiffusionRepositoryPushLog())->generatePHID(); - return PhabricatorRepositoryPushLog::initializeNewLog($this->getViewer()) + return DiffusionRepositoryPushLog::initializeNewLog($this->getViewer()) ->setPHID($phid) ->setRepositoryPHID($this->getRepository()->getPHID()) ->attachRepository($this->getRepository()) @@ -1069,7 +1069,7 @@ private function newPushEvent() { $viewer = $this->getViewer(); - return PhabricatorRepositoryPushEvent::initializeNewEvent($viewer) + return DiffusionRepositoryPushEvent::initializeNewEvent($viewer) ->setRepositoryPHID($this->getRepository()->getPHID()) ->setRemoteAddress($this->getRemoteAddressForLog()) ->setRemoteProtocol($this->getRemoteProtocol()) @@ -1082,8 +1082,8 @@ $vcs = $this->getRepository()->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // For git and hg, we can use normal commands. $drequest = DiffusionRequest::newFromDictionary( array( @@ -1098,7 +1098,7 @@ ->setLinesOfContext(0) ->loadRawDiff(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // TODO: This diff has 3 lines of context, which produces slightly // incorrect "added file content" and "removed file content" results. // This may also choke on binaries, but "svnlook diff" does not support @@ -1144,13 +1144,13 @@ $repository = $this->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return id(new DiffusionLowLevelCommitQuery()) ->setRepository($repository) ->withIdentifier($identifier) ->execute(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // For subversion, we need to use `svnlook`. list($message) = execx( 'svnlook log -t %s %s', @@ -1169,21 +1169,21 @@ $repository = $this->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: return idx($this->gitCommits, $identifier, array()); - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // NOTE: This will be "the branch the commit was made to", not // "a list of all branch heads which descend from the commit". // This is consistent with Mercurial, but possibly confusing. return idx($this->mercurialCommits, $identifier, array()); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // Subversion doesn't have branches. return array(); } } private function loadCommitInfoForWorker(array $all_updates) { - $type_commit = PhabricatorRepositoryPushLog::REFTYPE_COMMIT; + $type_commit = DiffusionRepositoryPushLog::REFTYPE_COMMIT; $map = array(); foreach ($all_updates as $update) { @@ -1209,7 +1209,7 @@ $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // There is no meaningful way to import history into Subversion by // pushing. return false; @@ -1230,7 +1230,7 @@ // heruistic might be good enough. $commit_count = 0; - $type_commit = PhabricatorRepositoryPushLog::REFTYPE_COMMIT; + $type_commit = DiffusionRepositoryPushLog::REFTYPE_COMMIT; foreach ($all_updates as $update) { if ($update->getRefType() != $type_commit) { continue; diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/diffusion/engine/DiffusionRepositoryDiscoveryEngine.php rename from src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php rename to src/applications/diffusion/engine/DiffusionRepositoryDiscoveryEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php +++ b/src/applications/diffusion/engine/DiffusionRepositoryDiscoveryEngine.php @@ -7,8 +7,8 @@ * @task hg Discovering Mercurial Repositories * @task internal Internals */ -final class PhabricatorRepositoryDiscoveryEngine - extends PhabricatorRepositoryEngine { +final class DiffusionRepositoryDiscoveryEngine + extends DiffusionRepositoryEngine { private $repairMode; private $commitCache = array(); @@ -39,13 +39,13 @@ $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $refs = $this->discoverSubversionCommits(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $refs = $this->discoverMercurialCommits(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $refs = $this->discoverGitCommits(); break; default: @@ -122,7 +122,7 @@ $this->log(pht('Looking for new commits.')); $branch_refs = $this->discoverStreamAncestry( - new PhabricatorGitGraphStream($repository, $commit), + new DiffusionRepositoryGitGraphStream($repository, $commit), $commit, $repository->shouldAutocloseBranch($name)); @@ -214,7 +214,7 @@ } - private function verifySubversionRoot(PhabricatorRepository $repository) { + private function verifySubversionRoot(DiffusionRepository $repository) { list($xml) = $repository->execxRemoteCommand( 'info --xml %s', $repository->getSubversionPathURI()); @@ -225,13 +225,13 @@ $remote_root = (string)($xml->entry[0]->repository[0]->root[0]); $expect_root = $repository->getSubversionPathURI(); - $normal_type_svn = PhabricatorRepositoryURINormalizer::TYPE_SVN; + $normal_type_svn = DiffusionRepositoryURINormalizer::TYPE_SVN; - $remote_normal = id(new PhabricatorRepositoryURINormalizer( + $remote_normal = id(new DiffusionRepositoryURINormalizer( $normal_type_svn, $remote_root))->getNormalizedPath(); - $expect_normal = id(new PhabricatorRepositoryURINormalizer( + $expect_normal = id(new DiffusionRepositoryURINormalizer( $normal_type_svn, $expect_root))->getNormalizedPath(); @@ -287,7 +287,7 @@ $this->log(pht('Looking for new commits.')); $branch_refs = $this->discoverStreamAncestry( - new PhabricatorMercurialGraphStream($repository, $commit), + new DiffusionRepositoryMercurialGraphStream($repository, $commit), $commit, $close_immediately = true); @@ -304,7 +304,7 @@ private function discoverStreamAncestry( - PhabricatorRepositoryGraphStream $stream, + DiffusionRepositoryGraphStream $stream, $commit, $close_immediately) { @@ -396,7 +396,7 @@ return; } - $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere( + $commits = id(new DiffusionCommit())->loadAllWhere( 'repositoryID = %d AND commitIdentifier IN (%Ls)', $this->getRepository()->getID(), $identifiers); @@ -440,21 +440,21 @@ private function recordCommit( - PhabricatorRepository $repository, + DiffusionRepository $repository, $commit_identifier, $epoch, $close_immediately, array $parents) { - $commit = new PhabricatorRepositoryCommit(); + $commit = new DiffusionCommit(); $commit->setRepositoryID($repository->getID()); $commit->setCommitIdentifier($commit_identifier); $commit->setEpoch($epoch); if ($close_immediately) { - $commit->setImportStatus(PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE); + $commit->setImportStatus(DiffusionCommit::IMPORTED_CLOSEABLE); } - $data = new PhabricatorRepositoryCommitData(); + $data = new DiffusionCommitData(); $conn_w = $repository->establishConnection('w'); @@ -501,7 +501,7 @@ $conn_w, 'INSERT IGNORE INTO %T (childCommitID, parentCommitID) VALUES (%d, %d)', - PhabricatorRepository::TABLE_PARENTS, + DiffusionRepository::TABLE_PARENTS, $commit->getID(), $parent_id); } @@ -518,7 +518,7 @@ lastCommitID = IF(VALUES(epoch) > epoch, VALUES(lastCommitID), lastCommitID), epoch = IF(VALUES(epoch) > epoch, VALUES(epoch), epoch)', - PhabricatorRepository::TABLE_SUMMARY, + DiffusionRepository::TABLE_SUMMARY, $repository->getID(), $commit->getID(), $epoch); @@ -555,20 +555,20 @@ } private function insertTask( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repository, + DiffusionCommit $commit, $data = array()) { $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $class = 'PhabricatorRepositoryGitCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + $class = 'DiffusionGitCommitMessageParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $class = 'PhabricatorRepositorySvnCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $class = 'DiffusionSvnCommitMessageParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: - $class = 'PhabricatorRepositoryMercurialCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $class = 'DiffusionMercurialCommitMessageParserWorker'; break; default: throw new Exception(pht("Unknown repository type '%s'!", $vcs)); diff --git a/src/applications/repository/engine/PhabricatorRepositoryEngine.php b/src/applications/diffusion/engine/DiffusionRepositoryEngine.php rename from src/applications/repository/engine/PhabricatorRepositoryEngine.php rename to src/applications/diffusion/engine/DiffusionRepositoryEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryEngine.php +++ b/src/applications/diffusion/engine/DiffusionRepositoryEngine.php @@ -4,7 +4,7 @@ * @task config Configuring Repository Engines * @task internal Internals */ -abstract class PhabricatorRepositoryEngine extends Phobject { +abstract class DiffusionRepositoryEngine extends Phobject { private $repository; private $verbose; @@ -12,7 +12,7 @@ /** * @task config */ - public function setRepository(PhabricatorRepository $repository) { + public function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } @@ -58,10 +58,10 @@ * an issue where Git 1.7.1 does not create an "origin" for `--bare` clones. * See T4041. * - * @param PhabricatorRepository Repository to verify. + * @param DiffusionRepository Repository to verify. * @return void */ - protected function verifyGitOrigin(PhabricatorRepository $repository) { + protected function verifyGitOrigin(DiffusionRepository $repository) { list($remotes) = $repository->execxLocalCommand( 'remote show -n origin'); @@ -87,13 +87,13 @@ $valid = false; $exists = false; } else { - $normal_type_git = PhabricatorRepositoryURINormalizer::TYPE_GIT; + $normal_type_git = DiffusionRepositoryURINormalizer::TYPE_GIT; - $remote_normal = id(new PhabricatorRepositoryURINormalizer( + $remote_normal = id(new DiffusionRepositoryURINormalizer( $normal_type_git, $remote_uri))->getNormalizedPath(); - $expect_normal = id(new PhabricatorRepositoryURINormalizer( + $expect_normal = id(new DiffusionRepositoryURINormalizer( $normal_type_git, $expect_remote))->getNormalizedPath(); diff --git a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php b/src/applications/diffusion/engine/DiffusionRepositoryMirrorEngine.php rename from src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php rename to src/applications/diffusion/engine/DiffusionRepositoryMirrorEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php +++ b/src/applications/diffusion/engine/DiffusionRepositoryMirrorEngine.php @@ -3,8 +3,8 @@ /** * Pushes a repository to its mirrors. */ -final class PhabricatorRepositoryMirrorEngine - extends PhabricatorRepositoryEngine { +final class DiffusionRepositoryMirrorEngine + extends DiffusionRepositoryEngine { public function pushToMirrors() { $repository = $this->getRepository(); @@ -19,7 +19,7 @@ return; } - $mirrors = id(new PhabricatorRepositoryMirrorQuery()) + $mirrors = id(new DiffusionRepositoryMirrorQuery()) ->setViewer($this->getViewer()) ->withRepositoryPHIDs(array($repository->getPHID())) ->execute(); @@ -43,8 +43,8 @@ } private function pushRepositoryToMirror( - PhabricatorRepository $repository, - PhabricatorRepositoryMirror $mirror) { + DiffusionRepository $repository, + DiffusionRepositoryMirror $mirror) { // TODO: This is a little bit janky, but we don't have first-class // infrastructure for running remote commands against an arbitrary remote @@ -71,7 +71,7 @@ } private function pushToGitRepository( - PhabricatorRepository $proxy) { + DiffusionRepository $proxy) { $future = $proxy->getRemoteCommandFuture( 'push --verbose --mirror -- %P', @@ -83,7 +83,7 @@ } private function pushToHgRepository( - PhabricatorRepository $proxy) { + DiffusionRepository $proxy) { $future = $proxy->getRemoteCommandFuture( 'push --verbose --rev tip -- %P', diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/diffusion/engine/DiffusionRepositoryPullEngine.php rename from src/applications/repository/engine/PhabricatorRepositoryPullEngine.php rename to src/applications/diffusion/engine/DiffusionRepositoryPullEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php +++ b/src/applications/diffusion/engine/DiffusionRepositoryPullEngine.php @@ -2,8 +2,8 @@ /** * Manages execution of `git pull` and `hg pull` commands for - * @{class:PhabricatorRepository} objects. Used by - * @{class:PhabricatorRepositoryPullLocalDaemon}. + * @{class:DiffusionRepository} objects. Used by + * @{class:DiffusionRepositoryPullLocalDaemon}. * * This class also covers initial working copy setup through `git clone`, * `git init`, `hg clone`, `hg init`, or `svnadmin create`. @@ -14,8 +14,8 @@ * @task svn Pulling Subversion Working Copies * @task internal Internals */ -final class PhabricatorRepositoryPullEngine - extends PhabricatorRepositoryEngine { +final class DiffusionRepositoryPullEngine + extends DiffusionRepositoryEngine { /* -( Pulling Working Copies )--------------------------------------------- */ @@ -32,7 +32,7 @@ $callsign = $repository->getCallsign(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // We never pull a local copy of non-hosted Subversion repositories. if (!$repository->isHosted()) { $this->skipPull( @@ -44,10 +44,10 @@ } $is_svn = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $is_git = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $is_hg = true; break; default: @@ -128,7 +128,7 @@ } private function abortPull($message, Exception $ex = null) { - $code_error = PhabricatorRepositoryStatusMessage::CODE_ERROR; + $code_error = DiffusionRepositoryStatusMessage::CODE_ERROR; $this->updateRepositoryInitStatus($code_error, $message); if ($ex) { throw $ex; @@ -138,19 +138,19 @@ } private function logPull($message) { - $code_working = PhabricatorRepositoryStatusMessage::CODE_WORKING; + $code_working = DiffusionRepositoryStatusMessage::CODE_WORKING; $this->updateRepositoryInitStatus($code_working, $message); $this->log('%s', $message); } private function donePull() { - $code_okay = PhabricatorRepositoryStatusMessage::CODE_OKAY; + $code_okay = DiffusionRepositoryStatusMessage::CODE_OKAY; $this->updateRepositoryInitStatus($code_okay); } private function updateRepositoryInitStatus($code, $message = null) { $this->getRepository()->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_INIT, + DiffusionRepositoryStatusMessage::TYPE_INIT, $code, array( 'message' => $message, @@ -190,7 +190,7 @@ Filesystem::writeFile($path.'/README', $readme); } - private function getHookContextIdentifier(PhabricatorRepository $repository) { + private function getHookContextIdentifier(DiffusionRepository $repository) { $identifier = $repository->getCallsign(); $instance = PhabricatorEnv::getEnvConfig('cluster.instance'); @@ -387,7 +387,7 @@ // On vulnerable versions of Mercurial, we refuse to clone remotes which // contain characters which may be interpreted by the shell. - $hg_version = PhabricatorRepositoryVersion::getMercurialVersion(); + $hg_version = DiffusionRepositoryVersion::getMercurialVersion(); $is_vulnerable = version_compare($hg_version, '3.2.4', '<'); if ($is_vulnerable) { $cleartext = $remote->openEnvelope(); diff --git a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php b/src/applications/diffusion/engine/DiffusionRepositoryRefEngine.php rename from src/applications/repository/engine/PhabricatorRepositoryRefEngine.php rename to src/applications/diffusion/engine/DiffusionRepositoryRefEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php +++ b/src/applications/diffusion/engine/DiffusionRepositoryRefEngine.php @@ -4,8 +4,8 @@ * Update the ref cursors for a repository, which track the positions of * branches, bookmarks, and tags. */ -final class PhabricatorRepositoryRefEngine - extends PhabricatorRepositoryEngine { +final class DiffusionRepositoryRefEngine + extends DiffusionRepositoryEngine { private $newRefs = array(); private $deadRefs = array(); @@ -23,19 +23,19 @@ $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // No meaningful refs of any type in Subversion. $branches = array(); $bookmarks = array(); $tags = array(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $branches = $this->loadMercurialBranchPositions($repository); $bookmarks = $this->loadMercurialBookmarkPositions($repository); $tags = array(); $branches_may_close = true; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $branches = $this->loadGitBranchPositions($repository); $bookmarks = array(); $tags = $this->loadGitTagPositions($repository); @@ -45,12 +45,12 @@ } $maps = array( - PhabricatorRepositoryRefCursor::TYPE_BRANCH => $branches, - PhabricatorRepositoryRefCursor::TYPE_TAG => $tags, - PhabricatorRepositoryRefCursor::TYPE_BOOKMARK => $bookmarks, + DiffusionRepositoryRefCursor::TYPE_BRANCH => $branches, + DiffusionRepositoryRefCursor::TYPE_TAG => $tags, + DiffusionRepositoryRefCursor::TYPE_BOOKMARK => $bookmarks, ); - $all_cursors = id(new PhabricatorRepositoryRefCursorQuery()) + $all_cursors = id(new DiffusionRepositoryRefCursorQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withRepositoryPHIDs(array($repository->getPHID())) ->execute(); @@ -97,18 +97,18 @@ } private function updateBranchStates( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $branches) { assert_instances_of($branches, 'DiffusionRepositoryRef'); - $all_cursors = id(new PhabricatorRepositoryRefCursorQuery()) + $all_cursors = id(new DiffusionRepositoryRefCursorQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withRepositoryPHIDs(array($repository->getPHID())) ->execute(); $state_map = array(); - $type_branch = PhabricatorRepositoryRefCursor::TYPE_BRANCH; + $type_branch = DiffusionRepositoryRefCursor::TYPE_BRANCH; foreach ($all_cursors as $cursor) { if ($cursor->getRefType() !== $type_branch) { continue; @@ -137,12 +137,12 @@ } } - private function markRefNew(PhabricatorRepositoryRefCursor $cursor) { + private function markRefNew(DiffusionRepositoryRefCursor $cursor) { $this->newRefs[] = $cursor; return $this; } - private function markRefDead(PhabricatorRepositoryRefCursor $cursor) { + private function markRefDead(DiffusionRepositoryRefCursor $cursor) { $this->deadRefs[] = $cursor; return $this; } @@ -246,7 +246,7 @@ $name, $identifier)); $this->markRefNew( - id(new PhabricatorRepositoryRefCursor()) + id(new DiffusionRepositoryRefCursor()) ->setRepositoryPHID($repository->getPHID()) ->setRefType($ref_type) ->setRefName($name) @@ -282,7 +282,7 @@ } private function shouldCloseRef($ref_type, $ref_name) { - if ($ref_type !== PhabricatorRepositoryRefCursor::TYPE_BRANCH) { + if ($ref_type !== DiffusionRepositoryRefCursor::TYPE_BRANCH) { return false; } @@ -308,7 +308,7 @@ $repository = $this->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: if ($all_closing_heads) { $parts = array(); foreach ($all_closing_heads as $head) { @@ -352,7 +352,7 @@ return array(); } return phutil_split_lines($stdout, $retain_newlines = false); - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: if ($all_closing_heads) { list($stdout) = $this->getRepository()->execxLocalCommand( 'log --format=%s %s --not %Ls', @@ -382,19 +382,19 @@ */ private function setCloseFlagOnCommits(array $identifiers) { $repository = $this->getRepository(); - $commit_table = new PhabricatorRepositoryCommit(); + $commit_table = new DiffusionCommit(); $conn_w = $commit_table->establishConnection('w'); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $class = 'PhabricatorRepositoryGitCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + $class = 'DiffusionGitCommitMessageParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $class = 'PhabricatorRepositorySvnCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $class = 'DiffusionSvnCommitMessageParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: - $class = 'PhabricatorRepositoryMercurialCommitMessageParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $class = 'DiffusionMercurialCommitMessageParserWorker'; break; default: throw new Exception(pht("Unknown repository type '%s'!", $vcs)); @@ -408,7 +408,7 @@ $repository->getID(), $identifiers); - $closeable_flag = PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE; + $closeable_flag = DiffusionCommit::IMPORTED_CLOSEABLE; $all_commits = ipull($all_commits, null, 'commitIdentifier'); foreach ($identifiers as $identifier) { @@ -447,7 +447,7 @@ /** * @task git */ - private function loadGitBranchPositions(PhabricatorRepository $repository) { + private function loadGitBranchPositions(DiffusionRepository $repository) { return id(new DiffusionLowLevelGitRefQuery()) ->setRepository($repository) ->withIsOriginBranch(true) @@ -458,7 +458,7 @@ /** * @task git */ - private function loadGitTagPositions(PhabricatorRepository $repository) { + private function loadGitTagPositions(DiffusionRepository $repository) { return id(new DiffusionLowLevelGitRefQuery()) ->setRepository($repository) ->withIsTag(true) @@ -473,7 +473,7 @@ * @task hg */ private function loadMercurialBranchPositions( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { return id(new DiffusionLowLevelMercurialBranchesQuery()) ->setRepository($repository) ->execute(); @@ -484,7 +484,7 @@ * @task hg */ private function loadMercurialBookmarkPositions( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { // TODO: Implement support for Mercurial bookmarks. return array(); } diff --git a/src/applications/repository/engine/PhabricatorRepositoryCommitRef.php b/src/applications/diffusion/engine/PhabricatorRepositoryCommitRef.php rename from src/applications/repository/engine/PhabricatorRepositoryCommitRef.php rename to src/applications/diffusion/engine/PhabricatorRepositoryCommitRef.php diff --git a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php b/src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php rename from src/applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php rename to src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php --- a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php +++ b/src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php @@ -37,7 +37,7 @@ private function discoverRefs($callsign) { $repo = $this->buildPulledRepository($callsign); - $engine = id(new PhabricatorRepositoryDiscoveryEngine()) + $engine = id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repo); $refs = $engine->discoverCommits($repo); diff --git a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php b/src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php rename from src/applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php rename to src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php diff --git a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php b/src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyTestCase.php rename from src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php rename to src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyTestCase.php --- a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php +++ b/src/applications/diffusion/engine/__tests__/PhabricatorWorkingCopyTestCase.php @@ -11,7 +11,7 @@ } protected function buildBareRepository($callsign) { - $existing_repository = id(new PhabricatorRepositoryQuery()) + $existing_repository = id(new DiffusionRepositoryQuery()) ->withCallsigns(array($callsign)) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->executeOne(); @@ -22,9 +22,9 @@ $data_dir = dirname(__FILE__).'/data/'; $types = array( - 'svn' => PhabricatorRepositoryType::REPOSITORY_TYPE_SVN, - 'hg' => PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL, - 'git' => PhabricatorRepositoryType::REPOSITORY_TYPE_GIT, + 'svn' => DiffusionRepositoryType::REPOSITORY_TYPE_SVN, + 'hg' => DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL, + 'git' => DiffusionRepositoryType::REPOSITORY_TYPE_GIT, ); $hits = array(); @@ -61,7 +61,7 @@ $local = new TempFile('.ignore'); $user = $this->generateNewTestUser(); - $repo = PhabricatorRepository::initializeNewRepository($user) + $repo = DiffusionRepository::initializeNewRepository($user) ->setCallsign($callsign) ->setName(pht('Test Repo "%s"', $callsign)) ->setVersionControlSystem($vcs_type) @@ -80,14 +80,14 @@ return $repo; } - protected function didConstructRepository(PhabricatorRepository $repository) { + protected function didConstructRepository(DiffusionRepository $repository) { return; } protected function buildPulledRepository($callsign) { $repository = $this->buildBareRepository($callsign); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->pullRepository(); @@ -97,7 +97,7 @@ protected function buildDiscoveredRepository($callsign) { $repository = $this->buildPulledRepository($callsign); - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->discoverCommits(); diff --git a/src/applications/repository/engine/__tests__/data/CHA.git.tgz b/src/applications/diffusion/engine/__tests__/data/CHA.git.tgz rename from src/applications/repository/engine/__tests__/data/CHA.git.tgz rename to src/applications/diffusion/engine/__tests__/data/CHA.git.tgz index 7b625e6f7fbd63970356bb25d907fbbacbdc270d..7b625e6f7fbd63970356bb25d907fbbacbdc270d GIT binary patch literal 10466 zc${rnRan(ew57WnDFNvYK^ml_q(c-50qO2Kbcb|zcXxwIcjp1=?mBSJ@AALjeY`LG zX=caFTI<_;h9(LP&Wvzb0}k=b7c-4gJNXhx#U&%`3vxf{cQ3|t`I63)g<5n%wDjQM zcSwxrwW24E)+L`*bxSKm5^2#nJ31S-0#G(#Ky*M;AEul`~AIIRQH2o z26)hkTM(C~p#M4_+5K=-%Pa}{f}cPO&4j-SHWt#XLS+01LVkk)-BW{QB3=bs?j162 zaGw6yNQA4SVUb`75FnB0e=?tKoV97EMO!%t-G|PQZ zP-_t_rt%CWHndk5FjOc`$bS(;?0PhGp6?Qu*)c|8*#-@i7HAg4 z>!`S129@uBdrWFXUHCScZ(eRxCVQNc`6bAc%s_WTaSFkwCCr#pfAp&`O(HJehKQq4 zAQOP%>N>h?Shitje^pEbg#=p`#tOq-->;UB0$rmfe|QVc1i;*F>bji z^pLnv`@!C*evo{!?>C0HK_`42;H-^Vr%m0j`sOd_oK&$(x!wD^y1pm%Or#vWbte?` zKcTld0A&4`tBLX(C>Cyq@{P~lPWP4mga;~SeJiJ@#n#0wX{xyIQsslsb-H}4hp~#1 zbulM0gzM_>7lJ9087Wskt+E>6x{#TY0r26ejG?R?h*Hf za#+H<#rkYb5CO_n9SRiBiBu~(8ITOH;Sm1e?D zUr=`q(T>1aW%(dQzt(AqTOb3W`Bt}d4dx7Ri2{}c^V1R>DuPhY7p~%@U$6=PH;|u) zo%8@x*p;F4YX&R3E^~&;H#fa%z^l_EiH)mVQXuT9mr)8E+I;FV2c81L?m#L5Zy+ag zIl$dDU<@l2Qj-Q{WY|4(vAkx2Z*^3w+WKeqvjPkg5mR+ep(5}&3-UtXQcV`V>vi?k`NR4=jEyo=;497Qq(47#JoF>HKbDhAub)*oOW9`bH>f8wZ49(C>wJcwp@ zZsiw#j{NShc`h#j8c{DEDDISS{uiPu_B4iT)(hn_?AmgcAUkb8{CpRHoEq)Z`n^3>+ls>EmLVruCt@ffpk`RPPmZgv3r@H*_~IJouD46?z1Y_lQ^GCm;{a2P~S`~ z_~vlK{i3}VNK0Ff|Mm;I*_`SFJT85IIqv0(hHm}od5N;O{R%lakf(Vb;Q{JQ8+{&- zV{b=W#hsuD`STNoc5AXU;s={-s)k*#vNK#TNba^`tY-Cg$`Eo(n9cD=Y=~NLqY~E` z>q)RIX@P$PFD8kOO|7S=!1zCJ!?E7R;sR_FxEBfArk| zEheuA_LXRM#Z-VzLuDd^KQkGNCA-*(H#_-HQHnB4XoAihVR~UbG_~TSmq7s|7nrBK z+yivzjew)&5+EU4B-@#EQpnbE>}M*aW|rN!bQ)G!FTj)@-$4H5ePc%%xuTA)%9nBT zn0FofeJdSy?_7mMUI8-N%dQOu5dYOO|3`(FN5hqINWtxE=w)&qOU(6;ah`EM45ma6p=`#9T-Dt^ zgJP?3;!hE|V7D>XZbZQi&{H*Oji1j1`M^|9uGr1Et^nBQT${!lI;13icTANF*}GTm zx&q^N(N-U~wRArh<{Fgw-OtHqyA2ty!3@{(ODD#l|0HnyjyjE|3md3i7xkd#*$ znKE0>$z&;{a7kzj5x=}W2t6M`g>ro zTB5LavS)wjENbuMyZ8NQ9F^~c%FHu~c#rFSzhLh{DHBkOdBEX)FXcYvnH#T@^}I@< z+5^PTeTPl-V@3k^zuWD*yG}(w!p3V)2F`Pnx@({L?R~wLH~`P99pL?C^UzPR-t(9# z389;nAXG?->IyDFh*~J*p!bm6U<`v?3wO-&UgzpKhd`$)*qyWkko zCyvWa^=Fh7W*K>hWOj4K0Hp!1!T)^x7z0kG)?vNweh;`08~1|V=97=t5)ux7>X{53 z7rejHxr4T#b1@ERi5PcNpd?u-0Zj#t!te&;PbFoM`WmFz42elvvMT0$3bM<&@8+dm zThBSg>KCQg#?KnV9{^MXAYf2?bI{B2?ZtPm+kCcINWX9H)8;2Xd$1*@YBAS(^YzS7 z&&%oQjew!^Ofrq|Rfn~G_Vd80lHumfrSpk|@0G0l@lVl~AN{?PkAw2MJzmea;D?wf zO)lyO`_wbopDR_v7U4V7TdS)yiVHEwW{s-vU0@?uT$lS($DdB~Q%`P+iUfD~c?p0t zx;wv=NMT7sYpmj-0RxLrOHwZ7Rr+>b3@2{DTOTce zOvE(cD|x&82cN~z102v*Ug9KlHhXB&uibkEsPdgUPa~7~IYf0HHCgp#34A-<_rlj& z)nP67JQXUQH7yQ0id+G|V2E8L=Y$yoXWawFy16_)gCNlvVQ0A|vqnM6-UHZutJfurSj!Ig%=n#wasOdWPcPY5qawqXdiD zqS%mt)!iHb{q6xM*4%!2)khy#94?$5F~ub{{Pe^2mu-4D9HcS;%9JrV+`)owX;7q~ zSrVA0h!JXP>dHZHLH?ejNX0l|3Mg8I0H%7t8l~iOFXax9ZUnebq&Xkavu!Sc4iqH( zU?ZIuA~MmZ8_$hv^4~kJRt<9?cWXHK=fGn^{}&0^mcPS%UE^Ij+b!Gqaof{)WerTC zQFv0{^+%LV`Wq?70>;^l;HpTH5IPu$r3K3x-lZ*QBmzZi-$c zZ{&J!|I>~G%=gzZfBNia9*|N4tG24p^YsCx+^+4vV5r6Y01fO?5Ea~MeKb_+{Syc4 zwLpn}JWYK92C6^@X^r=?3KfAC@A|num0&Sse~#qmdll&eAbIr$#Lxsx1USLKy+A2n z&-FV|gykHsvwCoi==J_-Y&-`z&Hc)~73Q^4kqY^W0=o~&w}-Sq+)6Q2~+KbgDI zmXGTFVmr2EDYmlwgU3fspFUwem&gVrsC@;PN(Ldh`;v(lfP_VH(q|ZybPN}sSz#!L zd*iEvWDpY|IXTOL|^v}y;}W!8kxZ1%()@0S*ovLz<51=NS1BPFd?0g=RVsTsFPb}8AMnj8K1ChwX$W8P#Xx3>V>JY>#Ze=D#>o+F z{=?RYw5FBbpRIuxe05r{;g5w~6?KT+OUk5fek zu(A=;$r|wxtbHyxW8(bUSPok8XY%y1TZ|abrm!qtEAIizor(PRoVnjA?4;|y_>`zU z0x}C!Nc0Uxx#lW4_5-lLopHnLF_c4J3L^}W2#~LfViK5ziMrI2qMEW%gU+#1ruChp zreuZ$+V6%gD`TGVr7J{2nNf<}b0G+!%VB@h!h8JH|IU(W7IPsGV0RS6RACFh-$Ly# zTE>y)O0H@_xtR}NDIpKC4ZZvo6M&8Aa@guPV?*LlH$RFHUh?KQZ&~CLs%4I_RZW-$ zgSd8oKJw+N330Fyd+!Bzn-Y>+M;5T184263ad zd8Iv3%@?gD((r4YzdHdPU(Rvi&?Wu~SNHa1EHlLAD(hBd0)vH8)~@x~vzZ z7AELel-wrZ(JZ3CVsFd9vtfwOKot>l^64bh4j)h@qcXsnqRMN*UqE(dnC%6L>XQSJ z@dk6}Av#9@g2z5Jrg90q#V()_sdfTH99_a{OZpyfC63L131qW*));B4p?Bb946*Nx zS|yfaE~M4bVL4D+4SaXv{hgmTQeq$uTh0FtqpHxfrpT5-o*o7W6I`#k!g^o(XtLCo z%$C8fV2fW;1;KWRs>K9T3qB`z$Sm%Po~l1R4F6vKEJ<%H4MbrfT8YQ_J~+&7U)SCz zuvYVj;C5N95YIRT10_uh(WlYOW-IWxK=$5OY5$rijIxve!|!z|MDa$Yv>#5P+i!#x zC&_U(TKp+9OX*)?q*dlWVRp$Rx5B4=psT2OXQrS`UcjiypfqPbI&MxR%fDdCT3Li8 zEvQlP?w8hI<;sk5wa4!XydQ-VM=}%?=8$DeI%uQxg{{qHLgusU8_t|rIuf4>epu!( zH;ADUk2xICUgooI%U-*9$3Oem8FPR9QaSsk_;?NxI`%;!=^JV|cFp&Jx;v!5CBh!= z5yvAzR6mFcAJlMxZA0ysX4p)pa8{i(^O*P?kHOe5%kquTn%9d_^5#iTSFc#ndatSnD zp8zdA;MHU8OVIe2eP;42Iw|c&rPGf6gZ@6QAo!*k_Y?F!nP#r5VER3M6 zvE_r%|G_ougZshnSG3!-4%Zum|8us&A9U`OMEWFub6O;|VgB{6-s7Y^h^P_wbSoUk zS*cL{FJ+a-ya;)@N4cYuFft0;uFb{cUoBUz#*rys|MY9w78le?QBM_22WtDXz%`|M zxcLCPG$;}lyi#hT^~|X8B%z)u)ghz;J0jr+me6gZAR=2hfXf-s8t<6YZZEv}mD5196jZP#DaVk1%LU|=h zGWmmh@e+|#pwDNw=GtvdV~ z92HAm^n)rQyVJOPTFNZ}Kl}GB=ek^fBC8)=)3T#YX(~I?0^fKtkpxraKB?OxS={w! zKV3JsqM))P)^l-g>S^EQ>T0?-_1PTiy}0x)0jp({XQIZg8fKfWC+0>K@q|dim*Z_# zHjUp5JFNHwt~}1ja&GNLf~I-@MCJa{KoQv;RBb~Uq#-2H{+p7!l;S@b)ct;tpaFz$ z?qqm0s9G@!K}uC2C!v=nna&wOmeptz`xd&KU^9nwCCNV~6BF0<&RhOAfd0!@fT1K=>%RwYt(V@`6BzAaU6xPt zNf-%nPXwffg6rIf;4>5p;9iwF-@ej7ipkKk&fAw?IWiQwxxoIb2{1lriSDXNc_d)ZZO*w6Yc}m2zliva5UoEjH;`^c0 z4)!3+rdnj=laj{1U@k{&|nw>0YC-{bewMfeDF# zt`E)n3rfm@q;2au-L>MGzh|0hG(6kzpPhxmLc@R`TqY$n*?M_Nf=E97;9J{!`r53J zbIF`MJg+^GX=)|6Wv!VBSg2&CMJJ6fieTWgq*7XxK{`fyLAP=PwH9U1t?U=Bb7UT$ zt2hPAU;|=Ufp4Pl^M#s*tqD4^lxoM3m6pZ9 zkBC_2J`5KW%p|-<4!DK;>3_-17{P*3+;TB9wF+Fl*gKPf*MVP=#KgyAsAM<&>!xL~ zLtvN%L|mCJI#nb5`9D8CSz*sc+##`NBFeE&aos?a^$bQF9g4et==%8lt+gO!-#FO; z`wmX-Ia#>YA%N0^gGAwH17s1X#LaC;Q7!AqB=Nd9N2QGxzy$m4SI-W8A5)x^->2X| zl)!J41+dBq!sD4AC4c(exfs?c=injE(^{3679R{;}AnfCtdZ;f&8Tzpm~{D{IBZ0t2R~kVIq(I0e*wjLe^AS+7$Y9O@?}2 zW=wku0_1%cCz6-}>BheHm}d(d#lXQ1UDasn^+!wbchm1uDfV=p+R)axjVM~a)K@3F zF3y+9skYPy+Yb*7Taz$ik&vHIk@8Un7n$ z)uVEoRnfEiyoSFg1EREl$Oes2hjLv66Nm}$-WY2}b&ZE_c-Ro{>@9c@&6EGQ5iQeZ zUy=}EA4);xLG0FweqO-=oxSz?Y$RZMxuf^?-zq!i4wW&jy+zZ2dz$0l({ojiS$q%Q3h5D{~R)pGD4WL6YaAjoQC<=j_Zm zt*Q2WaIUke>pvY>|I(nB%~O zI~tAh&NGgN9(OP(V|WzIP(=K)YhbON)9(zzi5^3Z_QJei>HYCBWR(*E@_R>p*}Ur@ zh(;~`vsL|XL5VGR1}rSIJ*X;~>cx-EhQ&o=T<&7HSObSpUfvJyRa0*ym&Ts*awar6 z`SeE+iq-1VNP1;Q-0(0@RkfLZ=1-!0)@oI2MNMRMDZ-(rDykoL)@kD!A2defUb7;8 zA&QHm6lwnb)mqOAo$~XLN#?IoJ+xZkLS-pWHnP9zSJ=qTaKmtsUzvle>IjD1GsCTE ze_Yy%P&F~~z3*@4rHc9~l11)e4|_}C_ID&Dm=E%8ez0|+lOw~H*x>ItaSHGRjptFkkuhu$gT)$B@r)79#A95Db zj~)lOgG5Uv?OQ7HpAT?^qjwu!aV27n1^OhC`gib*E|#wlM8mxRu#fg5a1-wzV2 zjNzjYx7GrphwGnG&=-G@Y7hkcnsqvW9=xk&y|eaodN%N^@aY_X9g6C96ClKAKN1{8Fg zcNB2ySAsNL%$+2WN5aN2z;s_`BihdTx{Di1LZ=R+Ka( z#}hX#ZzoW$VlIeeaFLb-83&2Gv6EOo9`J~r#9zM10L|xOEd!XWx4$J~*eM&;3-(vZ zY!P&?RKsRQLA$|_l!!h<=;US|ZRfHdQBP25jJHi{!}^!VWcYCQzS zM>>){Z8rRxQBq#dehNbsYY_?CgJhN(E}=X@R^f;{p@2J{>aM+97orDR*YAd43wqWZ zfxoWX^2&qU_}d+;twlCDvNl@taLpa~U$DQ~YW-=FJ8{DGi5L7XlzHYQ6=@ahf!^k4|VA)?yG@b4d?d=yW14U_}R9HK@X9z+P8v0nM%5r>guRC;e8 zIZpi|uCD`!Kiv&`;Cp1P>DUw4-G31n(nWaI37N}Yq!66n2U(vZ5Egfe1$;RbTb)gzzr(&VJ{{0=JF6 zzT1a?(p*yz9DvE@Aw=h(6k5-ZH$Zz&j=40glhV%g>m`iCEt*%bGITrk03Smvi_KNX z?3@Hz=rZ`vv5e+LNU~08)9j#03*G3aZ-rSxi~ObsXL4cgx_ff^d}cv+lrEOZ?^Pqmi4J_2_nim zq{^{kw^5KT9`CaPoXR!0uI#$a7bJKn2C(lLRpl8iq{dn?ucd9q+50oe5HF+zzQ(AY}tL=t(=WQJaffb2<6p(W-O?p!3c!{-%0qi(sn zg4rqMrsZ?>;Og2oRJ+=*D4c-BoD%d5r>!K$sz+IRRcXWfIpP8*KF@y zNduNWQ^7m)8_X{EJwBQuyL5)zQ?Ca;YiN-;RT^WtHsyj~|8J9F*5_#+gLq*(`+1S& z7B-Esyyqi>wI(Y&yv-{WEbQ)Bvx(`lAMLcAPx4&4*L!D1(`XB$a#1r_@-<=td zehr+zh%f!_g~*Ws7~F+JX3XstM>|&^dW;my5T&uW-mtIw-BXN-Pk1094)q**C@B`g zx@E+bcH+fw@Qv(X3yd<=QwH@L}y>yP~>Ya&nx!c+%^SEiV>R6i6#aF`zn&|0@ zSmRpOW;72;WL7p{vs3Bs6Mw$g8n!kj6?Q0`{u|Ju9*}9mxiZ~P;~Qiy=wXPr=~aeP zQ2C9VP48`_s8+LmmZ%R{v}H?#WIeLs<^6iNADGUmP&9z}f>epIKiq`FAV@DIr2GDF zOGYQXZw?*ir-|(N=H|BOrn+dHUM2Y_|FBeo-$QxJilKjz?(=BNJ??bh$9aF2@-Z#U(m+qDAdB{VVEC7?E`<@PMHLc3de@TzHTr=Gs6DwbZa{l88CvLSm z#rc7*Y0x{OXFXANVKK8o2@Zi}bCi|$M>#>Cj{=wCP9n8fn7+Hkp|q0T(&T^+(xnEv zzLkGVj9c(C%O6ByX(`h=pzP#zdY@t!;eLI)q_#-?5sfw&@BcTb{4XF~`uR9GNqD&b E0Wow$1ONa4 literal 10466 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 E0Wow$1ONa4 diff --git a/src/applications/repository/engine/__tests__/data/CHB.hg.tgz b/src/applications/diffusion/engine/__tests__/data/CHB.hg.tgz rename from src/applications/repository/engine/__tests__/data/CHB.hg.tgz rename to src/applications/diffusion/engine/__tests__/data/CHB.hg.tgz index f51e36812f095347134aefee0987efb3632af7de..f51e36812f095347134aefee0987efb3632af7de GIT binary patch literal 3084 zc$@(Y4D<6JiwFRszDI(2Olx@q+OgGblRSA#+l|)`@ilvaIVv%d)-a9i4!$?i+ zkGWc$KfiOY-p733J>UJG?>pZ)_edrQ><$QmNC*-e_5^O&LkMQvn;?b}gdkA}AqZ3q z!3d5)0x@oX)dT{)Rwvi6sxZkK6{FQ9FwgXU9ebHl`3t{edJgmcHv-8dNqn50-vQ3< zINlfgqwN2H{rP}o60OoaK=#K8g0nx0BEbH9Kr%_GN?>9sb@IO_fZ4I?)E>wc>Pz%xwzPf#T-vzv@Q`F{jq`A=Xt zED$3G)e_Yy3~e{v20H&u_P1*#+qA!B`;T$)A4WhJX#e>DX#WQ`jPbu#ui%;iJISya z|3SD_{Ev|k4EWCnXt_=fSU+%K%>O_T6)#VUV-nPH5>>y;u*rWCHuE3Dx%dyq2*7{7 z;3%f`iHXmM&98u1rxqt`m=q>SC)R6KN$i1mMyyVt#Tq7AEl!X>qt@&0x7Gmt0wez^ zITg>?EeqJE{+}WLiyuGrvT7a`;Q=~wf))aK>N=J@`X>l)$|zc z;=!EGc`VR%-=$ZlX7qMll0fjnRd(+g(VRiCdr^1VfIGE=J><-uN@4e|7Cj2~+&1nu z5qmC|-48Kmo4W4ee(*{28N2480q%v7{|R!f?vX@BtChzw5?yLPJ9pdtKf;Rt1d2m| z|9n7B)8YxK_gf2q`voKaHOz9oO2cUFBf}>DG3)*xMv^4pKObPbd2Ej_1r{lj44nXx zR;Si5B3i9uk|;IJfZWjU8%F*cjQ$|?|4;(V|KJ5i`|FcvwM3y-FH4kbmi4a@M={|4c>&ER<@yAW%^j$);6Kf1DZ9w9$$uEO z=0Ajh_MaCJB1)Z@r~)%T1}H4~Z?8cBTl~K_|BsU>82{x3clH(BPR)7hlRG7gTwLSb zZ*@r}mvc>L;alU@7et`hS#Q_g8kU{4 z^y2r?hgya%418nEoiv}EsUGU5%$gauT^4ZY(s5MDjHhBkJkcvnAH{#vGGh1aS?)nS z_4BVhEJ}mioR-FwmXeoSPZt%>`&(>j1>6}qZROn)wJ&;lT+95j`XpS_dh`!Pt8;>8 zT=&wZ?Z^mUwC(9)uXWF!t$kPdb-g13`HA=LU-xq5)0O#$;&4SnXRYV?Vcy>ugp?Sz z-27>dHjbv^!0A_iGU6O`ToeAzU$%|@w%u)&glLYls=qbUIQ>eltvVJX*8lNfde)Q; zPc9ys>Cw!5^2DUkPU*o(%+0eKBIxRU(QQ-eK0dXuarZ-yDqSi%Mn4`J@!7xBk?=_=EdFRZks< zmQV9Y=ib9rkDu_KGdZs&^pzVA3)=@3c;P!IKD*+(N6z_R@3p!?GvVyqGg0Hx8Tj>f zzlfDx9jmuYT3t2K!w%`K1VOQbw5vnKhOThUFXx^zuSEG zTi25>1Z*(l2YIW}ZmN$rIgvf;fYPM0@(`8up_ zY_AO5TJVYLC-+UW1J4X@i+X8-&&c({!joId0>knir2`_5-#Dr~9p)b4QaJchNciIY z0o9+TT*Vik`RpJb^xo>PL)zLM+>zn2oFvCZ27!#JxR{DFr=_it|I|YFqm7~$AvZxy z$I6-K21RW2jU0Yt%7&usVKs@nvwk|PIsc|lQA~(NsZd3|RB$~tCvbE?W`x4w&Yq2l zcM|efted{Vefz@L#wiOTZw`NG=jHYFD=zPPY;4+fH7>HCT6ttX>VGu>*N*RN}Bqe2FC56KjK|w}w zF^26Fw#ZGQ%-&gWu_I!I5|S|l zf}%1UlfjgX!f~lWic2X%DWzb!(kT87!*&*1;!NVrjyECl%<+ehGC^8MpS|VE`-Rb2 zBlMQCQwyo30%6GDW9tVW8>@OvR(#{b+f4Czx3Rvev7r^Av$DT(*<7rgRaUmSXzb?9 zip>>8MZTfFMZOhEm2X96wrYvsn_RCkhMzJzplNI=G-+XWtqW@3sJoWy_g}xz&MzcC z?CE&LFZYVI7HPs$c~xUNFPz-5uc|OAlRj0uqXi4oZjahdAD`j92BW6GNUw?Vc8xqz z>m!VG)kdOWLe$$;A~@0HInD5z8RL(sY^gCRVD^{UC7UXqn3#Y4z-w*!0cnY&N+-AY zTUjCARIu)^6=|4ID&z{*>?A}g5h;QyXi6@H2)P2mNSHOh6rtr1m0*l5XmbUeFv&N2 z!U^S5YJzu54>Z27(`j{)``!wyT4E)?(4;qR@wMEqeGO6{8~5aY?64eUU-CaVX^8(J90U0u zK5&oyjlKGQm0_#>M^LQW{;rHIa(-&DdSjb+`hUE#53V}Da_#7=9r=lq=l|2= z&-D+_4jp+uV*Ji)6H8TV=XtF>>He|mR%L5>&C$tMT7@ZB2UUMK+@05F2lzSu8&moH zB*PZ}Vc2^7hs44BPoB`te^<72`CR8N{-01E{NQ%-^T7d!E7P9dJKMJ;y}`}$c0C_! z^a9uoKf{01$Y1}+=#&4)A&&nf1o+PndiVcA;Qt2(dd>fs=K}PP44eMnV*Mv${)fE` z#Q*%D_x`_A7ypm7Rp(147R+h)DsRd7Q%$s98t z*yO)O{?9c38w3332Qm^uaZ--Z6vpP;cmM!@Lo-JJ literal 3084 zc$@(Y4D<6JiwFRszDI(2Olx@q+OgGblRSA#+l|)`@ilvaIVv%d)-a9i4!$?i+ zkGWc$KfiOY-p733J>UJG?>pZ)_edrQ><$QmNC*-e_5^O&LkMQvn;?b}gdkA}AqZ3q z!3d5)0x@oX)dT{)Rwvi6sxZkK6{FQ9FwgXU9ebHl`3t{edJgmcHv-8dNqn50-vQ3< zINlfgqwN2H{rP}o60OoaK=#K8g0nx0BEbH9Kr%_GN?>9sb@IO_fZ4I?)E>wc>Pz%xwzPf#T-vzv@Q`F{jq`A=Xt zED$3G)e_Yy3~e{v20H&u_P1*#+qA!B`;T$)A4WhJX#e>DX#WQ`jPbu#ui%;iJISya z|3SD_{Ev|k4EWCnXt_=fSU+%K%>O_T6)#VUV-nPH5>>y;u*rWCHuE3Dx%dyq2*7{7 z;3%f`iHXmM&98u1rxqt`m=q>SC)R6KN$i1mMyyVt#Tq7AEl!X>qt@&0x7Gmt0wez^ zITg>?EeqJE{+}WLiyuGrvT7a`;Q=~wf))aK>N=J@`X>l)$|zc z;=!EGc`VR%-=$ZlX7qMll0fjnRd(+g(VRiCdr^1VfIGE=J><-uN@4e|7Cj2~+&1nu z5qmC|-48Kmo4W4ee(*{28N2480q%v7{|R!f?vX@BtChzw5?yLPJ9pdtKf;Rt1d2m| z|9n7B)8YxK_gf2q`voKaHOz9oO2cUFBf}>DG3)*xMv^4pKObPbd2Ej_1r{lj44nXx zR;Si5B3i9uk|;IJfZWjU8%F*cjQ$|?|4;(V|KJ5i`|FcvwM3y-FH4kbmi4a@M={|4c>&ER<@yAW%^j$);6Kf1DZ9w9$$uEO z=0Ajh_MaCJB1)Z@r~)%T1}H4~Z?8cBTl~K_|BsU>82{x3clH(BPR)7hlRG7gTwLSb zZ*@r}mvc>L;alU@7et`hS#Q_g8kU{4 z^y2r?hgya%418nEoiv}EsUGU5%$gauT^4ZY(s5MDjHhBkJkcvnAH{#vGGh1aS?)nS z_4BVhEJ}mioR-FwmXeoSPZt%>`&(>j1>6}qZROn)wJ&;lT+95j`XpS_dh`!Pt8;>8 zT=&wZ?Z^mUwC(9)uXWF!t$kPdb-g13`HA=LU-xq5)0O#$;&4SnXRYV?Vcy>ugp?Sz z-27>dHjbv^!0A_iGU6O`ToeAzU$%|@w%u)&glLYls=qbUIQ>eltvVJX*8lNfde)Q; zPc9ys>Cw!5^2DUkPU*o(%+0eKBIxRU(QQ-eK0dXuarZ-yDqSi%Mn4`J@!7xBk?=_=EdFRZks< zmQV9Y=ib9rkDu_KGdZs&^pzVA3)=@3c;P!IKD*+(N6z_R@3p!?GvVyqGg0Hx8Tj>f zzlfDx9jmuYT3t2K!w%`K1VOQbw5vnKhOThUFXx^zuSEG zTi25>1Z*(l2YIW}ZmN$rIgvf;fYPM0@(`8up_ zY_AO5TJVYLC-+UW1J4X@i+X8-&&c({!joId0>knir2`_5-#Dr~9p)b4QaJchNciIY z0o9+TT*Vik`RpJb^xo>PL)zLM+>zn2oFvCZ27!#JxR{DFr=_it|I|YFqm7~$AvZxy z$I6-K21RW2jU0Yt%7&usVKs@nvwk|PIsc|lQA~(NsZd3|RB$~tCvbE?W`x4w&Yq2l zcM|efted{Vefz@L#wiOTZw`NG=jHYFD=zPPY;4+fH7>HCT6ttX>VGu>*N*RN}Bqe2FC56KjK|w}w zF^26Fw#ZGQ%-&gWu_I!I5|S|l zf}%1UlfjgX!f~lWic2X%DWzb!(kT87!*&*1;!NVrjyECl%<+ehGC^8MpS|VE`-Rb2 zBlMQCQwyo30%6GDW9tVW8>@OvR(#{b+f4Czx3Rvev7r^Av$DT(*<7rgRaUmSXzb?9 zip>>8MZTfFMZOhEm2X96wrYvsn_RCkhMzJzplNI=G-+XWtqW@3sJoWy_g}xz&MzcC z?CE&LFZYVI7HPs$c~xUNFPz-5uc|OAlRj0uqXi4oZjahdAD`j92BW6GNUw?Vc8xqz z>m!VG)kdOWLe$$;A~@0HInD5z8RL(sY^gCRVD^{UC7UXqn3#Y4z-w*!0cnY&N+-AY zTUjCARIu)^6=|4ID&z{*>?A}g5h;QyXi6@H2)P2mNSHOh6rtr1m0*l5XmbUeFv&N2 z!U^S5YJzu54>Z27(`j{)``!wyT4E)?(4;qR@wMEqeGO6{8~5aY?64eUU-CaVX^8(J90U0u zK5&oyjlKGQm0_#>M^LQW{;rHIa(-&DdSjb+`hUE#53V}Da_#7=9r=lq=l|2= z&-D+_4jp+uV*Ji)6H8TV=XtF>>He|mR%L5>&C$tMT7@ZB2UUMK+@05F2lzSu8&moH zB*PZ}Vc2^7hs44BPoB`te^<72`CR8N{-01E{NQ%-^T7d!E7P9dJKMJ;y}`}$c0C_! z^a9uoKf{01$Y1}+=#&4)A&&nf1o+PndiVcA;Qt2(dd>fs=K}PP44eMnV*Mv${)fE` z#Q*%D_x`_A7ypm7Rp(147R+h)DsRd7Q%$s98t z*yO)O{?9c38w3332Qm^uaZ--Z6vpP;cmM!@Lo-JJ diff --git a/src/applications/repository/engine/__tests__/data/CHC.svn.tgz b/src/applications/diffusion/engine/__tests__/data/CHC.svn.tgz rename from src/applications/repository/engine/__tests__/data/CHC.svn.tgz rename to src/applications/diffusion/engine/__tests__/data/CHC.svn.tgz index e12a64c97f9fd9eb5ed80149f296ebb3d18bbf3b..e12a64c97f9fd9eb5ed80149f296ebb3d18bbf3b GIT binary patch literal 12028 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 I2^Qx6062Kz*8l(j literal 12028 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 I2^Qx6062Kz*8l(j diff --git a/src/applications/repository/engine/__tests__/data/CHD.svn.tgz b/src/applications/diffusion/engine/__tests__/data/CHD.svn.tgz rename from src/applications/repository/engine/__tests__/data/CHD.svn.tgz rename to src/applications/diffusion/engine/__tests__/data/CHD.svn.tgz index 0a4d0a5700414b36e6c72445d35dc7310d9f464a..0a4d0a5700414b36e6c72445d35dc7310d9f464a GIT binary patch literal 9437 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 jFA1?%sY+F!@Tho%1y9M%tP02l!P;I_kn literal 9437 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 jFA1?%sY+F!@Tho%1y9M%tP02l!P;I_kn diff --git a/src/applications/repository/engine/__tests__/data/CHE.svn.tgz b/src/applications/diffusion/engine/__tests__/data/CHE.svn.tgz rename from src/applications/repository/engine/__tests__/data/CHE.svn.tgz rename to src/applications/diffusion/engine/__tests__/data/CHE.svn.tgz index e24e20b993be876fa98cd1b52f80d17106d1b508..e24e20b993be876fa98cd1b52f80d17106d1b508 GIT binary patch literal 9245 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 literal 9245 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 diff --git a/src/applications/repository/engine/__tests__/data/GT.git.tgz b/src/applications/diffusion/engine/__tests__/data/GT.git.tgz rename from src/applications/repository/engine/__tests__/data/GT.git.tgz rename to src/applications/diffusion/engine/__tests__/data/GT.git.tgz index b53e9a2d1c2eceeb3e3c3fbdf6c9223debdb02dc..b53e9a2d1c2eceeb3e3c3fbdf6c9223debdb02dc GIT binary patch literal 6830 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 literal 6830 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 diff --git a/src/applications/repository/engine/__tests__/data/HT.hg.tgz b/src/applications/diffusion/engine/__tests__/data/HT.hg.tgz rename from src/applications/repository/engine/__tests__/data/HT.hg.tgz rename to src/applications/diffusion/engine/__tests__/data/HT.hg.tgz index 7b170be199412d9fbe5933809cc004b8284b4eee..7b170be199412d9fbe5933809cc004b8284b4eee GIT binary patch literal 1101 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 z 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 z z_Y3A<-K;`{G)kUei^(**C*e0KeZ>4+M94U);YRqXAI>6VpLE`*v_ATB2M#h8j5 z_hkO7f(c4A{t)QuVJ2wW&fJ5`Cpp6-27>`wEh#E(KoS4~F-oWWnNIYun=%rpJJO`Z zO!{XUehQ$%lzW^-97b<%u)X_m2M$Ept}wYO?)aS}*8KN$dp&izZn9g~$geWb_^{M) zA(IC7rzueIhl9(|gydM+bHd}X4xoR)Ks5Ub@3n8)p62UPv&j3feahNu;RfPeRAM>Y z4bxuZVmM9@j$WIQ?I5(iKLJS^>rSvAyOZFa?NnU$^`QXpM8f9@lt z{+wTJ-&J3)=Z2Ry`YVg|8nU+Y(`H$B{rnlT$+~1y9rgL7L#Sc)5P)xr8ec*3hQp1{ zc6Hbz;deD!_3H4r+T^bdqXsL+OU8vfg>ka#&$8wg0q^eEm1s7VC&r%CDQa3fQN`&9 zF?zBa8Wcq3w(Psj7tiIf)cu4DT2)NjzZe?%K4OUaxO({n=+ue%V~_p7AFXK_Qy=Z< zw6|8cw=lfE^BU#8_zEPP#HZoA86=gl+3ysVQz|50T^^@5^|(39*O3F|r0;%KhEKqA z(=M)kgDwv}D+8eInjZ6%d5_Z!Vyb-5bW?fY@c2h}-eT?~p}7wSNF+8OVCU&iG5@uk-)f-|;WVmQrP2sFFx}llIo> zXG{a2fj*wW+)avAs0l$mOP(nRKkwpVRE3*v3H9^_#@lP}<*CRdM8EC49d`M>BV&I( zf7P3FTiUy=mmM0SlLk6Mi{ zA0eXoUbA<>MW&6uDKZ0iJj-f<6ySn-P{D`5!Ab!XjM0qd7o&;Z5l&aqo%XgZkU_14F3E!mjwX(t zGNM)Z`?Ks@q=2v&!!aW8Vs*6cFXOOb5*L}Mh{O@1sm0~r6Qx>gK;XBt2ytI8zbHr( z^DsU>uVn^z|3MiA|YqMYjv8MPh?N_lE*JGQETwLR5 z#1DyC2mvPUk1}c1T;G{>^f-PjMW(q=8UsC4yf~iYZ@nhyA>pHU^B_p zIZ>aw2gkEGW|Q(W`E zQxO}r?&%&4dHj8pA_8M}eZ^C5i{Bzj)JOfT3#dav0~=H<7_SZCXt^xwP@-*8{I@Z? zz4lWnMM|2lWkc?+WQ>V?f>k6-@>$Zg@P#8!h_b%Kbe|6cCmb_WfEPo(V%?MZtr#Lz zSg#jw)|6dnzc#wvu=Bn5W(~{9y;Uk)W$^2m5aw#lxnz$>uR6l!6mgKb_t&uYAuJOX zIJ?69Bx~L}-i9hpn{J6ntFC*yWI!G*VUW(LNv(IS5MqcMxz?=1R$^42308Cl7o6Ff zvG|u5p_AxV+qubo&?aJFeHgsialT%dS`G9ID{wz(z10Xr>(^&1W(@LuLJ+n--(n#B zy&CYc)7#oyeJ12tlhJRt?0kp={*V|!>noRHAaO((%1t58%C8o{-@;wbRo^_k%EZ4(&}9VZxk zD$RIEdK*|3G4!~2RqUXL$I3qAQ4gav&58Hj@)UneVl=9b@p)?EL;pA+9xx^@ip+xYQJEDmtaG|If zZU2yzasSX`#m0b9`5~?Los3x=PTmO0W)G)YpmqI$yQ^aA$m(O3Nw*~FVg4>TeC%)j zpx>#EkjFt!{vdoDJuTb3gYvD4;7VJmWwQqw-hidLK=z>R%^p;``-%>C)+70bv7bd1 z!w6qvT0<=}JIESciX;3h5Um4EQ|RJ>M&TdRDcI$#G+Po%*)Pgk{C#YQA*SD7U>!!l$7U6Th3=*phB* zMSZbUr)bMD#c!vCoQ2>x_WeK zNA{gd4*9tRd6_uAqpYa?=a~v(?Dy0gtpq=Kd)M%#n4ud3hT3yE*?8CXADEyBu?Uu$Ah+r&6> zHRZmrPm1B-hHM!|wSh@7#@5P&yT%#+Pw36(%WgiRhn20KNWAZ|qIPFusqLGY4~F*s zmyJGq6VWJhIV+8!g`vCFx}Kj2ksE^4NKXnF6AZcPoO9>GImK=Ctupk=%p{|`S;Y1G zZQ=tw3xcei`FO(52Q-LLz*hUE0R) z8y!PKsT4|2yh&SM@EP)Nf9HraOd)NsuB_FNoi@! zfO1<+@+r(#WMe#;z}{WkqTvMM6 znd_Q9-BNsE5|PaSzURoX%V;dK8j?K4)*mO|3c||suN2_(9M$_BZH(QeFq9+yl{TW= zxW1p(e-g7DTns3frNCupb|_4&6rNKfQ>_s>jX+e~Qn2RE;=~T$Z}hjC)4}J8LznPTPN1K5$%EYrwqr^`e%uZ%}5mSni0im`Wz$BcT3^R%N;anGP4M}v^LY+q%&c<7j* z!M+eSPDPF+pfxh0G!;{ErRcO4!(nM$0b}yE*m^#Tlu^fTq%c!=JWI`W$8%fCvuD%A zfvo6(b2%aL*|Y4P764OS=;6_6`~5t{!tDucw|OoFe2zW`VE?(DGMD%$5vgtH@g_fw zLz&*scBL4JDYR7rM*cB-Ih@IYWIr%*TY}Gn7v& zY}X+_M&WGczxp+cyfvUhyik<{W#`hcxRX?WW>f8Bo}i8mEhpJ4278*RzJsZ0lp6{) z?E`8%y30VaJ0OU2P`&$$iec!Jioa}FZUGxk-q72dN!hZ!Osq(1zsMz)=K|fb09pp} z<0XIZ?hz!Ve`p5!)QdiMjQr+P=F#t<7eQkrK0E;l#^Y`;=zLR#w9B%)s_%FP{yVpM zc1h{kz61&E2X{{MJU~cKPoEL$!8a}bNQsL4 z*C|iept5RUS4Ol!{V9ZHpU4XS5qgKK$Jm+cu^@s*W--^u$8Yx7EI*xsF9bn|=i{{~ ztU=Q;&;!97WLuGH=Jtmnn(6YAe8NVs0?L!FX4n78?|;L3X%uZgTwUThDN!9s`C|Kj zRq)?nz|JpmpG$fR5b?A){nyFa!?*8+@q}0@IS}&lwgp3GPej9=Au!rjio&mA53*YY ze#33;uwSC0f1SsiJaS=j!M5I0U~jJo*Hu06!HEY#54^RyVi)jzC0OGAYLc?><$f0F z3wIJQ|9>N&2S zYY$ZR45{gn|Luzef92ogs^VD{NBX1G-^!PExqU1*yR zd%@Pv@ULDI_n;$yJF*`Z<@*di!&x+L*m8I-q(zGEJ~e)nnnw}<1~we1dUKPI`F`C_ zLr71+b#SWB3C_`PEu=B-EeLulhg?8eg)ITQ5C+c1|LXPfMfD&Eq0E-q`uHH2CuJw+ z*88Vx)B_N;RZm=sS?|O!@)yjG^4Sb)`@ZmDlvh%a7HORL>p#+xO-TK6muvQu;1O&%eR&c#aS6Na`AOC|XyE7R={aO% zAh3+vIdAXaA1YWsPWgIYZ@!^r7mxBEB40{d2=U_FeRRw}?d5?9qkbhxF%bl}UdZo? z$T@2JkvKk(cZEkIaUeCAW=|YtRR%p~!M%;~RC>7G8$U_k@2GvhGp15x;^-lYK`9hF zkl^`GwY7ywfP#Adcr(~*_Q1oar1R+4a(z%C*vGMQ()+XK9ztyevFGLXef39-L{uiv zNe4+v?ComR(WhpCOeINj$2o*|TZQbi%W9kqXJ5tx+~f?Y@)E2n`Oui5ogF$Ed_KZ; z`n<>0V2gR7r6u&vgtNTC+^iKpaoM@kj<%H-sN<@ZPa&xTo`4E}<bu--lDCE zy*REQqGFNrD3{L=oLv8m=SJ_{(_ja|oZT0A8t$3w5#8ZhUI zgyW(=;=#1m)Jf3WYb6n$I^qu}ru?m%wSd$e2w9j!mYvh?L;mCG((rVuVFI{B-q3q^ z9+u~kmJ2RM4;fM?NV_+}>b!DbFq>zvMu&3wvujM&a(O>AUi^d<_Q_IGg5iI(^pB8z z4~=rOtH^E=AKPaa#GH4{wO%I-W;lh^JMehN#(#*El4^?r3orbu|YfD88FebMN_ zsI|&>E3mRlIoRKYbVgT2En@49m?vvj$Ij(l$7bBf0+Ki{qfN|zEjiF8mdt47qXE+Sz}PwhYg%vrarKjn>;pudpOaC@?t z>^`&f^9QGejg(yYLm*T#tf(a=KagNx{j*HdVHNhz1^@gW8b+vIhjq_W;|`ms;+fjn zRo|(_KsZ@Pc<0wzstoY;n=7E7)if{Z(?-b|u7Wzjp^K8o=nlf6I{m!Gqwx71@z=sR znq%YxxNWxOIa-6bs#bgr^yZGem&WJ3)vFFdwnX=+S)oCp=@FDYA4PKT0zE-2+LRgGVYUI=* zoV)JYH@!GAY#Jlr{&P2R?=aV*M8*Wr3g7g;M?j%xcp<1=0ng$t%rqG8H3mh5&>)#V zkH+iPqjZ0HY6Oem9)UV-o)`SqRkuLcvSjTGln>>CHvu$2td}~WQG<`Ps}}31+G;{G z9shhz2MO5Fd2Y=YBQ5AD3j^^WkK9xN@|KhF0d+$ul=9E0O_I#_Zwz$s*MNPPax}JP zi|7Sgi-~%s8|(&(52VMPZ)3@5Dl3v+RB0inYMruE51?6Xu*op+0q*dt1NRX`LH(Z* zZ1^m{6aUF9wKB3~{Y{#JaA(oqZ5~G{iw~rhuDscT=Cj=I0?|!Ay}?9-Y96#|m%m2+ zr;#OS^YtisZMK1tgqiq&o!&Jrie4aYYlNo8`%O9p>#F6X8cp~@)Zd!E8U#r1XNX4DCrn)iz?D%}(oVeVI?& z{kF-V3HOC~^90Gvqfj*NgIjT7=02G?igwK7tMx0M_rxfs0POQHVn5>L24V)>_rSsv z!((mk%J(F8Z){qN-U8{l@pKZfYBX?hx(cafo9N>LVEXXY?8VE+qi+E`>EBtXJ{?G} z87-nYvz1fK<%)#6a(Mmm6s4#B_rp`^uQr_|JA@K*M~GSK~LsjZFgriqZ zrLd$w{Z2{D20k*tHrI+n9_>C!_`05I0rS0+z&l;NX1lmzdAD2AX339V3dOUV8~^Kr zI%Z(UnAiB0o!w{sxt$EVh_fW98_LoJeZZP!Nhx!SfZje3F35fRb)b8rkrv+^rmSD% zn^DcDz!obUW&zM!86;$(%qTJ-7^*Au2?^i+amd6_cFvov(#P^bG~zDT=c|j7k8L2_ zZ*J(9!15OK%pFkvim^#c3G>%m#*RF&V-N0hip1VJez;S0rZT^P(VtK2Tn%G}ycJ~* zMOM0gi~QvB@5w%~&rItJVK45p3Jquz+KXcKcnx`!VB`qI_PI}D=+?G0t)qOy;K+Zg zTHTD(GH1z%FU1iRGxt8qe9Tp+p)8zG=vrFEC6SK*r@ft9UyP0!zJt-@pm~Tmx>x{4 z*b#f*2<0T3jd6)cU04gabRgetValue('handle'); $commit = $event->getValue('object'); - if (!($commit instanceof PhabricatorRepositoryCommit)) { + if (!($commit instanceof DiffusionCommit)) { return; } diff --git a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php b/src/applications/diffusion/graphcache/DiffusionRepositoryGraphCache.php rename from src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php rename to src/applications/diffusion/graphcache/DiffusionRepositoryGraphCache.php --- a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php +++ b/src/applications/diffusion/graphcache/DiffusionRepositoryGraphCache.php @@ -53,7 +53,7 @@ * @task query Querying the Graph Cache * @task cache Cache Internals */ -final class PhabricatorRepositoryGraphCache extends Phobject { +final class DiffusionRepositoryGraphCache extends Phobject { private $rebuiltKeys = array(); @@ -306,8 +306,8 @@ // commit IDs before small ones. Later on, we'll ignore the commits we // already know about. - $table_commit = new PhabricatorRepositoryCommit(); - $table_repository = new PhabricatorRepository(); + $table_commit = new DiffusionCommit(); + $table_repository = new DiffusionRepository(); $conn_r = $table_commit->establishConnection('r'); // Find all the Git and Mercurial commits in the block which have completed @@ -324,13 +324,13 @@ $table_commit->getTableName(), $table_repository->getTableName(), array( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT, - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL, + DiffusionRepositoryType::REPOSITORY_TYPE_GIT, + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL, ), $bucket_min, $bucket_max, - PhabricatorRepositoryCommit::IMPORTED_CHANGE, - PhabricatorRepositoryCommit::IMPORTED_CHANGE); + DiffusionCommit::IMPORTED_CHANGE, + DiffusionCommit::IMPORTED_CHANGE); // If we don't have any data, just return the existing data. if (!$commit_rows) { @@ -353,7 +353,7 @@ 'SELECT commitID, pathID FROM %T WHERE commitID IN (%Ld) AND (isDirect = 1 OR changeType = %d)', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $commit_ids, DifferentialChangeType::TYPE_CHILD); $path_changes = igroup($path_changes, 'commitID'); @@ -364,7 +364,7 @@ 'SELECT childCommitID, parentCommitID FROM %T WHERE childCommitID IN (%Ld) ORDER BY id ASC', - PhabricatorRepository::TABLE_PARENTS, + DiffusionRepository::TABLE_PARENTS, $commit_ids); $parents = igroup($parents, 'childCommitID'); diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php --- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php +++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php @@ -5,7 +5,7 @@ private $log; private $hookEngine; - public function setPushLog(PhabricatorRepositoryPushLog $log) { + public function setPushLog(DiffusionRepositoryPushLog $log) { $this->log = $log; return $this; } @@ -39,7 +39,7 @@ } public function canTriggerOnObject($object) { - if ($object instanceof PhabricatorRepository) { + if ($object instanceof DiffusionRepository) { return true; } diff --git a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php --- a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php +++ b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php @@ -186,15 +186,15 @@ $repository = $this->getHookEngine()->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $ref = $this->getCommitRef(); $author = $ref->getAuthor(); if (!strlen($author)) { return null; } return $this->lookupUser($author); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // In Subversion, the pusher is always the author. return $this->getHookEngine()->getViewer()->getPHID(); } @@ -204,8 +204,8 @@ $repository = $this->getHookEngine()->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // If there's no committer information, we're going to return the // author instead. However, if there's committer information and we // can't resolve it, return `null`. @@ -215,7 +215,7 @@ return $this->getAuthorPHID(); } return $this->lookupUser($committer); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // In Subversion, the pusher is always the committer. return $this->getHookEngine()->getViewer()->getPHID(); } @@ -225,11 +225,11 @@ $repository = $this->getHookEngine()->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $ref = $this->getCommitRef(); return $ref->getAuthor(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // In Subversion, the pusher is always the author. return $this->getHookEngine()->getViewer()->getUsername(); } @@ -239,8 +239,8 @@ $repository = $this->getHookEngine()->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // Here, if there's no committer, we're going to return the author // instead. $ref = $this->getCommitRef(); @@ -249,7 +249,7 @@ return $committer; } return $ref->getAuthor(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // In Subversion, the pusher is always the committer. return $this->getHookEngine()->getViewer()->getUsername(); } @@ -293,15 +293,15 @@ $repository = $this->getHookEngine()->getRepository(); $vcs = $repository->getVersionControlSystem(); switch ($vcs) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $parents = id(new DiffusionLowLevelParentsQuery()) ->setRepository($repository) ->withIdentifier($this->getObject()->getRefNew()) ->execute(); return (count($parents) > 1); - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // NOTE: For now, we ignore "svn:mergeinfo" at all levels. We might // change this some day, but it's not nearly as clear a signal as // ancestry is in Git/Mercurial. diff --git a/src/applications/repository/mail/PhabricatorRepositoryPushReplyHandler.php b/src/applications/diffusion/mail/DiffusionRepositoryPushReplyHandler.php rename from src/applications/repository/mail/PhabricatorRepositoryPushReplyHandler.php rename to src/applications/diffusion/mail/DiffusionRepositoryPushReplyHandler.php --- a/src/applications/repository/mail/PhabricatorRepositoryPushReplyHandler.php +++ b/src/applications/diffusion/mail/DiffusionRepositoryPushReplyHandler.php @@ -1,6 +1,6 @@ loadLastModifiedCommitID( diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementDiscoverWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementDiscoverWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementDiscoverWorkflow.php @@ -1,7 +1,7 @@ getCallsign())); - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repo) ->setVerbose($args->getArg('verbose')) ->setRepairMode($args->getArg('repair')) diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementEditWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementEditWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementEditWorkflow.php @@ -1,7 +1,7 @@ getArg('local-path')) { - $xactions[] = id(new PhabricatorRepositoryTransaction()) + $xactions[] = id(new DiffusionRepositoryTransaction()) ->setTransactionType($type_local_path) ->setNewValue($args->getArg('local-path')); } @@ -82,7 +82,7 @@ $content_source = PhabricatorContentSource::newConsoleSource(); - $editor = id(new PhabricatorRepositoryEditor()) + $editor = id(new DiffusionRepositoryEditor()) ->setActor($actor) ->setContentSource($content_source) ->setContinueOnNoEffect(true) diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementImportingWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementImportingWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementImportingWorkflow.php @@ -1,7 +1,7 @@ establishConnection('r'); $rows = queryfx_all( @@ -45,8 +45,8 @@ WHERE repositoryID IN (%Ld) AND (importStatus & %d) != %d', $table->getTableName(), array_keys($repos), - PhabricatorRepositoryCommit::IMPORTED_ALL, - PhabricatorRepositoryCommit::IMPORTED_ALL); + DiffusionCommit::IMPORTED_ALL, + DiffusionCommit::IMPORTED_ALL); $console = PhutilConsole::getConsole(); if ($rows) { @@ -59,16 +59,16 @@ if (!$args->getArg('simple')) { $status = $row['importStatus']; $need = array(); - if (!($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE)) { + if (!($status & DiffusionCommit::IMPORTED_MESSAGE)) { $need[] = pht('Message'); } - if (!($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE)) { + if (!($status & DiffusionCommit::IMPORTED_CHANGE)) { $need[] = pht('Change'); } - if (!($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS)) { + if (!($status & DiffusionCommit::IMPORTED_OWNERS)) { $need[] = pht('Owners'); } - if (!($status & PhabricatorRepositoryCommit::IMPORTED_HERALD)) { + if (!($status & DiffusionCommit::IMPORTED_HERALD)) { $need[] = pht('Herald'); } diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementListWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementListWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementListWorkflow.php @@ -1,7 +1,7 @@ setViewer($this->getViewer()) ->execute(); if ($repos) { diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementLookupUsersWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementLookupUsersWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementLookupUsersWorkflow.php @@ -1,7 +1,7 @@ withCommit($commit) ->withName($name) diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementMarkImportedWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementMarkImportedWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementMarkImportedWorkflow.php @@ -1,7 +1,7 @@ getCallsign())); - $engine = id(new PhabricatorRepositoryMirrorEngine()) + $engine = id(new DiffusionRepositoryMirrorEngine()) ->setRepository($repo) ->setVerbose($args->getArg('verbose')) ->pushToMirrors(); diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementParentsWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementParentsWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementParentsWorkflow.php @@ -1,7 +1,7 @@ loadRepositories($args, 'repos'); if (!$repos) { - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->execute(); } @@ -46,13 +46,13 @@ return 0; } - private function rebuildRepository(PhabricatorRepository $repo) { + private function rebuildRepository(DiffusionRepository $repo) { $console = PhutilConsole::getConsole(); $console->writeOut("%s\n", pht('Rebuilding "%s"...', $repo->getMonogram())); - $refs = id(new PhabricatorRepositoryRefCursorQuery()) + $refs = id(new DiffusionRepositoryRefCursorQuery()) ->setViewer($this->getViewer()) - ->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH)) + ->withRefTypes(array(DiffusionRepositoryRefCursor::TYPE_BRANCH)) ->withRepositoryPHIDs(array($repo->getPHID())) ->execute(); @@ -69,9 +69,9 @@ $commit = $ref->getCommitIdentifier(); if ($repo->isGit()) { - $stream = new PhabricatorGitGraphStream($repo, $commit); + $stream = new DiffusionRepositoryGitGraphStream($repo, $commit); } else { - $stream = new PhabricatorMercurialGraphStream($repo, $commit); + $stream = new DiffusionRepositoryMercurialGraphStream($repo, $commit); } $discover = array($commit); @@ -93,7 +93,7 @@ 'Found %s total commit(s); updating...', new PhutilNumber(count($graph)))); - $commit_table = id(new PhabricatorRepositoryCommit()); + $commit_table = id(new DiffusionCommit()); $commit_table_name = $commit_table->getTableName(); $conn_w = $commit_table->establishConnection('w'); @@ -161,7 +161,7 @@ queryfx( $conn_w, 'DELETE FROM %T WHERE childCommitID IN (%Q)', - PhabricatorRepository::TABLE_PARENTS, + DiffusionRepository::TABLE_PARENTS, $chunk); } @@ -169,7 +169,7 @@ queryfx( $conn_w, 'INSERT INTO %T (childCommitID, parentCommitID) VALUES %Q', - PhabricatorRepository::TABLE_PARENTS, + DiffusionRepository::TABLE_PARENTS, $chunk); } $commit_table->saveTransaction(); diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementPullWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementPullWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementPullWorkflow.php @@ -1,7 +1,7 @@ writeOut("%s\n", pht("Pulling '%s'...", $repo->getCallsign())); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repo) ->setVerbose($args->getArg('verbose')) ->pullRepository(); diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementRefsWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementRefsWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementRefsWorkflow.php @@ -1,7 +1,7 @@ getCallsign())); - $engine = id(new PhabricatorRepositoryRefEngine()) + $engine = id(new DiffusionRepositoryRefEngine()) ->setRepository($repo) ->setVerbose($args->getArg('verbose')) ->updateRefs(); diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementReparseWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementReparseWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementReparseWorkflow.php @@ -1,7 +1,7 @@ loadOneWhere( + $repository = id(new DiffusionRepository())->loadOneWhere( 'callsign = %s OR phid = %s', $all_from_repo, $all_from_repo); @@ -234,7 +234,7 @@ } $callsign = $matches[1]; $commit_identifier = $matches[2]; - $repository = id(new PhabricatorRepository())->loadOneWhere( + $repository = id(new DiffusionRepository())->loadOneWhere( 'callsign = %s', $callsign); if (!$repository) { @@ -242,7 +242,7 @@ "No repository with callsign '%s'!", $callsign)); } - $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere( + $commit = id(new DiffusionCommit())->loadOneWhere( 'repositoryID = %d AND commitIdentifier = %s', $repository->getID(), $commit_identifier); @@ -279,13 +279,13 @@ $reparse_change = false; $reparse_owners = false; $reparse_herald = false; - if (!($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE)) { + if (!($status & DiffusionCommit::IMPORTED_MESSAGE)) { $reparse_message = true; - } else if (!($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE)) { + } else if (!($status & DiffusionCommit::IMPORTED_CHANGE)) { $reparse_change = true; - } else if (!($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS)) { + } else if (!($status & DiffusionCommit::IMPORTED_OWNERS)) { $reparse_owners = true; - } else if (!($status & PhabricatorRepositoryCommit::IMPORTED_HERALD)) { + } else if (!($status & DiffusionCommit::IMPORTED_HERALD)) { $reparse_herald = true; } else { continue; @@ -294,39 +294,39 @@ $classes = array(); switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: if ($reparse_message) { - $classes[] = 'PhabricatorRepositoryGitCommitMessageParserWorker'; + $classes[] = 'DiffusionGitCommitMessageParserWorker'; } if ($reparse_change) { - $classes[] = 'PhabricatorRepositoryGitCommitChangeParserWorker'; + $classes[] = 'DiffusionGitCommitChangeParserWorker'; } break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: if ($reparse_message) { $classes[] = - 'PhabricatorRepositoryMercurialCommitMessageParserWorker'; + 'DiffusionMercurialCommitMessageParserWorker'; } if ($reparse_change) { - $classes[] = 'PhabricatorRepositoryMercurialCommitChangeParserWorker'; + $classes[] = 'DiffusionMercurialCommitChangeParserWorker'; } break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: if ($reparse_message) { - $classes[] = 'PhabricatorRepositorySvnCommitMessageParserWorker'; + $classes[] = 'DiffusionSvnCommitMessageParserWorker'; } if ($reparse_change) { - $classes[] = 'PhabricatorRepositorySvnCommitChangeParserWorker'; + $classes[] = 'DiffusionSvnCommitChangeParserWorker'; } break; } if ($reparse_herald) { - $classes[] = 'PhabricatorRepositoryCommitHeraldWorker'; + $classes[] = 'DiffusionCommitHeraldWorker'; } if ($reparse_owners) { - $classes[] = 'PhabricatorRepositoryCommitOwnersWorker'; + $classes[] = 'DiffusionCommitOwnersWorker'; } // NOTE: With "--importing", we queue the first unparsed step and let diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementUpdateWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementUpdateWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementUpdateWorkflow.php @@ -1,7 +1,7 @@ getArg('no-discovery'); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->setVerbose($this->getVerbose()) ->pullRepository(); @@ -89,7 +89,7 @@ // hosted repositories, too. $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, null); $this->discoverRepository($repository); @@ -101,16 +101,16 @@ $this->mirrorRepository($repository); $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_FETCH, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_FETCH, + DiffusionRepositoryStatusMessage::CODE_OKAY); } catch (Exception $ex) { $lock->unlock(); throw $ex; } } catch (Exception $ex) { $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_FETCH, - PhabricatorRepositoryStatusMessage::CODE_ERROR, + DiffusionRepositoryStatusMessage::TYPE_FETCH, + DiffusionRepositoryStatusMessage::CODE_ERROR, array( 'message' => pht( 'Error updating working copy: %s', $ex->getMessage()), @@ -128,8 +128,8 @@ return 0; } - private function discoverRepository(PhabricatorRepository $repository) { - $refs = id(new PhabricatorRepositoryDiscoveryEngine()) + private function discoverRepository(DiffusionRepository $repository) { + $refs = id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->setVerbose($this->getVerbose()) ->discoverCommits(); @@ -137,9 +137,9 @@ return (bool)count($refs); } - private function mirrorRepository(PhabricatorRepository $repository) { + private function mirrorRepository(DiffusionRepository $repository) { try { - id(new PhabricatorRepositoryMirrorEngine()) + id(new DiffusionRepositoryMirrorEngine()) ->setRepository($repository) ->pushToMirrors(); } catch (Exception $ex) { @@ -154,14 +154,14 @@ } } - private function updateRepositoryRefs(PhabricatorRepository $repository) { - id(new PhabricatorRepositoryRefEngine()) + private function updateRepositoryRefs(DiffusionRepository $repository) { + id(new DiffusionRepositoryRefEngine()) ->setRepository($repository) ->updateRefs(); } private function checkIfRepositoryIsFullyImported( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { // Check if the repository has the "Importing" flag set. We want to clear // the flag if we can. @@ -176,10 +176,10 @@ $repository->establishConnection('r'), 'SELECT * FROM %T WHERE repositoryID = %d AND (importStatus & %d) != %d LIMIT 1', - id(new PhabricatorRepositoryCommit())->getTableName(), + id(new DiffusionCommit())->getTableName(), $repository->getID(), - PhabricatorRepositoryCommit::IMPORTED_ALL, - PhabricatorRepositoryCommit::IMPORTED_ALL); + DiffusionCommit::IMPORTED_ALL, + DiffusionCommit::IMPORTED_ALL); if ($unparsed_commit) { // We found a commit which still needs to import, so we can't clear the // flag. diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php b/src/applications/diffusion/management/DiffusionRepositoryManagementWorkflow.php rename from src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php rename to src/applications/diffusion/management/DiffusionRepositoryManagementWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php +++ b/src/applications/diffusion/management/DiffusionRepositoryManagementWorkflow.php @@ -1,6 +1,6 @@ setViewer($this->getViewer()) ->withCallsigns($callsigns) ->execute(); diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php --- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php +++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php @@ -35,12 +35,12 @@ $request, '/settings/'); - $vcspassword = id(new PhabricatorRepositoryVCSPassword()) + $vcspassword = id(new DiffusionVCSPassword()) ->loadOneWhere( 'userPHID = %s', $user->getPHID()); if (!$vcspassword) { - $vcspassword = id(new PhabricatorRepositoryVCSPassword()); + $vcspassword = id(new DiffusionVCSPassword()); $vcspassword->setUserPHID($user->getPHID()); } diff --git a/src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php b/src/applications/diffusion/phid/DiffusionArcanistProjectPHIDType.php rename from src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php rename to src/applications/diffusion/phid/DiffusionArcanistProjectPHIDType.php --- a/src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php +++ b/src/applications/diffusion/phid/DiffusionArcanistProjectPHIDType.php @@ -1,6 +1,6 @@ withPHIDs($phids); } diff --git a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php b/src/applications/diffusion/phid/DiffusionCommitPHIDType.php rename from src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php rename to src/applications/diffusion/phid/DiffusionCommitPHIDType.php --- a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php +++ b/src/applications/diffusion/phid/DiffusionCommitPHIDType.php @@ -1,6 +1,6 @@ withPHIDs($phids); } diff --git a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php b/src/applications/diffusion/phid/DiffusionRepositoryPHIDType.php rename from src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php rename to src/applications/diffusion/phid/DiffusionRepositoryPHIDType.php --- a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php +++ b/src/applications/diffusion/phid/DiffusionRepositoryPHIDType.php @@ -1,6 +1,6 @@ withPHIDs($phids); } @@ -59,7 +59,7 @@ $names[$key] = substr($name, 1); } - $query = id(new PhabricatorRepositoryQuery()) + $query = id(new DiffusionRepositoryQuery()) ->setViewer($query->getViewer()) ->withIdentifiers($names); diff --git a/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php b/src/applications/diffusion/phid/DiffusionRepositoryPushEventPHIDType.php rename from src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php rename to src/applications/diffusion/phid/DiffusionRepositoryPushEventPHIDType.php --- a/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php +++ b/src/applications/diffusion/phid/DiffusionRepositoryPushEventPHIDType.php @@ -1,6 +1,6 @@ withPHIDs($phids); } diff --git a/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php b/src/applications/diffusion/phid/DiffusionRepositoryPushLogPHIDType.php rename from src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php rename to src/applications/diffusion/phid/DiffusionRepositoryPushLogPHIDType.php --- a/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php +++ b/src/applications/diffusion/phid/DiffusionRepositoryPushLogPHIDType.php @@ -1,6 +1,6 @@ withPHIDs($phids); } diff --git a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php b/src/applications/diffusion/query/DiffusionArcanistProjectQuery.php rename from src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php rename to src/applications/diffusion/query/DiffusionArcanistProjectQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php +++ b/src/applications/diffusion/query/DiffusionArcanistProjectQuery.php @@ -1,6 +1,6 @@ establishConnection('r'); $data = queryfx_all( @@ -39,11 +39,11 @@ } protected function willFilterPage(array $projects) { - assert_instances_of($projects, 'PhabricatorRepositoryArcanistProject'); + assert_instances_of($projects, 'DiffusionArcanistProject'); if ($this->needRepositories) { $repository_ids = mpull($projects, 'getRepositoryID'); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withIDs($repository_ids) ->execute(); diff --git a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php --- a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php +++ b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php @@ -34,11 +34,11 @@ } switch ($this->getRepository()->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->resolveGitAndMercurialRefs(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $result = $this->resolveSubversionRefs(); break; default: @@ -82,7 +82,7 @@ $conn_r, 'SELECT commitIdentifier FROM %T WHERE repositoryID = %s AND %Q', - id(new PhabricatorRepositoryCommit())->getTableName(), + id(new DiffusionCommit())->getTableName(), $repository->getID(), implode(' OR ', $prefixes)); @@ -108,7 +108,7 @@ $conn_r, 'SELECT refNameHash, refType, commitIdentifier, isClosed FROM %T WHERE repositoryPHID = %s AND refNameHash IN (%Ls)', - id(new PhabricatorRepositoryRefCursor())->getTableName(), + id(new DiffusionRepositoryRefCursor())->getTableName(), $repository->getPHID(), array_keys($name_hashes)); @@ -137,7 +137,7 @@ private function resolveSubversionRefs() { $repository = $this->getRepository(); - $max_commit = id(new PhabricatorRepositoryCommit()) + $max_commit = id(new DiffusionCommit()) ->loadOneWhere( 'repositoryID = %d ORDER BY epoch DESC, id DESC LIMIT 1', $repository->getID()); diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php --- a/src/applications/diffusion/query/DiffusionCommitQuery.php +++ b/src/applications/diffusion/query/DiffusionCommitQuery.php @@ -59,7 +59,7 @@ * Look up commits in a specific repository. This is a shorthand for calling * @{method:withDefaultRepository} and @{method:withRepositoryIDs}. */ - public function withRepository(PhabricatorRepository $repository) { + public function withRepository(DiffusionRepository $repository) { $this->withDefaultRepository($repository); $this->withRepositoryIDs(array($repository->getID())); return $this; @@ -83,7 +83,7 @@ * considered ambiguous, but if you provide a default repository it will * be correctly resolved. */ - public function withDefaultRepository(PhabricatorRepository $repository) { + public function withDefaultRepository(DiffusionRepository $repository) { $this->defaultRepository = $repository; return $this; } @@ -176,7 +176,7 @@ } protected function loadPage() { - $table = new PhabricatorRepositoryCommit(); + $table = new DiffusionCommit(); $conn_r = $table->establishConnection('r'); $data = queryfx_all( @@ -194,12 +194,12 @@ protected function willFilterPage(array $commits) { $repository_ids = mpull($commits, 'getRepositoryID', 'getRepositoryID'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withIDs($repository_ids) ->execute(); - $min_qualified = PhabricatorRepository::MINIMUM_QUALIFIED_HASH; + $min_qualified = DiffusionRepository::MINIMUM_QUALIFIED_HASH; $result = array(); foreach ($commits as $key => $commit) { @@ -262,14 +262,14 @@ protected function didFilterPage(array $commits) { if ($this->needCommitData) { - $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $data = id(new DiffusionCommitData())->loadAllWhere( 'commitID in (%Ld)', mpull($commits, 'getID')); $data = mpull($data, null, 'getCommitID'); foreach ($commits as $commit) { $commit_data = idx($data, $commit->getID()); if (!$commit_data) { - $commit_data = new PhabricatorRepositoryCommitData(); + $commit_data = new DiffusionCommitData(); } $commit->attachCommitData($commit_data); } @@ -279,7 +279,7 @@ // but leave that for a future diff. if ($this->needAuditRequests || $this->shouldJoinAudits()) { - $requests = id(new PhabricatorRepositoryAuditRequest())->loadAllWhere( + $requests = id(new DiffusionAuditRequest())->loadAllWhere( 'commitPHID IN (%Ls)', mpull($commits, 'getPHID')); @@ -300,7 +300,7 @@ $where = array(); if ($this->repositoryPHIDs !== null) { - $map_repositories = id (new PhabricatorRepositoryQuery()) + $map_repositories = id (new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs($this->repositoryPHIDs) ->execute(); @@ -362,20 +362,20 @@ $where[] = qsprintf( $conn_r, '(commit.importStatus & %d) != %d', - PhabricatorRepositoryCommit::IMPORTED_ALL, - PhabricatorRepositoryCommit::IMPORTED_ALL); + DiffusionCommit::IMPORTED_ALL, + DiffusionCommit::IMPORTED_ALL); } else { $where[] = qsprintf( $conn_r, '(commit.importStatus & %d) = %d', - PhabricatorRepositoryCommit::IMPORTED_ALL, - PhabricatorRepositoryCommit::IMPORTED_ALL); + DiffusionCommit::IMPORTED_ALL, + DiffusionCommit::IMPORTED_ALL); } } if ($this->identifiers !== null) { - $min_unqualified = PhabricatorRepository::MINIMUM_UNQUALIFIED_HASH; - $min_qualified = PhabricatorRepository::MINIMUM_QUALIFIED_HASH; + $min_unqualified = DiffusionRepository::MINIMUM_UNQUALIFIED_HASH; + $min_qualified = DiffusionRepository::MINIMUM_QUALIFIED_HASH; $refs = array(); $bare = array(); @@ -418,7 +418,7 @@ if ($refs) { $callsigns = ipull($refs, 'callsign'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withIdentifiers($callsigns); $repos->execute(); @@ -562,7 +562,7 @@ protected function buildJoinClause(AphrontDatabaseConnection $conn_r) { $joins = array(); - $audit_request = new PhabricatorRepositoryAuditRequest(); + $audit_request = new DiffusionAuditRequest(); if ($this->shouldJoinAudits()) { $joins[] = qsprintf( diff --git a/src/applications/diffusion/query/DiffusionLintCountQuery.php b/src/applications/diffusion/query/DiffusionLintCountQuery.php --- a/src/applications/diffusion/query/DiffusionLintCountQuery.php +++ b/src/applications/diffusion/query/DiffusionLintCountQuery.php @@ -30,7 +30,7 @@ throw new PhutilInvalidStateException('withBranchIDs'); } - $conn_r = id(new PhabricatorRepositoryCommit())->establishConnection('r'); + $conn_r = id(new DiffusionCommit())->establishConnection('r'); $this->paths = array_unique($this->paths); list($dirs, $paths) = $this->processPaths(); @@ -55,7 +55,7 @@ $conn_r, 'SELECT %s path_prefix, COUNT(*) N FROM %T %Q', $key, - PhabricatorRepository::TABLE_LINTMESSAGE, + DiffusionRepository::TABLE_LINTMESSAGE, $this->buildCustomWhereClause($conn_r, $part)); } diff --git a/src/applications/diffusion/query/DiffusionPathQuery.php b/src/applications/diffusion/query/DiffusionPathQuery.php --- a/src/applications/diffusion/query/DiffusionPathQuery.php +++ b/src/applications/diffusion/query/DiffusionPathQuery.php @@ -10,14 +10,14 @@ } public function execute() { - $conn_r = id(new PhabricatorRepository())->establishConnection('r'); + $conn_r = id(new DiffusionRepository())->establishConnection('r'); $where = $this->buildWhereClause($conn_r); $results = queryfx_all( $conn_r, 'SELECT * FROM %T %Q', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, $where); return ipull($results, null, 'id'); diff --git a/src/applications/diffusion/query/DiffusionQuery.php b/src/applications/diffusion/query/DiffusionQuery.php --- a/src/applications/diffusion/query/DiffusionQuery.php +++ b/src/applications/diffusion/query/DiffusionQuery.php @@ -22,12 +22,12 @@ final protected static function initQueryObject( $base_class, - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $map = array( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'Git', - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'Mercurial', - PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => 'Svn', + DiffusionRepositoryType::REPOSITORY_TYPE_GIT => 'Git', + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'Mercurial', + DiffusionRepositoryType::REPOSITORY_TYPE_SVN => 'Svn', ); $name = idx($map, $repository->getVersionControlSystem()); @@ -106,7 +106,7 @@ $repository = $drequest->getRepository(); - $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere( + $commits = id(new DiffusionCommit())->loadAllWhere( 'repositoryID = %d AND commitIdentifier IN (%Ls)', $repository->getID(), $identifiers); @@ -121,7 +121,7 @@ foreach ($identifiers as $identifier) { $commit_obj = idx($commits, $identifier); if (!$commit_obj) { - $commit_obj = new PhabricatorRepositoryCommit(); + $commit_obj = new DiffusionCommit(); $commit_obj->setRepositoryID($repository->getID()); $commit_obj->setCommitIdentifier($identifier); $commit_obj->makeEphemeral(); @@ -132,7 +132,7 @@ $commit_ids = array_filter(mpull($commits, 'getID')); if ($commit_ids) { - $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $commit_data = id(new DiffusionCommitData())->loadAllWhere( 'commitID in (%Ld)', $commit_ids); $commit_data = mpull($commit_data, null, 'getCommitID'); @@ -173,7 +173,7 @@ $paths = queryfx_all( $conn_r, 'SELECT id, path FROM %T WHERE pathHash IN (%Ls)', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, array(md5($path_normal))); $paths = ipull($paths, 'id', 'path'); $path_id = idx($paths, $path_normal); @@ -185,7 +185,7 @@ $path_changes = queryfx_all( $conn_r, 'SELECT * FROM %T WHERE commitID IN (%Ld) AND pathID = %d', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $commit_ids, $path_id); $path_changes = ipull($path_changes, null, 'commitID'); diff --git a/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php b/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php --- a/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php +++ b/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php @@ -33,7 +33,7 @@ public function loadOldFilename() { $drequest = $this->request; $repository_id = $drequest->getRepository()->getID(); - $conn_r = id(new PhabricatorRepository())->establishConnection('r'); + $conn_r = id(new DiffusionRepository())->establishConnection('r'); $commit_id = $this->loadCommitId($this->oldCommit); $old_commit_sequence = $this->loadCommitSequence($commit_id); @@ -55,9 +55,9 @@ AND pc.commitSequence BETWEEN %d AND %d ORDER BY pc.commitSequence DESC LIMIT 1', - PhabricatorRepository::TABLE_PATH, - PhabricatorRepository::TABLE_PATHCHANGE, - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATH, md5($path), $repository_id, ArcanistDiffChangeType::TYPE_MOVE_HERE, @@ -87,14 +87,14 @@ } private function loadCommitSequence($commit_id) { - $conn_r = id(new PhabricatorRepository())->establishConnection('r'); + $conn_r = id(new DiffusionRepository())->establishConnection('r'); $path_change = queryfx_one( $conn_r, 'SELECT commitSequence FROM %T WHERE repositoryID = %d AND commitID = %d LIMIT 1', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $this->request->getRepository()->getID(), $commit_id); return reset($path_change); diff --git a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php b/src/applications/diffusion/query/DiffusionRepositoryMirrorQuery.php rename from src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryMirrorQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryMirrorQuery.php @@ -1,6 +1,6 @@ establishConnection('r'); $data = queryfx_all( @@ -38,11 +38,11 @@ } protected function willFilterPage(array $mirrors) { - assert_instances_of($mirrors, 'PhabricatorRepositoryMirror'); + assert_instances_of($mirrors, 'DiffusionRepositoryMirror'); $repository_phids = mpull($mirrors, 'getRepositoryPHID'); if ($repository_phids) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs($repository_phids) ->execute(); diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/diffusion/query/DiffusionRepositoryPushEventQuery.php rename from src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryPushEventQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryPushEventQuery.php @@ -1,6 +1,6 @@ establishConnection('r'); $data = queryfx_all( @@ -51,7 +51,7 @@ protected function willFilterPage(array $events) { $repository_phids = mpull($events, 'getRepositoryPHID'); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs($repository_phids) ->execute(); @@ -73,7 +73,7 @@ $phids = mpull($events, 'getPHID'); if ($this->needLogs) { - $logs = id(new PhabricatorRepositoryPushLogQuery()) + $logs = id(new DiffusionRepositoryPushLogQuery()) ->setParentQuery($this) ->setViewer($this->getViewer()) ->withPushEventPHIDs($phids) diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/diffusion/query/DiffusionRepositoryPushLogQuery.php rename from src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryPushLogQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryPushLogQuery.php @@ -1,6 +1,6 @@ establishConnection('r'); $data = queryfx_all( diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/diffusion/query/DiffusionRepositoryPushLogSearchEngine.php rename from src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php rename to src/applications/diffusion/query/DiffusionRepositoryPushLogSearchEngine.php --- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php +++ b/src/applications/diffusion/query/DiffusionRepositoryPushLogSearchEngine.php @@ -1,6 +1,6 @@ setParameter( @@ -33,7 +33,7 @@ } public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) { - $query = id(new PhabricatorRepositoryPushLogQuery()); + $query = id(new DiffusionRepositoryPushLogQuery()); $repository_phids = $saved->getParameter('repositoryPHIDs'); if ($repository_phids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/diffusion/query/DiffusionRepositoryQuery.php rename from src/applications/repository/query/PhabricatorRepositoryQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryQuery.php @@ -1,6 +1,6 @@ $repo) { $status = $this->status; @@ -210,7 +210,7 @@ case self::STATUS_ALL: break; default: - throw new Exception("Unknown status '{$status}'!"); + throw new Exception(pht("Unknown status '%s'!", $status)); } // TODO: This should also be denormalized. @@ -394,7 +394,7 @@ $joins[] = qsprintf( $conn, 'LEFT JOIN %T s ON r.id = s.repositoryID', - PhabricatorRepository::TABLE_SUMMARY); + DiffusionRepository::TABLE_SUMMARY); } return $joins; @@ -527,14 +527,14 @@ // would be more complicated and it's not clear if it matters in practice. foreach ($this->remoteURIs as $uri) { - $normalized_uris[] = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_GIT, + $normalized_uris[] = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_GIT, $uri); - $normalized_uris[] = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_SVN, + $normalized_uris[] = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_SVN, $uri); - $normalized_uris[] = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_MERCURIAL, + $normalized_uris[] = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_MERCURIAL, $uri); } diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/diffusion/query/DiffusionRepositoryRefCursorQuery.php rename from src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryRefCursorQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryRefCursorQuery.php @@ -1,6 +1,6 @@ establishConnection('r'); $data = queryfx_all( @@ -40,7 +40,7 @@ protected function willFilterPage(array $refs) { $repository_phids = mpull($refs, 'getRepositoryPHID'); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->setParentQuery($this) ->withPHIDs($repository_phids) diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/diffusion/query/DiffusionRepositorySearchEngine.php rename from src/applications/repository/query/PhabricatorRepositorySearchEngine.php rename to src/applications/diffusion/query/DiffusionRepositorySearchEngine.php --- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php +++ b/src/applications/diffusion/query/DiffusionRepositorySearchEngine.php @@ -1,6 +1,6 @@ needProjectPHIDs(true) ->needCommitCounts(true) ->needMostRecentCommits(true); @@ -37,7 +37,7 @@ id(new PhabricatorSearchCheckboxesField()) ->setLabel(pht('Types')) ->setKey('types') - ->setOptions(PhabricatorRepositoryType::getAllRepositoryTypes()), + ->setOptions(DiffusionRepositoryType::getAllRepositoryTypes()), ); } @@ -111,9 +111,9 @@ private function getStatusValues() { return array( - '' => PhabricatorRepositoryQuery::STATUS_ALL, - 'open' => PhabricatorRepositoryQuery::STATUS_OPEN, - 'closed' => PhabricatorRepositoryQuery::STATUS_CLOSED, + '' => DiffusionRepositoryQuery::STATUS_ALL, + 'open' => DiffusionRepositoryQuery::STATUS_OPEN, + 'closed' => DiffusionRepositoryQuery::STATUS_CLOSED, ); } @@ -127,9 +127,9 @@ private function getHostedValues() { return array( - '' => PhabricatorRepositoryQuery::HOSTED_ALL, - 'phabricator' => PhabricatorRepositoryQuery::HOSTED_PHABRICATOR, - 'remote' => PhabricatorRepositoryQuery::HOSTED_REMOTE, + '' => DiffusionRepositoryQuery::HOSTED_ALL, + 'phabricator' => DiffusionRepositoryQuery::HOSTED_PHABRICATOR, + 'remote' => DiffusionRepositoryQuery::HOSTED_REMOTE, ); } @@ -143,7 +143,7 @@ array $repositories, PhabricatorSavedQuery $query, array $handles) { - assert_instances_of($repositories, 'PhabricatorRepository'); + assert_instances_of($repositories, 'DiffusionRepository'); $viewer = $this->requireViewer(); @@ -170,7 +170,7 @@ $item->addIcon( 'none', - PhabricatorRepositoryType::getNameForRepositoryType( + DiffusionRepositoryType::getNameForRepositoryType( $repository->getVersionControlSystem())); $size = $repository->getCommitCount(); diff --git a/src/applications/repository/query/PhabricatorRepositoryTransactionQuery.php b/src/applications/diffusion/query/DiffusionRepositoryTransactionQuery.php rename from src/applications/repository/query/PhabricatorRepositoryTransactionQuery.php rename to src/applications/diffusion/query/DiffusionRepositoryTransactionQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryTransactionQuery.php +++ b/src/applications/diffusion/query/DiffusionRepositoryTransactionQuery.php @@ -1,10 +1,10 @@ withRepositoryPHIDs(array($repository_phid)) ->setLimit(1); - $symbol = new PhabricatorRepositorySymbol(); + $symbol = new DiffusionSymbol(); $conn_r = $symbol->establishConnection('r'); $data = queryfx_all( @@ -148,7 +148,7 @@ pht('You must set a name or a name prefix!')); } - $symbol = new PhabricatorRepositorySymbol(); + $symbol = new DiffusionSymbol(); $conn_r = $symbol->establishConnection('r'); $data = queryfx_all( @@ -245,11 +245,11 @@ * @task internal */ private function loadPaths(array $symbols) { - assert_instances_of($symbols, 'PhabricatorRepositorySymbol'); + assert_instances_of($symbols, 'DiffusionSymbol'); $path_map = queryfx_all( - id(new PhabricatorRepository())->establishConnection('r'), + id(new DiffusionRepository())->establishConnection('r'), 'SELECT * FROM %T WHERE id IN (%Ld)', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, mpull($symbols, 'getPathID')); $path_map = ipull($path_map, 'path', 'id'); foreach ($symbols as $symbol) { @@ -262,9 +262,9 @@ * @task internal */ private function loadRepositories(array $symbols) { - assert_instances_of($symbols, 'PhabricatorRepositorySymbol'); + assert_instances_of($symbols, 'DiffusionSymbol'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->viewer) ->withPHIDs(mpull($symbols, 'getRepositoryPHID')) ->execute(); diff --git a/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php --- a/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php +++ b/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php @@ -153,7 +153,7 @@ } if ($commits) { - $commits_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( + $commits_data = id(new DiffusionCommitData())->loadAllWhere( 'commitID IN (%Ls)', mpull($commits, 'getID')); diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php --- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php +++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php @@ -22,13 +22,13 @@ $type = $this->getRepository()->getVersionControlSystem(); switch ($type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $result = $this->loadGitCommitRef(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->loadMercurialCommitRef(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $result = $this->loadSubversionCommitRef(); break; default: diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php --- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php +++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php @@ -17,13 +17,13 @@ $type = $this->getRepository()->getVersionControlSystem(); switch ($type) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $result = $this->loadGitParents(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->loadMercurialParents(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $result = $this->loadSubversionParents(); break; default: @@ -50,7 +50,7 @@ list($stdout) = $repository->execxLocalCommand( 'log --debug --limit 1 --template={parents} --rev %s', $this->identifier); - $stdout = PhabricatorRepository::filterMercurialDebugOutput($stdout); + $stdout = DiffusionRepository::filterMercurialDebugOutput($stdout); $hashes = preg_split('/\s+/', trim($stdout)); foreach ($hashes as $key => $value) { diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php --- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php +++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php @@ -6,7 +6,7 @@ abstract protected function executeQuery(); - public function setRepository(PhabricatorRepository $repository) { + public function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php --- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php +++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php @@ -32,13 +32,13 @@ } switch ($this->getRepository()->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $result = $this->resolveGitRefs(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $result = $this->resolveMercurialRefs(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $result = $this->resolveSubversionRefs(); break; default: diff --git a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php --- a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php +++ b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php @@ -60,9 +60,9 @@ LEFT JOIN %T t ON c.targetPathID = t.id LEFT JOIN %T i ON c.targetCommitID = i.id WHERE c.commitID = %d AND isDirect = 1 %Q', - PhabricatorRepository::TABLE_PATHCHANGE, - PhabricatorRepository::TABLE_PATH, - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, $commit->getTableName(), $commit->getID(), $limit); diff --git a/src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php b/src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php --- a/src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php +++ b/src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php @@ -12,7 +12,7 @@ } public function loadPathIDs() { - $repository = new PhabricatorRepository(); + $repository = new DiffusionRepository(); $path_normal_map = array(); foreach ($this->paths as $path) { @@ -23,7 +23,7 @@ $paths = queryfx_all( $repository->establishConnection('r'), 'SELECT * FROM %T WHERE pathHash IN (%Ls)', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, array_map('md5', array_keys($path_normal_map))); $paths = ipull($paths, 'id', 'path'); diff --git a/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php b/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php --- a/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php +++ b/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php @@ -11,7 +11,7 @@ } protected function getObjectIDPattern() { - return PhabricatorRepositoryCommitPHIDType::getCommitObjectNamePattern(); + return DiffusionCommitPHIDType::getCommitObjectNamePattern(); } protected function loadObjects(array $ids) { diff --git a/src/applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php b/src/applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php --- a/src/applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php +++ b/src/applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php @@ -18,7 +18,7 @@ protected function loadObjects(array $ids) { $viewer = $this->getEngine()->getConfig('viewer'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withIdentifiers($ids); diff --git a/src/applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php b/src/applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php --- a/src/applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php +++ b/src/applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php @@ -18,7 +18,7 @@ protected function loadObjects(array $ids) { $viewer = $this->getEngine()->getConfig('viewer'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withIdentifiers($ids); diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php --- a/src/applications/diffusion/request/DiffusionRequest.php +++ b/src/applications/diffusion/request/DiffusionRequest.php @@ -150,7 +150,7 @@ $callsign, PhabricatorUser $viewer) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withCallsigns(array($callsign)) ->executeOne(); @@ -166,17 +166,17 @@ /** * Internal. Use @{method:newFromDictionary}, not this method. * - * @param PhabricatorRepository Repository object. + * @param DiffusionRepository Repository object. * @return DiffusionRequest New request object. * @task new */ final private static function newFromRepository( - PhabricatorRepository $repository) { + DiffusionRepository $repository) { $map = array( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'DiffusionGitRequest', - PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => 'DiffusionSvnRequest', - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => + DiffusionRepositoryType::REPOSITORY_TYPE_GIT => 'DiffusionGitRequest', + DiffusionRepositoryType::REPOSITORY_TYPE_SVN => 'DiffusionSvnRequest', + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'DiffusionMercurialRequest', ); @@ -360,7 +360,7 @@ // TODO: Get rid of this and do real Queries on real objects. if ($this->branchObject === false) { - $this->branchObject = PhabricatorRepositoryBranch::loadBranch( + $this->branchObject = DiffusionBranch::loadBranch( $this->getRepository()->getID(), $this->getArcanistBranch()); } @@ -379,7 +379,7 @@ $path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs(); $coverage_row = queryfx_one( - id(new PhabricatorRepository())->establishConnection('r'), + id(new DiffusionRepository())->establishConnection('r'), 'SELECT * FROM %T WHERE branchID = %d AND pathID = %d ORDER BY commitID DESC LIMIT 1', 'repository_coverage', @@ -414,11 +414,11 @@ public function loadCommitData() { if (empty($this->repositoryCommitData)) { $commit = $this->loadCommit(); - $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + $data = id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); if (!$data) { - $data = new PhabricatorRepositoryCommitData(); + $data = new DiffusionCommitData(); $data->setCommitMessage( pht('(This commit has not been fully parsed yet.)')); } @@ -735,7 +735,7 @@ if ($this->supportsBranches()) { $ref = $this->getBranch(); $types = array( - PhabricatorRepositoryRefCursor::TYPE_BRANCH, + DiffusionRepositoryRefCursor::TYPE_BRANCH, ); } else { $ref = 'HEAD'; diff --git a/src/applications/repository/response/PhabricatorVCSResponse.php b/src/applications/diffusion/response/DiffusionVCSResponse.php rename from src/applications/repository/response/PhabricatorVCSResponse.php rename to src/applications/diffusion/response/DiffusionVCSResponse.php --- a/src/applications/repository/response/PhabricatorVCSResponse.php +++ b/src/applications/diffusion/response/DiffusionVCSResponse.php @@ -14,7 +14,7 @@ * All VCS binaries ignore the response body; we include it only for * completeness. */ -final class PhabricatorVCSResponse extends AphrontResponse { +final class DiffusionVCSResponse extends AphrontResponse { private $code; private $message; diff --git a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php b/src/applications/diffusion/search/DiffusionCommitSearchIndexer.php rename from src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php rename to src/applications/diffusion/search/DiffusionCommitSearchIndexer.php --- a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php +++ b/src/applications/diffusion/search/DiffusionCommitSearchIndexer.php @@ -1,23 +1,23 @@ loadDocumentByPHID($phid); - $commit_data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + $commit_data = id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); $date_created = $commit->getEpoch(); $commit_message = $commit_data->getCommitMessage(); $author_phid = $commit_data->getCommitDetail('authorPHID'); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withIDs(array($commit->getRepositoryID())) ->executeOne(); @@ -30,7 +30,7 @@ $doc = new PhabricatorSearchAbstractDocument(); $doc->setPHID($commit->getPHID()); - $doc->setDocumentType(PhabricatorRepositoryCommitPHIDType::TYPECONST); + $doc->setDocumentType(DiffusionCommitPHIDType::TYPECONST); $doc->setDocumentCreated($date_created); $doc->setDocumentModified($date_created); $doc->setDocumentTitle($title); @@ -50,7 +50,7 @@ $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY, $repository->getPHID(), - PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + DiffusionRepositoryPHIDType::TYPECONST, $date_created); $this->indexTransactions( diff --git a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php --- a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php +++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php @@ -36,8 +36,8 @@ if (!$err) { $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::CODE_OKAY); $this->waitForGitClient(); } diff --git a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php --- a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php +++ b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php @@ -77,8 +77,8 @@ if (!$err && $this->didSeeWrite) { $repository->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::CODE_OKAY); } return $err; diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php --- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php +++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php @@ -14,7 +14,7 @@ return $this->repository; } - private function setRepository(PhabricatorRepository $repository) { + private function setRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } @@ -160,7 +160,7 @@ } $callsign = $matches[1]; - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withCallsigns(array($callsign)) ->executeOne(); @@ -171,12 +171,12 @@ } switch ($repository->getServeOverSSH()) { - case PhabricatorRepository::SERVE_READONLY: - case PhabricatorRepository::SERVE_READWRITE: + case DiffusionRepository::SERVE_READONLY: + case DiffusionRepository::SERVE_READWRITE: // If we have read or read/write access, proceed for now. We will // check write access when the user actually issues a write command. break; - case PhabricatorRepository::SERVE_OFF: + case DiffusionRepository::SERVE_OFF: default: throw new Exception( pht('This repository is not available over SSH.')); @@ -194,7 +194,7 @@ $viewer = $this->getUser(); switch ($repository->getServeOverSSH()) { - case PhabricatorRepository::SERVE_READONLY: + case DiffusionRepository::SERVE_READONLY: if ($protocol_command !== null) { throw new Exception( pht( @@ -206,7 +206,7 @@ pht('This repository is read-only over SSH.')); } break; - case PhabricatorRepository::SERVE_READWRITE: + case DiffusionRepository::SERVE_READWRITE: $can_push = PhabricatorPolicyFilter::hasCapability( $viewer, $repository, @@ -216,7 +216,7 @@ pht('You do not have permission to push to this repository.')); } break; - case PhabricatorRepository::SERVE_OFF: + case DiffusionRepository::SERVE_OFF: default: // This shouldn't be reachable because we don't get this far if the // repository isn't enabled, but kick them out anyway. diff --git a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php --- a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php +++ b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php @@ -170,8 +170,8 @@ if (!$err && $this->didSeeWrite) { $this->getRepository()->writeStatusMessage( - PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE, - PhabricatorRepositoryStatusMessage::CODE_OKAY); + DiffusionRepositoryStatusMessage::TYPE_NEEDS_UPDATE, + DiffusionRepositoryStatusMessage::CODE_OKAY); } return $err; diff --git a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php b/src/applications/diffusion/storage/DiffusionArcanistProject.php rename from src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php rename to src/applications/diffusion/storage/DiffusionArcanistProject.php --- a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php +++ b/src/applications/diffusion/storage/DiffusionArcanistProject.php @@ -1,7 +1,7 @@ assertAttached($this->repository); } - public function attachRepository(PhabricatorRepository $repository = null) { + public function attachRepository(DiffusionRepository $repository = null) { $this->repository = $repository; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php b/src/applications/diffusion/storage/DiffusionAuditRequest.php rename from src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php rename to src/applications/diffusion/storage/DiffusionAuditRequest.php --- a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php +++ b/src/applications/diffusion/storage/DiffusionAuditRequest.php @@ -1,7 +1,7 @@ getAuditorPHID()) == $user_type); } - public function attachCommit(PhabricatorRepositoryCommit $commit) { + public function attachCommit(DiffusionCommit $commit) { $this->commit = $commit; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryBranch.php b/src/applications/diffusion/storage/DiffusionBranch.php rename from src/applications/repository/storage/PhabricatorRepositoryBranch.php rename to src/applications/diffusion/storage/DiffusionBranch.php --- a/src/applications/repository/storage/PhabricatorRepositoryBranch.php +++ b/src/applications/diffusion/storage/DiffusionBranch.php @@ -1,6 +1,6 @@ loadOneWhere( + return id(new DiffusionBranch())->loadOneWhere( 'repositoryID = %d AND name = %s', $repository_id, $branch_name); @@ -34,7 +34,7 @@ return $branch; } - return id(new PhabricatorRepositoryBranch()) + return id(new DiffusionBranch()) ->setRepositoryID($repository_id) ->setName($branch_name) ->save(); diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/diffusion/storage/DiffusionCommit.php rename from src/applications/repository/storage/PhabricatorRepositoryCommit.php rename to src/applications/diffusion/storage/DiffusionCommit.php --- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php +++ b/src/applications/diffusion/storage/DiffusionCommit.php @@ -1,7 +1,7 @@ repository = $repository; return $this; } @@ -107,20 +107,20 @@ public function generatePHID() { return PhabricatorPHID::generateNewPHID( - PhabricatorRepositoryCommitPHIDType::TYPECONST); + DiffusionCommitPHIDType::TYPECONST); } public function loadCommitData() { if (!$this->getID()) { return null; } - return id(new PhabricatorRepositoryCommitData())->loadOneWhere( + return id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $this->getID()); } public function attachCommitData( - PhabricatorRepositoryCommitData $data = null) { + DiffusionCommitData $data = null) { $this->commitData = $data; return $this; } @@ -130,7 +130,7 @@ } public function attachAudits(array $audits) { - assert_instances_of($audits, 'PhabricatorRepositoryAuditRequest'); + assert_instances_of($audits, 'DiffusionAuditRequest'); $this->audits = $audits; return $this; } @@ -174,7 +174,7 @@ public function delete() { $data = $this->loadCommitData(); - $audits = id(new PhabricatorRepositoryAuditRequest()) + $audits = id(new DiffusionAuditRequest()) ->loadAllWhere('commitPHID = %s', $this->getPHID()); $this->openTransaction(); @@ -207,7 +207,7 @@ * triggers. */ public function updateAuditStatus(array $requests) { - assert_instances_of($requests, 'PhabricatorRepositoryAuditRequest'); + assert_instances_of($requests, 'DiffusionAuditRequest'); $any_concern = false; $any_accept = false; @@ -303,7 +303,7 @@ } public static function newFromDictionary(array $dict) { - return id(new PhabricatorRepositoryCommit()) + return id(new DiffusionCommit()) ->loadFromArray($dict); } diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommitData.php b/src/applications/diffusion/storage/DiffusionCommitData.php rename from src/applications/repository/storage/PhabricatorRepositoryCommitData.php rename to src/applications/diffusion/storage/DiffusionCommitData.php --- a/src/applications/repository/storage/PhabricatorRepositoryCommitData.php +++ b/src/applications/diffusion/storage/DiffusionCommitData.php @@ -1,6 +1,6 @@ loadFromArray($dict); } diff --git a/src/applications/diffusion/storage/DiffusionDAO.php b/src/applications/diffusion/storage/DiffusionDAO.php new file mode 100644 --- /dev/null +++ b/src/applications/diffusion/storage/DiffusionDAO.php @@ -0,0 +1,9 @@ +getPolicy(DiffusionDefaultEditCapability::CAPABILITY); $push_policy = $app->getPolicy(DiffusionDefaultPushCapability::CAPABILITY); - $repository = id(new PhabricatorRepository()) + $repository = id(new DiffusionRepository()) ->setViewPolicy($view_policy) ->setEditPolicy($edit_policy) ->setPushPolicy($push_policy) @@ -121,7 +121,7 @@ public function generatePHID() { return PhabricatorPHID::generateNewPHID( - PhabricatorRepositoryRepositoryPHIDType::TYPECONST); + DiffusionRepositoryPHIDType::TYPECONST); } public function toDictionary() { @@ -184,7 +184,7 @@ } public function attachMostRecentCommit( - PhabricatorRepositoryCommit $commit = null) { + DiffusionCommit $commit = null) { $this->mostRecentCommit = $commit; return $this; } @@ -228,7 +228,7 @@ public function getSubversionPathURI($path = null, $commit = null) { $vcs = $this->getVersionControlSystem(); - if ($vcs != PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) { + if ($vcs != DiffusionRepositoryType::REPOSITORY_TYPE_SVN) { throw new Exception(pht('Not a subversion repository!')); } @@ -405,9 +405,9 @@ ); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: // NOTE: See T2965. Some time after Git 1.7.5.4, Git started fataling if // it can not read $HOME. For many users, $HOME points at /root (this // seems to be a default result of Apache setup). Instead, explicitly @@ -419,7 +419,7 @@ $root = dirname(phutil_get_library_root('phabricator')); $env['HOME'] = $root.'/support/empty/'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // NOTE: This overrides certain configuration, extensions, and settings // which make Mercurial commands do random unusual things. $env['HGPLAIN'] = 1; @@ -443,15 +443,15 @@ // to use. $env['PHABRICATOR_CREDENTIAL'] = $this->getCredentialPHID(); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: // Force SVN to use `bin/ssh-connect`. $env['SVN_SSH'] = $this->getSSHWrapper(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: // Force Git to use `bin/ssh-connect`. $env['GIT_SSH'] = $this->getSSHWrapper(); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // We force Mercurial through `bin/ssh-connect` too, but it uses a // command-line flag instead of an environmental variable. break; @@ -468,7 +468,7 @@ $args = array_slice($args, 1); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: if ($this->shouldUseHTTP() || $this->shouldUseSVNProtocol()) { $flags = array(); $flag_args = array(); @@ -496,10 +496,10 @@ $pattern = "svn --non-interactive {$pattern}"; } break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $pattern = "git {$pattern}"; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: if ($this->shouldUseSSH()) { $pattern = "hg --config ui.ssh=%s {$pattern}"; array_unshift( @@ -523,13 +523,13 @@ $args = array_slice($args, 1); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $pattern = "svn --non-interactive {$pattern}"; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $pattern = "git {$pattern}"; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $pattern = "hg {$pattern}"; break; default: @@ -585,19 +585,19 @@ $uri = (string)$this->getCloneURIObject(); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $normalized_uri = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_GIT, + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + $normalized_uri = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_GIT, $uri); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $normalized_uri = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_SVN, + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $normalized_uri = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_SVN, $uri); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: - $normalized_uri = new PhabricatorRepositoryURINormalizer( - PhabricatorRepositoryURINormalizer::TYPE_MERCURIAL, + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $normalized_uri = new DiffusionRepositoryURINormalizer( + DiffusionRepositoryURINormalizer::TYPE_MERCURIAL, $uri); break; default: @@ -618,8 +618,8 @@ } $default_branches = array( - PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'master', - PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'default', + DiffusionRepositoryType::REPOSITORY_TYPE_GIT => 'master', + DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL => 'default', ); return idx($default_branches, $this->getVersionControlSystem()); @@ -632,7 +632,7 @@ private function isBranchInFilter($branch, $filter_key) { $vcs = $this->getVersionControlSystem(); - $is_git = ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT); + $is_git = ($vcs == DiffusionRepositoryType::REPOSITORY_TYPE_GIT); $use_filter = ($is_git); if (!$use_filter) { @@ -685,8 +685,8 @@ public function formatCommitName($commit_identifier) { $vcs = $this->getVersionControlSystem(); - $type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; - $type_hg = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL; + $type_git = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; + $type_hg = DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL; $is_git = ($vcs == $type_git); $is_hg = ($vcs == $type_hg); @@ -744,11 +744,11 @@ * * For more details about why, use @{method:shouldSkipAutocloseCommit}. * - * @param PhabricatorRepositoryCommit Commit to check. + * @param DiffusionCommit Commit to check. * @return bool True if autoclose is active for the commit. * @task autoclose */ - public function shouldAutocloseCommit(PhabricatorRepositoryCommit $commit) { + public function shouldAutocloseCommit(DiffusionCommit $commit) { return ($this->shouldSkipAutocloseCommit($commit) === null); } @@ -788,13 +788,13 @@ * This method gives a detailed reason why autoclose will be skipped. To * perform a simple test, use @{method:shouldAutocloseCommit}. * - * @param PhabricatorRepositoryCommit Commit to check. + * @param DiffusionCommit Commit to check. * @return const|null Constant identifying reason to skip this commit, or null * if autoclose is active. * @task autoclose */ public function shouldSkipAutocloseCommit( - PhabricatorRepositoryCommit $commit) { + DiffusionCommit $commit) { $all_reason = $this->shouldSkipAllAutoclose(); if ($all_reason) { @@ -802,16 +802,16 @@ } switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return null; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: break; default: throw new Exception(pht('Unrecognized version control system.')); } - $closeable_flag = PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE; + $closeable_flag = DiffusionCommit::IMPORTED_CLOSEABLE; if (!$commit->isPartiallyImported($closeable_flag)) { return self::BECAUSE_NOT_ON_AUTOCLOSE_BRANCH; } @@ -1169,7 +1169,7 @@ $path->delete(); } - $projects = id(new PhabricatorRepositoryArcanistProject()) + $projects = id(new DiffusionArcanistProject()) ->loadAllWhere('repositoryID = %d', $this->getID()); foreach ($projects as $project) { $project->delete(); @@ -1178,24 +1178,24 @@ queryfx( $this->establishConnection('w'), 'DELETE FROM %T WHERE repositoryPHID = %s', - id(new PhabricatorRepositorySymbol())->getTableName(), + id(new DiffusionSymbol())->getTableName(), $this->getPHID()); - $commits = id(new PhabricatorRepositoryCommit()) + $commits = id(new DiffusionCommit()) ->loadAllWhere('repositoryID = %d', $this->getID()); foreach ($commits as $commit) { - // note PhabricatorRepositoryAuditRequests and - // PhabricatorRepositoryCommitData are deleted here too. + // note DiffusionAuditRequests and + // DiffusionCommitData are deleted here too. $commit->delete(); } - $mirrors = id(new PhabricatorRepositoryMirror()) + $mirrors = id(new DiffusionRepositoryMirror()) ->loadAllWhere('repositoryPHID = %s', $this->getPHID()); foreach ($mirrors as $mirror) { $mirror->delete(); } - $ref_cursors = id(new PhabricatorRepositoryRefCursor()) + $ref_cursors = id(new DiffusionRepositoryRefCursor()) ->loadAllWhere('repositoryPHID = %s', $this->getPHID()); foreach ($ref_cursors as $cursor) { $cursor->delete(); @@ -1229,17 +1229,17 @@ public function isGit() { $vcs = $this->getVersionControlSystem(); - return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT); + return ($vcs == DiffusionRepositoryType::REPOSITORY_TYPE_GIT); } public function isSVN() { $vcs = $this->getVersionControlSystem(); - return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN); + return ($vcs == DiffusionRepositoryType::REPOSITORY_TYPE_SVN); } public function isHg() { $vcs = $this->getVersionControlSystem(); - return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL); + return ($vcs == DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL); } public function isHosted() { @@ -1321,10 +1321,10 @@ */ public function isWorkingCopyBare() { switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return false; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $local = $this->getLocalPath(); if (Filesystem::pathExists($local.'/.git')) { return false; @@ -1336,10 +1336,10 @@ public function usesLocalWorkingCopy() { switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: return $this->isHosted(); - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: return true; } } @@ -1353,17 +1353,17 @@ $root = $this->getLocalPath(); switch ($this->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: if ($this->isWorkingCopyBare()) { $directories[] = $root.'/hooks/pre-receive-phabricator.d/'; } else { $directories[] = $root.'/.git/hooks/pre-receive-phabricator.d/'; } break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $directories[] = $root.'/hooks/pre-commit-phabricator.d/'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: // NOTE: We don't support custom Mercurial hooks for now because they're // messy and we can't easily just drop a `hooks.d/` directory next to // the hooks. @@ -1417,7 +1417,7 @@ $status_code, array $parameters = array()) { - $table = new PhabricatorRepositoryStatusMessage(); + $table = new DiffusionRepositoryStatusMessage(); $conn_w = $table->establishConnection('w'); $table_name = $table->getTableName(); @@ -1540,7 +1540,7 @@ $window_start = (PhabricatorTime::getNow() + $minimum); - $table = id(new PhabricatorRepositoryCommit()); + $table = id(new DiffusionCommit()); $last_commit = queryfx_one( $table->establishConnection('r'), 'SELECT epoch FROM %T @@ -1825,7 +1825,7 @@ public function getApplicationTransactionEditor() { - return new PhabricatorRepositoryEditor(); + return new DiffusionRepositoryEditor(); } public function getApplicationTransactionObject() { @@ -1833,7 +1833,7 @@ } public function getApplicationTransactionTemplate() { - return new PhabricatorRepositoryTransaction(); + return new DiffusionRepositoryTransaction(); } public function willRenderTimeline( diff --git a/src/applications/repository/storage/PhabricatorRepositoryMirror.php b/src/applications/diffusion/storage/DiffusionRepositoryMirror.php rename from src/applications/repository/storage/PhabricatorRepositoryMirror.php rename to src/applications/diffusion/storage/DiffusionRepositoryMirror.php --- a/src/applications/repository/storage/PhabricatorRepositoryMirror.php +++ b/src/applications/diffusion/storage/DiffusionRepositoryMirror.php @@ -1,6 +1,6 @@ setRemoteURI(''); } @@ -31,10 +31,10 @@ public function generatePHID() { return PhabricatorPHID::generateNewPHID( - PhabricatorRepositoryMirrorPHIDType::TYPECONST); + DiffusionRepositoryMirrorPHIDType::TYPECONST); } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/diffusion/storage/DiffusionRepositoryPushEvent.php rename from src/applications/repository/storage/PhabricatorRepositoryPushEvent.php rename to src/applications/diffusion/storage/DiffusionRepositoryPushEvent.php --- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php +++ b/src/applications/diffusion/storage/DiffusionRepositoryPushEvent.php @@ -4,8 +4,8 @@ * Groups a set of push logs corresponding to changes which were all pushed in * the same transaction. */ -final class PhabricatorRepositoryPushEvent - extends PhabricatorRepositoryDAO +final class DiffusionRepositoryPushEvent + extends DiffusionDAO implements PhabricatorPolicyInterface { protected $repositoryPHID; @@ -20,7 +20,7 @@ private $logs = self::ATTACHABLE; public static function initializeNewEvent(PhabricatorUser $viewer) { - return id(new PhabricatorRepositoryPushEvent()) + return id(new DiffusionRepositoryPushEvent()) ->setPusherPHID($viewer->getPHID()); } @@ -44,10 +44,10 @@ public function generatePHID() { return PhabricatorPHID::generateNewPHID( - PhabricatorRepositoryPushEventPHIDType::TYPECONST); + DiffusionRepositoryPushEventPHIDType::TYPECONST); } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/diffusion/storage/DiffusionRepositoryPushLog.php rename from src/applications/repository/storage/PhabricatorRepositoryPushLog.php rename to src/applications/diffusion/storage/DiffusionRepositoryPushLog.php --- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php +++ b/src/applications/diffusion/storage/DiffusionRepositoryPushLog.php @@ -9,8 +9,8 @@ * This log is written by commit hooks installed into hosted repositories. * See @{class:DiffusionCommitHookEngine}. */ -final class PhabricatorRepositoryPushLog - extends PhabricatorRepositoryDAO +final class DiffusionRepositoryPushLog + extends DiffusionDAO implements PhabricatorPolicyInterface { const REFTYPE_BRANCH = 'branch'; @@ -48,7 +48,7 @@ private $repository = self::ATTACHABLE; public static function initializeNewLog(PhabricatorUser $viewer) { - return id(new PhabricatorRepositoryPushLog()) + return id(new DiffusionRepositoryPushLog()) ->setPusherPHID($viewer->getPHID()); } @@ -104,10 +104,10 @@ public function generatePHID() { return PhabricatorPHID::generateNewPHID( - PhabricatorRepositoryPushLogPHIDType::TYPECONST); + DiffusionRepositoryPushLogPHIDType::TYPECONST); } - public function attachPushEvent(PhabricatorRepositoryPushEvent $push_event) { + public function attachPushEvent(DiffusionRepositoryPushEvent $push_event) { $this->pushEvent = $push_event; return $this; } @@ -157,7 +157,7 @@ return $this->assertAttached($this->dangerousChangeDescription); } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { // NOTE: Some gymnastics around this because of object construction order // in the hook engine. Particularly, web build the logs before we build // their push event. diff --git a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php b/src/applications/diffusion/storage/DiffusionRepositoryRefCursor.php rename from src/applications/repository/storage/PhabricatorRepositoryRefCursor.php rename to src/applications/diffusion/storage/DiffusionRepositoryRefCursor.php --- a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php +++ b/src/applications/diffusion/storage/DiffusionRepositoryRefCursor.php @@ -5,7 +5,7 @@ * out how a repository has changed when we discover new commits or branch * heads. */ -final class PhabricatorRepositoryRefCursor extends PhabricatorRepositoryDAO +final class DiffusionRepositoryRefCursor extends DiffusionDAO implements PhabricatorPolicyInterface { const TYPE_BRANCH = 'branch'; @@ -60,7 +60,7 @@ return $this; } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php b/src/applications/diffusion/storage/DiffusionRepositoryStatusMessage.php rename from src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php rename to src/applications/diffusion/storage/DiffusionRepositoryStatusMessage.php --- a/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php +++ b/src/applications/diffusion/storage/DiffusionRepositoryStatusMessage.php @@ -1,7 +1,7 @@ renderHandleLink($author_phid), - PhabricatorRepository::getProtocolAvailabilityName($old), - PhabricatorRepository::getProtocolAvailabilityName($new)); + DiffusionRepository::getProtocolAvailabilityName($old), + DiffusionRepository::getProtocolAvailabilityName($new)); case self::TYPE_PROTOCOL_SSH: return pht( '%s changed the availability of this repository over SSH from '. '"%s" to "%s".', $this->renderHandleLink($author_phid), - PhabricatorRepository::getProtocolAvailabilityName($old), - PhabricatorRepository::getProtocolAvailabilityName($new)); + DiffusionRepository::getProtocolAvailabilityName($old), + DiffusionRepository::getProtocolAvailabilityName($new)); case self::TYPE_PUSH_POLICY: return pht( '%s changed the push policy of this repository from "%s" to "%s".', diff --git a/src/applications/repository/storage/PhabricatorRepositorySchemaSpec.php b/src/applications/diffusion/storage/DiffusionSchemaSpec.php rename from src/applications/repository/storage/PhabricatorRepositorySchemaSpec.php rename to src/applications/diffusion/storage/DiffusionSchemaSpec.php --- a/src/applications/repository/storage/PhabricatorRepositorySchemaSpec.php +++ b/src/applications/diffusion/storage/DiffusionSchemaSpec.php @@ -1,14 +1,14 @@ buildEdgeSchemata(new PhabricatorRepository()); + $this->buildEdgeSchemata(new DiffusionRepository()); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_BADCOMMIT, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_BADCOMMIT, array( 'fullCommitName' => 'text64', 'description' => 'text', @@ -21,8 +21,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_COVERAGE, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_COVERAGE, array( 'id' => 'auto', 'branchID' => 'id', @@ -41,8 +41,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_FILESYSTEM, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_FILESYSTEM, array( 'repositoryID' => 'id', 'parentID' => 'id', @@ -62,8 +62,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_LINTMESSAGE, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_LINTMESSAGE, array( 'id' => 'auto', 'branchID' => 'id', @@ -92,8 +92,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_PARENTS, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_PARENTS, array( 'id' => 'auto', 'childCommitID' => 'id', @@ -114,8 +114,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_PATH, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_PATH, array( 'id' => 'auto', 'path' => 'text', @@ -133,8 +133,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_PATHCHANGE, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_PATHCHANGE, array( 'repositoryID' => 'id', 'pathID' => 'id', @@ -157,8 +157,8 @@ )); $this->buildRawSchema( - id(new PhabricatorRepository())->getApplicationName(), - PhabricatorRepository::TABLE_SUMMARY, + id(new DiffusionRepository())->getRealApplicationName(), + DiffusionRepository::TABLE_SUMMARY, array( 'repositoryID' => 'id', 'size' => 'uint32', diff --git a/src/applications/repository/storage/PhabricatorRepositorySymbol.php b/src/applications/diffusion/storage/DiffusionSymbol.php rename from src/applications/repository/storage/PhabricatorRepositorySymbol.php rename to src/applications/diffusion/storage/DiffusionSymbol.php --- a/src/applications/repository/storage/PhabricatorRepositorySymbol.php +++ b/src/applications/diffusion/storage/DiffusionSymbol.php @@ -6,7 +6,7 @@ * * Query symbols with @{class:DiffusionSymbolQuery}. */ -final class PhabricatorRepositorySymbol extends PhabricatorRepositoryDAO { +final class DiffusionSymbol extends DiffusionDAO { protected $repositoryPHID; protected $symbolContext; @@ -74,7 +74,7 @@ return $this->assertAttached($this->repository); } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php b/src/applications/diffusion/storage/DiffusionVCSPassword.php rename from src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php rename to src/applications/diffusion/storage/DiffusionVCSPassword.php --- a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php +++ b/src/applications/diffusion/storage/DiffusionVCSPassword.php @@ -1,6 +1,6 @@ $expect) { - $repository = new PhabricatorRepository(); + $repository = new DiffusionRepository(); $repository->setDetail('remote-uri', $uri); $this->assertEqual( @@ -28,9 +28,9 @@ } public function testBranchFilter() { - $git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT; + $git = DiffusionRepositoryType::REPOSITORY_TYPE_GIT; - $repo = new PhabricatorRepository(); + $repo = new DiffusionRepository(); $repo->setVersionControlSystem($git); $this->assertTrue( @@ -53,9 +53,9 @@ } public function testSubversionPathInfo() { - $svn = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN; + $svn = DiffusionRepositoryType::REPOSITORY_TYPE_SVN; - $repo = new PhabricatorRepository(); + $repo = new DiffusionRepository(); $repo->setVersionControlSystem($svn); $repo->setDetail('remote-uri', 'http://svn.example.com/repo'); @@ -147,7 +147,7 @@ ); foreach ($map as $input => $expect) { - $actual = PhabricatorRepository::filterMercurialDebugOutput($input); + $actual = DiffusionRepository::filterMercurialDebugOutput($input); $this->assertEqual($expect, $actual, $input); } } diff --git a/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php b/src/applications/diffusion/storage/__tests__/DiffusionRepositoryURITestCase.php rename from src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php rename to src/applications/diffusion/storage/__tests__/DiffusionRepositoryURITestCase.php --- a/src/applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php +++ b/src/applications/diffusion/storage/__tests__/DiffusionRepositoryURITestCase.php @@ -1,6 +1,6 @@ generateNewTestUser(); @@ -25,7 +25,7 @@ ->setSecretID($http_secret->getID()) ->save(); - $repo = PhabricatorRepository::initializeNewRepository($user) + $repo = DiffusionRepository::initializeNewRepository($user) ->setVersionControlSystem($svn) ->setName(pht('Test Repo')) ->setCallsign('TESTREPO') diff --git a/src/applications/diffusion/symbol/DiffusionExternalSymbolsSource.php b/src/applications/diffusion/symbol/DiffusionExternalSymbolsSource.php --- a/src/applications/diffusion/symbol/DiffusionExternalSymbolsSource.php +++ b/src/applications/diffusion/symbol/DiffusionExternalSymbolsSource.php @@ -3,12 +3,12 @@ abstract class DiffusionExternalSymbolsSource extends Phobject { /** - * @return list of PhabricatorRepositorySymbol + * @return list of DiffusionSymbol */ abstract public function executeQuery(DiffusionExternalSymbolQuery $query); protected function buildExternalSymbol() { - return id(new PhabricatorRepositorySymbol()) + return id(new DiffusionSymbol()) ->setIsExternal(true) ->makeEphemeral(); } 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 @@ -19,7 +19,7 @@ $viewer = $this->getViewer(); $raw_query = $this->getRawQuery(); - $query = id(new PhabricatorRepositoryQuery()) + $query = id(new DiffusionRepositoryQuery()) ->setOrder('name') ->withDatasourceQuery($raw_query); $repos = $this->executeQuery($query); diff --git a/src/applications/diffusion/view/DiffusionBranchTableView.php b/src/applications/diffusion/view/DiffusionBranchTableView.php --- a/src/applications/diffusion/view/DiffusionBranchTableView.php +++ b/src/applications/diffusion/view/DiffusionBranchTableView.php @@ -12,7 +12,7 @@ } public function setCommits(array $commits) { - assert_instances_of($commits, 'PhabricatorRepositoryCommit'); + assert_instances_of($commits, 'DiffusionCommit'); $this->commits = mpull($commits, null, 'getCommitIdentifier'); return $this; } @@ -41,19 +41,19 @@ } switch ($repository->shouldSkipAutocloseBranch($branch->getShortName())) { - case PhabricatorRepository::BECAUSE_REPOSITORY_IMPORTING: + case DiffusionRepository::BECAUSE_REPOSITORY_IMPORTING: $icon = 'fa-times bluegrey'; $tip = pht('Repository Importing'); break; - case PhabricatorRepository::BECAUSE_AUTOCLOSE_DISABLED: + case DiffusionRepository::BECAUSE_AUTOCLOSE_DISABLED: $icon = 'fa-times bluegrey'; $tip = pht('Repository Autoclose Disabled'); break; - case PhabricatorRepository::BECAUSE_BRANCH_UNTRACKED: + case DiffusionRepository::BECAUSE_BRANCH_UNTRACKED: $icon = 'fa-times bluegrey'; $tip = pht('Branch Untracked'); break; - case PhabricatorRepository::BECAUSE_BRANCH_NOT_AUTOCLOSE: + case DiffusionRepository::BECAUSE_BRANCH_NOT_AUTOCLOSE: $icon = 'fa-times bluegrey'; $tip = pht('Branch Autoclose Disabled'); break; diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php --- a/src/applications/diffusion/view/DiffusionHistoryTableView.php +++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php @@ -141,8 +141,8 @@ } // We can show details once the message and change have been imported. - $partial_import = PhabricatorRepositoryCommit::IMPORTED_MESSAGE | - PhabricatorRepositoryCommit::IMPORTED_CHANGE; + $partial_import = DiffusionCommit::IMPORTED_MESSAGE | + DiffusionCommit::IMPORTED_CHANGE; $commit = $history->getCommit(); if ($commit && $commit->isPartiallyImported($partial_import) && $data) { 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 @@ -6,7 +6,7 @@ private $handles; public function setLogs(array $logs) { - assert_instances_of($logs, 'PhabricatorRepositoryPushLog'); + assert_instances_of($logs, 'DiffusionRepositoryPushLog'); $this->logs = $logs; return $this; } @@ -25,7 +25,7 @@ // IPs if you have edit capability on a repository. $editable_repos = array(); if ($logs) { - $editable_repos = id(new PhabricatorRepositoryQuery()) + $editable_repos = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->requireCapabilities( array( 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 @@ -97,12 +97,12 @@ } final public static function nameCommit( - PhabricatorRepository $repository, + DiffusionRepository $repository, $commit) { switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: $commit_name = substr($commit, 0, 12); break; default: @@ -115,7 +115,7 @@ } final public static function linkCommit( - PhabricatorRepository $repository, + DiffusionRepository $repository, $commit, $summary = '') { diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/diffusion/worker/DiffusionCommitHeraldWorker.php rename from src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php rename to src/applications/diffusion/worker/DiffusionCommitHeraldWorker.php --- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php +++ b/src/applications/diffusion/worker/DiffusionCommitHeraldWorker.php @@ -1,7 +1,7 @@ triggerOwnerAudits($repository, $commit); $commit->writeImportStatusFlag( - PhabricatorRepositoryCommit::IMPORTED_OWNERS); + DiffusionCommit::IMPORTED_OWNERS); if ($this->shouldQueueFollowupTasks()) { $this->queueTask( - 'PhabricatorRepositoryCommitHeraldWorker', + 'DiffusionCommitHeraldWorker', array( 'commitID' => $commit->getID(), )); @@ -22,8 +22,8 @@ } private function triggerOwnerAudits( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit) { + DiffusionRepository $repository, + DiffusionCommit $commit) { if (!$repository->shouldPublish()) { return; @@ -38,7 +38,7 @@ $affected_paths); if ($affected_packages) { - $requests = id(new PhabricatorRepositoryAuditRequest()) + $requests = id(new DiffusionAuditRequest()) ->loadAllWhere( 'commitPHID = %s', $commit->getPHID()); @@ -65,7 +65,7 @@ $audit_status = PhabricatorAuditStatusConstants::NONE; } - $relationship = new PhabricatorRepositoryAuditRequest(); + $relationship = new DiffusionAuditRequest(); $relationship->setAuditorPHID($package->getPHID()); $relationship->setCommitPHID($commit->getPHID()); $relationship->setAuditReasons($reasons); @@ -82,10 +82,10 @@ } private function checkAuditReasons( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, PhabricatorOwnersPackage $package) { - $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + $data = id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php b/src/applications/diffusion/worker/DiffusionCommitParserWorker.php rename from src/applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php rename to src/applications/diffusion/worker/DiffusionCommitParserWorker.php --- a/src/applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php +++ b/src/applications/diffusion/worker/DiffusionCommitParserWorker.php @@ -1,6 +1,6 @@ load($commit_id); + $commit = id(new DiffusionCommit())->load($commit_id); if (!$commit) { throw new PhabricatorWorkerPermanentFailureException( @@ -32,7 +32,7 @@ return; } - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs(array($this->commit->getRepositoryID())) ->executeOne(); @@ -49,16 +49,16 @@ } abstract protected function parseCommit( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit); + DiffusionRepository $repository, + DiffusionCommit $commit); protected function isBadCommit($full_commit_name) { - $repository = new PhabricatorRepository(); + $repository = new DiffusionRepository(); $bad_commit = queryfx_one( $repository->establishConnection('w'), 'SELECT * FROM %T WHERE fullCommitName = %s', - PhabricatorRepository::TABLE_BADCOMMIT, + DiffusionRepository::TABLE_BADCOMMIT, $full_commit_name); return (bool)$bad_commit; diff --git a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php b/src/applications/diffusion/worker/DiffusionPushMailWorker.php rename from src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php rename to src/applications/diffusion/worker/DiffusionPushMailWorker.php --- a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php +++ b/src/applications/diffusion/worker/DiffusionPushMailWorker.php @@ -1,6 +1,6 @@ setViewer($viewer) ->withPHIDs(array($event_phid)) ->needLogs(true) @@ -27,7 +27,7 @@ return; } - $targets = id(new PhabricatorRepositoryPushReplyHandler()) + $targets = id(new DiffusionRepositoryPushReplyHandler()) ->setMailReceiver($repository) ->getMailTargets($email_phids, array()); foreach ($targets as $target) { @@ -37,8 +37,8 @@ private function sendMail( PhabricatorMailTarget $target, - PhabricatorRepository $repository, - PhabricatorRepositoryPushEvent $event) { + DiffusionRepository $repository, + DiffusionRepositoryPushEvent $event) { $task_data = $this->getTaskData(); $viewer = $target->getViewer(); @@ -137,18 +137,18 @@ $type_name = null; $type_prefix = null; switch ($log->getRefType()) { - case PhabricatorRepositoryPushLog::REFTYPE_BRANCH: + case DiffusionRepositoryPushLog::REFTYPE_BRANCH: $type_name = pht('branch'); break; - case PhabricatorRepositoryPushLog::REFTYPE_TAG: + case DiffusionRepositoryPushLog::REFTYPE_TAG: $type_name = pht('tag'); $type_prefix = pht('tag:'); break; - case PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK: + case DiffusionRepositoryPushLog::REFTYPE_BOOKMARK: $type_name = pht('bookmark'); $type_prefix = pht('bookmark:'); break; - case PhabricatorRepositoryPushLog::REFTYPE_COMMIT: + case DiffusionRepositoryPushLog::REFTYPE_COMMIT: default: break; } @@ -158,15 +158,15 @@ } $flags = $log->getChangeFlags(); - if ($flags & PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS) { + if ($flags & DiffusionRepositoryPushLog::CHANGEFLAG_DANGEROUS) { $action = '!'; - } else if ($flags & PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE) { + } else if ($flags & DiffusionRepositoryPushLog::CHANGEFLAG_DELETE) { $action = '-'; - } else if ($flags & PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE) { + } else if ($flags & DiffusionRepositoryPushLog::CHANGEFLAG_REWRITE) { $action = '~'; - } else if ($flags & PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND) { + } else if ($flags & DiffusionRepositoryPushLog::CHANGEFLAG_APPEND) { $action = ' '; - } else if ($flags & PhabricatorRepositoryPushLog::CHANGEFLAG_ADD) { + } else if ($flags & DiffusionRepositoryPushLog::CHANGEFLAG_ADD) { $action = '+'; } else { $action = '?'; @@ -188,14 +188,14 @@ } private function renderCommits( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $logs, array $info) { $commit_lines = array(); $subject_line = null; foreach ($logs as $log) { - if ($log->getRefType() != PhabricatorRepositoryPushLog::REFTYPE_COMMIT) { + if ($log->getRefType() != DiffusionRepositoryPushLog::REFTYPE_COMMIT) { continue; } diff --git a/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php b/src/applications/diffusion/worker/__tests__/PhabricatorChangeParserTestCase.php rename from src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php rename to src/applications/diffusion/worker/__tests__/PhabricatorChangeParserTestCase.php --- a/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php +++ b/src/applications/diffusion/worker/__tests__/PhabricatorChangeParserTestCase.php @@ -958,11 +958,11 @@ $repository = $this->buildBareRepository('CHD'); $repository->setDetail('svn-subpath', 'trunk/'); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->pullRepository(); - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->discoverCommits(); @@ -1061,13 +1061,13 @@ public function testSubversionValidRootParser() { // First, automatically configure the root correctly. $repository = $this->buildBareRepository('CHD'); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->pullRepository(); $caught = null; try { - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->discoverCommits(); } catch (Exception $ex) { @@ -1085,13 +1085,13 @@ 'remote-uri', $repository->getDetail('remote-uri').'trunk/'); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->pullRepository(); $caught = null; try { - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->discoverCommits(); } catch (Exception $ex) { @@ -1107,11 +1107,11 @@ $repository = $this->buildBareRepository('CHE'); $repository->setDetail('svn-subpath', 'branch/'); - id(new PhabricatorRepositoryPullEngine()) + id(new DiffusionRepositoryPullEngine()) ->setRepository($repository) ->pullRepository(); - id(new PhabricatorRepositoryDiscoveryEngine()) + id(new DiffusionRepositoryDiscoveryEngine()) ->setRepository($repository) ->discoverCommits(); @@ -1144,23 +1144,23 @@ $commit = $commits['2']; $this->assertEqual( - PhabricatorRepositoryCommit::IMPORTED_ALL, + DiffusionCommit::IMPORTED_ALL, (int)$commit->getImportStatus()); } private function parseCommit( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit) { + DiffusionRepository $repository, + DiffusionCommit $commit) { switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $parser = 'PhabricatorRepositoryGitCommitChangeParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: + $parser = 'DiffusionGitCommitChangeParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: - $parser = 'PhabricatorRepositoryMercurialCommitChangeParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $parser = 'DiffusionMercurialCommitChangeParserWorker'; break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $parser = 'PhabricatorRepositorySvnCommitChangeParserWorker'; + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: + $parser = 'DiffusionSvnCommitChangeParserWorker'; break; default: throw new Exception(pht('No support yet.')); @@ -1171,7 +1171,7 @@ } private function expectChanges( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $commits, array $expect) { diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php b/src/applications/diffusion/worker/commitchangeparser/DiffusionCommitChangeParserWorker.php rename from src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php rename to src/applications/diffusion/worker/commitchangeparser/DiffusionCommitChangeParserWorker.php --- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php +++ b/src/applications/diffusion/worker/commitchangeparser/DiffusionCommitChangeParserWorker.php @@ -1,7 +1,7 @@ getCommitIdentifier(); $callsign = $repository->getCallsign(); @@ -36,13 +36,13 @@ } public function parseChangesForUnitTest( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit) { + DiffusionRepository $repository, + DiffusionCommit $commit) { return $this->parseCommitChanges($repository, $commit); } public static function lookupOrCreatePaths(array $paths) { - $repository = new PhabricatorRepository(); + $repository = new DiffusionRepository(); $conn_w = $repository->establishConnection('w'); $result_map = self::lookupPaths($paths); @@ -60,7 +60,7 @@ queryfx( $conn_w, 'INSERT IGNORE INTO %T (path, pathHash) VALUES %Q', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, implode(', ', $sql)); } $result_map += self::lookupPaths($missing_paths); @@ -70,7 +70,7 @@ } private static function lookupPaths(array $paths) { - $repository = new PhabricatorRepository(); + $repository = new DiffusionRepository(); $conn_w = $repository->establishConnection('w'); $result_map = array(); @@ -78,7 +78,7 @@ $chunk_map = queryfx_all( $conn_w, 'SELECT path, id FROM %T WHERE pathHash IN (%Ls)', - PhabricatorRepository::TABLE_PATH, + DiffusionRepository::TABLE_PATH, array_map('md5', $path_chunk)); foreach ($chunk_map as $row) { $result_map[$row['path']] = $row['id']; @@ -91,14 +91,14 @@ $commit = $this->commit; $commit->writeImportStatusFlag( - PhabricatorRepositoryCommit::IMPORTED_CHANGE); + DiffusionCommit::IMPORTED_CHANGE); id(new PhabricatorSearchIndexer()) ->queueDocumentForIndexing($commit->getPHID()); if ($this->shouldQueueFollowupTasks()) { $this->queueTask( - 'PhabricatorRepositoryCommitOwnersWorker', + 'DiffusionCommitOwnersWorker', array( 'commitID' => $commit->getID(), )); @@ -106,8 +106,8 @@ } private function writeCommitChanges( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repository, + DiffusionCommit $commit, array $changes) { $repository_id = (int)$repository->getID(); @@ -138,7 +138,7 @@ queryfx( $conn_w, 'DELETE FROM %T WHERE commitID = %d', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $commit_id); foreach (PhabricatorLiskDAO::chunkSQL($changes_sql) as $chunk) { @@ -148,7 +148,7 @@ (repositoryID, pathID, commitID, targetPathID, targetCommitID, changeType, fileType, isDirect, commitSequence) VALUES %Q', - PhabricatorRepository::TABLE_PATHCHANGE, + DiffusionRepository::TABLE_PATHCHANGE, $chunk); } } diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php b/src/applications/diffusion/worker/commitchangeparser/DiffusionGitCommitChangeParserWorker.php rename from src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php rename to src/applications/diffusion/worker/commitchangeparser/DiffusionGitCommitChangeParserWorker.php --- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php +++ b/src/applications/diffusion/worker/commitchangeparser/DiffusionGitCommitChangeParserWorker.php @@ -1,11 +1,11 @@ setPathID($change['pathID']) ->setTargetPathID($change['targetPathID']) ->setTargetCommitID($change['targetCommitID']) diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php b/src/applications/diffusion/worker/commitchangeparser/DiffusionMercurialCommitChangeParserWorker.php rename from src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php rename to src/applications/diffusion/worker/commitchangeparser/DiffusionMercurialCommitChangeParserWorker.php --- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php +++ b/src/applications/diffusion/worker/commitchangeparser/DiffusionMercurialCommitChangeParserWorker.php @@ -1,11 +1,11 @@ execxLocalCommand( 'status -C --change %s', @@ -265,7 +265,7 @@ $results = array(); foreach ($changes as $change) { - $result = id(new PhabricatorRepositoryParsedChange()) + $result = id(new DiffusionParsedChange()) ->setPathID($change['pathID']) ->setTargetPathID($change['targetPathID']) ->setTargetCommitID($change['targetCommitID']) @@ -281,7 +281,7 @@ } private function mercurialPathExists( - PhabricatorRepository $repository, + DiffusionRepository $repository, $path, $rev) { diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/diffusion/worker/commitchangeparser/DiffusionSvnCommitChangeParserWorker.php rename from src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php rename to src/applications/diffusion/worker/commitchangeparser/DiffusionSvnCommitChangeParserWorker.php --- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php +++ b/src/applications/diffusion/worker/commitchangeparser/DiffusionSvnCommitChangeParserWorker.php @@ -1,11 +1,11 @@ setPathID($path_id) ->setTargetPathID($target_path_id) ->setTargetCommitID($target_commit_id) @@ -404,8 +404,8 @@ } private function writeBrowse( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repository, + DiffusionCommit $commit, array $effects, array $path_map) { @@ -454,7 +454,7 @@ queryfx( $conn_w, 'DELETE FROM %T WHERE repositoryID = %d AND svnCommit = %d', - PhabricatorRepository::TABLE_FILESYSTEM, + DiffusionRepository::TABLE_FILESYSTEM, $repository->getID(), $commit->getCommitIdentifier()); @@ -464,21 +464,21 @@ 'INSERT INTO %T (repositoryID, parentID, svnCommit, pathID, existed, fileType) VALUES %Q', - PhabricatorRepository::TABLE_FILESYSTEM, + DiffusionRepository::TABLE_FILESYSTEM, implode(', ', $sql_chunk)); } } private function lookupSvnCommits( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $commits) { if (!$commits) { return array(); } - $commit_table = new PhabricatorRepositoryCommit(); + $commit_table = new DiffusionCommit(); $commit_data = queryfx_all( $commit_table->establishConnection('w'), 'SELECT id, commitIdentifier FROM %T @@ -512,16 +512,16 @@ } foreach ($need as $foreign_commit) { - $commit = new PhabricatorRepositoryCommit(); + $commit = new DiffusionCommit(); $commit->setRepositoryID($repository->getID()); $commit->setCommitIdentifier($foreign_commit); $commit->setEpoch(0); // Mark this commit as imported so it doesn't prevent the repository // from transitioning into the "Imported" state. - $commit->setImportStatus(PhabricatorRepositoryCommit::IMPORTED_ALL); + $commit->setImportStatus(DiffusionCommit::IMPORTED_ALL); $commit->save(); - $data = new PhabricatorRepositoryCommitData(); + $data = new DiffusionCommitData(); $data->setCommitID($commit->getID()); $data->setAuthorName(''); $data->setCommitMessage(''); @@ -542,7 +542,7 @@ } private function lookupPathFileType( - PhabricatorRepository $repository, + DiffusionRepository $repository, $path, array $path_info) { @@ -556,7 +556,7 @@ } private function lookupPathFileTypes( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $paths) { $result_map = array(); @@ -637,7 +637,7 @@ } private function lookupRecursiveFileList( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $info) { $path = $info['rawPath']; @@ -790,7 +790,7 @@ } private function getSVNLogXMLObject( - PhabricatorRepository $repository, + DiffusionRepository $repository, $uri, $revision) { list($xml) = $repository->execxRemoteCommand( diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/diffusion/worker/commitmessageparser/DiffusionCommitMessageParserWorker.php rename from src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php rename to src/applications/diffusion/worker/commitmessageparser/DiffusionCommitMessageParserWorker.php --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php +++ b/src/applications/diffusion/worker/commitmessageparser/DiffusionCommitMessageParserWorker.php @@ -1,16 +1,16 @@ getCommitter(); $hashes = $ref->getHashes(); - $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + $data = id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); if (!$data) { - $data = new PhabricatorRepositoryCommitData(); + $data = new DiffusionCommitData(); } $data->setCommitID($commit->getID()); $data->setAuthorName(id(new PhutilUTF8StringTruncator()) @@ -123,7 +123,7 @@ $force_autoclose = idx($this->getTaskData(), 'forceAutoclose', false); if ($force_autoclose) { - $autoclose_reason = PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED; + $autoclose_reason = DiffusionRepository::BECAUSE_AUTOCLOSE_FORCED; } else { $autoclose_reason = $repository->shouldSkipAutocloseCommit($commit); } @@ -274,7 +274,7 @@ $data->save(); $commit->writeImportStatusFlag( - PhabricatorRepositoryCommit::IMPORTED_MESSAGE); + DiffusionCommit::IMPORTED_MESSAGE); } private function generateFinalDiff( @@ -444,7 +444,7 @@ } private function resolveUserPHID( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, $user_name) { return id(new DiffusionResolveUserQuery()) @@ -456,8 +456,8 @@ private function closeTasks( PhabricatorUser $actor, $acting_as, - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repository, + DiffusionCommit $commit, $message) { $maniphest = 'PhabricatorManiphestApplication'; diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php b/src/applications/diffusion/worker/commitmessageparser/DiffusionGitCommitMessageParserWorker.php rename from src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php rename to src/applications/diffusion/worker/commitmessageparser/DiffusionGitCommitMessageParserWorker.php --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php +++ b/src/applications/diffusion/worker/commitmessageparser/DiffusionGitCommitMessageParserWorker.php @@ -1,18 +1,18 @@ updateCommitData($ref); if ($this->shouldQueueFollowupTasks()) { $this->queueTask( - 'PhabricatorRepositorySvnCommitChangeParserWorker', + 'DiffusionGitCommitChangeParserWorker', array( 'commitID' => $commit->getID(), )); diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php b/src/applications/diffusion/worker/commitmessageparser/DiffusionMercurialCommitMessageParserWorker.php rename from src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php rename to src/applications/diffusion/worker/commitmessageparser/DiffusionMercurialCommitMessageParserWorker.php --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php +++ b/src/applications/diffusion/worker/commitmessageparser/DiffusionMercurialCommitMessageParserWorker.php @@ -1,18 +1,18 @@ updateCommitData($ref); if ($this->shouldQueueFollowupTasks()) { $this->queueTask( - 'PhabricatorRepositoryGitCommitChangeParserWorker', + 'DiffusionMercurialCommitChangeParserWorker', array( 'commitID' => $commit->getID(), )); diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php b/src/applications/diffusion/worker/commitmessageparser/DiffusionSvnCommitMessageParserWorker.php rename from src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php rename to src/applications/diffusion/worker/commitmessageparser/DiffusionSvnCommitMessageParserWorker.php --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php +++ b/src/applications/diffusion/worker/commitmessageparser/DiffusionSvnCommitMessageParserWorker.php @@ -1,18 +1,18 @@ updateCommitData($ref); if ($this->shouldQueueFollowupTasks()) { $this->queueTask( - 'PhabricatorRepositorySvnCommitChangeParserWorker', + 'DiffusionSvnCommitChangeParserWorker', array( 'commitID' => $commit->getID(), )); diff --git a/src/applications/diviner/query/DivinerAtomQuery.php b/src/applications/diviner/query/DivinerAtomQuery.php --- a/src/applications/diviner/query/DivinerAtomQuery.php +++ b/src/applications/diviner/query/DivinerAtomQuery.php @@ -272,7 +272,7 @@ } if ($this->needRepositories) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs(mpull($atoms, 'getRepositoryPHID')) ->execute(); diff --git a/src/applications/diviner/query/DivinerBookQuery.php b/src/applications/diviner/query/DivinerBookQuery.php --- a/src/applications/diviner/query/DivinerBookQuery.php +++ b/src/applications/diviner/query/DivinerBookQuery.php @@ -71,7 +71,7 @@ assert_instances_of($books, 'DivinerLiveBook'); if ($this->needRepositories) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs(mpull($books, 'getRepositoryPHID')) ->execute(); diff --git a/src/applications/diviner/search/DivinerAtomSearchIndexer.php b/src/applications/diviner/search/DivinerAtomSearchIndexer.php --- a/src/applications/diviner/search/DivinerAtomSearchIndexer.php +++ b/src/applications/diviner/search/DivinerAtomSearchIndexer.php @@ -32,7 +32,7 @@ $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY, $atom->getRepositoryPHID(), - PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + DiffusionRepositoryPHIDType::TYPECONST, PhabricatorTime::getNow()); $doc->addRelationship( diff --git a/src/applications/diviner/search/DivinerBookSearchIndexer.php b/src/applications/diviner/search/DivinerBookSearchIndexer.php --- a/src/applications/diviner/search/DivinerBookSearchIndexer.php +++ b/src/applications/diviner/search/DivinerBookSearchIndexer.php @@ -21,7 +21,7 @@ $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY, $book->getRepositoryPHID(), - PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + DiffusionRepositoryPHIDType::TYPECONST, $book->getDateCreated()); $this->indexTransactions( diff --git a/src/applications/diviner/storage/DivinerLiveBook.php b/src/applications/diviner/storage/DivinerLiveBook.php --- a/src/applications/diviner/storage/DivinerLiveBook.php +++ b/src/applications/diviner/storage/DivinerLiveBook.php @@ -71,7 +71,7 @@ return idx($spec, 'name', $group); } - public function attachRepository(PhabricatorRepository $repository = null) { + public function attachRepository(DiffusionRepository $repository = null) { $this->repository = $repository; return $this; } diff --git a/src/applications/diviner/storage/DivinerLiveSymbol.php b/src/applications/diviner/storage/DivinerLiveSymbol.php --- a/src/applications/diviner/storage/DivinerLiveSymbol.php +++ b/src/applications/diviner/storage/DivinerLiveSymbol.php @@ -101,7 +101,7 @@ return $this->assertAttached($this->repository); } - public function attachRepository(PhabricatorRepository $repository = null) { + public function attachRepository(DiffusionRepository $repository = null) { $this->repository = $repository; return $this; } diff --git a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php --- a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php +++ b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php @@ -195,7 +195,7 @@ $callsign = $args->getArg('repository'); $repository = null; if ($callsign) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withCallsigns(array($callsign)) ->executeOne(); diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php --- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php +++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php @@ -42,7 +42,7 @@ 'repositoryID')); } - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs(array($repository_id)) ->executeOne(); @@ -55,7 +55,7 @@ } switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: break; default: throw new Exception(pht('Unsupported VCS!')); 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 @@ -25,7 +25,7 @@ $request, 'repositories', array( - PhabricatorRepositoryRepositoryPHIDType::TYPECONST, + DiffusionRepositoryPHIDType::TYPECONST, )); $container_phids = array_merge($revisions, $repositories); @@ -35,7 +35,7 @@ $request, 'commits', array( - PhabricatorRepositoryCommitPHIDType::TYPECONST, + DiffusionCommitPHIDType::TYPECONST, )); $diffs = $this->readListFromRequest($request, 'diffs'); @@ -111,9 +111,9 @@ $revision_names[] = 'D'.$object->getID(); } else if ($object instanceof DifferentialDiff) { $diff_names[] = $object->getID(); - } else if ($object instanceof PhabricatorRepository) { + } else if ($object instanceof DiffusionRepository) { $repository_names[] = 'r'.$object->getCallsign(); - } else if ($object instanceof PhabricatorRepositoryCommit) { + } else if ($object instanceof DiffusionCommit) { $repository = $object->getRepository(); $commit_names[] = $repository->formatCommitName( $object->getCommitIdentifier()); diff --git a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php --- a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php +++ b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php @@ -20,7 +20,7 @@ // We can only wait when building against commits. $buildable = $build->getBuildable(); $object = $buildable->getBuildableObject(); - if (!($object instanceof PhabricatorRepositoryCommit)) { + if (!($object instanceof DiffusionCommit)) { return; } @@ -52,7 +52,7 @@ } private function getBlockers( - PhabricatorRepositoryCommit $commit, + DiffusionCommit $commit, HarbormasterBuildPlan $plan, HarbormasterBuild $source) { diff --git a/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php b/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php --- a/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php +++ b/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php @@ -8,7 +8,7 @@ // NOTE: This table is not used by any Harbormaster objects, but is used // by unit tests. $this->buildRawSchema( - id(new HarbormasterObject())->getApplicationName(), + id(new HarbormasterObject())->getRealApplicationName(), PhabricatorLiskDAO::COUNTER_TABLE_NAME, array( 'counterName' => 'text32', @@ -23,7 +23,7 @@ $this->buildRawSchema( - id(new HarbormasterBuildable())->getApplicationName(), + id(new HarbormasterBuildable())->getRealApplicationName(), 'harbormaster_buildlogchunk', array( 'id' => 'auto', diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php --- a/src/applications/herald/adapter/HeraldAdapter.php +++ b/src/applications/herald/adapter/HeraldAdapter.php @@ -1275,7 +1275,7 @@ break; case HeraldPreCommitRefAdapter::FIELD_REF_CHANGE: $change_map = - PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions(); + DiffusionRepositoryPushLog::getHeraldChangeFlagConditionOptions(); foreach ($value as $index => $val) { $name = idx($change_map, $val); if ($name) { diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php --- a/src/applications/herald/adapter/HeraldCommitAdapter.php +++ b/src/applications/herald/adapter/HeraldCommitAdapter.php @@ -26,7 +26,7 @@ } protected function newObject() { - return new PhabricatorRepositoryCommit(); + return new DiffusionCommit(); } public function getObject() { @@ -60,7 +60,7 @@ } public function canTriggerOnObject($object) { - if ($object instanceof PhabricatorRepository) { + if ($object instanceof DiffusionRepository) { return true; } if ($object instanceof PhabricatorProject) { @@ -173,9 +173,9 @@ } public static function newLegacyAdapter( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, - PhabricatorRepositoryCommitData $commit_data) { + DiffusionRepository $repository, + DiffusionCommit $commit, + DiffusionCommitData $commit_data) { $object = new HeraldCommitAdapter(); @@ -188,10 +188,10 @@ return $object; } - public function setCommit(PhabricatorRepositoryCommit $commit) { + public function setCommit(DiffusionCommit $commit) { $viewer = PhabricatorUser::getOmnipotentUser(); - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withIDs(array($commit->getRepositoryID())) ->needProjectPHIDs(true) @@ -200,7 +200,7 @@ throw new Exception(pht('Unable to load repository!')); } - $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + $data = id(new DiffusionCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); if (!$data) { @@ -263,7 +263,7 @@ PhabricatorAuditStatusConstants::AUDIT_REQUIRED, PhabricatorAuditStatusConstants::CONCERNED, ); - $requests = id(new PhabricatorRepositoryAuditRequest()) + $requests = id(new DiffusionAuditRequest()) ->loadAllWhere( 'commitPHID = %s AND auditStatus IN (%Ls)', $this->commit->getPHID(), diff --git a/src/applications/herald/adapter/HeraldDifferentialAdapter.php b/src/applications/herald/adapter/HeraldDifferentialAdapter.php --- a/src/applications/herald/adapter/HeraldDifferentialAdapter.php +++ b/src/applications/herald/adapter/HeraldDifferentialAdapter.php @@ -22,7 +22,7 @@ $repository_phid = $this->getObject()->getRepositoryPHID(); if ($repository_phid) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withPHIDs(array($repository_phid)) ->needProjectPHIDs(true) diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -497,7 +497,7 @@ } $changeflag_options = - PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions(); + DiffusionRepositoryPushLog::getHeraldChangeFlagConditionOptions(); Javelin::initBehavior( 'herald-rule-editor', array( @@ -515,18 +515,18 @@ ), HeraldPreCommitRefAdapter::VALUE_REF_TYPE => array( 'options' => array( - PhabricatorRepositoryPushLog::REFTYPE_BRANCH + DiffusionRepositoryPushLog::REFTYPE_BRANCH => pht('branch (git/hg)'), - PhabricatorRepositoryPushLog::REFTYPE_TAG + DiffusionRepositoryPushLog::REFTYPE_TAG => pht('tag (git)'), - PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK + DiffusionRepositoryPushLog::REFTYPE_BOOKMARK => pht('bookmark (hg)'), ), - 'default' => PhabricatorRepositoryPushLog::REFTYPE_BRANCH, + 'default' => DiffusionRepositoryPushLog::REFTYPE_BRANCH, ), HeraldPreCommitRefAdapter::VALUE_REF_CHANGE => array( 'options' => $changeflag_options, - 'default' => PhabricatorRepositoryPushLog::CHANGEFLAG_ADD, + 'default' => DiffusionRepositoryPushLog::CHANGEFLAG_ADD, ), ), 'template' => $this->buildTokenizerTemplates($handles) + array( diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php --- a/src/applications/herald/controller/HeraldTestConsoleController.php +++ b/src/applications/herald/controller/HeraldTestConsoleController.php @@ -38,7 +38,7 @@ $adapter = HeraldDifferentialRevisionAdapter::newLegacyAdapter( $object, $object->loadActiveDiff()); - } else if ($object instanceof PhabricatorRepositoryCommit) { + } else if ($object instanceof DiffusionCommit) { $adapter = id(new HeraldCommitAdapter()) ->setCommit($object); } else if ($object instanceof ManiphestTask) { diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php --- a/src/applications/herald/controller/HeraldTranscriptController.php +++ b/src/applications/herald/controller/HeraldTranscriptController.php @@ -300,7 +300,7 @@ $object_xscript = $xscript->getObjectTranscript(); $handle = $handles[$object_xscript->getPHID()]; if ($handle->getType() == - PhabricatorRepositoryCommitPHIDType::TYPECONST) { + DiffusionCommitPHIDType::TYPECONST) { $commit = id(new DiffusionCommitQuery()) ->setViewer($request->getUser()) ->withPHIDs(array($handle->getPHID())) diff --git a/src/applications/herald/storage/HeraldSchemaSpec.php b/src/applications/herald/storage/HeraldSchemaSpec.php --- a/src/applications/herald/storage/HeraldSchemaSpec.php +++ b/src/applications/herald/storage/HeraldSchemaSpec.php @@ -4,7 +4,7 @@ public function buildSchemata() { $this->buildRawSchema( - id(new HeraldRule())->getApplicationName(), + id(new HeraldRule())->getRealApplicationName(), HeraldRule::TABLE_RULE_APPLIED, array( 'ruleID' => 'id', @@ -21,7 +21,7 @@ )); $this->buildRawSchema( - id(new HeraldRule())->getApplicationName(), + id(new HeraldRule())->getRealApplicationName(), HeraldTranscript::TABLE_SAVED_HEADER, array( 'phid' => 'phid', diff --git a/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php --- a/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php +++ b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php @@ -72,7 +72,7 @@ $repo_callsign, $path) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withCallsigns(array($repo_callsign)) ->executeOne(); 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 @@ -26,7 +26,7 @@ } if ($repository_phids) { - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array_keys($repository_phids)) ->execute(); 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 @@ -70,7 +70,7 @@ $path_refs = mpull($paths, 'getRef'); } - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->execute(); diff --git a/src/applications/owners/query/PhabricatorOwnerPathQuery.php b/src/applications/owners/query/PhabricatorOwnerPathQuery.php --- a/src/applications/owners/query/PhabricatorOwnerPathQuery.php +++ b/src/applications/owners/query/PhabricatorOwnerPathQuery.php @@ -3,8 +3,8 @@ final class PhabricatorOwnerPathQuery extends Phobject { public static function loadAffectedPaths( - PhabricatorRepository $repository, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repository, + DiffusionCommit $commit, PhabricatorUser $user) { $drequest = DiffusionRequest::newFromDictionary( diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php --- a/src/applications/owners/storage/PhabricatorOwnersPackage.php +++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php @@ -104,7 +104,7 @@ } public static function loadAffectedPackages( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $paths) { if (!$paths) { @@ -123,7 +123,7 @@ } private static function loadPackagesForPaths( - PhabricatorRepository $repository, + DiffusionRepository $repository, array $paths, $limit = 0) { diff --git a/src/applications/people/storage/PhabricatorUserSchemaSpec.php b/src/applications/people/storage/PhabricatorUserSchemaSpec.php --- a/src/applications/people/storage/PhabricatorUserSchemaSpec.php +++ b/src/applications/people/storage/PhabricatorUserSchemaSpec.php @@ -6,7 +6,7 @@ $this->buildEdgeSchemata(new PhabricatorUser()); $this->buildRawSchema( - id(new PhabricatorUser())->getApplicationName(), + id(new PhabricatorUser())->getRealApplicationName(), PhabricatorUser::NAMETOKEN_TABLE, array( 'token' => 'sort255', diff --git a/src/applications/project/storage/PhabricatorProjectSchemaSpec.php b/src/applications/project/storage/PhabricatorProjectSchemaSpec.php --- a/src/applications/project/storage/PhabricatorProjectSchemaSpec.php +++ b/src/applications/project/storage/PhabricatorProjectSchemaSpec.php @@ -6,7 +6,7 @@ $this->buildEdgeSchemata(new PhabricatorProject()); $this->buildRawSchema( - id(new PhabricatorProject())->getApplicationName(), + id(new PhabricatorProject())->getRealApplicationName(), PhabricatorProject::TABLE_DATASOURCE_TOKEN, array( 'id' => 'auto', diff --git a/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php b/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php --- a/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php +++ b/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php @@ -40,7 +40,7 @@ $full_branch_name = $branch->getName(); $cut_point_commit = $branch->loadOneRelative( - id(new PhabricatorRepositoryCommit()), + id(new DiffusionCommit()), 'phid', 'getCutPointCommitPHID'); diff --git a/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php b/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php --- a/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php +++ b/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php @@ -62,7 +62,7 @@ $commit_message[] = pht('Cut Point: %s', $handles[$cut_phid]->getName()); - $cut_point_pr_commit = id(new PhabricatorRepositoryCommit()) + $cut_point_pr_commit = id(new DiffusionCommit()) ->loadOneWhere('phid = %s', $cut_phid); $cut_point_commit_date = strftime( '%Y-%m-%d %H:%M:%S%z', @@ -91,7 +91,7 @@ */ $repo = $project->getRepository(); switch ($repo->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $commit_message[] = sprintf( '@new-branch: %s', $branch->getName()); diff --git a/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php --- a/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php +++ b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php @@ -106,7 +106,7 @@ } else if ($needs_pick) { $releeph_request = head($needs_pick); $action = 'pick'; - $commit = $releeph_request->loadPhabricatorRepositoryCommit(); + $commit = $releeph_request->loadDiffusionCommit(); $commit_id = $commit->getCommitIdentifier(); $commit_phid = $commit->getPHID(); } else { @@ -149,7 +149,7 @@ if ($diff_rev) { $new_author_phid = $diff_rev->getAuthorPHID(); } else { - $pr_commit = $releeph_request->loadPhabricatorRepositoryCommit(); + $pr_commit = $releeph_request->loadDiffusionCommit(); if ($pr_commit) { $new_author_phid = $pr_commit->getAuthorPHID(); } @@ -177,7 +177,7 @@ foreach ($releeph_requests as $rq) { // TODO: it's likely that relying on the `id` column to provide // trunk-commit-order is thoroughly broken. - $ordinal = (int)$rq->loadPhabricatorRepositoryCommit()->getID(); + $ordinal = (int)$rq->loadDiffusionCommit()->getID(); $surrogate[$ordinal] = $rq; } ksort($surrogate); @@ -196,7 +196,7 @@ // ReleephRequests, keyed by $releeph_requests = mpull($releeph_requests, null, 'getCommitIdentifier'); - $commits = id(new PhabricatorRepositoryCommit()) + $commits = id(new DiffusionCommit()) ->loadAllWhere( 'commitIdentifier IN (%Ls)', mpull($releeph_requests, 'getCommitIdentifier')); diff --git a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php --- a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php @@ -33,9 +33,9 @@ if (!$cut_point) { $repository = $product->getRepository(); switch ($repository->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: $cut_point = $product->getTrunkBranch(); break; } 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 @@ -25,7 +25,7 @@ 'You must specify which branch you will be picking from.'); } - $pr_repository = id(new PhabricatorRepositoryQuery()) + $pr_repository = id(new DiffusionRepositoryQuery()) ->setViewer($request->getUser()) ->withPHIDs(array($repository_phid)) ->executeOne(); @@ -111,7 +111,7 @@ } private function getRepositorySelectOptions() { - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($this->getRequest()->getUser()) ->execute(); diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php --- a/src/applications/releeph/controller/product/ReleephProductViewController.php +++ b/src/applications/releeph/controller/product/ReleephProductViewController.php @@ -49,7 +49,7 @@ $products = mpull($branches, 'getProduct'); $repo_phids = mpull($products, 'getRepositoryPHID'); - $repos = id(new PhabricatorRepositoryQuery()) + $repos = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs($repo_phids) ->execute(); diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php --- a/src/applications/releeph/controller/request/ReleephRequestEditController.php +++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php @@ -255,7 +255,7 @@ } else { $origin = $branch->getURI(); $repo = $product->getRepository(); - $branch_cut_point = id(new PhabricatorRepositoryCommit()) + $branch_cut_point = id(new DiffusionCommit()) ->loadOneWhere( 'phid = %s', $branch->getCutPointCommitPHID()); diff --git a/src/applications/releeph/controller/request/ReleephRequestTypeaheadController.php b/src/applications/releeph/controller/request/ReleephRequestTypeaheadController.php --- a/src/applications/releeph/controller/request/ReleephRequestTypeaheadController.php +++ b/src/applications/releeph/controller/request/ReleephRequestTypeaheadController.php @@ -15,8 +15,8 @@ $data = array(); // Dummy instances used for getting connections, table names, etc. - $pr_commit = new PhabricatorRepositoryCommit(); - $pr_commit_data = new PhabricatorRepositoryCommitData(); + $pr_commit = new DiffusionCommit(); + $pr_commit_data = new DiffusionCommitData(); $conn = $pr_commit->establishConnection('r'); 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 @@ -5,7 +5,7 @@ * * 1: To parse "Releeph: picks RQ" headers in commits created by * arc-releeph so that RQs committed by arc-releeph have real - * PhabricatorRepositoryCommits associated with them (instaed of just the SHA + * DiffusionCommits associated with them (instaed of just the SHA * of the commit, as seen by the pusher). * * 2: If requestors want to commit directly to their release branch, they can @@ -254,9 +254,9 @@ } public function didParseCommit( - PhabricatorRepository $repo, - PhabricatorRepositoryCommit $commit, - PhabricatorRepositoryCommitData $data) { + DiffusionRepository $repo, + DiffusionCommit $commit, + DiffusionCommitData $data) { // NOTE: This is currently dead code. See T2222. @@ -320,12 +320,12 @@ } private function isCommitOnBranch( - PhabricatorRepository $repo, - PhabricatorRepositoryCommit $commit, + DiffusionRepository $repo, + DiffusionCommit $commit, ReleephBranch $releeph_branch) { switch ($repo->getVersionControlSystem()) { - case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + case DiffusionRepositoryType::REPOSITORY_TYPE_GIT: list($output) = $repo->execxLocalCommand( 'branch --all --no-color --contains %s', $commit->getCommitIdentifier()); @@ -344,7 +344,7 @@ return idx($branches, $releeph_branch->getName()); break; - case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + case DiffusionRepositoryType::REPOSITORY_TYPE_SVN: $change_query = DiffusionPathChangeQuery::newFromDiffusionRequest( DiffusionRequest::newFromDictionary(array( 'user' => $this->getUser(), diff --git a/src/applications/releeph/editor/ReleephBranchEditor.php b/src/applications/releeph/editor/ReleephBranchEditor.php --- a/src/applications/releeph/editor/ReleephBranchEditor.php +++ b/src/applications/releeph/editor/ReleephBranchEditor.php @@ -16,7 +16,7 @@ } public function newBranchFromCommit( - PhabricatorRepositoryCommit $cut_point, + DiffusionCommit $cut_point, $branch_date, $symbolic_name = null) { diff --git a/src/applications/releeph/field/specification/ReleephAuthorFieldSpecification.php b/src/applications/releeph/field/specification/ReleephAuthorFieldSpecification.php --- a/src/applications/releeph/field/specification/ReleephAuthorFieldSpecification.php +++ b/src/applications/releeph/field/specification/ReleephAuthorFieldSpecification.php @@ -13,7 +13,7 @@ public function getRequiredHandlePHIDsForPropertyView() { $pull = $this->getReleephRequest(); - $commit = $pull->loadPhabricatorRepositoryCommit(); + $commit = $pull->loadDiffusionCommit(); if (!$commit) { return array(); } diff --git a/src/applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php b/src/applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php --- a/src/applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php +++ b/src/applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php @@ -31,7 +31,7 @@ public function getMarkupText($field) { $commit_data = $this ->getReleephRequest() - ->loadPhabricatorRepositoryCommitData(); + ->loadDiffusionCommitData(); if ($commit_data) { return $commit_data->getCommitMessage(); } else { diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php --- a/src/applications/releeph/query/ReleephProductQuery.php +++ b/src/applications/releeph/query/ReleephProductQuery.php @@ -65,7 +65,7 @@ $repository_phids = mpull($projects, 'getRepositoryPHID'); - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($this->getViewer()) ->withPHIDs($repository_phids) ->execute(); diff --git a/src/applications/releeph/storage/ReleephBranch.php b/src/applications/releeph/storage/ReleephBranch.php --- a/src/applications/releeph/storage/ReleephBranch.php +++ b/src/applications/releeph/storage/ReleephBranch.php @@ -141,7 +141,7 @@ } public function attachCutPointCommit( - PhabricatorRepositoryCommit $commit = null) { + DiffusionCommit $commit = null) { $this->cutPointCommit = $commit; return $this; } diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php --- a/src/applications/releeph/storage/ReleephProject.php +++ b/src/applications/releeph/storage/ReleephProject.php @@ -89,7 +89,7 @@ } } - public function attachRepository(PhabricatorRepository $repository) { + public function attachRepository(DiffusionRepository $repository) { $this->repository = $repository; return $this; } diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php --- a/src/applications/releeph/storage/ReleephRequest.php +++ b/src/applications/releeph/storage/ReleephRequest.php @@ -241,7 +241,7 @@ $summary = $this->getDetail('summary'); if (!strlen($summary)) { - $commit = $this->loadPhabricatorRepositoryCommit(); + $commit = $this->loadDiffusionCommit(); if ($commit) { $summary = $commit->getSummary(); } @@ -256,18 +256,18 @@ /* -( Loading external objects )------------------------------------------- */ - public function loadPhabricatorRepositoryCommit() { + public function loadDiffusionCommit() { return $this->loadOneRelative( - new PhabricatorRepositoryCommit(), + new DiffusionCommit(), 'phid', 'getRequestCommitPHID'); } - public function loadPhabricatorRepositoryCommitData() { - $commit = $this->loadPhabricatorRepositoryCommit(); + public function loadDiffusionCommitData() { + $commit = $this->loadDiffusionCommit(); if ($commit) { return $commit->loadOneRelative( - new PhabricatorRepositoryCommitData(), + new DiffusionCommitData(), 'commitID'); } } diff --git a/src/applications/releeph/view/branch/ReleephBranchTemplate.php b/src/applications/releeph/view/branch/ReleephBranchTemplate.php --- a/src/applications/releeph/view/branch/ReleephBranchTemplate.php +++ b/src/applications/releeph/view/branch/ReleephBranchTemplate.php @@ -28,7 +28,7 @@ $repository_phid, PhabricatorUser $viewer) { - $repository = id(new PhabricatorRepositoryQuery()) + $repository = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); diff --git a/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php b/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php --- a/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php +++ b/src/applications/releeph/view/request/ReleephRequestTypeaheadControl.php @@ -7,7 +7,7 @@ private $repo; private $startTime; - public function setRepo(PhabricatorRepository $repo) { + public function setRepo(DiffusionRepository $repo) { $this->repo = $repo; return $this; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryDAO.php b/src/applications/repository/storage/PhabricatorRepositoryDAO.php deleted file mode 100644 --- a/src/applications/repository/storage/PhabricatorRepositoryDAO.php +++ /dev/null @@ -1,9 +0,0 @@ -updateCommitData($ref); - - if ($this->shouldQueueFollowupTasks()) { - $this->queueTask( - 'PhabricatorRepositoryMercurialCommitChangeParserWorker', - array( - 'commitID' => $commit->getID(), - )); - } - } - -} diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php --- a/src/applications/search/controller/PhabricatorSearchAttachController.php +++ b/src/applications/search/controller/PhabricatorSearchAttachController.php @@ -207,7 +207,7 @@ $noun = pht('Tasks'); $selected = pht('assigned'); break; - case PhabricatorRepositoryCommitPHIDType::TYPECONST: + case DiffusionCommitPHIDType::TYPECONST: $noun = pht('Commits'); $selected = pht('created'); break; @@ -276,7 +276,7 @@ } private function getEdgeType($src_type, $dst_type) { - $t_cmit = PhabricatorRepositoryCommitPHIDType::TYPECONST; + $t_cmit = DiffusionCommitPHIDType::TYPECONST; $t_task = ManiphestTaskPHIDType::TYPECONST; $t_drev = DifferentialRevisionPHIDType::TYPECONST; $t_mock = PholioMockPHIDType::TYPECONST; 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 @@ -52,7 +52,7 @@ ->setURI("/diffusion/symbol/$symbol/?jump=true$context"); case 'find-repository': $name = $matches[1]; - $repositories = id(new PhabricatorRepositoryQuery()) + $repositories = id(new DiffusionRepositoryQuery()) ->setViewer($viewer) ->withNameContains($name) ->execute(); diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php --- a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php +++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php @@ -35,7 +35,7 @@ case PhabricatorTransactions::TYPE_VIEW_POLICY: case PhabricatorTransactions::TYPE_EDIT_POLICY: case PhabricatorTransactions::TYPE_JOIN_POLICY: - case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY: + case DiffusionRepositoryTransaction::TYPE_PUSH_POLICY: break; default: return new Aphront404Response(); diff --git a/src/docs/user/configuration/managing_daemons.diviner b/src/docs/user/configuration/managing_daemons.diviner --- a/src/docs/user/configuration/managing_daemons.diviner +++ b/src/docs/user/configuration/managing_daemons.diviner @@ -68,7 +68,7 @@ - **libphutil test daemons** are not generally useful unless you are developing daemon infrastructure or debugging a daemon problem; - **PhabricatorTaskmasterDaemon** performs work from a task queue; - - **PhabricatorRepositoryPullLocalDaemon** daemons track repositories, for + - **DiffusionRepositoryPullLocalDaemon** daemons track repositories, for more information see @{article:Diffusion User Guide}; and - **PhabricatorTriggerDaemon** schedules event triggers and cleans up old logs and caches. @@ -118,7 +118,7 @@ If you have multiple machines, you should use `phd launch` to tweak which daemons launch, and split daemons across machines like this: - - `PhabricatorRepositoryPullLocalDaemon`: Run one copy on any machine. + - `DiffusionRepositoryPullLocalDaemon`: Run one copy on any machine. On each web frontend which is not running a normal copy, run a copy with the `--no-discovery` flag. - `PhabricatorTriggerDaemon`: Run one copy on any machine. @@ -128,7 +128,7 @@ A gratuitously wasteful install might have a dedicated daemon machine which runs `phd start` with a large pool of taskmasters set in the config, and then -runs `phd launch PhabricatorRepositoryPullLocalDaemon -- --no-discovery` on each +runs `phd launch DiffusionRepositoryPullLocalDaemon -- --no-discovery` on each web server. This is grossly excessive in normal cases. = Next Steps = diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner --- a/src/docs/user/userguide/events.diviner +++ b/src/docs/user/userguide/events.diviner @@ -194,7 +194,7 @@ - `is_generated` Boolean indicating if this file should be treated as generated. -== Diffusion: Did Discover Commit == +== DiffusionRepository: Did Discover Commit == The constant for this event is `PhabricatorEventType::TYPE_DIFFUSION_DIDDISCOVERCOMMIT`. @@ -203,11 +203,10 @@ This event happens very early in the pipeline, and not all commit information will be available yet. Data available on this event: - - `commit` The @{class:PhabricatorRepositoryCommit} that was discovered. - - `repository` The @{class:PhabricatorRepository} the commit was discovered - in. + - `commit` The @{class:DiffusionCommit} that was discovered. + - `repository` The @{class:DiffusionRepository} the commit was discovered in. -== Diffusion: Lookup User == +== DiffusionRepository: Lookup User == The constant for this event is `PhabricatorEventType::TYPE_DIFFUSION_LOOKUPUSER`. @@ -224,7 +223,7 @@ Data available on this event: - - `commit` The @{class:PhabricatorRepositoryCommit} that data is being looked + - `commit` The @{class:DiffusionCommit} that data is being looked up for. - `query` The author or committer string being looked up. This will usually be something like "Abraham Lincoln ", but diff --git a/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php b/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php --- a/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php +++ b/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php @@ -38,7 +38,7 @@ if (!$this->getDao()) { return null; } - return $this->namespace.'_'.$this->getDao()->getApplicationName(); + return $this->namespace.'_'.$this->getDao()->getRealApplicationName(); } protected function getDao() { diff --git a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php --- a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php +++ b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php @@ -7,6 +7,9 @@ private static $namespaceStack = array(); + private $applicationName; + private $tableName; + const ATTACHABLE = ''; const CONFIG_APPLICATION_SERIALIZERS = 'phabricator/serializers'; @@ -75,6 +78,10 @@ * @task config */ public function getTableName() { + if ($this->tableName) { + return $this->tableName; + } + $str = 'phabricator'; $len = strlen($str); @@ -97,10 +104,30 @@ /** * @task config */ + final public function setTableName($table_name) { + $this->tableName = $table_name; + return $this; + } + + /** + * @task config + */ abstract public function getApplicationName(); + public function getRealApplicationName() { + return coalesce($this->applicationName, $this->getApplicationName()); + } + + /** + * @task config + */ + final public function setApplicationName($application_name) { + $this->applicationName = $application_name; + return $this; + } + protected function getConnectionNamespace() { - return self::getStorageNamespace().'_'.$this->getApplicationName(); + return self::getStorageNamespace().'_'.$this->getRealApplicationName(); } diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php --- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php +++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php @@ -55,6 +55,7 @@ 'db.countdown' => array(), 'db.daemon' => array(), 'db.differential' => array(), + 'db.diffusion' => array(), 'db.draft' => array(), 'db.drydock' => array(), 'db.feed' => array(), @@ -71,7 +72,9 @@ 'db.phame' => array(), 'db.phriction' => array(), 'db.project' => array(), - 'db.repository' => array(), + 'db.repository' => array( + 'dead' => true, + ), 'db.search' => array(), 'db.slowvote' => array(), 'db.timeline' => array( diff --git a/src/infrastructure/util/PhabricatorGlobalLock.php b/src/infrastructure/util/PhabricatorGlobalLock.php --- a/src/infrastructure/util/PhabricatorGlobalLock.php +++ b/src/infrastructure/util/PhabricatorGlobalLock.php @@ -81,7 +81,7 @@ // database-free connection instead, but that's kind of messy and we // might forget about it in the future if we vertically partition the // application. - $dao = new PhabricatorRepository(); + $dao = new DiffusionRepository(); // NOTE: Using "force_new" to make sure each lock is on its own // connection.