No OneTemporary
Actions

Size

154 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/resources/sql/patches/018.owners.sql b/resources/sql/patches/018.owners.sql
	index b2bc59ece8..9628cc3710 100644
	--- a/resources/sql/patches/018.owners.sql
	+++ b/resources/sql/patches/018.owners.sql
	@@ -1,28 +1,27 @@
	CREATE DATABASE phabricator_owners;

	-CREATE TABLE phabricator_owners.onwners_package (
	+CREATE TABLE phabricator_owners.owners_package (
	id int unsigned not null auto_increment primary key,
	phid varchar(64) binary not null,
	unique key(phid),
	name varchar(255) not null,
	unique key(name),
	description text not null,
	primaryOwnerPHID varchar(64) binary
	);

	CREATE TABLE phabricator_owners.owners_owner (
	id int unsigned not null auto_increment primary key,
	packageID int unsigned not null,
	userPHID varchar(64) binary not null,
	UNIQUE KEY(packageID, userPHID),
	KEY(userPHID)
	);

	CREATE TABLE phabricator_owners.owners_path (
	id int unsigned not null auto_increment primary key,
	packageID int unsigned not null,
	key(packageID),
	repositoryPHID varchar(64) binary not null,
	- path varchar(255) not null,
	- unique key (repositoryPHID, path)
	+ path varchar(255) not null
	);
	\ No newline at end of file
	diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
	index 758a39c077..5c3fcfee6c 100644
	--- a/src/__celerity_resource_map__.php
	+++ b/src/__celerity_resource_map__.php
	@@ -1,742 +1,742 @@
	<?php

	/**
	* This file is automatically generated. Use 'celerity_mapper.php' to rebuild
	* it.
	* @generated
	*/

	celerity_register_resource_map(array(
	'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-dark-console-css' =>
	array(
	'uri' => '/res/056b0c12/rsrc/css/aphront/dark-console.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/dark-console.css',
	),
	'aphront-dialog-view-css' =>
	array(
	'uri' => '/res/7101ab69/rsrc/css/aphront/dialog-view.css',
	'type' => 'css',
	'requires' =>
	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/82eca506/rsrc/css/aphront/form-view.css',
	'type' => 'css',
	'requires' =>
	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-list-filter-view-css' =>
	array(
	- 'uri' => '/res/89f641c5/rsrc/css/aphront/list-filter-view.css',
	+ 'uri' => '/res/50a790ae/rsrc/css/aphront/list-filter-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/list-filter-view.css',
	),
	'aphront-pager-view-css' =>
	array(
	'uri' => '/res/73ec8cd5/rsrc/css/aphront/pager-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/pager-view.css',
	),
	'aphront-panel-view-css' =>
	array(
	- 'uri' => '/res/63672373/rsrc/css/aphront/panel-view.css',
	+ 'uri' => '/res/8f9f3632/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',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/side-nav-view.css',
	),
	'aphront-table-view-css' =>
	array(
	'uri' => '/res/03724b05/rsrc/css/aphront/table-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/table-view.css',
	),
	'aphront-tokenizer-control-css' =>
	array(
	'uri' => '/res/190349be/rsrc/css/aphront/tokenizer.css',
	'type' => 'css',
	'requires' =>
	array(
	0 => 'aphront-typeahead-control-css',
	),
	'disk' => '/rsrc/css/aphront/tokenizer.css',
	),
	'aphront-typeahead-control-css' =>
	array(
	'uri' => '/res/928df9f0/rsrc/css/aphront/typeahead.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/typeahead.css',
	),
	'phabricator-standard-page-view' =>
	array(
	'uri' => '/res/0d41ea7c/rsrc/css/application/base/standard-page-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/base/standard-page-view.css',
	),
	'differential-revision-add-comment-css' =>
	array(
	'uri' => '/res/aaae14d3/rsrc/css/application/differential/add-comment.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/add-comment.css',
	),
	'differential-changeset-view-css' =>
	array(
	'uri' => '/res/f26ca6f9/rsrc/css/application/differential/changeset-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/changeset-view.css',
	),
	'differential-core-view-css' =>
	array(
	'uri' => '/res/525d1a12/rsrc/css/application/differential/core.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/core.css',
	),
	'differential-revision-comment-list-css' =>
	array(
	'uri' => '/res/10b9a829/rsrc/css/application/differential/revision-comment-list.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/revision-comment-list.css',
	),
	'differential-revision-comment-css' =>
	array(
	'uri' => '/res/b271baaf/rsrc/css/application/differential/revision-comment.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',
	),
	'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(
	'uri' => '/res/6a000601/rsrc/css/application/directory/phabricator-directory.css',
	'type' => 'css',
	'requires' =>
	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/8dc6fb13/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',
	'type' => 'css',
	'requires' =>
	array(
	0 => 'aphront-dialog-view-css',
	),
	'disk' => '/rsrc/css/application/objectselector/object-selector.css',
	),
	'owners-path-editor-css' =>
	array(
	'uri' => '/res/f40dc6b1/rsrc/css/application/owners/owners-path-editor.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/owners/owners-path-editor.css',
	),
	'phabricator-profile-css' =>
	array(
	'uri' => '/res/259ad37f/rsrc/css/application/people/profile.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/people/profile.css',
	),
	'phabricator-ui-example-css' =>
	array(
	'uri' => '/res/365a10f1/rsrc/css/application/uiexample/example.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/uiexample/example.css',
	),
	'phabricator-core-buttons-css' =>
	array(
	'uri' => '/res/53b4f712/rsrc/css/core/buttons.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/buttons.css',
	),
	'phabricator-core-css' =>
	array(
	'uri' => '/res/6eebb99b/rsrc/css/core/core.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/core.css',
	),
	'phabricator-remarkup-css' =>
	array(
	'uri' => '/res/bf863100/rsrc/css/core/remarkup.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/remarkup.css',
	),
	'syntax-highlighting-css' =>
	array(
	'uri' => '/res/fb673ece/rsrc/css/core/syntax.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/syntax.css',
	),
	'javelin-behavior-dark-console' =>
	array(
	'uri' => '/res/020b0265/rsrc/js/application/core/behavior-dark-console.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/application/core/behavior-dark-console.js',
	),
	'javelin-behavior-phabricator-object-selector' =>
	array(
	'uri' => '/res/4fe735af/rsrc/js/application/core/behavior-object-selector.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'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',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/core/behavior-workflow.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-differential-add-reviewers' =>
	array(
	'uri' => '/res/330154e4/rsrc/js/application/differential/behavior-add-reviewers.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-add-reviewers.js',
	),
	'javelin-behavior-differential-feedback-preview' =>
	array(
	'uri' => '/res/8695d8b8/rsrc/js/application/differential/behavior-comment-preview.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-comment-preview.js',
	),
	'javelin-behavior-differential-diff-radios' =>
	array(
	'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-diff-radios.js',
	),
	'javelin-behavior-differential-edit-inline-comments' =>
	array(
	'uri' => '/res/74747b2e/rsrc/js/application/differential/behavior-edit-inline-comments.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'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',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'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/6a5e7374/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/ec8e2110/rsrc/js/application/herald/HeraldRuleEditor.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'multirow-row-manager',
	1 => 'javelin-lib-dev',
	2 => 'javelin-typeahead-dev',
	3 => 'path-typeahead',
	),
	'disk' => '/rsrc/js/application/herald/HeraldRuleEditor.js',
	),
	'path-typeahead' =>
	array(
	'uri' => '/res/42fb76c3/rsrc/js/application/herald/PathTypeahead.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	1 => 'javelin-typeahead-dev',
	),
	'disk' => '/rsrc/js/application/herald/PathTypeahead.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-behavior-owners-path-editor' =>
	array(
	'uri' => '/res/7568aa22/rsrc/js/application/owners/owners-path-editor.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'owners-path-editor',
	1 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/owners/owners-path-editor.js',
	),
	'owners-path-editor' =>
	array(
	'uri' => '/res/b01c1ca9/rsrc/js/application/owners/OwnersPathEditor.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'multirow-row-manager',
	1 => 'javelin-lib-dev',
	2 => 'javelin-typeahead-dev',
	3 => 'path-typeahead',
	),
	'disk' => '/rsrc/js/application/owners/OwnersPathEditor.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 (
	- 'e3ec35d7' =>
	+ '2de9aa4e' =>
	array (
	'name' => 'core.pkg.css',
	'symbols' =>
	array (
	0 => 'phabricator-core-css',
	1 => 'phabricator-core-buttons-css',
	2 => 'phabricator-standard-page-view',
	3 => 'aphront-dialog-view-css',
	4 => 'aphront-form-view-css',
	5 => 'aphront-panel-view-css',
	6 => 'aphront-side-nav-view-css',
	7 => 'aphront-table-view-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/e3ec35d7/core.pkg.css',
	+ 'uri' => '/res/pkg/2de9aa4e/core.pkg.css',
	'type' => 'css',
	),
	'76f3c1f8' =>
	array (
	'name' => 'differential.pkg.css',
	'symbols' =>
	array (
	0 => 'differential-core-view-css',
	1 => 'differential-changeset-view-css',
	2 => 'differential-revision-detail-css',
	3 => 'differential-revision-history-css',
	4 => 'differential-table-of-contents-css',
	5 => 'differential-revision-comment-css',
	6 => 'differential-revision-add-comment-css',
	7 => 'differential-revision-comment-list-css',
	),
	'uri' => '/res/pkg/76f3c1f8/differential.pkg.css',
	'type' => 'css',
	),
	'30d594cf' =>
	array (
	'name' => 'differential.pkg.js',
	'symbols' =>
	array (
	0 => 'javelin-behavior-differential-feedback-preview',
	1 => 'javelin-behavior-differential-edit-inline-comments',
	2 => 'javelin-behavior-differential-populate',
	3 => 'javelin-behavior-differential-show-more',
	4 => 'javelin-behavior-differential-diff-radios',
	),
	'uri' => '/res/pkg/30d594cf/differential.pkg.js',
	'type' => 'js',
	),
	'eadf6ec3' =>
	array (
	'name' => 'diffusion.pkg.css',
	'symbols' =>
	array (
	0 => 'diffusion-commit-view-css',
	),
	'uri' => '/res/pkg/eadf6ec3/diffusion.pkg.css',
	'type' => 'css',
	),
	),
	'reverse' =>
	array (
	- 'phabricator-core-css' => 'e3ec35d7',
	- 'phabricator-core-buttons-css' => 'e3ec35d7',
	- 'phabricator-standard-page-view' => 'e3ec35d7',
	- 'aphront-dialog-view-css' => 'e3ec35d7',
	- 'aphront-form-view-css' => 'e3ec35d7',
	- 'aphront-panel-view-css' => 'e3ec35d7',
	- 'aphront-side-nav-view-css' => 'e3ec35d7',
	- 'aphront-table-view-css' => 'e3ec35d7',
	- 'aphront-crumbs-view-css' => 'e3ec35d7',
	- 'aphront-tokenizer-control-css' => 'e3ec35d7',
	- 'aphront-typeahead-control-css' => 'e3ec35d7',
	- 'phabricator-directory-css' => 'e3ec35d7',
	- 'phabricator-remarkup-css' => 'e3ec35d7',
	- 'syntax-highlighting-css' => 'e3ec35d7',
	+ 'phabricator-core-css' => '2de9aa4e',
	+ 'phabricator-core-buttons-css' => '2de9aa4e',
	+ 'phabricator-standard-page-view' => '2de9aa4e',
	+ 'aphront-dialog-view-css' => '2de9aa4e',
	+ 'aphront-form-view-css' => '2de9aa4e',
	+ 'aphront-panel-view-css' => '2de9aa4e',
	+ 'aphront-side-nav-view-css' => '2de9aa4e',
	+ 'aphront-table-view-css' => '2de9aa4e',
	+ 'aphront-crumbs-view-css' => '2de9aa4e',
	+ 'aphront-tokenizer-control-css' => '2de9aa4e',
	+ 'aphront-typeahead-control-css' => '2de9aa4e',
	+ 'phabricator-directory-css' => '2de9aa4e',
	+ 'phabricator-remarkup-css' => '2de9aa4e',
	+ 'syntax-highlighting-css' => '2de9aa4e',
	'differential-core-view-css' => '76f3c1f8',
	'differential-changeset-view-css' => '76f3c1f8',
	'differential-revision-detail-css' => '76f3c1f8',
	'differential-revision-history-css' => '76f3c1f8',
	'differential-table-of-contents-css' => '76f3c1f8',
	'differential-revision-comment-css' => '76f3c1f8',
	'differential-revision-add-comment-css' => '76f3c1f8',
	'differential-revision-comment-list-css' => '76f3c1f8',
	'javelin-behavior-differential-feedback-preview' => '30d594cf',
	'javelin-behavior-differential-edit-inline-comments' => '30d594cf',
	'javelin-behavior-differential-populate' => '30d594cf',
	'javelin-behavior-differential-show-more' => '30d594cf',
	'javelin-behavior-differential-diff-radios' => '30d594cf',
	'diffusion-commit-view-css' => 'eadf6ec3',
	),
	));
	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index e8d4a40a1d..21be35b244 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,773 +1,777 @@
	<?php

	/**
	* This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
	* @generated
	*/

	phutil_register_library_map(array(
	'class' =>
	array(
	'Aphront400Response' => 'aphront/response/400',
	'Aphront404Response' => 'aphront/response/404',
	'AphrontAjaxResponse' => 'aphront/response/ajax',
	'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
	'AphrontController' => 'aphront/controller',
	'AphrontCrumbsView' => 'view/layout/crumbs',
	'AphrontDatabaseConnection' => 'storage/connection/base',
	'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration',
	'AphrontDefaultApplicationController' => 'aphront/default/controller',
	'AphrontDialogResponse' => 'aphront/response/dialog',
	'AphrontDialogView' => 'view/dialog',
	'AphrontErrorView' => 'view/form/error',
	'AphrontException' => 'aphront/exception/base',
	'AphrontFileResponse' => 'aphront/response/file',
	'AphrontFormCheckboxControl' => 'view/form/control/checkbox',
	'AphrontFormControl' => 'view/form/control/base',
	'AphrontFormDividerControl' => 'view/form/control/divider',
	'AphrontFormFileControl' => 'view/form/control/file',
	'AphrontFormMarkupControl' => 'view/form/control/markup',
	'AphrontFormPasswordControl' => 'view/form/control/password',
	'AphrontFormRecaptchaControl' => 'view/form/control/recaptcha',
	'AphrontFormSelectControl' => 'view/form/control/select',
	'AphrontFormStaticControl' => 'view/form/control/static',
	'AphrontFormSubmitControl' => 'view/form/control/submit',
	'AphrontFormTextAreaControl' => 'view/form/control/textarea',
	'AphrontFormTextControl' => 'view/form/control/text',
	'AphrontFormToggleButtonsControl' => 'view/form/control/togglebuttons',
	'AphrontFormTokenizerControl' => 'view/form/control/tokenizer',
	'AphrontFormView' => 'view/form/base',
	'AphrontHeadsupActionListView' => 'view/layout/headsup/actionlist',
	'AphrontHeadsupActionView' => 'view/layout/headsup/action',
	'AphrontListFilterView' => 'view/layout/listfilter',
	'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
	'AphrontNullView' => 'view/null',
	'AphrontPageView' => 'view/page/base',
	'AphrontPagerView' => 'view/control/pager',
	'AphrontPanelView' => 'view/layout/panel',
	'AphrontQueryConnectionException' => 'storage/exception/connection',
	'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost',
	'AphrontQueryCountException' => 'storage/exception/count',
	'AphrontQueryDuplicateKeyException' => 'storage/exception/duplicatekey',
	'AphrontQueryException' => 'storage/exception/base',
	'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing',
	'AphrontQueryParameterException' => 'storage/exception/parameter',
	'AphrontQueryRecoverableException' => 'storage/exception/recoverable',
	'AphrontRedirectException' => 'aphront/exception/redirect',
	'AphrontRedirectResponse' => 'aphront/response/redirect',
	'AphrontRequest' => 'aphront/request',
	'AphrontRequestFailureView' => 'view/page/failure',
	'AphrontResponse' => 'aphront/response/base',
	'AphrontSideNavView' => 'view/layout/sidenav',
	'AphrontTableView' => 'view/control/table',
	'AphrontTokenizerTemplateView' => 'view/control/tokenizer',
	'AphrontTypeaheadTemplateView' => 'view/control/typeahead',
	'AphrontURIMapper' => 'aphront/mapper',
	'AphrontView' => 'view/base',
	'AphrontWebpageResponse' => 'aphront/response/webpage',
	'CelerityAPI' => 'infrastructure/celerity/api',
	'CelerityResourceController' => 'infrastructure/celerity/controller',
	'CelerityResourceMap' => 'infrastructure/celerity/map',
	'CelerityStaticResourceResponse' => 'infrastructure/celerity/response',
	'ConduitAPIMethod' => 'applications/conduit/method/base',
	'ConduitAPIRequest' => 'applications/conduit/protocol/request',
	'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/connect',
	'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ping',
	'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/launched',
	'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/log',
	'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/creatediff',
	'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/createrevision',
	'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/find',
	'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/getcommitmessage',
	'ConduitAPI_differential_getcommitpaths_Method' => 'applications/conduit/method/differential/getcommitpaths',
	'ConduitAPI_differential_getdiff_Method' => 'applications/conduit/method/differential/getdiff',
	'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/markcommitted',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/parsecommitmessage',
	'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/setdiffproperty',
	'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/updaterevision',
	'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
	'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find',
	'ConduitException' => 'applications/conduit/protocol/exception',
	'DarkConsole' => 'aphront/console/api',
	'DarkConsoleConfigPlugin' => 'aphront/console/plugin/config',
	'DarkConsoleController' => 'aphront/console/controller',
	'DarkConsoleCore' => 'aphront/console/core',
	'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/errorlog',
	'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/api',
	'DarkConsolePlugin' => 'aphront/console/plugin/base',
	'DarkConsoleRequestPlugin' => 'aphront/console/plugin/request',
	'DarkConsoleServicesPlugin' => 'aphront/console/plugin/services',
	'DarkConsoleServicesPluginAPI' => 'aphront/console/plugin/services/api',
	'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof',
	'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api',
	'DifferentialAction' => 'applications/differential/constants/action',
	'DifferentialAddCommentView' => 'applications/differential/view/addcomment',
	'DifferentialAttachController' => 'applications/differential/controller/attach',
	'DifferentialCCWelcomeMail' => 'applications/differential/mail/ccwelcome',
	'DifferentialChangeType' => 'applications/differential/constants/changetype',
	'DifferentialChangeset' => 'applications/differential/storage/changeset',
	'DifferentialChangesetDetailView' => 'applications/differential/view/changesetdetailview',
	'DifferentialChangesetListView' => 'applications/differential/view/changesetlistview',
	'DifferentialChangesetParser' => 'applications/differential/parser/changeset',
	'DifferentialChangesetViewController' => 'applications/differential/controller/changesetview',
	'DifferentialComment' => 'applications/differential/storage/comment',
	'DifferentialCommentEditor' => 'applications/differential/editor/comment',
	'DifferentialCommentMail' => 'applications/differential/mail/comment',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/commentpreview',
	'DifferentialCommentSaveController' => 'applications/differential/controller/commentsave',
	'DifferentialCommitMessage' => 'applications/differential/parser/commitmessage',
	'DifferentialCommitMessageData' => 'applications/differential/data/commitmessage',
	'DifferentialCommitMessageParserException' => 'applications/differential/parser/commitmessage/exception',
	'DifferentialController' => 'applications/differential/controller/base',
	'DifferentialDAO' => 'applications/differential/storage/base',
	'DifferentialDiff' => 'applications/differential/storage/diff',
	'DifferentialDiffContentMail' => 'applications/differential/mail/diffcontent',
	'DifferentialDiffCreateController' => 'applications/differential/controller/diffcreate',
	'DifferentialDiffProperty' => 'applications/differential/storage/diffproperty',
	'DifferentialDiffTableOfContentsView' => 'applications/differential/view/difftableofcontents',
	'DifferentialDiffViewController' => 'applications/differential/controller/diffview',
	'DifferentialHunk' => 'applications/differential/storage/hunk',
	'DifferentialInlineComment' => 'applications/differential/storage/inlinecomment',
	'DifferentialInlineCommentEditController' => 'applications/differential/controller/inlinecommentedit',
	'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/inlinecommentpreview',
	'DifferentialInlineCommentView' => 'applications/differential/view/inlinecomment',
	'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
	'DifferentialMail' => 'applications/differential/mail/base',
	'DifferentialMarkupEngineFactory' => 'applications/differential/parser/markup',
	'DifferentialNewDiffMail' => 'applications/differential/mail/newdiff',
	'DifferentialReviewRequestMail' => 'applications/differential/mail/reviewrequest',
	'DifferentialRevision' => 'applications/differential/storage/revision',
	'DifferentialRevisionCommentListView' => 'applications/differential/view/revisioncommentlist',
	'DifferentialRevisionCommentView' => 'applications/differential/view/revisioncomment',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem',
	'DifferentialRevisionDetailView' => 'applications/differential/view/revisiondetail',
	'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit',
	'DifferentialRevisionEditor' => 'applications/differential/editor/revision',
	'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist',
	'DifferentialRevisionListData' => 'applications/differential/data/revisionlist',
	'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/revisionupdatehistory',
	'DifferentialRevisionViewController' => 'applications/differential/controller/revisionview',
	'DifferentialSubscribeController' => 'applications/differential/controller/subscribe',
	'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
	'DiffusionBranchInformation' => 'applications/diffusion/data/branch',
	'DiffusionBranchQuery' => 'applications/diffusion/query/branch/base',
	'DiffusionBranchTableView' => 'applications/diffusion/view/branchtable',
	'DiffusionBrowseController' => 'applications/diffusion/controller/browse',
	'DiffusionBrowseFileController' => 'applications/diffusion/controller/file',
	'DiffusionBrowseQuery' => 'applications/diffusion/query/browse/base',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/browsetable',
	'DiffusionChangeController' => 'applications/diffusion/controller/change',
	'DiffusionCommitChangeTableView' => 'applications/diffusion/view/commitchangetable',
	'DiffusionCommitController' => 'applications/diffusion/controller/commit',
	'DiffusionController' => 'applications/diffusion/controller/base',
	'DiffusionDiffController' => 'applications/diffusion/controller/diff',
	'DiffusionDiffQuery' => 'applications/diffusion/query/diff/base',
	'DiffusionFileContent' => 'applications/diffusion/data/filecontent',
	'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/base',
	'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/git',
	'DiffusionGitBrowseQuery' => 'applications/diffusion/query/browse/git',
	'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',
	'DiffusionPathCompleteController' => 'applications/diffusion/controller/pathcomplete',
	'DiffusionPathValidateController' => 'applications/diffusion/controller/pathvalidate',
	'DiffusionRepositoryController' => 'applications/diffusion/controller/repository',
	'DiffusionRepositoryPath' => 'applications/diffusion/data/repositorypath',
	'DiffusionRequest' => 'applications/diffusion/request/base',
	'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/svn',
	'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',
	'HeraldActionConfig' => 'applications/herald/config/action',
	'HeraldApplyTranscript' => 'applications/herald/storage/transcript/apply',
	'HeraldCondition' => 'applications/herald/storage/condition',
	'HeraldConditionConfig' => 'applications/herald/config/condition',
	'HeraldConditionTranscript' => 'applications/herald/storage/transcript/condition',
	'HeraldContentTypeConfig' => 'applications/herald/config/contenttype',
	'HeraldController' => 'applications/herald/controller/base',
	'HeraldDAO' => 'applications/herald/storage/base',
	'HeraldDeleteController' => 'applications/herald/controller/delete',
	'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/differential',
	'HeraldDryRunAdapter' => 'applications/herald/adapter/dryrun',
	'HeraldEffect' => 'applications/herald/engine/effect',
	'HeraldEngine' => 'applications/herald/engine/engine',
	'HeraldFieldConfig' => 'applications/herald/config/field',
	'HeraldHomeController' => 'applications/herald/controller/home',
	'HeraldInvalidConditionException' => 'applications/herald/engine/engine/exception',
	'HeraldInvalidFieldException' => 'applications/herald/engine/engine/exception',
	'HeraldNewController' => 'applications/herald/controller/new',
	'HeraldObjectAdapter' => 'applications/herald/adapter/base',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/object',
	'HeraldRecursiveConditionsException' => 'applications/herald/engine/engine/exception',
	'HeraldRule' => 'applications/herald/storage/rule',
	'HeraldRuleController' => 'applications/herald/controller/rule',
	'HeraldRuleTranscript' => 'applications/herald/storage/transcript/rule',
	'HeraldTestConsoleController' => 'applications/herald/controller/test',
	'HeraldTranscript' => 'applications/herald/storage/transcript/base',
	'HeraldTranscriptController' => 'applications/herald/controller/transcript',
	'HeraldTranscriptListController' => 'applications/herald/controller/transcriptlist',
	'HeraldValueTypeConfig' => 'applications/herald/config/valuetype',
	'Javelin' => 'infrastructure/javelin/api',
	'LiskDAO' => 'storage/lisk/dao',
	'ManiphestController' => 'applications/maniphest/controller/base',
	'ManiphestDAO' => 'applications/maniphest/storage/base',
	'ManiphestTask' => 'applications/maniphest/storage/task',
	'ManiphestTaskDetailController' => 'applications/maniphest/controller/taskdetail',
	'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit',
	'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
	'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
	'ManiphestTaskSelectorSearchController' => 'applications/maniphest/controller/taskselectorsearch',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
	'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
	'ManiphestTransaction' => 'applications/maniphest/storage/transaction',
	'ManiphestTransactionDetailView' => 'applications/maniphest/view/transactiondetail',
	'ManiphestTransactionEditor' => 'applications/maniphest/editor/transaction',
	'ManiphestTransactionListView' => 'applications/maniphest/view/transactionlist',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/transactionsave',
	'ManiphestTransactionType' => 'applications/maniphest/constants/transactiontype',
	'Phabricator404Controller' => 'applications/base/controller/404',
	'PhabricatorAuthController' => 'applications/auth/controller/base',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
	'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
	'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
	'PhabricatorConduitController' => 'applications/conduit/controller/base',
	'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
	'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
	'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
	'PhabricatorController' => 'applications/base/controller/base',
	'PhabricatorDaemon' => 'infrastructure/daemon/base',
	'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/console',
	'PhabricatorDaemonControl' => 'infrastructure/daemon/control',
	'PhabricatorDaemonController' => 'applications/daemon/controller/base',
	'PhabricatorDaemonDAO' => 'infrastructure/daemon/storage/base',
	'PhabricatorDaemonLog' => 'infrastructure/daemon/storage/log',
	'PhabricatorDaemonLogEvent' => 'infrastructure/daemon/storage/event',
	'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/logview',
	'PhabricatorDaemonReference' => 'infrastructure/daemon/control/reference',
	'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/timeline',
	'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/timelineevent',
	'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
	'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
	'PhabricatorDirectoryCategoryEditController' => 'applications/directory/controller/categoryedit',
	'PhabricatorDirectoryCategoryListController' => 'applications/directory/controller/categorylist',
	'PhabricatorDirectoryController' => 'applications/directory/controller/base',
	'PhabricatorDirectoryDAO' => 'applications/directory/storage/base',
	'PhabricatorDirectoryItem' => 'applications/directory/storage/item',
	'PhabricatorDirectoryItemDeleteController' => 'applications/directory/controller/itemdelete',
	'PhabricatorDirectoryItemEditController' => 'applications/directory/controller/itemedit',
	'PhabricatorDirectoryItemListController' => 'applications/directory/controller/itemlist',
	'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
	'PhabricatorDraft' => 'applications/draft/storage/draft',
	'PhabricatorDraftDAO' => 'applications/draft/storage/base',
	'PhabricatorEditPreferencesController' => 'applications/preferences/controller/edit',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/email',
	'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken',
	'PhabricatorEnv' => 'infrastructure/env',
	'PhabricatorFile' => 'applications/files/storage/file',
	'PhabricatorFileController' => 'applications/files/controller/base',
	'PhabricatorFileDAO' => 'applications/files/storage/base',
	'PhabricatorFileListController' => 'applications/files/controller/list',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
	'PhabricatorFileURI' => 'applications/files/uri',
	'PhabricatorFileUploadController' => 'applications/files/controller/upload',
	'PhabricatorFileViewController' => 'applications/files/controller/view',
	'PhabricatorGoodForNothingWorker' => 'infrastructure/daemon/workers/worker/goodfornothing',
	'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/selector',
	'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
	'PhabricatorLoginController' => 'applications/auth/controller/login',
	'PhabricatorLogoutController' => 'applications/auth/controller/logout',
	'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/base',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/amazonses',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/phpmailerlite',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/base',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base',
	'PhabricatorMetaMTADaemon' => 'applications/metamta/daemon/mta',
	'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail',
	'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/mailinglist',
	'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/mailinglistedit',
	'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists',
	'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
	'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view',
	'PhabricatorOAuthDefaultRegistrationController' => 'applications/auth/controller/oauthregistration/default',
	'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/oauthdiagnostics',
	'PhabricatorOAuthFailureView' => 'applications/auth/view/oauthfailure',
	'PhabricatorOAuthLoginController' => 'applications/auth/controller/oauth',
	'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/base',
	'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/facebook',
	'PhabricatorOAuthProviderGithub' => 'applications/auth/oauth/provider/github',
	'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/base',
	'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/unlink',
	'PhabricatorObjectHandle' => 'applications/phid/handle',
	'PhabricatorObjectHandleData' => 'applications/phid/handle/data',
	'PhabricatorObjectSelectorDialog' => 'view/control/objectselector',
	'PhabricatorOwnersController' => 'applications/owners/controller/base',
	'PhabricatorOwnersDAO' => 'applications/owners/storage/base',
	+ 'PhabricatorOwnersDeleteController' => 'applications/owners/controller/delete',
	'PhabricatorOwnersDetailController' => 'applications/owners/controller/detail',
	+ 'PhabricatorOwnersEditController' => 'applications/owners/controller/edit',
	'PhabricatorOwnersListController' => 'applications/owners/controller/list',
	'PhabricatorOwnersOwner' => 'applications/owners/storage/owner',
	'PhabricatorOwnersPackage' => 'applications/owners/storage/package',
	'PhabricatorOwnersPath' => 'applications/owners/storage/path',
	'PhabricatorPHID' => 'applications/phid/storage/phid',
	'PhabricatorPHIDAllocateController' => 'applications/phid/controller/allocate',
	'PhabricatorPHIDConstants' => 'applications/phid/constants',
	'PhabricatorPHIDController' => 'applications/phid/controller/base',
	'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
	'PhabricatorPHIDListController' => 'applications/phid/controller/list',
	'PhabricatorPHIDLookupController' => 'applications/phid/controller/lookup',
	'PhabricatorPeopleController' => 'applications/people/controller/base',
	'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
	'PhabricatorPeopleListController' => 'applications/people/controller/list',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
	'PhabricatorPeopleProfileEditController' => 'applications/people/controller/profileedit',
	'PhabricatorPreferencesController' => 'applications/preferences/controller/base',
	'PhabricatorProject' => 'applications/project/storage/project',
	'PhabricatorProjectAffiliation' => 'applications/project/storage/affiliation',
	'PhabricatorProjectAffiliationEditController' => 'applications/project/controller/editaffiliation',
	'PhabricatorProjectController' => 'applications/project/controller/base',
	'PhabricatorProjectDAO' => 'applications/project/storage/base',
	'PhabricatorProjectEditController' => 'applications/project/controller/edit',
	'PhabricatorProjectListController' => 'applications/project/controller/list',
	'PhabricatorProjectProfile' => 'applications/project/storage/profile',
	'PhabricatorProjectProfileController' => 'applications/project/controller/profile',
	'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/differential',
	'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/maniphest',
	'PhabricatorRepository' => 'applications/repository/storage/repository',
	'PhabricatorRepositoryCommit' => 'applications/repository/storage/commit',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/base',
	'PhabricatorRepositoryCommitData' => 'applications/repository/storage/commitdata',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/base',
	'PhabricatorRepositoryCommitMessageDetailParser' => 'applications/repository/parser/base',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/base',
	'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/base',
	'PhabricatorRepositoryCommitTaskDaemon' => 'applications/repository/daemon/committask',
	'PhabricatorRepositoryController' => 'applications/repository/controller/base',
	'PhabricatorRepositoryCreateController' => 'applications/repository/controller/create',
	'PhabricatorRepositoryDAO' => 'applications/repository/storage/base',
	'PhabricatorRepositoryDaemon' => 'applications/repository/daemon/base',
	'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'applications/repository/parser/default',
	'PhabricatorRepositoryEditController' => 'applications/repository/controller/edit',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/git',
	'PhabricatorRepositoryGitCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/git',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/git',
	'PhabricatorRepositoryGitFetchDaemon' => 'applications/repository/daemon/gitfetch',
	'PhabricatorRepositoryGitHubNotification' => 'applications/repository/storage/githubnotification',
	'PhabricatorRepositoryGitHubPostReceiveController' => 'applications/repository/controller/github-post-receive',
	'PhabricatorRepositoryListController' => 'applications/repository/controller/list',
	'PhabricatorRepositoryShortcut' => 'applications/repository/storage/shortcut',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/svn',
	'PhabricatorRepositorySvnCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/svn',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/svn',
	'PhabricatorRepositoryType' => 'applications/repository/constants/repositorytype',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/abstractdocument',
	'PhabricatorSearchBaseController' => 'applications/search/controller/base',
	'PhabricatorSearchController' => 'applications/search/controller/search',
	'PhabricatorSearchDAO' => 'applications/search/storage/base',
	'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/differential',
	'PhabricatorSearchDocument' => 'applications/search/storage/document/document',
	'PhabricatorSearchDocumentField' => 'applications/search/storage/document/field',
	'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/base',
	'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/relationship',
	'PhabricatorSearchExecutor' => 'applications/search/execute/base',
	'PhabricatorSearchField' => 'applications/search/constants/field',
	'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/maniphest',
	'PhabricatorSearchMySQLExecutor' => 'applications/search/execute/mysql',
	'PhabricatorSearchQuery' => 'applications/search/storage/query',
	'PhabricatorSearchRelationship' => 'applications/search/constants/relationship',
	'PhabricatorStandardPageView' => 'view/page/standard',
	'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/taskmaster',
	'PhabricatorTimelineCursor' => 'infrastructure/daemon/timeline/storage/cursor',
	'PhabricatorTimelineDAO' => 'infrastructure/daemon/timeline/storage/base',
	'PhabricatorTimelineEvent' => 'infrastructure/daemon/timeline/storage/event',
	'PhabricatorTimelineEventData' => 'infrastructure/daemon/timeline/storage/eventdata',
	'PhabricatorTimelineIterator' => 'infrastructure/daemon/timeline/cursor/iterator',
	'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/common',
	'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base',
	'PhabricatorUIExample' => 'applications/uiexample/examples/base',
	'PhabricatorUIExampleController' => 'applications/uiexample/controller/base',
	'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/render',
	'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/listfilter',
	'PhabricatorUIPagerExample' => 'applications/uiexample/examples/pager',
	'PhabricatorUser' => 'applications/people/storage/user',
	'PhabricatorUserDAO' => 'applications/people/storage/base',
	'PhabricatorUserOAuthInfo' => 'applications/people/storage/useroauthinfo',
	'PhabricatorUserPreferences' => 'applications/people/storage/preferences',
	'PhabricatorUserProfile' => 'applications/people/storage/profile',
	'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
	'PhabricatorWorker' => 'infrastructure/daemon/workers/worker',
	'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/base',
	'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/task',
	'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/taskdata',
	'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/workertaskdetail',
	'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
	'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile',
	'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol',
	'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/toplevel',
	),
	'function' =>
	array(
	'_qsprintf_check_scalar_type' => 'storage/qsprintf',
	'_qsprintf_check_type' => 'storage/qsprintf',
	'celerity_generate_unique_node_id' => 'infrastructure/celerity/api',
	'celerity_register_resource_map' => 'infrastructure/celerity/map',
	'javelin_render_tag' => 'infrastructure/javelin/markup',
	'phabricator_format_relative_time' => 'view/utils',
	'phabricator_format_timestamp' => 'view/utils',
	'phabricator_format_units_generic' => 'view/utils',
	'phabricator_render_form' => 'infrastructure/javelin/markup',
	'qsprintf' => 'storage/qsprintf',
	'queryfx' => 'storage/queryfx',
	'queryfx_all' => 'storage/queryfx',
	'queryfx_one' => 'storage/queryfx',
	'require_celerity_resource' => 'infrastructure/celerity/api',
	'vqsprintf' => 'storage/qsprintf',
	'vqueryfx' => 'storage/queryfx',
	'vqueryfx_all' => 'storage/queryfx',
	'xsprintf_query' => 'storage/qsprintf',
	),
	'requires_class' =>
	array(
	'Aphront400Response' => 'AphrontResponse',
	'Aphront404Response' => 'AphrontResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontCrumbsView' => 'AphrontView',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDefaultApplicationController' => 'AphrontController',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => 'AphrontView',
	'AphrontErrorView' => 'AphrontView',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	'AphrontFormMarkupControl' => 'AphrontFormControl',
	'AphrontFormPasswordControl' => 'AphrontFormControl',
	'AphrontFormRecaptchaControl' => 'AphrontFormControl',
	'AphrontFormSelectControl' => 'AphrontFormControl',
	'AphrontFormStaticControl' => 'AphrontFormControl',
	'AphrontFormSubmitControl' => 'AphrontFormControl',
	'AphrontFormTextAreaControl' => 'AphrontFormControl',
	'AphrontFormTextControl' => 'AphrontFormControl',
	'AphrontFormToggleButtonsControl' => 'AphrontFormControl',
	'AphrontFormTokenizerControl' => 'AphrontFormControl',
	'AphrontFormView' => 'AphrontView',
	'AphrontHeadsupActionListView' => 'AphrontView',
	'AphrontHeadsupActionView' => 'AphrontView',
	'AphrontListFilterView' => 'AphrontView',
	'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontNullView' => 'AphrontView',
	'AphrontPageView' => 'AphrontView',
	'AphrontPagerView' => 'AphrontView',
	'AphrontPanelView' => 'AphrontView',
	'AphrontQueryConnectionException' => 'AphrontQueryException',
	'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
	'AphrontQueryCountException' => 'AphrontQueryException',
	'AphrontQueryDuplicateKeyException' => 'AphrontQueryException',
	'AphrontQueryObjectMissingException' => 'AphrontQueryException',
	'AphrontQueryParameterException' => 'AphrontQueryException',
	'AphrontQueryRecoverableException' => 'AphrontQueryException',
	'AphrontRedirectException' => 'AphrontException',
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontRequestFailureView' => 'AphrontView',
	'AphrontSideNavView' => 'AphrontView',
	'AphrontTableView' => 'AphrontView',
	'AphrontTokenizerTemplateView' => 'AphrontView',
	'AphrontTypeaheadTemplateView' => 'AphrontView',
	'AphrontWebpageResponse' => 'AphrontResponse',
	'CelerityResourceController' => 'AphrontController',
	'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_launched_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_log_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getdiff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_markcommitted_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_find_Method' => 'ConduitAPIMethod',
	'DarkConsoleConfigPlugin' => 'DarkConsolePlugin',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialAttachController' => 'DifferentialController',
	'DifferentialCCWelcomeMail' => 'DifferentialReviewRequestMail',
	'DifferentialChangeset' => 'DifferentialDAO',
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialComment' => 'DifferentialDAO',
	'DifferentialCommentMail' => 'DifferentialMail',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDiff' => 'DifferentialDAO',
	'DifferentialDiffContentMail' => 'DifferentialMail',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialHunk' => 'DifferentialDAO',
	'DifferentialInlineComment' => 'DifferentialDAO',
	'DifferentialInlineCommentEditController' => 'DifferentialController',
	'DifferentialInlineCommentPreviewController' => 'DifferentialController',
	'DifferentialInlineCommentView' => 'AphrontView',
	'DifferentialNewDiffMail' => 'DifferentialReviewRequestMail',
	'DifferentialReviewRequestMail' => 'DifferentialMail',
	'DifferentialRevision' => 'DifferentialDAO',
	'DifferentialRevisionCommentListView' => 'AphrontView',
	'DifferentialRevisionCommentView' => 'AphrontView',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSubscribeController' => 'DifferentialController',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseFileController' => 'DiffusionController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionCommitChangeTableView' => 'DiffusionView',
	'DiffusionCommitController' => 'DiffusionController',
	'DiffusionController' => 'PhabricatorController',
	'DiffusionDiffController' => 'DiffusionController',
	'DiffusionGitBranchQuery' => 'DiffusionBranchQuery',
	'DiffusionGitBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionGitDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionGitHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionGitLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionGitRequest' => 'DiffusionRequest',
	'DiffusionHistoryController' => 'DiffusionController',
	'DiffusionHistoryTableView' => 'DiffusionView',
	'DiffusionHomeController' => 'DiffusionController',
	'DiffusionLastModifiedController' => 'DiffusionController',
	'DiffusionPathCompleteController' => 'DiffusionController',
	'DiffusionPathValidateController' => 'DiffusionController',
	'DiffusionRepositoryController' => 'DiffusionController',
	'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionSvnDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionSvnHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionSvnLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionSvnRequest' => 'DiffusionRequest',
	'DiffusionView' => 'AphrontView',
	'HeraldAction' => 'HeraldDAO',
	'HeraldApplyTranscript' => 'HeraldDAO',
	'HeraldCondition' => 'HeraldDAO',
	'HeraldController' => 'PhabricatorController',
	'HeraldDAO' => 'PhabricatorLiskDAO',
	'HeraldDeleteController' => 'HeraldController',
	'HeraldDifferentialRevisionAdapter' => 'HeraldObjectAdapter',
	'HeraldDryRunAdapter' => 'HeraldObjectAdapter',
	'HeraldHomeController' => 'HeraldController',
	'HeraldNewController' => 'HeraldController',
	'HeraldRule' => 'HeraldDAO',
	'HeraldRuleController' => 'HeraldController',
	'HeraldTestConsoleController' => 'HeraldController',
	'HeraldTranscript' => 'HeraldDAO',
	'HeraldTranscriptController' => 'HeraldController',
	'HeraldTranscriptListController' => 'HeraldController',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestTask' => 'ManiphestDAO',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskEditController' => 'ManiphestController',
	'ManiphestTaskListController' => 'ManiphestController',
	'ManiphestTaskListView' => 'AphrontView',
	'ManiphestTaskSelectorSearchController' => 'ManiphestController',
	'ManiphestTaskSummaryView' => 'AphrontView',
	'ManiphestTransaction' => 'ManiphestDAO',
	'ManiphestTransactionDetailView' => 'AphrontView',
	'ManiphestTransactionListView' => 'AphrontView',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorDaemon' => 'PhutilDaemon',
	'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonController' => 'PhabricatorController',
	'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDaemonLog' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEvent' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineEventController' => 'PhabricatorDaemonController',
	'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryController' => 'PhabricatorController',
	'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorEditPreferencesController' => 'PhabricatorPreferencesController',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
	'PhabricatorFile' => 'PhabricatorFileDAO',
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileViewController' => 'PhabricatorFileController',
	'PhabricatorGoodForNothingWorker' => 'PhabricatorWorker',
	'PhabricatorLiskDAO' => 'LiskDAO',
	'PhabricatorLoginController' => 'PhabricatorAuthController',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTADaemon' => 'PhabricatorDaemon',
	'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingList' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingListEditController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailingListsController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
	'PhabricatorOAuthDefaultRegistrationController' => 'PhabricatorOAuthRegistrationController',
	'PhabricatorOAuthDiagnosticsController' => 'PhabricatorAuthController',
	'PhabricatorOAuthFailureView' => 'AphrontView',
	'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
	'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGithub' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthRegistrationController' => 'PhabricatorAuthController',
	'PhabricatorOAuthUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorOwnersController' => 'PhabricatorController',
	'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorOwnersDeleteController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersDetailController' => 'PhabricatorOwnersController',
	+ 'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackage' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	'PhabricatorPHID' => 'PhabricatorPHIDDAO',
	'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDController' => 'PhabricatorController',
	'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileEditController' => 'PhabricatorPeopleController',
	'PhabricatorPreferencesController' => 'PhabricatorController',
	'PhabricatorProject' => 'PhabricatorProjectDAO',
	'PhabricatorProjectAffiliation' => 'PhabricatorProjectDAO',
	'PhabricatorProjectAffiliationEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectController' => 'PhabricatorController',
	'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
	'PhabricatorProjectEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectListController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfile' => 'PhabricatorProjectDAO',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorRemarkupRuleDifferential' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleManiphest' => 'PhutilRemarkupRule',
	'PhabricatorRepository' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommit' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryCommitTaskDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryController' => 'PhabricatorController',
	'PhabricatorRepositoryCreateController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryDaemon' => 'PhabricatorDaemon',
	'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'PhabricatorRepositoryCommitMessageDetailParser',
	'PhabricatorRepositoryEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryGitCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryGitFetchDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryGitHubNotification' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryGitHubPostReceiveController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryListController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryShortcut' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositorySvnCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDifferentialIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchManiphestIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchMySQLExecutor' => 'PhabricatorSearchExecutor',
	'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
	'PhabricatorStandardPageView' => 'AphrontPageView',
	'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
	'PhabricatorTimelineCursor' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineDAO' => 'PhabricatorLiskDAO',
	'PhabricatorTimelineEvent' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineEventData' => 'PhabricatorTimelineDAO',
	'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorUIExampleController' => 'PhabricatorController',
	'PhabricatorUIExampleRenderController' => 'PhabricatorUIExampleController',
	'PhabricatorUIListFilterExample' => 'PhabricatorUIExample',
	'PhabricatorUIPagerExample' => 'PhabricatorUIExample',
	'PhabricatorUser' => 'PhabricatorUserDAO',
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserOAuthInfo' => 'PhabricatorUserDAO',
	'PhabricatorUserPreferences' => 'PhabricatorUserDAO',
	'PhabricatorUserProfile' => 'PhabricatorUserDAO',
	'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
	'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'AphrontView',
	'PhabricatorXHProfProfileTopLevelView' => 'AphrontView',
	),
	'requires_interface' =>
	array(
	),
	));
	diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	index 59819b28ec..42cd52cb75 100644
	--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	@@ -1,370 +1,372 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group aphront
	*/
	class AphrontDefaultApplicationConfiguration
	extends AphrontApplicationConfiguration {

	public function __construct() {

	}

	public function getApplicationName() {
	return 'aphront-default';
	}

	public function getURIMap() {
	return $this->getResourceURIMapRules() + array(
	'/' => array(
	'$' => 'PhabricatorDirectoryMainController',
	),
	'/directory/' => array(
	'item/$'
	=> 'PhabricatorDirectoryItemListController',
	'item/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryItemEditController',
	'item/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryItemDeleteController',
	'category/$'
	=> 'PhabricatorDirectoryCategoryListController',
	'category/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryCategoryEditController',
	'category/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryCategoryDeleteController',
	),
	'/file/' => array(
	'$' => 'PhabricatorFileListController',
	'upload/$' => 'PhabricatorFileUploadController',
	'(?P<view>info)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>view)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>download)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	),
	'/phid/' => array(
	'$' => 'PhabricatorPHIDLookupController',
	'list/$' => 'PhabricatorPHIDListController',
	'new/$' => 'PhabricatorPHIDAllocateController',
	),
	'/people/' => array(
	'$' => 'PhabricatorPeopleListController',
	'edit/(?:(?P<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
	),
	'/p/(?P<username>\w+)/$' => 'PhabricatorPeopleProfileController',
	'/profile/' => array(
	'edit/$' => 'PhabricatorPeopleProfileEditController',
	),
	'/conduit/' => array(
	'$' => 'PhabricatorConduitConsoleController',
	'method/(?P<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
	'log/$' => 'PhabricatorConduitLogController',
	),
	'/api/(?P<method>[^/]+)$' => 'PhabricatorConduitAPIController',


	'/D(?P<id>\d+)' => 'DifferentialRevisionViewController',
	'/differential/' => array(
	'$' => 'DifferentialRevisionListController',
	'filter/(?P<filter>\w+)/$' => 'DifferentialRevisionListController',
	'diff/' => array(
	'(?P<id>\d+)/$' => 'DifferentialDiffViewController',
	'create/$' => 'DifferentialDiffCreateController',
	),
	'changeset/$' => 'DifferentialChangesetViewController',
	'revision/edit/(?:(?P<id>\d+)/)?$'
	=> 'DifferentialRevisionEditController',
	'comment/' => array(
	'preview/(?P<id>\d+)/$' => 'DifferentialCommentPreviewController',
	'save/$' => 'DifferentialCommentSaveController',
	'inline/' => array(
	'preview/(?P<id>\d+)/$' =>
	'DifferentialInlineCommentPreviewController',
	'edit/(?P<id>\d+)/$' => 'DifferentialInlineCommentEditController',
	),
	),
	'attach/(?P<id>\d+)/(?P<type>\w+)/$' => 'DifferentialAttachController',
	'subscribe/(?P<action>add\|rem)/(?P<id>\d+)/$'
	=> 'DifferentialSubscribeController',
	),

	'/typeahead/' => array(
	'common/(?P<type>\w+)/$'
	=> 'PhabricatorTypeaheadCommonDatasourceController',
	),

	'/mail/' => array(
	'$' => 'PhabricatorMetaMTAListController',
	'send/$' => 'PhabricatorMetaMTASendController',
	'view/(?P<id>\d+)/$' => 'PhabricatorMetaMTAViewController',
	'lists/$' => 'PhabricatorMetaMTAMailingListsController',
	'lists/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorMetaMTAMailingListEditController',
	),

	'/login/' => array(
	'$' => 'PhabricatorLoginController',
	'email/$' => 'PhabricatorEmailLoginController',
	'etoken/(?P<token>\w+)/$' => 'PhabricatorEmailTokenController',
	),

	'/logout/$' => 'PhabricatorLogoutController',

	'/oauth/' => array(
	'(?P<provider>github\|facebook)/' => array(
	'login/$' => 'PhabricatorOAuthLoginController',
	'diagnose/$' => 'PhabricatorOAuthDiagnosticsController',
	'unlink/$' => 'PhabricatorOAuthUnlinkController',
	),
	),

	'/xhprof/' => array(
	'profile/(?P<phid>[^/]+)/$' => 'PhabricatorXHProfProfileController',
	),

	'/~/' => 'DarkConsoleController',

	'/settings/' => array(
	'(?:page/(?P<page>[^/]+)/)?$' => 'PhabricatorUserSettingsController',
	),

	'/maniphest/' => array(
	'$' => 'ManiphestTaskListController',
	'view/(?P<view>\w+)/$' => 'ManiphestTaskListController',
	'task/' => array(
	'create/$' => 'ManiphestTaskEditController',
	'edit/(?P<id>\d+)/$' => 'ManiphestTaskEditController',
	),
	'transaction/' => array(
	'save/' => 'ManiphestTransactionSaveController',
	),
	'select/search/$' => 'ManiphestTaskSelectorSearchController',
	),

	'/T(?P<id>\d+)$' => 'ManiphestTaskDetailController',

	'/github-post-receive/(?P<id>\d+)/(?P<token>[^/]+)/$'
	=> 'PhabricatorRepositoryGitHubPostReceiveController',

	'/repository/' => array(
	'$' => 'PhabricatorRepositoryListController',
	'create/$' => 'PhabricatorRepositoryCreateController',
	'edit/(?P<id>\d+)/(?:(?P<view>\w+)?/)?$' =>
	'PhabricatorRepositoryEditController',
	'delete/(?P<id>\d+)/$' => 'PhabricatorRepositoryDeleteController',
	),

	'/search/' => array(
	'$' => 'PhabricatorSearchController',
	'(?P<id>\d+)/$' => 'PhabricatorSearchController',
	),

	'/project/' => array(
	'$' => 'PhabricatorProjectListController',
	'edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorProjectEditController',
	'view/(?P<id>\d+)/$' => 'PhabricatorProjectProfileController',
	'affiliation/(?P<id>\d+)/$'
	=> 'PhabricatorProjectAffiliationEditController',
	),

	'/r(?P<callsign>[A-Z]+)(?P<commit>[a-z0-9]+)$'
	=> 'DiffusionCommitController',
	'/diffusion/' => array(
	'$' => 'DiffusionHomeController',
	'(?P<callsign>[A-Z]+)/' => array(
	'$' => 'DiffusionRepositoryController',
	'repository/'.
	'(?P<path>[^/]+)/'.
	'$'
	=> 'DiffusionRepositoryController',
	'change/'.
	'(?P<path>.*?)'.
	'(?:[;](?P<commit>[a-z0-9]+))?'.
	'$'
	=> 'DiffusionChangeController',
	'history/'.
	'(?P<path>.*?)'.
	'(?:[;](?P<commit>[a-z0-9]+))?'.
	'$'
	=> 'DiffusionHistoryController',
	'browse/'.
	'(?P<path>.*?)'.
	'(?:[;](?P<commit>[a-z0-9]+))?'.
	'(?:[$](?P<line>\d+))?'.
	'$'
	=> 'DiffusionBrowseController',
	'diff/'.
	'(?P<path>.*?)'.
	'(?:[;](?P<commit>[a-z0-9]+))?'.
	'$'
	=> 'DiffusionDiffController',
	'lastmodified/'.
	'(?P<path>.*?)'.
	'(?:[;](?P<commit>[a-z0-9]+))?'.
	'$'
	=> 'DiffusionLastModifiedController',
	),
	'services/' => array(
	'path/' => array(
	'complete/$' => 'DiffusionPathCompleteController',
	'validate/$' => 'DiffusionPathValidateController',
	),
	),
	),

	'/daemon/' => array(
	'task/(?P<id>\d+)/$' => 'PhabricatorWorkerTaskDetailController',
	'log/' => array(
	'(?P<id>\d+)/$' => 'PhabricatorDaemonLogViewController',
	),
	'timeline/$' => 'PhabricatorDaemonTimelineConsoleController',
	'timeline/(?P<id>\d+)/$' => 'PhabricatorDaemonTimelineEventController',
	'$' => 'PhabricatorDaemonConsoleController',
	),

	'/herald/' => array(
	'$' => 'HeraldHomeController',
	'view/(?P<view>[^/]+)/$' => 'HeraldHomeController',
	'new/(?:(?P<type>[^/]+)/)?$' => 'HeraldNewController',
	'rule/(?:(?<id>\d+)/)?$' => 'HeraldRuleController',
	'delete/(?P<id>\d+)/$' => 'HeraldDeleteController',
	'test/$' => 'HeraldTestConsoleController',
	'transcript/$' => 'HeraldTranscriptListController',
	'transcript/(?P<id>\d+)/(?:(?P<filter>\w+)/)?$'
	=> 'HeraldTranscriptController',
	),

	'/preferences/' => array(
	'$' => 'PhabricatorEditPreferencesController'
	),

	'/uiexample/' => array(
	'$' => 'PhabricatorUIExampleRenderController',
	'view/(?P<class>[^/]+)/$' => 'PhabricatorUIExampleRenderController',
	),

	'/owners/' => array(
	'$' => 'PhabricatorOwnersListController',
	'view/(?P<view>[^/]+)/$' => 'PhabricatorOwnersListController',
	+ 'edit/(?P<id>\d+)/$' => 'PhabricatorOwnersEditController',
	+ 'new/$' => 'PhabricatorOwnersEditController',
	'package/(?P<id>\d+)/$' => 'PhabricatorOwnersDetailController',
	- 'new/$' => 'PhabricatorOwnersDetailController',
	+ 'delete/(?P<id>\d+)/$' => 'PhabricatorOwnersDeleteController',
	),

	);
	}

	protected function getResourceURIMapRules() {
	return array(
	'/res/' => array(
	'(?P<package>pkg/)?(?P<hash>[a-f0-9]{8})/(?P<path>.+\.(?:css\|js))$'
	=> 'CelerityResourceController',
	),
	);
	}

	public function buildRequest() {
	$request = new AphrontRequest($this->getHost(), $this->getPath());
	$request->setRequestData($_GET + $_POST);
	$request->setApplicationConfiguration($this);
	return $request;
	}

	public function handleException(Exception $ex) {

	$class = phutil_escape_html(get_class($ex));
	$message = phutil_escape_html($ex->getMessage());

	$content =
	'<div class="aphront-unhandled-exception">'.
	'<h1>Unhandled Exception "'.$class.'": '.$message.'</h1>'.
	'<code>'.phutil_escape_html((string)$ex).'</code>'.
	'</div>';

	$user = $this->getRequest()->getUser();
	if (!$user) {
	// If we hit an exception very early, we won't have a user.
	$user = new PhabricatorUser();
	}

	$dialog = new AphrontDialogView();
	$dialog
	->setTitle('Exception!')
	->setClass('aphront-exception-dialog')
	->setUser($user)
	->appendChild($content)
	->addCancelButton('/');

	$response = new AphrontDialogResponse();
	$response->setDialog($dialog);

	return $response;
	}

	public function willSendResponse(AphrontResponse $response) {
	$request = $this->getRequest();
	if ($response instanceof AphrontDialogResponse) {
	if (!$request->isAjax()) {
	$view = new PhabricatorStandardPageView();
	$view->setRequest($request);
	$view->appendChild(
	'<div style="padding: 2em 0;">'.
	$response->buildResponseString().
	'</div>');
	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	return $response;
	} else {
	return id(new AphrontAjaxResponse())
	->setContent(array(
	'dialog' => $response->buildResponseString(),
	));
	}
	} else if ($response instanceof AphrontRedirectResponse) {
	if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	'redirect' => $response->getURI(),
	));
	}
	} else if ($response instanceof Aphront404Response) {

	$failure = new AphrontRequestFailureView();
	$failure->setHeader('404 Not Found');
	$failure->appendChild(
	'<p>The page you requested was not found.</p>');

	$view = new PhabricatorStandardPageView();
	$view->setTitle('404 Not Found');
	$view->setRequest($this->getRequest());
	$view->appendChild($failure);

	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	$response->setHTTPResponseCode(404);
	return $response;
	}

	return $response;
	}

	public function build404Controller() {
	return array(new Phabricator404Controller($this->getRequest()), array());
	}


	}
	diff --git a/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php b/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
	index ccb5fbfed0..4536a643cd 100644
	--- a/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
	+++ b/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
	@@ -1,68 +1,67 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DiffusionPathCompleteController extends DiffusionController {

	public function willProcessRequest(array $data) {
	// Don't build a DiffusionRequest.
	}

	public function processRequest() {
	$request = $this->getRequest();

	$repository_phid = $request->getStr('repositoryPHID');
	$repository = id(new PhabricatorRepository())->loadOneWhere(
	'phid = %s',
	$repository_phid);
	if (!$repository) {
	return new Aphront400Response();
	}

	$query_path = $request->getStr('q');
	$query_path = ltrim($query_path, '/');
	if (preg_match('@/$@', $query_path)) {
	$query_dir = $query_path;
	} else {
	$query_dir = dirname($query_path);
	if ($query_dir == '.') {
	$query_dir = '';
	}
	}

	$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
	array(
	'callsign' => $repository->getCallsign(),
	- 'path' => $query_dir,
	- 'nobranch' => true,
	+ 'path' => ':/'.$query_dir,
	));

	$browse_query = DiffusionBrowseQuery::newFromDiffusionRequest($drequest);
	$paths = $browse_query->loadPaths();

	$output = array();
	foreach ($paths as $path) {
	$full_path = $query_dir.$path->getPath();
	if ($path->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
	$full_path .= '/';
	}
	$output[] = array('/'.$full_path, null, substr(md5($full_path), 0, 7));
	}

	return id(new AphrontAjaxResponse())->setContent($output);
	}
	}
	diff --git a/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php b/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
	index f57cc6cc15..6199cdca2b 100644
	--- a/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
	+++ b/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
	@@ -1,80 +1,79 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DiffusionPathValidateController extends DiffusionController {

	public function willProcessRequest(array $data) {
	// Don't build a DiffusionRequest.
	}

	public function processRequest() {
	$request = $this->getRequest();

	$repository_phid = $request->getStr('repositoryPHID');
	$repository = id(new PhabricatorRepository())->loadOneWhere(
	'phid = %s',
	$repository_phid);
	if (!$repository) {
	return new Aphront400Response();
	}

	$path = $request->getStr('path');
	$path = ltrim($path, '/');

	$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
	array(
	'callsign' => $repository->getCallsign(),
	- 'path' => $path,
	- 'nobranch' => true,
	+ 'path' => ':/'.$path,
	));

	$browse_query = DiffusionBrowseQuery::newFromDiffusionRequest($drequest);
	$browse_query->needValidityOnly(true);
	$valid = $browse_query->loadPaths();

	if (!$valid) {
	switch ($browse_query->getReasonForEmptyResultSet()) {
	case DiffusionBrowseQuery::REASON_IS_FILE:
	$valid = true;
	break;
	case DiffusionBrowseQuery::REASON_IS_EMPTY:
	$valid = true;
	break;
	}
	}

	$output = array(
	'valid' => (bool)$valid,
	);

	if (!$valid) {
	$branch = $drequest->getBranch();
	if ($branch) {
	$message = 'Not found in '.$branch;
	} else {
	$message = 'Not found at HEAD';
	}
	} else {
	$message = 'OK';
	}

	$output['message'] = $message;

	return id(new AphrontAjaxResponse())->setContent($output);
	}
	}
	diff --git a/src/applications/diffusion/request/git/DiffusionGitRequest.php b/src/applications/diffusion/request/git/DiffusionGitRequest.php
	index 3ac4e8aa32..11e414a379 100644
	--- a/src/applications/diffusion/request/git/DiffusionGitRequest.php
	+++ b/src/applications/diffusion/request/git/DiffusionGitRequest.php
	@@ -1,134 +1,134 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DiffusionGitRequest extends DiffusionRequest {

	protected function initializeFromAphrontRequestDictionary(array $data) {
	parent::initializeFromAphrontRequestDictionary($data);

	$path = $this->path;
	$parts = explode('/', $path);

	- if (empty($data['nobranch'])) {
	- $branch = array_shift($parts);
	+ $branch = array_shift($parts);
	+ if ($branch != ':') {
	$this->branch = $this->decodeBranchName($branch);
	}

	foreach ($parts as $key => $part) {
	// Prevent any hyjinx since we're ultimately shipping this to the
	// filesystem under a lot of git workflows.
	if ($part == '..') {
	unset($parts[$key]);
	}
	}

	$this->path = implode('/', $parts);

	if ($this->repository) {
	$local_path = $this->repository->getDetail('local-path');

	// TODO: This is not terribly efficient and does not produce terribly
	// good error messages, but it seems better to put error handling code
	// here than to try to do it in every query.

	$branch = $this->getBranch();

	// TODO: Here, particularly, we should give the user a specific error
	// message to indicate whether they've typed in some bogus branch and/or
	// followed a bad link, or misconfigured the default branch in the
	// Repository tool.
	execx(
	'(cd %s && git rev-parse --verify %s)',
	$local_path,
	$branch);

	if ($this->commit) {
	list($commit) = execx(
	'(cd %s && git rev-parse --verify %s)',
	$local_path,
	$this->commit);

	// Beyond verifying them, expand commit short forms to full 40-character
	// sha1s.
	$this->commit = trim($commit);

	/*

	TODO: Unclear if this is actually a good idea or not; it breaks commit views
	at the very least.

	list($contains) = execx(
	'(cd %s && git branch --contains %s)',
	$local_path,
	$this->commit);
	$contains = array_filter(explode("\n", $contains));
	$found = false;
	foreach ($contains as $containing_branch) {
	$containing_branch = trim($containing_branch, "* \n");
	if ($containing_branch == $branch) {
	$found = true;
	break;
	}
	}
	if (!$found) {
	throw new Exception(
	"Commit does not exist on this branch!");
	}
	*/

	}
	}


	}

	public function getBranch() {
	if ($this->branch) {
	return $this->branch;
	}
	if ($this->repository) {
	return $this->repository->getDetail('default-branch', 'origin/master');
	}
	throw new Exception("Unable to determine branch!");
	}

	public function getUriPath() {
	return '/diffusion/'.$this->getCallsign().'/browse/'.
	$this->branch.'/'.$this->path;
	}

	public function getCommit() {
	if ($this->commit) {
	return $this->commit;
	}
	return $this->getBranch();
	}

	public function getBranchURIComponent($branch) {
	return $this->encodeBranchName($branch).'/';
	}

	private function decodeBranchName($branch) {
	return str_replace(':', '/', $branch);
	}

	private function encodeBranchName($branch) {
	return str_replace('/', ':', $branch);
	}

	}
	diff --git a/src/applications/diffusion/request/svn/DiffusionSvnRequest.php b/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
	index fb6c1bae53..dea97cb9f4 100644
	--- a/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
	+++ b/src/applications/diffusion/request/svn/DiffusionSvnRequest.php
	@@ -1,37 +1,45 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DiffusionSvnRequest extends DiffusionRequest {

	private $loadedCommit;

	+ protected function initializeFromAphrontRequestDictionary(array $data) {
	+ parent::initializeFromAphrontRequestDictionary($data);
	+ if (!strncmp($this->path, ':', 1)) {
	+ $this->path = substr($this->path, 1);
	+ $this->path = ltrim($this->path, '/');
	+ }
	+ }
	+
	public function getCommit() {
	if ($this->commit) {
	return $this->commit;
	}

	if (!$this->loadedCommit) {
	$this->loadedCommit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
	'repositoryID = %d ORDER BY epoch DESC LIMIT 1',
	$this->getRepository()->getID())->getCommitIdentifier();
	}

	return $this->loadedCommit;
	}

	}
	diff --git a/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php b/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php
	new file mode 100644
	index 0000000000..2e4ad2e8d1
	--- /dev/null
	+++ b/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php
	@@ -0,0 +1,55 @@
	+<?php
	+
	+/*
	+ * Copyright 2011 Facebook, Inc.
	+ *
	+ * Licensed under the Apache License, Version 2.0 (the "License");
	+ * you may not use this file except in compliance with the License.
	+ * You may obtain a copy of the License at
	+ *
	+ * http://www.apache.org/licenses/LICENSE-2.0
	+ *
	+ * Unless required by applicable law or agreed to in writing, software
	+ * distributed under the License is distributed on an "AS IS" BASIS,
	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	+ * See the License for the specific language governing permissions and
	+ * limitations under the License.
	+ */
	+
	+class PhabricatorOwnersDeleteController extends PhabricatorOwnersController {
	+
	+ private $id;
	+
	+ public function willProcessRequest(array $data) {
	+ $this->id = $data['id'];
	+ }
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $package = id(new PhabricatorOwnersPackage())->load($this->id);
	+ if (!$package) {
	+ return new Aphront404Response();
	+ }
	+
	+ if ($request->isDialogFormPost()) {
	+ $package->delete();
	+ return id(new AphrontRedirectResponse())->setURI('/owners/');
	+ }
	+
	+ $dialog = id(new AphrontDialogView())
	+ ->setUser($user)
	+ ->setTitle('Really delete this package?')
	+ ->appendChild(
	+ '<p>Are you sure you want to delete the "'.
	+ phutil_escape_html($package->getName()).'" package? This operation '.
	+ 'can not be undone.</p>')
	+ ->addSubmitButton('Delete')
	+ ->addCancelButton('/owners/package/'.$package->getID().'/')
	+ ->setSubmitURI($request->getRequestURI());
	+
	+ return id(new AphrontDialogResponse())->setDialog($dialog);
	+ }
	+
	+}
	diff --git a/src/applications/owners/controller/delete/__init__.php b/src/applications/owners/controller/delete/__init__.php
	new file mode 100644
	index 0000000000..14c5c7834c
	--- /dev/null
	+++ b/src/applications/owners/controller/delete/__init__.php
	@@ -0,0 +1,19 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+phutil_require_module('phabricator', 'aphront/response/404');
	+phutil_require_module('phabricator', 'aphront/response/dialog');
	+phutil_require_module('phabricator', 'aphront/response/redirect');
	+phutil_require_module('phabricator', 'applications/owners/controller/base');
	+phutil_require_module('phabricator', 'applications/owners/storage/package');
	+phutil_require_module('phabricator', 'view/dialog');
	+
	+phutil_require_module('phutil', 'utils');
	+
	+
	+phutil_require_source('PhabricatorOwnersDeleteController.php');
	diff --git a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
	index 4dba3244a5..9709472e1a 100644
	--- a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
	+++ b/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
	@@ -1,153 +1,143 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorOwnersDetailController extends PhabricatorOwnersController {

	private $id;

	public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	+ $this->id = $data['id'];
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	- if ($this->id) {
	- $package = id(new PhabricatorOwnersPackage())->load($this->id);
	- if (!$package) {
	- return new Aphront404Response();
	- }
	- } else {
	- $package = new PhabricatorOwnersPackage();
	- $package->setPrimaryOwnerPHID($user->getPHID());
	+ $package = id(new PhabricatorOwnersPackage())->load($this->id);
	+ if (!$package) {
	+ return new Aphront404Response();
	}

	- $e_name = true;
	- $e_primary = true;
	+ $paths = $package->loadPaths();
	+ $owners = $package->loadOwners();

	+ $phids = array();
	+ foreach ($paths as $path) {
	+ $phids[$path->getRepositoryPHID()] = true;
	+ }
	+ foreach ($owners as $owner) {
	+ $phids[$owner->getUserPHID()] = true;
	+ }
	+ $phids = array_keys($phids);

	- $token_primary_owner = array();
	- $token_all_owners = array();
	+ $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();

	- $title = $package->getID() ? 'Edit Package' : 'New Package';
	+ $rows = array();

	- $repos = id(new PhabricatorRepository())->loadAll();
	+ $rows[] = array(
	+ 'Name',
	+ phutil_escape_html($package->getName()));
	+ $rows[] = array(
	+ 'Description',
	+ phutil_escape_html($package->getDescription()));

	- $default_paths = array();
	- foreach ($repos as $repo) {
	- $default_path = $repo->getDetail('default-owners-path');
	- if ($default_path) {
	- $default_paths[$repo->getPHID()] = $default_path;
	- }
	+ $primary_owner = null;
	+ $primary_phid = $package->getPrimaryOwnerPHID();
	+ if ($primary_phid && isset($handles[$primary_phid])) {
	+ $primary_owner =
	+ '<strong>'.$handles[$primary_phid]->renderLink().'</strong>';
	}
	+ $rows[] = array(
	+ 'Primary Owner',
	+ $primary_owner,
	+ );
	+
	+ $owner_links = array();
	+ foreach ($owners as $owner) {
	+ $owner_links[] = $handles[$owner->getUserPHID()]->renderLink();
	+ }
	+ $owner_links = implode('<br />', $owner_links);
	+ $rows[] = array(
	+ 'Owners',
	+ $owner_links);
	+
	+ $path_links = array();
	+ foreach ($paths as $path) {
	+ $callsign = $handles[$path->getRepositoryPHID()]->getName();
	+ $repo = phutil_escape_html('r'.$callsign);
	+ $path_link = phutil_render_tag(
	+ 'a',
	+ array(
	+ 'href' => '/diffusion/'.$callsign.'/browse/:'.$path->getPath(),
	+ ),
	+ phutil_escape_html($path->getPath()));
	+ $path_links[] = $repo.' '.$path_link;
	+ }
	+ $path_links = implode('<br />', $path_links);
	+ $rows[] = array(
	+ 'Paths',
	+ $path_links);

	- $repos = mpull($repos, 'getCallsign', 'getPHID');
	-
	- $template = new AphrontTypeaheadTemplateView();
	- $template = $template->render();
	-
	-
	- Javelin::initBehavior(
	- 'owners-path-editor',
	+ $table = new AphrontTableView($rows);
	+ $table->setColumnClasses(
	array(
	- 'root' => 'path-editor',
	- 'table' => 'paths',
	- 'add_button' => 'addpath',
	- 'repositories' => $repos,
	- 'input_template' => $template,
	- 'path_refs' => array(),
	-
	- 'completeURI' => '/diffusion/services/path/complete/',
	- 'validateURI' => '/diffusion/services/path/validate/',
	-
	- 'repositoryDefaultPaths' => $default_paths,
	+ 'header',
	+ 'wide',
	));

	- require_celerity_resource('owners-path-editor-css');
	-
	- $form = id(new AphrontFormView())
	- ->setUser($user)
	- ->appendChild(
	- id(new AphrontFormTextControl())
	- ->setLabel('Name')
	- ->setName('name')
	- ->setValue($package->getName())
	- ->setError($e_name))
	- ->appendChild(
	- id(new AphrontFormTokenizerControl())
	- ->setDatasource('/typeahead/common/users/')
	- ->setLabel('Primary Owner')
	- ->setName('primary')
	- ->setLimit(1)
	- ->setValue($token_primary_owner)
	- ->setError($e_primary))
	- ->appendChild(
	- id(new AphrontFormTokenizerControl())
	- ->setDatasource('/typeahead/common/users/')
	- ->setLabel('Owners')
	- ->setName('owners')
	- ->setValue($token_all_owners)
	- ->setError($e_primary))
	- ->appendChild(
	- '<h1>Paths</h1>'.
	- '<div class="aphront-form-inset" id="path-editor">'.
	- '<div style="float: right;">'.
	- javelin_render_tag(
	- 'a',
	- array(
	- 'href' => '#',
	- 'class' => 'button green',
	- 'sigil' => 'addpath',
	- 'mustcapture' => true,
	- ),
	- 'Add New Path').
	- '</div>'.
	- '<p>Specify the files and directories which comprise this '.
	- 'package.</p>'.
	- '<div style="clear: both;"></div>'.
	- javelin_render_tag(
	- 'table',
	- array(
	- 'class' => 'owners-path-editor-table',
	- 'sigil' => 'paths',
	- ),
	- '').
	- '</div>')
	- ->appendChild(
	- id(new AphrontFormTextAreaControl())
	- ->setLabel('Description')
	- ->setName('description')
	- ->setValue($package->getDescription()))
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->setValue('Save Package'));
	-
	$panel = new AphrontPanelView();
	- $panel->setHeader($title);
	- $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	- $panel->appendChild($form);
	+ $panel->setHeader(
	+ 'Package Details for "'.phutil_escape_html($package->getName()).'"');
	+ $panel->addButton(
	+ javelin_render_tag(
	+ 'a',
	+ array(
	+ 'href' => '/owners/delete/'.$package->getID().'/',
	+ 'class' => 'button grey',
	+ 'sigil' => 'workflow',
	+ ),
	+ 'Delete Package'));
	+ $panel->addButton(
	+ phutil_render_tag(
	+ 'a',
	+ array(
	+ 'href' => '/owners/edit/'.$package->getID().'/',
	+ 'class' => 'button',
	+ ),
	+ 'Edit Package'));
	+ $panel->appendChild($table);
	+
	+ $nav = new AphrontSideNavView();
	+ $nav->appendChild($panel);
	+ $nav->addNavItem(
	+ phutil_render_tag(
	+ 'a',
	+ array(
	+ 'href' => '/owners/package/'.$package->getID().'/',
	+ 'class' => 'aphront-side-nav-selected',
	+ ),
	+ 'Package Details'));

	return $this->buildStandardPageResponse(
	- $panel,
	+ $nav,
	array(
	- 'title' => $title,
	+ 'title' => "Package '".$package->getName()."'",
	));
	}

	}
	diff --git a/src/applications/owners/controller/detail/__init__.php b/src/applications/owners/controller/detail/__init__.php
	index 4a02ae3b99..f81c2c268e 100644
	--- a/src/applications/owners/controller/detail/__init__.php
	+++ b/src/applications/owners/controller/detail/__init__.php
	@@ -1,23 +1,22 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'aphront/response/404');
	phutil_require_module('phabricator', 'applications/owners/controller/base');
	phutil_require_module('phabricator', 'applications/owners/storage/package');
	-phutil_require_module('phabricator', 'applications/repository/storage/repository');
	-phutil_require_module('phabricator', 'infrastructure/celerity/api');
	-phutil_require_module('phabricator', 'infrastructure/javelin/api');
	-phutil_require_module('phabricator', 'view/control/typeahead');
	-phutil_require_module('phabricator', 'view/form/base');
	-phutil_require_module('phabricator', 'view/form/control/submit');
	+phutil_require_module('phabricator', 'applications/phid/handle/data');
	+phutil_require_module('phabricator', 'infrastructure/javelin/markup');
	+phutil_require_module('phabricator', 'view/control/table');
	phutil_require_module('phabricator', 'view/layout/panel');
	+phutil_require_module('phabricator', 'view/layout/sidenav');

	+phutil_require_module('phutil', 'markup');
	phutil_require_module('phutil', 'utils');


	phutil_require_source('PhabricatorOwnersDetailController.php');
	diff --git a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
	similarity index 56%
	copy from src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
	copy to src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
	index 4dba3244a5..7de183d4ea 100644
	--- a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
	+++ b/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
	@@ -1,153 +1,258 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	-class PhabricatorOwnersDetailController extends PhabricatorOwnersController {
	+class PhabricatorOwnersEditController extends PhabricatorOwnersController {

	private $id;

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	if ($this->id) {
	$package = id(new PhabricatorOwnersPackage())->load($this->id);
	if (!$package) {
	return new Aphront404Response();
	}
	} else {
	$package = new PhabricatorOwnersPackage();
	$package->setPrimaryOwnerPHID($user->getPHID());
	}

	$e_name = true;
	$e_primary = true;
	+ $e_owners = true;

	+ $errors = array();

	- $token_primary_owner = array();
	- $token_all_owners = array();
	+ if ($request->isFormPost()) {
	+ $package->setName($request->getStr('name'));
	+ $package->setDescription($request->getStr('description'));
	+
	+ $primary = $request->getArr('primary');
	+ $primary = reset($primary);
	+ $package->setPrimaryOwnerPHID($primary);
	+
	+ $owners = $request->getArr('owners');
	+ if ($primary) {
	+ array_unshift($owners, $primary);
	+ }
	+ $owners = array_unique($owners);
	+
	+ $paths = $request->getArr('path');
	+ $repos = $request->getArr('repo');
	+
	+ $path_refs = array();
	+ for ($ii = 0; $ii < count($paths); $ii++) {
	+ if (empty($paths[$ii]) \|\| empty($repos[$ii])) {
	+ continue;
	+ }
	+ $path_refs[] = array(
	+ 'repositoryPHID' => $repos[$ii],
	+ 'path' => $paths[$ii],
	+ );
	+ }
	+
	+ if (!strlen($package->getName())) {
	+ $e_name = 'Required';
	+ $errors[] = 'Package name is required.';
	+ } else {
	+ $e_name = null;
	+ }
	+
	+ if (!$package->getPrimaryOwnerPHID()) {
	+ $e_primary = 'Required';
	+ $errors[] = 'Package must have a primary owner.';
	+ } else {
	+ $e_primary = null;
	+ }
	+
	+ if (!$owners) {
	+ $e_owners = 'Required';
	+ $errors[] = 'Package must have at least one owner.';
	+ } else {
	+ $e_owners = null;
	+ }
	+
	+ if (!$path_refs) {
	+ $errors[] = 'Package must include at least one path.';
	+ }
	+
	+ if (!$errors) {
	+ $package->attachUnsavedOwners($owners);
	+ $package->attachUnsavedPaths($path_refs);
	+ try {
	+ $package->save();
	+ return id(new AphrontRedirectResponse())
	+ ->setURI('/owners/package/'.$package->getID().'/');
	+ } catch (AphrontQueryDuplicateKeyException $ex) {
	+ $e_name = 'Duplicate';
	+ $errors[] = 'Package name must be unique.';
	+ }
	+ }
	+ } else {
	+ $owners = $package->loadOwners();
	+ $owners = mpull($owners, 'getUserPHID');
	+
	+ $paths = $package->loadPaths();
	+ $path_refs = array();
	+ foreach ($paths as $path) {
	+ $path_refs[] = array(
	+ 'repositoryPHID' => $path->getRepositoryPHID(),
	+ 'path' => $path->getPath(),
	+ );
	+ }
	+ }
	+
	+ $error_view = null;
	+ if ($errors) {
	+ $error_view = new AphrontErrorView();
	+ $error_view->setTitle('Package Errors');
	+ $error_view->setErrors($errors);
	+ }
	+
	+ $handles = id(new PhabricatorObjectHandleData($owners))
	+ ->loadHandles();
	+
	+ $primary = $package->getPrimaryOwnerPHID();
	+ if ($primary && isset($handles[$primary])) {
	+ $token_primary_owner = array(
	+ $primary => $handles[$primary]->getFullName(),
	+ );
	+ } else {
	+ $token_primary_owner = array();
	+ }
	+
	+ $token_all_owners = array_select_keys($handles, $owners);
	+ $token_all_owners = mpull($token_all_owners, 'getFullName');

	$title = $package->getID() ? 'Edit Package' : 'New Package';

	$repos = id(new PhabricatorRepository())->loadAll();

	$default_paths = array();
	foreach ($repos as $repo) {
	$default_path = $repo->getDetail('default-owners-path');
	if ($default_path) {
	$default_paths[$repo->getPHID()] = $default_path;
	}
	}

	$repos = mpull($repos, 'getCallsign', 'getPHID');

	$template = new AphrontTypeaheadTemplateView();
	$template = $template->render();

	-
	Javelin::initBehavior(
	'owners-path-editor',
	array(
	'root' => 'path-editor',
	'table' => 'paths',
	'add_button' => 'addpath',
	'repositories' => $repos,
	'input_template' => $template,
	- 'path_refs' => array(),
	+ 'pathRefs' => $path_refs,

	'completeURI' => '/diffusion/services/path/complete/',
	'validateURI' => '/diffusion/services/path/validate/',

	'repositoryDefaultPaths' => $default_paths,
	));

	require_celerity_resource('owners-path-editor-css');

	+ $cancel_uri = $package->getID()
	+ ? '/owners/package/'.$package->getID().'/'
	+ : '/owners/';
	+
	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Name')
	->setName('name')
	->setValue($package->getName())
	->setError($e_name))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	->setLabel('Primary Owner')
	->setName('primary')
	->setLimit(1)
	->setValue($token_primary_owner)
	->setError($e_primary))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	->setLabel('Owners')
	->setName('owners')
	->setValue($token_all_owners)
	- ->setError($e_primary))
	+ ->setError($e_owners))
	->appendChild(
	'<h1>Paths</h1>'.
	'<div class="aphront-form-inset" id="path-editor">'.
	'<div style="float: right;">'.
	javelin_render_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'addpath',
	'mustcapture' => true,
	),
	'Add New Path').
	'</div>'.
	'<p>Specify the files and directories which comprise this '.
	'package.</p>'.
	'<div style="clear: both;"></div>'.
	javelin_render_tag(
	'table',
	array(
	'class' => 'owners-path-editor-table',
	'sigil' => 'paths',
	),
	'').
	'</div>')
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Description')
	->setName('description')
	->setValue($package->getDescription()))
	->appendChild(
	id(new AphrontFormSubmitControl())
	+ ->addCancelButton($cancel_uri)
	->setValue('Save Package'));

	$panel = new AphrontPanelView();
	$panel->setHeader($title);
	$panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	+ $panel->appendChild($error_view);
	$panel->appendChild($form);

	return $this->buildStandardPageResponse(
	$panel,
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/owners/controller/detail/__init__.php b/src/applications/owners/controller/edit/__init__.php
	similarity index 76%
	copy from src/applications/owners/controller/detail/__init__.php
	copy to src/applications/owners/controller/edit/__init__.php
	index 4a02ae3b99..6b9054146e 100644
	--- a/src/applications/owners/controller/detail/__init__.php
	+++ b/src/applications/owners/controller/edit/__init__.php
	@@ -1,23 +1,26 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'aphront/response/404');
	+phutil_require_module('phabricator', 'aphront/response/redirect');
	phutil_require_module('phabricator', 'applications/owners/controller/base');
	phutil_require_module('phabricator', 'applications/owners/storage/package');
	+phutil_require_module('phabricator', 'applications/phid/handle/data');
	phutil_require_module('phabricator', 'applications/repository/storage/repository');
	phutil_require_module('phabricator', 'infrastructure/celerity/api');
	phutil_require_module('phabricator', 'infrastructure/javelin/api');
	phutil_require_module('phabricator', 'view/control/typeahead');
	phutil_require_module('phabricator', 'view/form/base');
	phutil_require_module('phabricator', 'view/form/control/submit');
	+phutil_require_module('phabricator', 'view/form/error');
	phutil_require_module('phabricator', 'view/layout/panel');

	phutil_require_module('phutil', 'utils');


	-phutil_require_source('PhabricatorOwnersDetailController.php');
	+phutil_require_source('PhabricatorOwnersEditController.php');
	diff --git a/src/applications/owners/controller/list/PhabricatorOwnersListController.php b/src/applications/owners/controller/list/PhabricatorOwnersListController.php
	index 540d655405..8640a13f5a 100644
	--- a/src/applications/owners/controller/list/PhabricatorOwnersListController.php
	+++ b/src/applications/owners/controller/list/PhabricatorOwnersListController.php
	@@ -1,174 +1,240 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorOwnersListController extends PhabricatorOwnersController {

	private $view;

	public function willProcessRequest(array $data) {
	$this->view = idx($data, 'view');
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();

	$views = array(
	'owned' => 'Owned Packages',
	'all' => 'All Packages',
	'search' => 'Search Results',
	);

	if (empty($views[$this->view])) {
	reset($views);
	$this->view = key($views);
	}

	if ($this->view != 'search') {
	unset($views['search']);
	}

	$nav = new AphrontSideNavView();
	foreach ($views as $key => $name) {
	$nav->addNavItem(
	phutil_render_tag(
	'a',
	array(
	'href' => '/owners/view/'.$key.'/',
	'class' => ($this->view == $key)
	? 'aphront-side-nav-selected'
	: null,
	),
	phutil_escape_html($name)));
	}

	+ $package = new PhabricatorOwnersPackage();
	+
	switch ($this->view) {
	case 'search':
	- $content = $this->renderPackageTable(array(), 'Search Results');
	+ $packages = array();
	+
	+ $header = 'Search Results';
	+ $nodata = 'No packages match your query.';
	break;
	case 'owned':
	- $content = $this->renderOwnedView();
	+ $owner = new PhabricatorOwnersOwner();
	+ $data = queryfx_all(
	+ $package->establishConnection('r'),
	+ 'SELECT p.* FROM %T p JOIN %T o ON p.id = o.packageID
	+ WHERE o.userPHID = %s GROUP BY p.id',
	+ $package->getTableName(),
	+ $owner->getTableName(),
	+ $user->getPHID());
	+ $packages = $package->loadAllFromArray($data);
	+
	+ $header = 'Owned Packages';
	+ $nodata = 'No owned packages';
	break;
	case 'all':
	- $content = $this->renderAllView();
	+ $packages = $package->loadAll();
	+
	+ $header = 'All Packages';
	+ $nodata = 'There are no defined packages.';
	break;
	}

	+ $content = $this->renderPackageTable(
	+ $packages,
	+ $header,
	+ $nodata);
	+
	$filter = new AphrontListFilterView();
	$filter->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => '/owners/new/',
	'class' => 'green button',
	),
	'Create New Package'));

	$owners_search_value = array();
	if ($request->getArr('owner')) {
	$phids = $request->getArr('owner');
	$phid = reset($phids);
	$handles = id(new PhabricatorObjectHandleData(array($phid)))
	->loadHandles();
	$owners_search_value = array(
	$phid => $handles[$phid]->getFullName(),
	);
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/owners/view/search/')
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setLabel('Name')
	->setValue($request->getStr('name')))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	->setLimit(1)
	->setName('owner')
	->setLabel('Owner')
	->setValue($owners_search_value))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('path')
	->setLabel('Path')
	->setValue($request->getStr('path')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Search for Packages'));

	$filter->appendChild($form);

	$nav->appendChild($filter);
	$nav->appendChild($content);

	return $this->buildStandardPageResponse(
	$nav,
	array(
	'title' => 'List',
	));
	}

	- private function renderOwnedView() {
	- $packages = array();
	+ private function renderPackageTable(array $packages, $header, $nodata) {

	- return $this->renderPackageTable($packages, 'Owned Packages');
	- }
	+ if ($packages) {
	+ $package_ids = mpull($packages, 'getID');

	- private function renderAllView() {
	- $packages = array();
	+ $owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
	+ 'packageID IN (%Ld)',
	+ $package_ids);

	- return $this->renderPackageTable($packages, 'All Packages');
	- }
	+ $paths = id(new PhabricatorOwnersPath())->loadAllWhere(
	+ 'packageID in (%Ld)',
	+ $package_ids);
	+
	+ $phids = array();
	+ foreach ($owners as $owner) {
	+ $phids[$owner->getUserPHID()] = true;
	+ }
	+ foreach ($paths as $path) {
	+ $phids[$path->getRepositoryPHID()] = true;
	+ }
	+ $phids = array_keys($phids);
	+
	+ $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();

	- private function renderPackageTable(array $packages, $header) {
	+ $owners = mgroup($owners, 'getPackageID');
	+ $paths = mgroup($paths, 'getPackageID');
	+ } else {
	+ $handles = array();
	+ $owners = array();
	+ $paths = array();
	+ }

	$rows = array();
	foreach ($packages as $package) {
	+
	+ $pkg_owners = idx($owners, $package->getID(), array());
	+ foreach ($pkg_owners as $key => $owner) {
	+ $pkg_owners[$key] = $handles[$owner->getUserPHID()]->renderLink();
	+ if ($owner->getUserPHID() == $package->getPrimaryOwnerPHID()) {
	+ $pkg_owners[$key] = '<strong>'.$pkg_owners[$key].'</strong>';
	+ }
	+ }
	+ $pkg_owners = implode('<br />', $pkg_owners);
	+
	+ $pkg_paths = idx($paths, $package->getID(), array());
	+ foreach ($pkg_paths as $key => $path) {
	+ $repo = $handles[$path->getRepositoryPHID()]->getName();
	+ $pkg_paths[$key] =
	+ '<strong>'.$repo.'</strong> '.
	+ phutil_escape_html($path->getPath());
	+ }
	+ $pkg_paths = implode('<br />', $pkg_paths);
	+
	$rows[] = array(
	- 'x',
	- 'y',
	- 'z',
	+ phutil_render_tag(
	+ 'a',
	+ array(
	+ 'href' => '/owners/package/'.$package->getID().'/',
	+ ),
	+ phutil_escape_html($package->getName())),
	+ $pkg_owners,
	+ $pkg_paths,
	);
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	'Name',
	'Owners',
	'Paths',
	));
	$table->setColumnClasses(
	array(
	- '',
	+ 'pri',
	'',
	'wide wrap',
	));

	$panel = new AphrontPanelView();
	$panel->setHeader($header);
	$panel->appendChild($table);

	return $panel;
	}

	}
	diff --git a/src/applications/owners/controller/list/__init__.php b/src/applications/owners/controller/list/__init__.php
	index e6920b2e11..6a75d3c690 100644
	--- a/src/applications/owners/controller/list/__init__.php
	+++ b/src/applications/owners/controller/list/__init__.php
	@@ -1,22 +1,26 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/owners/controller/base');
	+phutil_require_module('phabricator', 'applications/owners/storage/owner');
	+phutil_require_module('phabricator', 'applications/owners/storage/package');
	+phutil_require_module('phabricator', 'applications/owners/storage/path');
	phutil_require_module('phabricator', 'applications/phid/handle/data');
	+phutil_require_module('phabricator', 'storage/queryfx');
	phutil_require_module('phabricator', 'view/control/table');
	phutil_require_module('phabricator', 'view/form/base');
	phutil_require_module('phabricator', 'view/form/control/submit');
	phutil_require_module('phabricator', 'view/layout/listfilter');
	phutil_require_module('phabricator', 'view/layout/panel');
	phutil_require_module('phabricator', 'view/layout/sidenav');

	phutil_require_module('phutil', 'markup');
	phutil_require_module('phutil', 'utils');


	phutil_require_source('PhabricatorOwnersListController.php');
	diff --git a/src/applications/owners/storage/owner/PhabricatorOwnersOwner.php b/src/applications/owners/storage/owner/PhabricatorOwnersOwner.php
	index 3f3c46cfde..8c9d9827cf 100644
	--- a/src/applications/owners/storage/owner/PhabricatorOwnersOwner.php
	+++ b/src/applications/owners/storage/owner/PhabricatorOwnersOwner.php
	@@ -1,30 +1,30 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorOwnersOwner extends PhabricatorOwnersDAO {

	protected $packageID;
	protected $userPHID;

	public function getConfiguration() {
	return array(
	self::CONFIG_TIMESTAMPS => false,
	- );
	+ ) + parent::getConfiguration();
	}

	}
	diff --git a/src/applications/owners/storage/package/PhabricatorOwnersPackage.php b/src/applications/owners/storage/package/PhabricatorOwnersPackage.php
	index ca96f9c74f..a720cb0888 100644
	--- a/src/applications/owners/storage/package/PhabricatorOwnersPackage.php
	+++ b/src/applications/owners/storage/package/PhabricatorOwnersPackage.php
	@@ -1,38 +1,132 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorOwnersPackage extends PhabricatorOwnersDAO {

	protected $phid;
	protected $name;
	protected $description;
	protected $primaryOwnerPHID;

	+ private $unsavedOwners;
	+ private $unsavedPaths;
	+
	public function getConfiguration() {
	return array(
	// This information is better available from the history table.
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_AUX_PHID => true,
	- );
	+ ) + parent::getConfiguration();
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNew('OPKG');
	+ return PhabricatorPHID::generateNewPHID('OPKG');
	+ }
	+
	+ public function attachUnsavedOwners(array $owners) {
	+ $this->unsavedOwners = $owners;
	+ return $this;
	+ }
	+
	+ public function attachUnsavedPaths(array $paths) {
	+ $this->unsavedPaths = $paths;
	+ return $this;
	+ }
	+
	+ public function loadOwners() {
	+ if (!$this->getID()) {
	+ return array();
	+ }
	+ return id(new PhabricatorOwnersOwner())->loadAllWhere(
	+ 'packageID = %d',
	+ $this->getID());
	+ }
	+
	+ public function loadPaths() {
	+ if (!$this->getID()) {
	+ return array();
	+ }
	+ return id(new PhabricatorOwnersPath())->loadAllWhere(
	+ 'packageID = %d',
	+ $this->getID());
	+ }
	+
	+ public function save() {
	+
	+ // TODO: Transactions!
	+
	+ $ret = parent::save();
	+
	+ if ($this->unsavedOwners) {
	+ $new_owners = array_fill_keys($this->unsavedOwners, true);
	+ $cur_owners = array();
	+ foreach ($this->loadOwners() as $owner) {
	+ if (empty($new_owners[$owner->getUserPHID()])) {
	+ $owner->delete();
	+ continue;
	+ }
	+ $cur_owners[$owner->getUserPHID()] = true;
	+ }
	+ $add_owners = array_diff_key($new_owners, $cur_owners);
	+ foreach ($add_owners as $phid => $ignored) {
	+ $owner = new PhabricatorOwnersOwner();
	+ $owner->setPackageID($this->getID());
	+ $owner->setUserPHID($phid);
	+ $owner->save();
	+ }
	+ unset($this->unsavedOwners);
	+ }
	+
	+ if ($this->unsavedPaths) {
	+ $new_paths = igroup($this->unsavedPaths, 'repositoryPHID', 'path');
	+ $cur_paths = $this->loadPaths();
	+ foreach ($cur_paths as $key => $path) {
	+ if (empty($new_paths[$path->getRepositoryPHID()][$path->getPath()])) {
	+ $path->delete();
	+ unset($cur_paths[$key]);
	+ }
	+ }
	+ $cur_paths = mgroup($cur_paths, 'getRepositoryPHID', 'getPath');
	+ foreach ($new_paths as $repository_phid => $paths) {
	+ foreach ($paths as $path => $ignored) {
	+ if (empty($cur_paths[$repository_phid][$path])) {
	+ $obj = new PhabricatorOwnersPath();
	+ $obj->setPackageID($this->getID());
	+ $obj->setRepositoryPHID($repository_phid);
	+ $obj->setPath($path);
	+ $obj->save();
	+ }
	+ }
	+ }
	+ unset($this->unsavedPaths);
	+ }
	+
	+ return $ret;
	+ }
	+
	+ public function delete() {
	+ foreach ($this->loadOwners() as $owner) {
	+ $owner->delete();
	+ }
	+ foreach ($this->loadPaths() as $path) {
	+ $path->delete();
	+ }
	+ return parent::delete();
	}

	}
	diff --git a/src/applications/owners/storage/package/__init__.php b/src/applications/owners/storage/package/__init__.php
	index 8a401ec1b2..fb10ed296a 100644
	--- a/src/applications/owners/storage/package/__init__.php
	+++ b/src/applications/owners/storage/package/__init__.php
	@@ -1,13 +1,17 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/owners/storage/base');
	+phutil_require_module('phabricator', 'applications/owners/storage/owner');
	+phutil_require_module('phabricator', 'applications/owners/storage/path');
	phutil_require_module('phabricator', 'applications/phid/storage/phid');

	+phutil_require_module('phutil', 'utils');
	+

	phutil_require_source('PhabricatorOwnersPackage.php');
	diff --git a/src/applications/owners/storage/path/PhabricatorOwnersPath.php b/src/applications/owners/storage/path/PhabricatorOwnersPath.php
	index ce4e055d0d..cf8fbca3ee 100644
	--- a/src/applications/owners/storage/path/PhabricatorOwnersPath.php
	+++ b/src/applications/owners/storage/path/PhabricatorOwnersPath.php
	@@ -1,31 +1,31 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorOwnersPath extends PhabricatorOwnersDAO {

	protected $packageID;
	protected $repositoryPHID;
	protected $path;

	public function getConfiguration() {
	return array(
	self::CONFIG_TIMESTAMPS => false,
	- );
	+ ) + parent::getConfiguration();
	}

	}
	diff --git a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
	index 8c3a9600bb..cc395d316e 100644
	--- a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
	+++ b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
	@@ -1,242 +1,264 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorObjectHandleData {

	private $phids;

	public function __construct(array $phids) {
	$this->phids = $phids;
	}

	public function loadHandles() {

	$types = array();
	foreach ($this->phids as $phid) {
	$type = $this->lookupType($phid);
	$types[$type][] = $phid;
	}

	$handles = array();

	$external_loaders = PhabricatorEnv::getEnvConfig('phid.external-loaders');

	foreach ($types as $type => $phids) {
	switch ($type) {
	case PhabricatorPHIDConstants::PHID_TYPE_MAGIC:
	// Black magic!
	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	switch ($phid) {
	case 'PHID-!!!!-UP-FOR-GRABS':
	$handle->setName('Up For Grabs');
	break;
	default:
	$handle->setName('Foul Magicks');
	break;
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_USER:
	$class = 'PhabricatorUser';
	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$users = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$users = mpull($users, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($users[$phid])) {
	$handle->setName('Unknown User');
	} else {
	$user = $users[$phid];
	$handle->setName($user->getUsername());
	$handle->setURI('/p/'.$user->getUsername().'/');
	$handle->setEmail($user->getEmail());
	$handle->setFullName(
	$user->getUsername().' ('.$user->getRealName().')');

	$img_phid = $user->getProfileImagePHID();
	if ($img_phid) {
	$handle->setImageURI(
	PhabricatorFileURI::getViewURIForPHID($img_phid));
	}
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_MLST:
	$class = 'PhabricatorMetaMTAMailingList';

	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$lists = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$lists = mpull($lists, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($lists[$phid])) {
	$handle->setName('Unknown Mailing List');
	} else {
	$list = $lists[$phid];
	$handle->setEmail($list->getEmail());
	$handle->setName($list->getName());
	$handle->setURI($list->getURI());
	$handle->setFullName($list->getName());
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_DREV:
	$class = 'DifferentialRevision';
	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$revs = $object->loadAllWhere('phid in (%Ls)', $phids);
	$revs = mpull($revs, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($revs[$phid])) {
	$handle->setName('Unknown Revision');
	} else {
	$rev = $revs[$phid];
	$handle->setName($rev->getTitle());
	$handle->setURI('/D'.$rev->getID());
	$handle->setFullName('D'.$rev->getID().': '.$rev->getTitle());
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_TASK:
	$class = 'ManiphestTask';
	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$tasks = $object->loadAllWhere('phid in (%Ls)', $phids);
	$tasks = mpull($tasks, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($tasks[$phid])) {
	$handle->setName('Unknown Revision');
	} else {
	$task = $tasks[$phid];
	$handle->setName($task->getTitle());
	$handle->setURI('/T'.$task->getID());
	$handle->setFullName('T'.$task->getID().': '.$task->getTitle());
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_FILE:
	$class = 'PhabricatorFile';
	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$files = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$files = mpull($files, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($files[$phid])) {
	$handle->setName('Unknown File');
	} else {
	$file = $files[$phid];
	$handle->setName($file->getName());
	$handle->setURI($file->getViewURI());
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_PROJ:
	$class = 'PhabricatorProject';
	PhutilSymbolLoader::loadClass($class);
	$object = newv($class, array());

	$projects = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$projects = mpull($projects, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($projects[$phid])) {
	$handle->setName('Unknown Project');
	} else {
	$project = $projects[$phid];
	$handle->setName($project->getName());
	$handle->setURI('/project/view/'.$project->getID().'/');
	}
	$handles[$phid] = $handle;
	}
	break;
	+ case PhabricatorPHIDConstants::PHID_TYPE_REPO:
	+ $class = 'PhabricatorRepository';
	+ PhutilSymbolLoader::loadClass($class);
	+ $object = newv($class, array());
	+
	+ $repositories = $object->loadAllWhere('phid in (%Ls)', $phids);
	+ $repositories = mpull($repositories, null, 'getPHID');
	+
	+ foreach ($phids as $phid) {
	+ $handle = new PhabricatorObjectHandle();
	+ $handle->setPHID($phid);
	+ $handle->setType($type);
	+ if (empty($repositories[$phid])) {
	+ $handle->setName('Unknown Repository');
	+ } else {
	+ $repository = $repositories[$phid];
	+ $handle->setName($repository->getCallsign());
	+ $handle->setURI('/diffusion/'.$repository->getCallsign().'/');
	+ }
	+ $handles[$phid] = $handle;
	+ }
	+ break;
	default:
	$loader = null;
	if (isset($external_loaders[$type])) {
	$loader = $external_loaders[$type];
	} else if (isset($external_loaders['*'])) {
	$loader = $external_loaders['*'];
	}

	if ($loader) {
	PhutilSymbolLoader::loadClass($loader);
	$object = newv($loader, array());
	$handles += $object->loadHandles($phids);
	break;
	}

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setType($type);
	$handle->setPHID($phid);
	$handle->setName('Unknown Object');
	$handle->setFullName('An Unknown Object');
	$handles[$phid] = $handle;
	}
	break;
	}
	}

	return $handles;
	}

	private function lookupType($phid) {
	$matches = null;
	if (preg_match('/^PHID-([^-]{4})-/', $phid, $matches)) {
	return $matches[1];
	}
	return PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN;
	}

	}
	diff --git a/src/view/layout/panel/AphrontPanelView.php b/src/view/layout/panel/AphrontPanelView.php
	index 026c7f7094..9a3f83d064 100644
	--- a/src/view/layout/panel/AphrontPanelView.php
	+++ b/src/view/layout/panel/AphrontPanelView.php
	@@ -1,82 +1,89 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	final class AphrontPanelView extends AphrontView {

	const WIDTH_FULL = 'full';
	const WIDTH_FORM = 'form';
	const WIDTH_WIDE = 'wide';

	- private $createButton;
	+ private $buttons = array();
	private $header;
	private $width;

	public function setCreateButton($create_button, $href) {
	+ $this->addButton(
	+ phutil_render_tag(
	+ 'a',
	+ array(
	+ 'href' => $href,
	+ 'class' => 'button green',
	+ ),
	+ $create_button));

	- $this->createButton = phutil_render_tag(
	- 'a',
	- array(
	- 'href' => $href,
	- 'class' => 'create-button button green',
	- ),
	- $create_button);
	+ return $this;
	+ }

	+ public function addButton($button) {
	+ $this->buttons[] = $button;
	return $this;
	}

	public function setHeader($header) {
	$this->header = $header;
	return $this;
	}

	public function setWidth($width) {
	$this->width = $width;
	return $this;
	}

	public function render() {
	if ($this->header !== null) {
	$header = '<h1>'.$this->header.'</h1>';
	} else {
	$header = null;
	}

	- if ($this->createButton !== null) {
	- $button = $this->createButton;
	- } else {
	- $button = null;
	+ $buttons = null;
	+ if ($this->buttons) {
	+ $buttons =
	+ '<div class="aphront-panel-view-buttons">'.
	+ implode(" ", $this->buttons).
	+ '</div>';
	}

	$table = $this->renderChildren();

	require_celerity_resource('aphront-panel-view-css');

	$class = array('aphront-panel-view');
	if ($this->width) {
	$class[] = 'aphront-panel-width-'.$this->width;
	}

	return
	'<div class="'.implode(' ', $class).'">'.
	- $button.
	+ $buttons.
	$header.
	$table.
	'</div>';
	}

	}
	diff --git a/webroot/rsrc/css/aphront/list-filter-view.css b/webroot/rsrc/css/aphront/list-filter-view.css
	index f05836d929..09b59baabf 100644
	--- a/webroot/rsrc/css/aphront/list-filter-view.css
	+++ b/webroot/rsrc/css/aphront/list-filter-view.css
	@@ -1,38 +1,39 @@
	/**
	* @provides aphront-list-filter-view-css
	*/

	.aphront-list-filter-view {
	background: #f6f6f6;
	border-bottom: 1px solid #bbbbbb;
	width: 100%;
	+ margin-bottom: 2em;
	}

	.aphront-list-filter-view-buttons {
	padding: 10px 20px;
	}

	.aphront-list-filter-view-buttons a.button {
	width: 200px;
	display: block;
	}

	.aphront-list-filter-view-controls {
	width: 100%;
	border-right: 1px solid #bbbbbb;
	}

	.aphront-list-filter-view-controls .aphront-form-view {
	border-width: 0;
	- padding: 0 0 6px;
	+ padding: 12px 0 6px;
	}

	.aphront-list-filter-view-controls .aphront-form-view .aphront-form-label {
	width: 12%;
	}

	.aphront-list-filter-view-controls .aphront-form-view .aphront-form-input {
	width: 70%;
	margin-left: 13%;
	margin-right: 17%;
	}
	diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css
	index 1aaed03fa4..889510d502 100644
	--- a/webroot/rsrc/css/aphront/panel-view.css
	+++ b/webroot/rsrc/css/aphront/panel-view.css
	@@ -1,39 +1,39 @@
	/**
	* @provides aphront-panel-view-css
	*/


	.aphront-panel-view {
	background: #f3f3f3;
	border: 1px solid #c0c0c0;
	border-width: 1px 0 0;
	padding: 1em 2em;
	margin: 1em 2em;
	}

	.aphront-panel-view h1 {
	font-size: 14px;
	font-weight: bold;
	padding: 2px 0 8px;
	}

	-.aphront-panel-view a.create-button {
	+.aphront-panel-view-buttons {
	float: right;
	}

	.aphront-panel-view p.aphront-panel-instructions {
	margin: .5em 2em .75em;
	font-size: 13px;
	}

	.aphront-panel-width-form {
	width: 720px;
	margin-right: auto;
	margin-left: auto;
	}

	.aphront-panel-width-wide {
	width: 1080px;
	margin-right: auto;
	margin-left: auto;
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 14:40 (3 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125597
Default Alt Text: (154 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions