diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php index 4a30d205a6..f766a669fb 100755 --- a/scripts/celerity_mapper.php +++ b/scripts/celerity_mapper.php @@ -11,6 +11,7 @@ $package_spec = array( 'aphront-panel-view-css', 'aphront-side-nav-view-css', 'aphront-table-view-css', + 'aphront-crumbs-view-css', 'aphront-tokenizer-control-css', 'aphront-typeahead-control-css', @@ -36,6 +37,9 @@ $package_spec = array( 'javelin-behavior-differential-show-more', 'javelin-behavior-differential-diff-radios', ), + 'diffusion.pkg.css' => array( + 'diffusion-commit-view-css', + ), ); @@ -89,30 +93,30 @@ foreach ($file_map as $path => $info) { "File {$path} does not have a header doc comment. Encode dependency ". "data in a header docblock."); } - + list($description, $metadata) = $parser->parse($matches[0]); - + $provides = preg_split('/\s+/', trim(idx($metadata, 'provides'))); $requires = preg_split('/\s+/', trim(idx($metadata, 'requires'))); $provides = array_filter($provides); $requires = array_filter($requires); - + if (count($provides) !== 1) { throw new Exception( "File {$path} must @provide exactly one Celerity target."); } - + $provides = reset($provides); $type = 'js'; if (preg_match('/\.css$/', $path)) { $type = 'css'; } - + $uri = '/res/'.substr($info['hash'], 0, 8).$path; - + $hash_map[$provides] = $info['hash']; - + $runtime_map[$provides] = array( 'uri' => $uri, 'type' => $type, @@ -155,7 +159,7 @@ foreach ($package_spec as $name => $package) { $package_map['reverse'][$symbol] = $key; } } - + $runtime_map = var_export($runtime_map, true); $runtime_map = preg_replace('/\s+$/m', '', $runtime_map); @@ -182,4 +186,4 @@ echo "Writing map...\n"; Filesystem::writeFile( $root.'/../src/__celerity_resource_map__.php', $resource_map); -echo "Done.\n"; +echo "Done.\n"; diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 1b172b910f..c8bd5852be 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -199,7 +199,7 @@ celerity_register_resource_map(array( ), 'diffusion-commit-view-css' => array( - 'uri' => '/res/3d212e58/rsrc/css/application/diffusion/commit-view.css', + 'uri' => '/res/4593ecc8/rsrc/css/application/diffusion/commit-view.css', 'type' => 'css', 'requires' => array( @@ -491,7 +491,7 @@ celerity_register_resource_map(array( ), array ( 'packages' => array ( - 'c1818681' => + 73063447 => array ( 'name' => 'core.pkg.css', 'symbols' => @@ -504,13 +504,14 @@ celerity_register_resource_map(array( 5 => 'aphront-panel-view-css', 6 => 'aphront-side-nav-view-css', 7 => 'aphront-table-view-css', - 8 => 'aphront-tokenizer-control-css', - 9 => 'aphront-typeahead-control-css', - 10 => 'phabricator-directory-css', - 11 => 'phabricator-remarkup-css', - 12 => 'syntax-highlighting-css', + 8 => 'aphront-crumbs-view-css', + 9 => 'aphront-tokenizer-control-css', + 10 => 'aphront-typeahead-control-css', + 11 => 'phabricator-directory-css', + 12 => 'phabricator-remarkup-css', + 13 => 'syntax-highlighting-css', ), - 'uri' => '/res/pkg/c1818681/core.pkg.css', + 'uri' => '/res/pkg/73063447/core.pkg.css', 'type' => 'css', ), '76f3c1f8' => @@ -544,22 +545,33 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/30d594cf/differential.pkg.js', 'type' => 'js', ), + '2393c3a4' => + array ( + 'name' => 'diffusion.pkg.css', + 'symbols' => + array ( + 0 => 'diffusion-commit-view-css', + ), + 'uri' => '/res/pkg/2393c3a4/diffusion.pkg.css', + 'type' => 'css', + ), ), 'reverse' => array ( - 'phabricator-core-css' => 'c1818681', - 'phabricator-core-buttons-css' => 'c1818681', - 'phabricator-standard-page-view' => 'c1818681', - 'aphront-dialog-view-css' => 'c1818681', - 'aphront-form-view-css' => 'c1818681', - 'aphront-panel-view-css' => 'c1818681', - 'aphront-side-nav-view-css' => 'c1818681', - 'aphront-table-view-css' => 'c1818681', - 'aphront-tokenizer-control-css' => 'c1818681', - 'aphront-typeahead-control-css' => 'c1818681', - 'phabricator-directory-css' => 'c1818681', - 'phabricator-remarkup-css' => 'c1818681', - 'syntax-highlighting-css' => 'c1818681', + 'phabricator-core-css' => '73063447', + 'phabricator-core-buttons-css' => '73063447', + 'phabricator-standard-page-view' => '73063447', + 'aphront-dialog-view-css' => '73063447', + 'aphront-form-view-css' => '73063447', + 'aphront-panel-view-css' => '73063447', + 'aphront-side-nav-view-css' => '73063447', + 'aphront-table-view-css' => '73063447', + 'aphront-crumbs-view-css' => '73063447', + 'aphront-tokenizer-control-css' => '73063447', + 'aphront-typeahead-control-css' => '73063447', + 'phabricator-directory-css' => '73063447', + 'phabricator-remarkup-css' => '73063447', + 'syntax-highlighting-css' => '73063447', 'differential-core-view-css' => '76f3c1f8', 'differential-changeset-view-css' => '76f3c1f8', 'differential-revision-detail-css' => '76f3c1f8', @@ -573,5 +585,6 @@ celerity_register_resource_map(array( 'javelin-behavior-differential-populate' => '30d594cf', 'javelin-behavior-differential-show-more' => '30d594cf', 'javelin-behavior-differential-diff-radios' => '30d594cf', + 'diffusion-commit-view-css' => '2393c3a4', ), )); diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 1068655a16..6112b1bdc1 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -171,7 +171,6 @@ phutil_register_library_map(array( 'DiffusionRequest' => 'applications/diffusion/request/base', 'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/svn', 'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/svn', - 'DiffusionSvnPathChangeQuery' => 'applications/diffusion/query/pathchange/svn', 'DiffusionView' => 'applications/diffusion/view/base', 'Javelin' => 'infrastructure/javelin/api', 'LiskDAO' => 'storage/lisk/dao', @@ -489,7 +488,6 @@ phutil_register_library_map(array( 'DiffusionRepositoryController' => 'DiffusionController', 'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery', 'DiffusionSvnHistoryQuery' => 'DiffusionHistoryQuery', - 'DiffusionSvnPathChangeQuery' => 'DiffusionPathChangeQuery', 'DiffusionView' => 'AphrontView', 'ManiphestController' => 'PhabricatorController', 'ManiphestDAO' => 'PhabricatorLiskDAO', diff --git a/src/applications/diffusion/controller/commit/__init__.php b/src/applications/diffusion/controller/commit/__init__.php index 5909d3351d..0abf62d921 100644 --- a/src/applications/diffusion/controller/commit/__init__.php +++ b/src/applications/diffusion/controller/commit/__init__.php @@ -9,7 +9,10 @@ phutil_require_module('phabricator', 'applications/diffusion/controller/base'); phutil_require_module('phabricator', 'applications/diffusion/query/pathchange/base'); phutil_require_module('phabricator', 'applications/diffusion/view/commitchangetable'); +phutil_require_module('phabricator', 'infrastructure/celerity/api'); phutil_require_module('phabricator', 'view/layout/panel'); +phutil_require_module('phutil', 'markup'); + phutil_require_source('DiffusionCommitController.php'); diff --git a/src/applications/diffusion/query/pathchange/base/__init__.php b/src/applications/diffusion/query/pathchange/base/__init__.php index 60c1bac746..e60330f6aa 100644 --- a/src/applications/diffusion/query/pathchange/base/__init__.php +++ b/src/applications/diffusion/query/pathchange/base/__init__.php @@ -8,7 +8,6 @@ phutil_require_module('phabricator', 'applications/differential/constants/changetype'); phutil_require_module('phabricator', 'applications/diffusion/data/pathchange'); -phutil_require_module('phabricator', 'applications/repository/storage/commit'); phutil_require_module('phabricator', 'applications/repository/storage/repository'); phutil_require_module('phabricator', 'storage/queryfx'); diff --git a/src/applications/diffusion/request/base/__init__.php b/src/applications/diffusion/request/base/__init__.php index cdb31cde66..0439ae99df 100644 --- a/src/applications/diffusion/request/base/__init__.php +++ b/src/applications/diffusion/request/base/__init__.php @@ -7,6 +7,8 @@ phutil_require_module('phabricator', 'applications/repository/constants/repositorytype'); +phutil_require_module('phabricator', 'applications/repository/storage/commit'); +phutil_require_module('phabricator', 'applications/repository/storage/commitdata'); phutil_require_module('phabricator', 'applications/repository/storage/repository'); phutil_require_module('phutil', 'utils'); diff --git a/webroot/rsrc/css/application/diffusion/commit-view.css b/webroot/rsrc/css/application/diffusion/commit-view.css index 8c472a3f82..e065c61e0b 100644 --- a/webroot/rsrc/css/application/diffusion/commit-view.css +++ b/webroot/rsrc/css/application/diffusion/commit-view.css @@ -34,4 +34,4 @@ .diffusion-commit-message { padding: 8px; -} \ No newline at end of file +}