diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 1dfcd72148..8f0f5e7ef9 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -7,50 +7,14 @@ */ celerity_register_resource_map(array( - 'phabricator-remarkup-css' => + 'aphront-crumbs-view-css' => array( - 'uri' => '/res/786989c3/rsrc/css/core/remarkup.css', + 'uri' => '/res/c666a518/rsrc/css/aphront/crumbs-view.css', 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/css/core/remarkup.css', - ), - 'phabricator-core-css' => - array( - 'uri' => '/res/6eebb99b/rsrc/css/core/core.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/core/core.css', - ), - 'phabricator-core-buttons-css' => - array( - 'uri' => '/res/53b4f712/rsrc/css/core/buttons.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/core/buttons.css', - ), - 'syntax-highlighting-css' => - array( - 'uri' => '/res/fb673ece/rsrc/css/core/syntax.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/core/syntax.css', - ), - 'aphront-headsup-action-list-view-css' => - array( - 'uri' => '/res/8fd91c1d/rsrc/css/aphront/headsup-action-list-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/headsup-action-list-view.css', + 'disk' => '/rsrc/css/aphront/crumbs-view.css', ), 'aphront-dark-console-css' => array( @@ -61,24 +25,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/dark-console.css', ), - 'aphront-error-view-css' => - array( - 'uri' => '/res/19b27527/rsrc/css/aphront/error-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/error-view.css', - ), - 'aphront-panel-view-css' => - array( - 'uri' => '/res/63672373/rsrc/css/aphront/panel-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/panel-view.css', - ), 'aphront-dialog-view-css' => array( 'uri' => '/res/7101ab69/rsrc/css/aphront/dialog-view.css', @@ -88,6 +34,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/dialog-view.css', ), + 'aphront-error-view-css' => + array( + 'uri' => '/res/19b27527/rsrc/css/aphront/error-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/aphront/error-view.css', + ), 'aphront-form-view-css' => array( 'uri' => '/res/472d41b4/rsrc/css/aphront/form-view.css', @@ -97,6 +52,33 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/form-view.css', ), + 'aphront-headsup-action-list-view-css' => + array( + 'uri' => '/res/8fd91c1d/rsrc/css/aphront/headsup-action-list-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/aphront/headsup-action-list-view.css', + ), + 'aphront-panel-view-css' => + array( + 'uri' => '/res/63672373/rsrc/css/aphront/panel-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/aphront/panel-view.css', + ), + 'aphront-request-failure-view-css' => + array( + 'uri' => '/res/97b8337a/rsrc/css/aphront/request-failure-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/aphront/request-failure-view.css', + ), 'aphront-side-nav-view-css' => array( 'uri' => '/res/4f4c5ca8/rsrc/css/aphront/side-nav-view.css', @@ -106,6 +88,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/side-nav-view.css', ), + 'aphront-table-view-css' => + array( + 'uri' => '/res/7bf17fb8/rsrc/css/aphront/table-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/aphront/table-view.css', + ), 'aphront-tokenizer-control-css' => array( 'uri' => '/res/a3d23074/rsrc/css/aphront/tokenizer.css', @@ -116,24 +107,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/tokenizer.css', ), - 'aphront-crumbs-view-css' => - array( - 'uri' => '/res/c666a518/rsrc/css/aphront/crumbs-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/crumbs-view.css', - ), - 'aphront-request-failure-view-css' => - array( - 'uri' => '/res/97b8337a/rsrc/css/aphront/request-failure-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/request-failure-view.css', - ), 'aphront-typeahead-control-css' => array( 'uri' => '/res/928df9f0/rsrc/css/aphront/typeahead.css', @@ -143,33 +116,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/typeahead.css', ), - 'aphront-table-view-css' => - array( - 'uri' => '/res/7bf17fb8/rsrc/css/aphront/table-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/table-view.css', - ), - 'diffusion-commit-view-css' => - array( - 'uri' => '/res/8c139192/rsrc/css/application/diffusion/commit-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/diffusion/commit-view.css', - ), - 'diffusion-source-css' => - array( - 'uri' => '/res/7f50817b/rsrc/css/application/diffusion/diffusion-source.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/diffusion/diffusion-source.css', - ), 'phabricator-standard-page-view' => array( 'uri' => '/res/0d41ea7c/rsrc/css/application/base/standard-page-view.css', @@ -179,69 +125,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/base/standard-page-view.css', ), - 'maniphest-task-summary-css' => - array( - 'uri' => '/res/94d01e6f/rsrc/css/application/maniphest/task-summary.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/maniphest/task-summary.css', - ), - 'maniphest-transaction-detail-css' => - array( - 'uri' => '/res/9418efc9/rsrc/css/application/maniphest/transaction-detail.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/maniphest/transaction-detail.css', - ), - 'mainphest-task-detail-css' => - array( - 'uri' => '/res/e5f3beca/rsrc/css/application/maniphest/task-detail.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/maniphest/task-detail.css', - ), - 'herald-test-css' => - array( - 'uri' => '/res/28269358/rsrc/css/application/herald/herald-test.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/herald/herald-test.css', - ), - 'herald-css' => - array( - 'uri' => '/res/211a4b1b/rsrc/css/application/herald/herald.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/herald/herald.css', - ), - 'differential-table-of-contents-css' => - array( - 'uri' => '/res/e68f6f05/rsrc/css/application/differential/table-of-contents.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/differential/table-of-contents.css', - ), - 'differential-revision-history-css' => - array( - 'uri' => '/res/755f3da3/rsrc/css/application/differential/revision-history.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/differential/revision-history.css', - ), 'differential-revision-add-comment-css' => array( 'uri' => '/res/aaae14d3/rsrc/css/application/differential/add-comment.css', @@ -251,23 +134,14 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/differential/add-comment.css', ), - 'differential-revision-comment-css' => + 'differential-changeset-view-css' => array( - 'uri' => '/res/b271baaf/rsrc/css/application/differential/revision-comment.css', + 'uri' => '/res/f26ca6f9/rsrc/css/application/differential/changeset-view.css', 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/css/application/differential/revision-comment.css', - ), - 'differential-revision-detail-css' => - array( - 'uri' => '/res/623e3946/rsrc/css/application/differential/revision-detail.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/application/differential/revision-detail.css', + 'disk' => '/rsrc/css/application/differential/changeset-view.css', ), 'differential-core-view-css' => array( @@ -287,14 +161,59 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/differential/revision-comment-list.css', ), - 'differential-changeset-view-css' => + 'differential-revision-comment-css' => array( - 'uri' => '/res/f26ca6f9/rsrc/css/application/differential/changeset-view.css', + 'uri' => '/res/b271baaf/rsrc/css/application/differential/revision-comment.css', 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/css/application/differential/changeset-view.css', + 'disk' => '/rsrc/css/application/differential/revision-comment.css', + ), + 'differential-revision-detail-css' => + array( + 'uri' => '/res/623e3946/rsrc/css/application/differential/revision-detail.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/differential/revision-detail.css', + ), + 'differential-revision-history-css' => + array( + 'uri' => '/res/755f3da3/rsrc/css/application/differential/revision-history.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/differential/revision-history.css', + ), + 'differential-table-of-contents-css' => + array( + 'uri' => '/res/e68f6f05/rsrc/css/application/differential/table-of-contents.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/differential/table-of-contents.css', + ), + 'diffusion-commit-view-css' => + array( + 'uri' => '/res/8c139192/rsrc/css/application/diffusion/commit-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/diffusion/commit-view.css', + ), + 'diffusion-source-css' => + array( + 'uri' => '/res/7f50817b/rsrc/css/application/diffusion/diffusion-source.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/diffusion/diffusion-source.css', ), 'phabricator-directory-css' => array( @@ -305,6 +224,51 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/directory/phabricator-directory.css', ), + 'herald-test-css' => + array( + 'uri' => '/res/28269358/rsrc/css/application/herald/herald-test.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/herald/herald-test.css', + ), + 'herald-css' => + array( + 'uri' => '/res/211a4b1b/rsrc/css/application/herald/herald.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/herald/herald.css', + ), + 'mainphest-task-detail-css' => + array( + 'uri' => '/res/e5f3beca/rsrc/css/application/maniphest/task-detail.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/maniphest/task-detail.css', + ), + 'maniphest-task-summary-css' => + array( + 'uri' => '/res/94d01e6f/rsrc/css/application/maniphest/task-summary.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/maniphest/task-summary.css', + ), + 'maniphest-transaction-detail-css' => + array( + 'uri' => '/res/16725026/rsrc/css/application/maniphest/transaction-detail.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/maniphest/transaction-detail.css', + ), 'phabricator-object-selector-css' => array( 'uri' => '/res/52a7e289/rsrc/css/application/objectselector/object-selector.css', @@ -324,97 +288,41 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/people/profile.css', ), - 'javelin-typeahead-dev' => + 'phabricator-core-buttons-css' => array( - 'uri' => '/res/6de6ae59/rsrc/js/javelin/typeahead.dev.js', - 'type' => 'js', + 'uri' => '/res/53b4f712/rsrc/css/core/buttons.css', + 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/js/javelin/typeahead.dev.js', + 'disk' => '/rsrc/css/core/buttons.css', ), - 'javelin-workflow-prod' => + 'phabricator-core-css' => array( - 'uri' => '/res/b758e0a0/rsrc/js/javelin/workflow.min.js', - 'type' => 'js', + 'uri' => '/res/6eebb99b/rsrc/css/core/core.css', + 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/js/javelin/workflow.min.js', + 'disk' => '/rsrc/css/core/core.css', ), - 'javelin-workflow-dev' => + 'phabricator-remarkup-css' => array( - 'uri' => '/res/c6b17f93/rsrc/js/javelin/workflow.dev.js', - 'type' => 'js', + 'uri' => '/res/bf863100/rsrc/css/core/remarkup.css', + 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/js/javelin/workflow.dev.js', + 'disk' => '/rsrc/css/core/remarkup.css', ), - 'javelin-lib-dev' => + 'syntax-highlighting-css' => array( - 'uri' => '/res/a0e7a5e9/rsrc/js/javelin/javelin.dev.js', - 'type' => 'js', + 'uri' => '/res/fb673ece/rsrc/css/core/syntax.css', + 'type' => 'css', 'requires' => array( ), - 'disk' => '/rsrc/js/javelin/javelin.dev.js', - ), - 'javelin-init-prod' => - array( - 'uri' => '/res/1267c868/rsrc/js/javelin/init.min.js', - 'type' => 'js', - 'requires' => - array( - ), - 'disk' => '/rsrc/js/javelin/init.min.js', - ), - 'javelin-typeahead-prod' => - array( - 'uri' => '/res/69d5fad1/rsrc/js/javelin/typeahead.min.js', - 'type' => 'js', - 'requires' => - array( - ), - 'disk' => '/rsrc/js/javelin/typeahead.min.js', - ), - 'javelin-lib-prod' => - array( - 'uri' => '/res/2f2b3b2e/rsrc/js/javelin/javelin.min.js', - 'type' => 'js', - 'requires' => - array( - ), - 'disk' => '/rsrc/js/javelin/javelin.min.js', - ), - 'javelin-magical-init' => - array( - 'uri' => '/res/76614f84/rsrc/js/javelin/init.dev.js', - 'type' => 'js', - 'requires' => - array( - ), - 'disk' => '/rsrc/js/javelin/init.dev.js', - ), - 'javelin-behavior-diffusion-jump-to' => - array( - 'uri' => '/res/4f3f6cdc/rsrc/js/application/diffusion/behavior-jump-to.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-lib-dev', - ), - 'disk' => '/rsrc/js/application/diffusion/behavior-jump-to.js', - ), - 'javelin-behavior-maniphest-transaction-controls' => - array( - 'uri' => '/res/fc6a8722/rsrc/js/application/maniphest/behavior-transaction-controls.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-lib-dev', - ), - 'disk' => '/rsrc/js/application/maniphest/behavior-transaction-controls.js', + 'disk' => '/rsrc/css/core/syntax.css', ), 'javelin-behavior-dark-console' => array( @@ -425,26 +333,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/core/behavior-dark-console.js', ), - 'javelin-behavior-aphront-basic-tokenizer' => - array( - 'uri' => '/res/8317d761/rsrc/js/application/core/behavior-tokenizer.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-lib-dev', - ), - 'disk' => '/rsrc/js/application/core/behavior-tokenizer.js', - ), - 'multirow-row-manager' => - array( - 'uri' => '/res/330d076b/rsrc/js/application/core/MultirowRowManager.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-lib-dev', - ), - 'disk' => '/rsrc/js/application/core/MultirowRowManager.js', - ), 'javelin-behavior-phabricator-object-selector' => array( 'uri' => '/res/4fe735af/rsrc/js/application/core/behavior-object-selector.js', @@ -455,6 +343,16 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/core/behavior-object-selector.js', ), + 'javelin-behavior-aphront-basic-tokenizer' => + array( + 'uri' => '/res/8317d761/rsrc/js/application/core/behavior-tokenizer.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/core/behavior-tokenizer.js', + ), 'javelin-behavior-workflow' => array( 'uri' => '/res/15446e7e/rsrc/js/application/core/behavior-workflow.js', @@ -465,45 +363,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/core/behavior-workflow.js', ), - 'herald-rule-editor' => + 'multirow-row-manager' => array( - 'uri' => '/res/8b5e9d5e/rsrc/js/application/herald/HeraldRuleEditor.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'multirow-row-manager', - ), - 'disk' => '/rsrc/js/application/herald/HeraldRuleEditor.js', - ), - 'javelin-behavior-herald-rule-editor' => - array( - 'uri' => '/res/48108130/rsrc/js/application/herald/herald-rule-editor.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'herald-rule-editor', - ), - 'disk' => '/rsrc/js/application/herald/herald-rule-editor.js', - ), - 'javelin-behavior-differential-diff-radios' => - array( - 'uri' => '/res/fdeb3823/rsrc/js/application/differential/behavior-diff-radios.js', + 'uri' => '/res/330d076b/rsrc/js/application/core/MultirowRowManager.js', 'type' => 'js', 'requires' => array( 0 => 'javelin-lib-dev', ), - 'disk' => '/rsrc/js/application/differential/behavior-diff-radios.js', - ), - 'javelin-behavior-differential-show-more' => - array( - 'uri' => '/res/ea998002/rsrc/js/application/differential/behavior-show-more.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-lib-dev', - ), - 'disk' => '/rsrc/js/application/differential/behavior-show-more.js', + 'disk' => '/rsrc/js/application/core/MultirowRowManager.js', ), 'javelin-behavior-differential-add-reviewers' => array( @@ -525,15 +393,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/differential/behavior-comment-preview.js', ), - 'javelin-behavior-differential-populate' => + 'javelin-behavior-differential-diff-radios' => array( - 'uri' => '/res/a13dcd7e/rsrc/js/application/differential/behavior-populate.js', + 'uri' => '/res/fdeb3823/rsrc/js/application/differential/behavior-diff-radios.js', 'type' => 'js', 'requires' => array( 0 => 'javelin-lib-dev', ), - 'disk' => '/rsrc/js/application/differential/behavior-populate.js', + 'disk' => '/rsrc/js/application/differential/behavior-diff-radios.js', ), 'javelin-behavior-differential-edit-inline-comments' => array( @@ -545,6 +413,16 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/differential/behavior-edit-inline-comments.js', ), + 'javelin-behavior-differential-populate' => + array( + 'uri' => '/res/a13dcd7e/rsrc/js/application/differential/behavior-populate.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/differential/behavior-populate.js', + ), 'javelin-behavior-differential-show-all-comments' => array( 'uri' => '/res/2a3592b8/rsrc/js/application/differential/behavior-show-all-comments.js', @@ -555,10 +433,145 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/differential/behavior-show-all-comments.js', ), + 'javelin-behavior-differential-show-more' => + array( + 'uri' => '/res/ea998002/rsrc/js/application/differential/behavior-show-more.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/differential/behavior-show-more.js', + ), + 'javelin-behavior-diffusion-jump-to' => + array( + 'uri' => '/res/4f3f6cdc/rsrc/js/application/diffusion/behavior-jump-to.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/diffusion/behavior-jump-to.js', + ), + 'javelin-behavior-diffusion-pull-lastmodified' => + array( + 'uri' => '/res/1c95a58e/rsrc/js/application/diffusion/behavior-pull-lastmodified.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/diffusion/behavior-pull-lastmodified.js', + ), + 'javelin-behavior-herald-rule-editor' => + array( + 'uri' => '/res/48108130/rsrc/js/application/herald/herald-rule-editor.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'herald-rule-editor', + 1 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/herald/herald-rule-editor.js', + ), + 'herald-rule-editor' => + array( + 'uri' => '/res/8b5e9d5e/rsrc/js/application/herald/HeraldRuleEditor.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'multirow-row-manager', + 1 => 'javelin-lib-dev', + 2 => 'javelin-typeahead-dev', + ), + 'disk' => '/rsrc/js/application/herald/HeraldRuleEditor.js', + ), + 'javelin-behavior-maniphest-transaction-controls' => + array( + 'uri' => '/res/fc6a8722/rsrc/js/application/maniphest/behavior-transaction-controls.js', + 'type' => 'js', + 'requires' => + array( + 0 => 'javelin-lib-dev', + ), + 'disk' => '/rsrc/js/application/maniphest/behavior-transaction-controls.js', + ), + 'javelin-magical-init' => + array( + 'uri' => '/res/76614f84/rsrc/js/javelin/init.dev.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/init.dev.js', + ), + 'javelin-init-prod' => + array( + 'uri' => '/res/1267c868/rsrc/js/javelin/init.min.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/init.min.js', + ), + 'javelin-lib-dev' => + array( + 'uri' => '/res/a0e7a5e9/rsrc/js/javelin/javelin.dev.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/javelin.dev.js', + ), + 'javelin-lib-prod' => + array( + 'uri' => '/res/2f2b3b2e/rsrc/js/javelin/javelin.min.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/javelin.min.js', + ), + 'javelin-typeahead-dev' => + array( + 'uri' => '/res/6de6ae59/rsrc/js/javelin/typeahead.dev.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/typeahead.dev.js', + ), + 'javelin-typeahead-prod' => + array( + 'uri' => '/res/69d5fad1/rsrc/js/javelin/typeahead.min.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/typeahead.min.js', + ), + 'javelin-workflow-dev' => + array( + 'uri' => '/res/c6b17f93/rsrc/js/javelin/workflow.dev.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/workflow.dev.js', + ), + 'javelin-workflow-prod' => + array( + 'uri' => '/res/b758e0a0/rsrc/js/javelin/workflow.min.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/javelin/workflow.min.js', + ), ), array ( 'packages' => array ( - 'abe939ec' => + 'aa9bbfd1' => array ( 'name' => 'core.pkg.css', 'symbols' => @@ -578,7 +591,7 @@ celerity_register_resource_map(array( 12 => 'phabricator-remarkup-css', 13 => 'syntax-highlighting-css', ), - 'uri' => '/res/pkg/abe939ec/core.pkg.css', + 'uri' => '/res/pkg/aa9bbfd1/core.pkg.css', 'type' => 'css', ), '76f3c1f8' => @@ -625,20 +638,20 @@ celerity_register_resource_map(array( ), 'reverse' => array ( - 'phabricator-core-css' => 'abe939ec', - 'phabricator-core-buttons-css' => 'abe939ec', - 'phabricator-standard-page-view' => 'abe939ec', - 'aphront-dialog-view-css' => 'abe939ec', - 'aphront-form-view-css' => 'abe939ec', - 'aphront-panel-view-css' => 'abe939ec', - 'aphront-side-nav-view-css' => 'abe939ec', - 'aphront-table-view-css' => 'abe939ec', - 'aphront-crumbs-view-css' => 'abe939ec', - 'aphront-tokenizer-control-css' => 'abe939ec', - 'aphront-typeahead-control-css' => 'abe939ec', - 'phabricator-directory-css' => 'abe939ec', - 'phabricator-remarkup-css' => 'abe939ec', - 'syntax-highlighting-css' => 'abe939ec', + 'phabricator-core-css' => 'aa9bbfd1', + 'phabricator-core-buttons-css' => 'aa9bbfd1', + 'phabricator-standard-page-view' => 'aa9bbfd1', + 'aphront-dialog-view-css' => 'aa9bbfd1', + 'aphront-form-view-css' => 'aa9bbfd1', + 'aphront-panel-view-css' => 'aa9bbfd1', + 'aphront-side-nav-view-css' => 'aa9bbfd1', + 'aphront-table-view-css' => 'aa9bbfd1', + 'aphront-crumbs-view-css' => 'aa9bbfd1', + 'aphront-tokenizer-control-css' => 'aa9bbfd1', + 'aphront-typeahead-control-css' => 'aa9bbfd1', + 'phabricator-directory-css' => 'aa9bbfd1', + 'phabricator-remarkup-css' => 'aa9bbfd1', + 'syntax-highlighting-css' => 'aa9bbfd1', 'differential-core-view-css' => '76f3c1f8', 'differential-changeset-view-css' => '76f3c1f8', 'differential-revision-detail-css' => '76f3c1f8', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 5c71e0d2de..8ed7696fe1 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -166,12 +166,15 @@ phutil_register_library_map(array( 'DiffusionGitDiffQuery' => 'applications/diffusion/query/diff/git', 'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/git', 'DiffusionGitHistoryQuery' => 'applications/diffusion/query/history/git', + 'DiffusionGitLastModifiedQuery' => 'applications/diffusion/query/lastmodified/git', 'DiffusionGitPathIDQuery' => 'applications/diffusion/query/pathid/base', 'DiffusionGitRequest' => 'applications/diffusion/request/git', 'DiffusionHistoryController' => 'applications/diffusion/controller/history', 'DiffusionHistoryQuery' => 'applications/diffusion/query/history/base', 'DiffusionHistoryTableView' => 'applications/diffusion/view/historytable', 'DiffusionHomeController' => 'applications/diffusion/controller/home', + 'DiffusionLastModifiedController' => 'applications/diffusion/controller/lastmodified', + 'DiffusionLastModifiedQuery' => 'applications/diffusion/query/lastmodified/base', 'DiffusionPathChange' => 'applications/diffusion/data/pathchange', 'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/base', 'DiffusionRepositoryController' => 'applications/diffusion/controller/repository', @@ -181,6 +184,7 @@ phutil_register_library_map(array( 'DiffusionSvnDiffQuery' => 'applications/diffusion/query/diff/svn', 'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/svn', 'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/svn', + 'DiffusionSvnLastModifiedQuery' => 'applications/diffusion/query/lastmodified/svn', 'DiffusionSvnRequest' => 'applications/diffusion/request/svn', 'DiffusionView' => 'applications/diffusion/view/base', 'HeraldAction' => 'applications/herald/storage/action', @@ -535,15 +539,18 @@ phutil_register_library_map(array( 'DiffusionGitDiffQuery' => 'DiffusionDiffQuery', 'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery', 'DiffusionGitHistoryQuery' => 'DiffusionHistoryQuery', + 'DiffusionGitLastModifiedQuery' => 'DiffusionLastModifiedQuery', 'DiffusionGitRequest' => 'DiffusionRequest', 'DiffusionHistoryController' => 'DiffusionController', 'DiffusionHistoryTableView' => 'DiffusionView', 'DiffusionHomeController' => 'DiffusionController', + 'DiffusionLastModifiedController' => 'DiffusionController', 'DiffusionRepositoryController' => 'DiffusionController', 'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery', 'DiffusionSvnDiffQuery' => 'DiffusionDiffQuery', 'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery', 'DiffusionSvnHistoryQuery' => 'DiffusionHistoryQuery', + 'DiffusionSvnLastModifiedQuery' => 'DiffusionLastModifiedQuery', 'DiffusionSvnRequest' => 'DiffusionRequest', 'DiffusionView' => 'AphrontView', 'HeraldAction' => 'HeraldDAO', diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php index 268564389a..aa33fd4928 100644 --- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php @@ -210,6 +210,11 @@ class AphrontDefaultApplicationConfiguration '(?:[;](?P[a-z0-9]+))?'. '$' => 'DiffusionDiffController', + 'lastmodified/'. + '(?P.*?)'. + '(?:[;](?P[a-z0-9]+))?'. + '$' + => 'DiffusionLastModifiedController', ), ), diff --git a/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php new file mode 100644 index 0000000000..bc8ecbe8a6 --- /dev/null +++ b/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php @@ -0,0 +1,37 @@ +getDiffusionRequest(); + $request = $this->getRequest(); + + $modified_query = DiffusionLastModifiedQuery::newFromDiffusionRequest( + $drequest); + list($commit, $commit_data) = $modified_query->loadLastModification(); + + $output = DiffusionBrowseTableView::renderLastModifiedColumns( + $drequest->getRepository(), + $commit, + $commit_data); + + return id(new AphrontAjaxResponse()) + ->setContent($output); + } +} diff --git a/src/applications/diffusion/controller/lastmodified/__init__.php b/src/applications/diffusion/controller/lastmodified/__init__.php new file mode 100644 index 0000000000..1ac38ad136 --- /dev/null +++ b/src/applications/diffusion/controller/lastmodified/__init__.php @@ -0,0 +1,17 @@ +setCommit($commit); diff --git a/src/applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php b/src/applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php new file mode 100644 index 0000000000..10f496591d --- /dev/null +++ b/src/applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php @@ -0,0 +1,61 @@ + + } + + final public static function newFromDiffusionRequest( + DiffusionRequest $request) { + + $repository = $request->getRepository(); + + switch ($repository->getVersionControlSystem()) { + case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: + $class = 'DiffusionGitLastModifiedQuery'; + break; + case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: + $class = 'DiffusionSvnLastModifiedQuery'; + break; + default: + throw new Exception("Unsupported VCS!"); + } + + PhutilSymbolLoader::loadClass($class); + $query = new $class(); + + $query->request = $request; + + return $query; + } + + final protected function getRequest() { + return $this->request; + } + + final public function loadLastModification() { + return $this->executeQuery(); + } + + abstract protected function executeQuery(); + +} diff --git a/src/applications/diffusion/query/lastmodified/base/__init__.php b/src/applications/diffusion/query/lastmodified/base/__init__.php new file mode 100644 index 0000000000..201f669215 --- /dev/null +++ b/src/applications/diffusion/query/lastmodified/base/__init__.php @@ -0,0 +1,14 @@ +getRequest(); + $repository = $drequest->getRepository(); + + list($hash) = execx( + "(cd %s && git log -n1 --format=%%H %s -- %s)", + $repository->getDetail('local-path'), + $drequest->getCommit(), + $drequest->getPath()); + $hash = trim($hash); + + $commit_data = null; + + $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere( + 'repositoryID = %d AND commitIdentifier = %s', + $repository->getID(), + $hash); + if ($commit) { + $commit_data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( + 'commitID = %d', + $commit->getID()); + } + + return array($commit, $commit_data); + } + +} diff --git a/src/applications/diffusion/query/lastmodified/git/__init__.php b/src/applications/diffusion/query/lastmodified/git/__init__.php new file mode 100644 index 0000000000..14b7716460 --- /dev/null +++ b/src/applications/diffusion/query/lastmodified/git/__init__.php @@ -0,0 +1,17 @@ +getRequest(); + $repository = $drequest->getRepository(); + + $path = $drequest->getPath(); + + $history_query = DiffusionHistoryQuery::newFromDiffusionRequest( + $drequest); + $history_query->setLimit(1); + $history_array = $history_query->loadHistory(); + $history = reset($history_array); + + return array($history->getCommit(), $history->getCommitData()); + } + +} diff --git a/src/applications/diffusion/query/lastmodified/svn/__init__.php b/src/applications/diffusion/query/lastmodified/svn/__init__.php new file mode 100644 index 0000000000..fecbe080db --- /dev/null +++ b/src/applications/diffusion/query/lastmodified/svn/__init__.php @@ -0,0 +1,13 @@ +getEpoch(); + $modified = DiffusionView::linkCommit( + $repository, + $commit->getCommitIdentifier()); + $date = date('M j, Y', $epoch); + $time = date('g:i A', $epoch); + } else { + $modified = ''; + $date = ''; + $time = ''; + } + + if ($data) { + $author = phutil_escape_html($data->getAuthorName()); + $details = phutil_escape_html($data->getSummary()); + } else { + $author = ''; + $details = ''; + } + + return array( + 'commit' => $modified, + 'date' => $date, + 'time' => $time, + 'author' => $author, + 'details' => $details, + ); + } + public function render() { $request = $this->getDiffusionRequest(); $repository = $request->getRepository(); @@ -34,6 +69,7 @@ final class DiffusionBrowseTableView extends DiffusionView { $base_path = $base_path.'/'; } + $need_pull = array(); $rows = array(); foreach ($this->paths as $path) { @@ -58,38 +94,46 @@ final class DiffusionBrowseTableView extends DiffusionView { $commit = $path->getLastModifiedCommit(); if ($commit) { - $epoch = $commit->getEpoch(); - $modified = $this->linkCommit( + $dict = self::renderLastModifiedColumns( $repository, - $commit->getCommitIdentifier()); - $date = date('M j, Y', $epoch); - $time = date('g:i A', $epoch); + $commit, + $path->getLastCommitData()); } else { - $modified = ''; - $date = ''; - $time = ''; - } - - $data = $path->getLastCommitData(); - if ($data) { - $author = phutil_escape_html($data->getAuthorName()); - $details = phutil_escape_html($data->getSummary()); - } else { - $author = ''; - $details = ''; + $dict = array( + 'commit' => celerity_generate_unique_node_id(), + 'date' => celerity_generate_unique_node_id(), + 'time' => celerity_generate_unique_node_id(), + 'author' => celerity_generate_unique_node_id(), + 'details' => celerity_generate_unique_node_id(), + ); + $uri = + '/diffusion/'.$repository->getCallsign().'/lastmodified/'. + $request->getBranchURIComponent($request->getBranch()). + $base_path.$path->getPath(); + if ($request->getRawCommit()) { + $uri .= ';'.$request->getRawCommit(); + } + $need_pull[$uri] = $dict; + foreach ($dict as $k => $uniq) { + $dict[$k] = ''; + } } $rows[] = array( $this->linkHistory($base_path.$path->getPath().$dir_slash), $browse_link, - $modified, - $date, - $time, - $author, - $details, + $dict['commit'], + $dict['date'], + $dict['time'], + $dict['author'], + $dict['details'], ); } + if ($need_pull) { + Javelin::initBehavior('diffusion-pull-lastmodified', $need_pull); + } + $view = new AphrontTableView($rows); $view->setHeaders( array( diff --git a/src/applications/diffusion/view/browsetable/__init__.php b/src/applications/diffusion/view/browsetable/__init__.php index 1dde4b2648..f1c4b316b2 100644 --- a/src/applications/diffusion/view/browsetable/__init__.php +++ b/src/applications/diffusion/view/browsetable/__init__.php @@ -8,6 +8,8 @@ phutil_require_module('phabricator', 'applications/differential/constants/changetype'); phutil_require_module('phabricator', 'applications/diffusion/view/base'); +phutil_require_module('phabricator', 'infrastructure/celerity/api'); +phutil_require_module('phabricator', 'infrastructure/javelin/api'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phutil', 'markup'); diff --git a/webroot/rsrc/js/application/diffusion/behavior-pull-lastmodified.js b/webroot/rsrc/js/application/diffusion/behavior-pull-lastmodified.js new file mode 100644 index 0000000000..ae351eb680 --- /dev/null +++ b/webroot/rsrc/js/application/diffusion/behavior-pull-lastmodified.js @@ -0,0 +1,19 @@ +/** + * @provides javelin-behavior-diffusion-pull-lastmodified + * @requires javelin-lib-dev + */ + +JX.behavior('diffusion-pull-lastmodified', function(config) { + + for (var uri in config) { + new JX.Request(uri, JX.bind(config[uri], function(r) { + for (var k in r) { + if (this[k]) { + JX.DOM.setContent(JX.$(this[k]), JX.HTML(r[k])); + } + } + })).send(); + } + +}); +