No OneTemporary
Actions

Size

166 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index 3647f3116f..91f516ff78 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,1238 +1,1237 @@
	<?php

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

	phutil_register_library_map(array(
	'class' =>
	array(
	'Aphront304Response' => 'aphront/response/304',
	'Aphront400Response' => 'aphront/response/400',
	'Aphront404Response' => 'aphront/response/404',
	'AphrontAjaxResponse' => 'aphront/response/ajax',
	'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
	'AphrontAttachedFileView' => 'view/control/attachedfile',
	'AphrontCSRFException' => 'aphront/exception/csrf',
	'AphrontCalendarMonthView' => 'applications/calendar/view/month',
	'AphrontContextBarView' => 'view/layout/contextbar',
	'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',
	'AphrontFilePreviewView' => 'view/layout/filepreview',
	'AphrontFileResponse' => 'aphront/response/file',
	'AphrontFormCheckboxControl' => 'view/form/control/checkbox',
	'AphrontFormControl' => 'view/form/control/base',
	'AphrontFormDividerControl' => 'view/form/control/divider',
	'AphrontFormDragAndDropUploadControl' => 'view/form/control/draganddropupload',
	'AphrontFormFileControl' => 'view/form/control/file',
	'AphrontFormLayoutView' => 'view/form/layout',
	'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',
	'AphrontIsolatedDatabaseConnection' => 'storage/connection/isolated',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/isolated/__tests__',
	'AphrontKeyboardShortcutsAvailableView' => 'view/widget/keyboardshortcuts',
	'AphrontListFilterView' => 'view/layout/listfilter',
	'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
	'AphrontNullView' => 'view/null',
	'AphrontPageView' => 'view/page/base',
	'AphrontPagerView' => 'view/control/pager',
	'AphrontPanelView' => 'view/layout/panel',
	'AphrontQueryAccessDeniedException' => 'storage/exception/accessdenied',
	'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',
	'AphrontReloadResponse' => 'aphront/response/reload',
	'AphrontRequest' => 'aphront/request',
	'AphrontRequestFailureView' => 'view/page/failure',
	'AphrontResponse' => 'aphront/response/base',
	'AphrontScopedUnguardedWriteCapability' => 'aphront/writeguard/scopeguard',
	'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',
	'AphrontWriteGuard' => 'aphront/writeguard',
	'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_getcertificate_Method' => 'applications/conduit/method/conduit/getcertificate',
	'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_getalldiffs_Method' => 'applications/conduit/method/differential/getalldiffs',
	'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_getrevision_Method' => 'applications/conduit/method/differential/getrevision',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'applications/conduit/method/differential/getrevisionfeedback',
	'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_differential_updatetaskrevisionassoc_Method' => 'applications/conduit/method/differential/updatetaskrevisionassoc',
	'ConduitAPI_differential_updateunitresults_Method' => 'applications/conduit/method/differential/updateunitresults',
	'ConduitAPI_diffusion_getcommits_Method' => 'applications/conduit/method/diffusion/getcommits',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/conduit/method/diffusion/getrecentcommitsbypath',
	'ConduitAPI_feed_publish_Method' => 'applications/conduit/method/feed/publish',
	'ConduitAPI_file_download_Method' => 'applications/conduit/method/file/download',
	'ConduitAPI_file_info_Method' => 'applications/conduit/method/file/info',
	'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
	'ConduitAPI_maniphest_info_Method' => 'applications/conduit/method/maniphest/info',
	'ConduitAPI_paste_Method' => 'applications/conduit/method/paste/base',
	'ConduitAPI_paste_create_Method' => 'applications/conduit/method/paste/create',
	'ConduitAPI_paste_info_Method' => 'applications/conduit/method/paste/info',
	'ConduitAPI_path_getowners_Method' => 'applications/conduit/method/path/getowners',
	'ConduitAPI_slowvote_info_Method' => 'applications/conduit/method/slowvote/info',
	'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find',
	'ConduitAPI_user_whoami_Method' => 'applications/conduit/method/user/whoami',
	'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',
	'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof',
	'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api',
	'DatabaseConfigurationProvider' => 'applications/base/storage/configuration',
	'DifferentialAction' => 'applications/differential/constants/action',
	'DifferentialAddCommentView' => 'applications/differential/view/addcomment',
	'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/applypatch',
	'DifferentialArcanistProjectFieldSpecification' => 'applications/differential/field/specification/arcanistproject',
	'DifferentialAuthorFieldSpecification' => 'applications/differential/field/specification/author',
	'DifferentialAuxiliaryField' => 'applications/differential/storage/auxiliaryfield',
	'DifferentialBlameRevisionFieldSpecification' => 'applications/differential/field/specification/blamerev',
	'DifferentialCCWelcomeMail' => 'applications/differential/mail/ccwelcome',
	'DifferentialCCsFieldSpecification' => 'applications/differential/field/specification/ccs',
	'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',
	- 'DifferentialCommitMessageParserException' => 'applications/differential/parser/commitmessage/exception',
	'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/commits',
	'DifferentialController' => 'applications/differential/controller/base',
	'DifferentialDAO' => 'applications/differential/storage/base',
	'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/default',
	'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/dependencies',
	'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',
	'DifferentialExceptionMail' => 'applications/differential/mail/exception',
	'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/exportpatch',
	'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/notavailable',
	+ 'DifferentialFieldParseException' => 'applications/differential/field/exception/parse',
	'DifferentialFieldSelector' => 'applications/differential/field/selector/base',
	'DifferentialFieldSpecification' => 'applications/differential/field/specification/base',
	'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/incomplete',
	'DifferentialFieldValidationException' => 'applications/differential/field/exception/validation',
	'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/gitsvnid',
	'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/host',
	'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',
	'DifferentialLinesFieldSpecification' => 'applications/differential/field/specification/lines',
	'DifferentialLintFieldSpecification' => 'applications/differential/field/specification/lint',
	'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
	'DifferentialMail' => 'applications/differential/mail/base',
	'DifferentialManiphestTasksFieldSpecification' => 'applications/differential/field/specification/maniphesttasks',
	'DifferentialNewDiffMail' => 'applications/differential/mail/newdiff',
	'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/path',
	'DifferentialPrimaryPaneView' => 'applications/differential/view/primarypane',
	'DifferentialReplyHandler' => 'applications/differential/replyhandler',
	'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/revertplan',
	'DifferentialReviewRequestMail' => 'applications/differential/mail/reviewrequest',
	'DifferentialReviewedByFieldSpecification' => 'applications/differential/field/specification/reviewedby',
	'DifferentialReviewersFieldSpecification' => 'applications/differential/field/specification/reviewers',
	'DifferentialRevision' => 'applications/differential/storage/revision',
	'DifferentialRevisionCommentListView' => 'applications/differential/view/revisioncommentlist',
	'DifferentialRevisionCommentView' => 'applications/differential/view/revisioncomment',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem',
	'DifferentialRevisionDetailRenderer' => 'applications/differential/controller/customrenderer',
	'DifferentialRevisionDetailView' => 'applications/differential/view/revisiondetail',
	'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit',
	'DifferentialRevisionEditor' => 'applications/differential/editor/revision',
	'DifferentialRevisionIDFieldSpecification' => 'applications/differential/field/specification/revisionid',
	'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist',
	'DifferentialRevisionListData' => 'applications/differential/data/revisionlist',
	'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
	'DifferentialRevisionStatusFieldSpecification' => 'applications/differential/field/specification/revisionstatus',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/revisionupdatehistory',
	'DifferentialRevisionViewController' => 'applications/differential/controller/revisionview',
	'DifferentialSubscribeController' => 'applications/differential/controller/subscribe',
	'DifferentialSummaryFieldSpecification' => 'applications/differential/field/specification/summary',
	'DifferentialTasksAttacher' => 'applications/differential/tasks',
	'DifferentialTestPlanFieldSpecification' => 'applications/differential/field/specification/testplan',
	'DifferentialTitleFieldSpecification' => 'applications/differential/field/specification/title',
	'DifferentialUnitFieldSpecification' => 'applications/differential/field/specification/unit',
	'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
	'DifferentialUnitTestResult' => 'applications/differential/constants/unittestresult',
	'DifferentialViewTime' => 'applications/differential/storage/viewtime',
	'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',
	'DiffusionCommitListController' => 'applications/diffusion/controller/commitlist',
	'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',
	'HeraldCommitAdapter' => 'applications/herald/adapter/commit',
	'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',
	'HeraldRepetitionPolicyConfig' => 'applications/herald/config/repetitionpolicy',
	'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',
	'LiskIsolationTestCase' => 'storage/lisk/dao/__tests__',
	'LiskIsolationTestDAO' => 'storage/lisk/dao/__tests__',
	'LiskIsolationTestDAOException' => 'storage/lisk/dao/__tests__',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/default',
	'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/base',
	'ManiphestAuxiliaryFieldTypeException' => 'applications/maniphest/auxiliaryfield/typeexception',
	'ManiphestAuxiliaryFieldValidationException' => 'applications/maniphest/auxiliaryfield/validationexception',
	'ManiphestConstants' => 'applications/maniphest/constants/base',
	'ManiphestController' => 'applications/maniphest/controller/base',
	'ManiphestDAO' => 'applications/maniphest/storage/base',
	'ManiphestDefaultTaskExtensions' => 'applications/maniphest/extensions/task',
	'ManiphestReplyHandler' => 'applications/maniphest/replyhandler',
	'ManiphestTask' => 'applications/maniphest/storage/task',
	'ManiphestTaskAuxiliaryStorage' => 'applications/maniphest/storage/auxiliary',
	'ManiphestTaskDescriptionChangeController' => 'applications/maniphest/controller/descriptionchange',
	'ManiphestTaskDetailController' => 'applications/maniphest/controller/taskdetail',
	'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit',
	'ManiphestTaskExtensions' => 'applications/maniphest/extensions/base',
	'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
	'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
	'ManiphestTaskOwner' => 'applications/maniphest/constants/owner',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
	'ManiphestTaskProject' => 'applications/maniphest/storage/taskproject',
	'ManiphestTaskQuery' => 'applications/maniphest/query',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
	'ManiphestTaskSubscriber' => 'applications/maniphest/storage/subscriber',
	'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',
	'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/transactionpreview',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/transactionsave',
	'ManiphestTransactionType' => 'applications/maniphest/constants/transactiontype',
	'ManiphestView' => 'applications/maniphest/view/base',
	'Phabricator404Controller' => 'applications/base/controller/404',
	'PhabricatorAuthController' => 'applications/auth/controller/base',
	'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/browse',
	'PhabricatorCalendarController' => 'applications/calendar/controller/base',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
	'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/token',
	'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',
	'PhabricatorConduitTokenController' => 'applications/conduit/controller/token',
	'PhabricatorController' => 'applications/base/controller/base',
	'PhabricatorCountdownController' => 'applications/countdown/controller/base',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/base',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/delete',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/edit',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/list',
	'PhabricatorCountdownViewController' => 'applications/countdown/controller/view',
	'PhabricatorDaemon' => 'infrastructure/daemon/base',
	'PhabricatorDaemonCombinedLogController' => 'applications/daemon/controller/combined',
	'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',
	'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/daemonlogevents',
	'PhabricatorDaemonLogListController' => 'applications/daemon/controller/loglist',
	'PhabricatorDaemonLogListView' => 'applications/daemon/view/daemonloglist',
	'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/logview',
	'PhabricatorDaemonReference' => 'infrastructure/daemon/control/reference',
	'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/timeline',
	'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/timelineevent',
	'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/default',
	'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/default',
	'PhabricatorDifferenceEngine' => 'infrastructure/diff/engine',
	'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',
	'PhabricatorDisabledUserController' => 'applications/auth/controller/disabled',
	'PhabricatorDraft' => 'applications/draft/storage/draft',
	'PhabricatorDraftDAO' => 'applications/draft/storage/base',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/email',
	'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken',
	'PhabricatorEnv' => 'infrastructure/env',
	'PhabricatorFeedConstants' => 'applications/feed/constants/base',
	'PhabricatorFeedController' => 'applications/feed/controller/base',
	'PhabricatorFeedDAO' => 'applications/feed/storage/base',
	'PhabricatorFeedPublicStreamController' => 'applications/feed/controller/publicstream',
	'PhabricatorFeedQuery' => 'applications/feed/query',
	'PhabricatorFeedStory' => 'applications/feed/story/base',
	'PhabricatorFeedStoryData' => 'applications/feed/storage/story',
	'PhabricatorFeedStoryDifferential' => 'applications/feed/story/differential',
	'PhabricatorFeedStoryPhriction' => 'applications/feed/story/phriction',
	'PhabricatorFeedStoryPublisher' => 'applications/feed/publisher',
	'PhabricatorFeedStoryReference' => 'applications/feed/storage/storyreference',
	'PhabricatorFeedStoryStatus' => 'applications/feed/story/status',
	'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/story',
	'PhabricatorFeedStoryUnknown' => 'applications/feed/story/unknown',
	'PhabricatorFeedStoryView' => 'applications/feed/view/story',
	'PhabricatorFeedStreamController' => 'applications/feed/controller/stream',
	'PhabricatorFeedView' => 'applications/feed/view/base',
	'PhabricatorFile' => 'applications/files/storage/file',
	'PhabricatorFileAltViewController' => 'applications/files/controller/altview',
	'PhabricatorFileController' => 'applications/files/controller/base',
	'PhabricatorFileDAO' => 'applications/files/storage/base',
	'PhabricatorFileDropUploadController' => 'applications/files/controller/dropupload',
	'PhabricatorFileImageMacro' => 'applications/files/storage/imagemacro',
	'PhabricatorFileListController' => 'applications/files/controller/list',
	'PhabricatorFileMacroDeleteController' => 'applications/files/controller/macrodelete',
	'PhabricatorFileMacroEditController' => 'applications/files/controller/macroedit',
	'PhabricatorFileMacroListController' => 'applications/files/controller/macrolist',
	'PhabricatorFileProxyController' => 'applications/files/controller/proxy',
	'PhabricatorFileProxyImage' => 'applications/files/storage/proxyimage',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
	'PhabricatorFileStorageEngine' => 'applications/files/engine/base',
	'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/base',
	'PhabricatorFileTransformController' => 'applications/files/controller/transform',
	'PhabricatorFileURI' => 'applications/files/uri',
	'PhabricatorFileUploadController' => 'applications/files/controller/upload',
	'PhabricatorFileUploadException' => 'applications/files/exception/upload',
	'PhabricatorFileViewController' => 'applications/files/controller/view',
	'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/garbagecollector',
	'PhabricatorGoodForNothingWorker' => 'infrastructure/daemon/workers/worker/goodfornothing',
	'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/selector',
	'PhabricatorHelpController' => 'applications/help/controller/base',
	'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/keyboardshortcut',
	'PhabricatorIRCBot' => 'infrastructure/daemon/irc/bot',
	'PhabricatorIRCHandler' => 'infrastructure/daemon/irc/handler/base',
	'PhabricatorIRCMessage' => 'infrastructure/daemon/irc/message',
	'PhabricatorIRCObjectNameHandler' => 'infrastructure/daemon/irc/handler/objectname',
	'PhabricatorIRCProtocolHandler' => 'infrastructure/daemon/irc/handler/protocol',
	'PhabricatorImageTransformer' => 'applications/files/transform',
	'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/javelin',
	'PhabricatorLintEngine' => 'infrastructure/lint/engine',
	'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
	'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/localdisk',
	'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',
	'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/sendgrid',
	'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/test',
	'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/base',
	'PhabricatorMarkupEngine' => 'applications/markup/engine',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/base',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base',
	'PhabricatorMetaMTADaemon' => 'applications/metamta/daemon/mta',
	'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/parser',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/parser/__tests__',
	'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail',
	'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/mail/__tests__',
	'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/mailinglist',
	'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/mailinglistedit',
	'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists',
	'PhabricatorMetaMTAReceiveController' => 'applications/metamta/controller/receive',
	'PhabricatorMetaMTAReceivedListController' => 'applications/metamta/controller/receivedlist',
	'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/receivedmail',
	'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
	'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/sendgridreceive',
	'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view',
	'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/mysql',
	'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',
	'PhabricatorObjectGraph' => 'applications/phid/graph',
	'PhabricatorObjectHandle' => 'applications/phid/handle',
	'PhabricatorObjectHandleConstants' => 'applications/phid/handle/const/base',
	'PhabricatorObjectHandleData' => 'applications/phid/handle/data',
	'PhabricatorObjectHandleStatus' => 'applications/phid/handle/const/status',
	'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',
	'PhabricatorPHIDConstants' => 'applications/phid/constants',
	'PhabricatorPHIDController' => 'applications/phid/controller/base',
	'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
	'PhabricatorPHIDListController' => 'applications/phid/controller/list',
	'PhabricatorPHIDLookupController' => 'applications/phid/controller/lookup',
	'PhabricatorPaste' => 'applications/paste/storage/paste',
	'PhabricatorPasteController' => 'applications/paste/controller/base',
	'PhabricatorPasteCreateController' => 'applications/paste/controller/create',
	'PhabricatorPasteDAO' => 'applications/paste/storage/base',
	'PhabricatorPasteListController' => 'applications/paste/controller/list',
	'PhabricatorPasteViewController' => 'applications/paste/controller/view',
	'PhabricatorPeopleController' => 'applications/people/controller/base',
	'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
	'PhabricatorPeopleListController' => 'applications/people/controller/list',
	'PhabricatorPeopleLogsController' => 'applications/people/controller/logs',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
	'PhabricatorProfileView' => 'view/layout/profile',
	'PhabricatorProject' => 'applications/project/storage/project',
	'PhabricatorProjectAffiliation' => 'applications/project/storage/affiliation',
	'PhabricatorProjectAffiliationEditController' => 'applications/project/controller/editaffiliation',
	'PhabricatorProjectController' => 'applications/project/controller/base',
	'PhabricatorProjectCreateController' => 'applications/project/controller/create',
	'PhabricatorProjectDAO' => 'applications/project/storage/base',
	'PhabricatorProjectListController' => 'applications/project/controller/list',
	'PhabricatorProjectProfile' => 'applications/project/storage/profile',
	'PhabricatorProjectProfileController' => 'applications/project/controller/profile',
	'PhabricatorProjectProfileEditController' => 'applications/project/controller/profileedit',
	'PhabricatorProjectStatus' => 'applications/project/constants/status',
	'PhabricatorProjectSubproject' => 'applications/project/storage/subproject',
	'PhabricatorRedirectController' => 'applications/base/controller/redirect',
	'PhabricatorRefreshCSRFController' => 'applications/auth/controller/refresh',
	'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/differential',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/remarkup/markuprule/handle/differential',
	'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/remarkup/markuprule/diffusion',
	'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/remarkup/markuprule/embedobject',
	'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/remarkup/markuprule/imagemacro',
	'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/maniphest',
	'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/remarkup/markuprule/handle/maniphest',
	'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/remarkup/markuprule/mention',
	'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/remarkup/markuprule/handle',
	'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/remarkup/markuprule/objectname',
	'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/remarkup/markuprule/paste',
	'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/remarkup/markuprule/phriction',
	'PhabricatorRemarkupRuleProxyImage' => 'infrastructure/markup/remarkup/markuprule/proxyimage',
	'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/remarkup/markuprule/youtube',
	'PhabricatorRepository' => 'applications/repository/storage/repository',
	'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/arcanistproject',
	'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/arcansistprojectedit',
	'PhabricatorRepositoryCommit' => 'applications/repository/storage/commit',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/base',
	'PhabricatorRepositoryCommitData' => 'applications/repository/storage/commitdata',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/base',
	'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/herald',
	'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',
	'PhabricatorRepositoryDeleteController' => 'applications/repository/controller/delete',
	'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',
	'PhabricatorS3FileStorageEngine' => 'applications/files/engine/s3',
	'PhabricatorSQLPatchList' => 'infrastructure/setup/sql',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/abstractdocument',
	'PhabricatorSearchAttachController' => 'applications/search/controller/attach',
	'PhabricatorSearchBaseController' => 'applications/search/controller/base',
	'PhabricatorSearchCommitIndexer' => 'applications/search/index/indexer/repository',
	'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',
	'PhabricatorSearchEngine' => 'applications/search/engine/base',
	'PhabricatorSearchEngineMySQL' => 'applications/search/engine/mysql',
	'PhabricatorSearchEngineSelector' => 'applications/search/selector/base',
	'PhabricatorSearchField' => 'applications/search/constants/field',
	'PhabricatorSearchIndexController' => 'applications/search/controller/index',
	'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/maniphest',
	'PhabricatorSearchPhrictionIndexer' => 'applications/search/index/indexer/phriction',
	'PhabricatorSearchQuery' => 'applications/search/storage/query',
	'PhabricatorSearchRelationship' => 'applications/search/constants/relationship',
	'PhabricatorSearchResultView' => 'applications/search/view/searchresult',
	'PhabricatorSearchSelectController' => 'applications/search/controller/select',
	'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/user',
	'PhabricatorSetup' => 'infrastructure/setup',
	'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/choice',
	'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/comment',
	'PhabricatorSlowvoteController' => 'applications/slowvote/controller/base',
	'PhabricatorSlowvoteCreateController' => 'applications/slowvote/controller/create',
	'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/base',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/list',
	'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/option',
	'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/poll',
	'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/poll',
	'PhabricatorStandardPageView' => 'view/page/standard',
	'PhabricatorStatusController' => 'applications/status/base',
	'PhabricatorSyntaxHighlighter' => 'applications/markup/syntax',
	'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/taskmaster',
	'PhabricatorTestCase' => 'infrastructure/testing/testcase',
	'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',
	'PhabricatorTimer' => 'applications/countdown/storage/timer',
	'PhabricatorTransformedFile' => 'applications/files/storage/transformed',
	'PhabricatorTrivialTestCase' => 'infrastructure/testing/testcase/__tests__',
	'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',
	'PhabricatorUserAccountSettingsPanelController' => 'applications/people/controller/settings/panels/account',
	'PhabricatorUserConduitSettingsPanelController' => 'applications/people/controller/settings/panels/conduit',
	'PhabricatorUserDAO' => 'applications/people/storage/base',
	'PhabricatorUserEmailSettingsPanelController' => 'applications/people/controller/settings/panels/email',
	'PhabricatorUserLog' => 'applications/people/storage/log',
	'PhabricatorUserOAuthInfo' => 'applications/people/storage/useroauthinfo',
	'PhabricatorUserOAuthSettingsPanelController' => 'applications/people/controller/settings/panels/oauth',
	'PhabricatorUserPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/preferences',
	'PhabricatorUserPreferences' => 'applications/people/storage/preferences',
	'PhabricatorUserProfile' => 'applications/people/storage/profile',
	'PhabricatorUserProfileSettingsPanelController' => 'applications/people/controller/settings/panels/profile',
	'PhabricatorUserSSHKey' => 'applications/people/storage/usersshkey',
	'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/sshkeys',
	'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
	'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/base',
	'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',
	'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/base',
	'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/base',
	'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/viewframe',
	'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/viewframeset',
	'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/viewinput',
	'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/viewpanel',
	'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/parsetree',
	'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/run',
	'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/viewstream',
	'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/viewtree',
	'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
	'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile',
	'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol',
	'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/toplevel',
	'PhrictionActionConstants' => 'applications/phriction/constants/action',
	'PhrictionConstants' => 'applications/phriction/constants/base',
	'PhrictionContent' => 'applications/phriction/storage/content',
	'PhrictionController' => 'applications/phriction/controller/base',
	'PhrictionDAO' => 'applications/phriction/storage/base',
	'PhrictionDiffController' => 'applications/phriction/controller/diff',
	'PhrictionDocument' => 'applications/phriction/storage/document',
	'PhrictionDocumentController' => 'applications/phriction/controller/document',
	'PhrictionDocumentPreviewController' => 'applications/phriction/controller/documentpreview',
	'PhrictionDocumentTestCase' => 'applications/phriction/storage/document/__tests__',
	'PhrictionEditController' => 'applications/phriction/controller/edit',
	'PhrictionHistoryController' => 'applications/phriction/controller/history',
	'PhrictionListController' => 'applications/phriction/controller/list',
	),
	'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_date' => 'view/utils',
	'phabricator_datetime' => 'view/utils',
	'phabricator_format_relative_time' => 'view/utils',
	'phabricator_format_timestamp' => 'view/utils',
	'phabricator_format_units_generic' => 'view/utils',
	'phabricator_render_form' => 'infrastructure/javelin/markup',
	'phabricator_time' => 'view/utils',
	'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(
	'Aphront304Response' => 'AphrontResponse',
	'Aphront400Response' => 'AphrontResponse',
	'Aphront404Response' => 'AphrontResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontAttachedFileView' => 'AphrontView',
	'AphrontCSRFException' => 'AphrontException',
	'AphrontCalendarMonthView' => 'AphrontView',
	'AphrontContextBarView' => 'AphrontView',
	'AphrontCrumbsView' => 'AphrontView',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDefaultApplicationController' => 'AphrontController',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => 'AphrontView',
	'AphrontErrorView' => 'AphrontView',
	'AphrontFilePreviewView' => 'AphrontView',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormDragAndDropUploadControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	'AphrontFormLayoutView' => 'AphrontView',
	'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',
	'AphrontIsolatedDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
	'AphrontListFilterView' => 'AphrontView',
	'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontNullView' => 'AphrontView',
	'AphrontPageView' => 'AphrontView',
	'AphrontPagerView' => 'AphrontView',
	'AphrontPanelView' => 'AphrontView',
	'AphrontQueryAccessDeniedException' => 'AphrontQueryRecoverableException',
	'AphrontQueryConnectionException' => 'AphrontQueryException',
	'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
	'AphrontQueryCountException' => 'AphrontQueryException',
	'AphrontQueryDuplicateKeyException' => 'AphrontQueryException',
	'AphrontQueryObjectMissingException' => 'AphrontQueryException',
	'AphrontQueryParameterException' => 'AphrontQueryException',
	'AphrontQueryRecoverableException' => 'AphrontQueryException',
	'AphrontRedirectException' => 'AphrontException',
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontReloadResponse' => 'AphrontRedirectResponse',
	'AphrontRequestFailureView' => 'AphrontView',
	'AphrontSideNavView' => 'AphrontView',
	'AphrontTableView' => 'AphrontView',
	'AphrontTokenizerTemplateView' => 'AphrontView',
	'AphrontTypeaheadTemplateView' => 'AphrontView',
	'AphrontWebpageResponse' => 'AphrontResponse',
	'CelerityResourceController' => 'AphrontController',
	'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_getcertificate_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_getalldiffs_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getdiff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_markcommitted_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getcommits_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'ConduitAPIMethod',
	'ConduitAPI_feed_publish_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_download_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
	'ConduitAPI_maniphest_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_paste_Method' => 'ConduitAPIMethod',
	'ConduitAPI_paste_create_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_paste_info_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_path_getowners_Method' => 'ConduitAPIMethod',
	'ConduitAPI_slowvote_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_find_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_whoami_Method' => 'ConduitAPIMethod',
	'DarkConsoleConfigPlugin' => 'DarkConsolePlugin',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialApplyPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialArcanistProjectFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuthorFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuxiliaryField' => 'DifferentialDAO',
	'DifferentialBlameRevisionFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialCCWelcomeMail' => 'DifferentialReviewRequestMail',
	'DifferentialCCsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialChangeset' => 'DifferentialDAO',
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialComment' => 'DifferentialDAO',
	'DifferentialCommentMail' => 'DifferentialMail',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialCommitsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDefaultFieldSelector' => 'DifferentialFieldSelector',
	'DifferentialDependenciesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDiff' => 'DifferentialDAO',
	'DifferentialDiffContentMail' => 'DifferentialMail',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialExceptionMail' => 'DifferentialMail',
	'DifferentialExportPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialGitSVNIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHostFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHunk' => 'DifferentialDAO',
	'DifferentialInlineComment' => 'DifferentialDAO',
	'DifferentialInlineCommentEditController' => 'DifferentialController',
	'DifferentialInlineCommentPreviewController' => 'DifferentialController',
	'DifferentialInlineCommentView' => 'AphrontView',
	'DifferentialLinesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialLintFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialManiphestTasksFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialNewDiffMail' => 'DifferentialReviewRequestMail',
	'DifferentialPathFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialPrimaryPaneView' => 'AphrontView',
	'DifferentialReplyHandler' => 'PhabricatorMailReplyHandler',
	'DifferentialRevertPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewRequestMail' => 'DifferentialMail',
	'DifferentialReviewedByFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewersFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevision' => 'DifferentialDAO',
	'DifferentialRevisionCommentListView' => 'AphrontView',
	'DifferentialRevisionCommentView' => 'AphrontView',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	'DifferentialRevisionIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionStatusFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSubscribeController' => 'DifferentialController',
	'DifferentialSummaryFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialTestPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialTitleFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialUnitFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialViewTime' => 'DifferentialDAO',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseFileController' => 'DiffusionController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionCommitChangeTableView' => 'DiffusionView',
	'DiffusionCommitController' => 'DiffusionController',
	'DiffusionCommitListController' => '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',
	'HeraldCommitAdapter' => 'HeraldObjectAdapter',
	'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',
	'LiskIsolationTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestDAO' => 'LiskDAO',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'ManiphestAuxiliaryFieldSpecification',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestDefaultTaskExtensions' => 'ManiphestTaskExtensions',
	'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ManiphestTask' => 'ManiphestDAO',
	'ManiphestTaskAuxiliaryStorage' => 'ManiphestDAO',
	'ManiphestTaskDescriptionChangeController' => 'ManiphestController',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskEditController' => 'ManiphestController',
	'ManiphestTaskListController' => 'ManiphestController',
	'ManiphestTaskListView' => 'ManiphestView',
	'ManiphestTaskOwner' => 'ManiphestConstants',
	'ManiphestTaskPriority' => 'ManiphestConstants',
	'ManiphestTaskProject' => 'ManiphestDAO',
	'ManiphestTaskStatus' => 'ManiphestConstants',
	'ManiphestTaskSubscriber' => 'ManiphestDAO',
	'ManiphestTaskSummaryView' => 'ManiphestView',
	'ManiphestTransaction' => 'ManiphestDAO',
	'ManiphestTransactionDetailView' => 'ManiphestView',
	'ManiphestTransactionListView' => 'ManiphestView',
	'ManiphestTransactionPreviewController' => 'ManiphestController',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	'ManiphestTransactionType' => 'ManiphestConstants',
	'ManiphestView' => 'AphrontView',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarController' => 'PhabricatorController',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorCountdownController' => 'PhabricatorController',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownViewController' => 'PhabricatorCountdownController',
	'PhabricatorDaemon' => 'PhutilDaemon',
	'PhabricatorDaemonCombinedLogController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonController' => 'PhabricatorController',
	'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDaemonLog' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEvent' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEventsView' => 'AphrontView',
	'PhabricatorDaemonLogListController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonLogListView' => 'AphrontView',
	'PhabricatorDaemonLogViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineEventController' => 'PhabricatorDaemonController',
	'PhabricatorDefaultFileStorageEngineSelector' => 'PhabricatorFileStorageEngineSelector',
	'PhabricatorDefaultSearchEngineSelector' => 'PhabricatorSearchEngineSelector',
	'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryController' => 'PhabricatorController',
	'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
	'PhabricatorDisabledUserController' => 'PhabricatorAuthController',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
	'PhabricatorFeedController' => 'PhabricatorController',
	'PhabricatorFeedDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFeedPublicStreamController' => 'PhabricatorFeedController',
	'PhabricatorFeedStoryData' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryDifferential' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryPhriction' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryStatus' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryTypeConstants' => 'PhabricatorFeedConstants',
	'PhabricatorFeedStoryUnknown' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryView' => 'PhabricatorFeedView',
	'PhabricatorFeedStreamController' => 'PhabricatorFeedController',
	'PhabricatorFeedView' => 'AphrontView',
	'PhabricatorFile' => 'PhabricatorFileDAO',
	'PhabricatorFileAltViewController' => 'PhabricatorFileController',
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
	'PhabricatorFileImageMacro' => 'PhabricatorFileDAO',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileMacroDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileMacroEditController' => 'PhabricatorFileController',
	'PhabricatorFileMacroListController' => 'PhabricatorFileController',
	'PhabricatorFileProxyController' => 'PhabricatorFileController',
	'PhabricatorFileProxyImage' => 'PhabricatorFileDAO',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileTransformController' => 'PhabricatorFileController',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileViewController' => 'PhabricatorFileController',
	'PhabricatorGarbageCollectorDaemon' => 'PhabricatorDaemon',
	'PhabricatorGoodForNothingWorker' => 'PhabricatorWorker',
	'PhabricatorHelpController' => 'PhabricatorController',
	'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
	'PhabricatorIRCBot' => 'PhabricatorDaemon',
	'PhabricatorIRCObjectNameHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCProtocolHandler' => 'PhabricatorIRCHandler',
	'PhabricatorJavelinLinter' => 'ArcanistLinter',
	'PhabricatorLintEngine' => 'PhutilLintEngine',
	'PhabricatorLiskDAO' => 'LiskDAO',
	'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorLoginController' => 'PhabricatorAuthController',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationSendGridAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationTestAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTADaemon' => 'PhabricatorDaemon',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailingList' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingListEditController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailingListsController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTASendGridReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
	'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorOAuthDefaultRegistrationController' => 'PhabricatorOAuthRegistrationController',
	'PhabricatorOAuthDiagnosticsController' => 'PhabricatorAuthController',
	'PhabricatorOAuthFailureView' => 'AphrontView',
	'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
	'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGithub' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthRegistrationController' => 'PhabricatorAuthController',
	'PhabricatorOAuthUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorObjectGraph' => 'AbstractDirectedGraph',
	'PhabricatorObjectHandleStatus' => 'PhabricatorObjectHandleConstants',
	'PhabricatorOwnersController' => 'PhabricatorController',
	'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOwnersDeleteController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersDetailController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackage' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	'PhabricatorPHID' => 'PhabricatorPHIDDAO',
	'PhabricatorPHIDController' => 'PhabricatorController',
	'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController',
	'PhabricatorPaste' => 'PhabricatorPasteDAO',
	'PhabricatorPasteController' => 'PhabricatorController',
	'PhabricatorPasteCreateController' => 'PhabricatorPasteController',
	'PhabricatorPasteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPasteListController' => 'PhabricatorPasteController',
	'PhabricatorPasteViewController' => 'PhabricatorPasteController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorProfileView' => 'AphrontView',
	'PhabricatorProject' => 'PhabricatorProjectDAO',
	'PhabricatorProjectAffiliation' => 'PhabricatorProjectDAO',
	'PhabricatorProjectAffiliationEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectController' => 'PhabricatorController',
	'PhabricatorProjectCreateController' => 'PhabricatorProjectController',
	'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
	'PhabricatorProjectListController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfile' => 'PhabricatorProjectDAO',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfileEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectSubproject' => 'PhabricatorProjectDAO',
	'PhabricatorRedirectController' => 'PhabricatorController',
	'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
	'PhabricatorRemarkupRuleDifferential' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleDiffusion' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleEmbedFile' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleImageMacro' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleManiphest' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleManiphestHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectHandle' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectName' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRulePaste' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRulePhriction' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleProxyImage' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule',
	'PhabricatorRepository' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProject' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProjectEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryCommit' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryCommitTaskDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryController' => 'PhabricatorController',
	'PhabricatorRepositoryCreateController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryDaemon' => 'PhabricatorDaemon',
	'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'PhabricatorRepositoryCommitMessageDetailParser',
	'PhabricatorRepositoryDeleteController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryGitCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryGitFetchDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryGitHubNotification' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryGitHubPostReceiveController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryListController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryShortcut' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositorySvnCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorSearchAttachController' => 'PhabricatorSearchController',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchCommitIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDifferentialIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchEngineMySQL' => 'PhabricatorSearchEngine',
	'PhabricatorSearchIndexController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchManiphestIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchPhrictionIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
	'PhabricatorSearchResultView' => 'AphrontView',
	'PhabricatorSearchSelectController' => 'PhabricatorSearchController',
	'PhabricatorSearchUserIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteController' => 'PhabricatorController',
	'PhabricatorSlowvoteCreateController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteOption' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePoll' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePollController' => 'PhabricatorSlowvoteController',
	'PhabricatorStandardPageView' => 'AphrontPageView',
	'PhabricatorStatusController' => 'PhabricatorController',
	'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
	'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
	'PhabricatorTimelineCursor' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineDAO' => 'PhabricatorLiskDAO',
	'PhabricatorTimelineEvent' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineEventData' => 'PhabricatorTimelineDAO',
	'PhabricatorTimer' => 'PhabricatorCountdownDAO',
	'PhabricatorTransformedFile' => 'PhabricatorFileDAO',
	'PhabricatorTrivialTestCase' => 'PhabricatorTestCase',
	'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorUIExampleController' => 'PhabricatorController',
	'PhabricatorUIExampleRenderController' => 'PhabricatorUIExampleController',
	'PhabricatorUIListFilterExample' => 'PhabricatorUIExample',
	'PhabricatorUIPagerExample' => 'PhabricatorUIExample',
	'PhabricatorUser' => 'PhabricatorUserDAO',
	'PhabricatorUserAccountSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserConduitSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserEmailSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserLog' => 'PhabricatorUserDAO',
	'PhabricatorUserOAuthInfo' => 'PhabricatorUserDAO',
	'PhabricatorUserOAuthSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserPreferenceSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserPreferences' => 'PhabricatorUserDAO',
	'PhabricatorUserProfile' => 'PhabricatorUserDAO',
	'PhabricatorUserProfileSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserSSHKey' => 'PhabricatorUserDAO',
	'PhabricatorUserSSHKeysSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
	'PhabricatorUserSettingsPanelController' => 'PhabricatorPeopleController',
	'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
	'PhabricatorXHPASTViewController' => 'PhabricatorController',
	'PhabricatorXHPASTViewDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewParseTree' => 'PhabricatorXHPASTViewDAO',
	'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'AphrontView',
	'PhabricatorXHProfProfileTopLevelView' => 'AphrontView',
	'PhrictionActionConstants' => 'PhrictionConstants',
	'PhrictionContent' => 'PhrictionDAO',
	'PhrictionController' => 'PhabricatorController',
	'PhrictionDAO' => 'PhabricatorLiskDAO',
	'PhrictionDiffController' => 'PhrictionController',
	'PhrictionDocument' => 'PhrictionDAO',
	'PhrictionDocumentController' => 'PhrictionController',
	'PhrictionDocumentPreviewController' => 'PhrictionController',
	'PhrictionDocumentTestCase' => 'PhabricatorTestCase',
	'PhrictionEditController' => 'PhrictionController',
	'PhrictionHistoryController' => 'PhrictionController',
	'PhrictionListController' => 'PhrictionController',
	),
	'requires_interface' =>
	array(
	),
	));
	diff --git a/src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php
	index b3feedabbb..924449d6b5 100644
	--- a/src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php
	+++ b/src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php
	@@ -1,72 +1,175 @@
	<?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 conduit
	*/
	class ConduitAPI_differential_parsecommitmessage_Method
	extends ConduitAPIMethod {

	public function getMethodDescription() {
	return "Parse commit messages for Differential fields.";
	}

	public function defineParamTypes() {
	return array(
	'corpus' => 'required string',
	);
	}

	public function defineReturnType() {
	return 'nonempty dict';
	}

	public function defineErrorTypes() {
	return array(
	);
	}

	protected function execute(ConduitAPIRequest $request) {
	$corpus = $request->getValue('corpus');

	- try {
	- $message = DifferentialCommitMessage::newFromRawCorpus($corpus);
	- } catch (DifferentialCommitMessageParserException $ex) {
	- return array(
	- 'error' => $ex->getMessage(),
	- );
	+ $aux_fields = DifferentialFieldSelector::newSelector()
	+ ->getFieldSpecifications();
	+
	+ foreach ($aux_fields as $key => $aux_field) {
	+ if (!$aux_field->shouldAppearOnCommitMessage()) {
	+ unset($aux_fields[$key]);
	+ }
	}

	+ $aux_fields = mpull($aux_fields, null, 'getCommitMessageKey');
	+
	+ // Build a map from labels (like "Test Plan") to field keys
	+ // (like "testPlan").
	+ $label_map = $this->buildLabelMap($aux_fields);
	+ $field_map = $this->parseCommitMessage($corpus, $label_map);
	+
	+ $fields = array();
	+ $errors = array();
	+ foreach ($field_map as $field_key => $field_value) {
	+ $field = $aux_fields[$field_key];
	+ try {
	+ $fields[$field_key] = $field->parseValueFromCommitMessage($field_value);
	+ } catch (DifferentialFieldParseException $ex) {
	+ $field_label = $field->renderLabelForCommitMessage();
	+ $errors[] = "Error parsing field '{$field_label}': ".$ex->getMessage();
	+ }
	+ }
	+
	+ // TODO: This is for backcompat only, remove once Arcanist gets updated.
	+ $error = head($errors);
	+
	return array(
	- 'error' => null,
	- 'fields' => array(
	- 'title' => $message->getTitle(),
	- 'summary' => $message->getSummary(),
	- 'testPlan' => $message->getTestPlan(),
	- 'blameRevision' => $message->getBlameRevision(),
	- 'revertPlan' => $message->getRevertPlan(),
	- 'reviewerPHIDs' => $message->getReviewerPHIDs(),
	- 'reviewedByPHIDs' => $message->getReviewedByPHIDs(),
	- 'ccPHIDs' => $message->getCCPHIDs(),
	- 'revisionID' => $message->getRevisionID(),
	- 'gitSVNID' => $message->getGitSVNID(),
	- 'tasks' => $message->getTasks(),
	- ),
	+ 'error' => $error,
	+ 'errors' => $errors,
	+ 'fields' => $fields,
	);
	}
	+
	+ private function buildLabelMap(array $aux_fields) {
	+ $label_map = array();
	+ foreach ($aux_fields as $key => $aux_field) {
	+ $labels = $aux_field->getSupportedCommitMessageLabels();
	+ foreach ($labels as $label) {
	+ $normal_label = strtolower($label);
	+ if (!empty($label_map[$normal_label])) {
	+ $previous = $label_map[$normal_label];
	+ throw new Exception(
	+ "Field label '{$label}' is parsed by two fields: '{$key}' and ".
	+ "'{$previous}'. Each label must be parsed by only one field.");
	+ }
	+ $label_map[$normal_label] = $key;
	+ }
	+ }
	+ return $label_map;
	+ }
	+
	+ private function buildLabelRegexp(array $label_map) {
	+ $field_labels = array_keys($label_map);
	+ foreach ($field_labels as $key => $label) {
	+ $field_labels[$key] = preg_quote($label, '/');
	+ }
	+ $field_labels = implode('\|', $field_labels);
	+
	+ $field_pattern = '/^(?P<field>'.$field_labels.'):(?P<text>.*)$/i';
	+
	+ return $field_pattern;
	+ }
	+
	+ private function parseCommitMessage($corpus, array $label_map) {
	+ $label_regexp = $this->buildLabelRegexp($label_map);
	+
	+ // Note, deliberately not populating $seen with 'title' because it is
	+ // optional to include the 'Title:' label. We're doing a little special
	+ // casing to consume the first line as the title regardless of whether you
	+ // label it as such or not.
	+ $field = 'title';
	+
	+ $seen = array();
	+ $lines = explode("\n", trim($corpus));
	+ $field_map = array();
	+ foreach ($lines as $key => $line) {
	+ $match = null;
	+ if (preg_match($label_regexp, $line, $match)) {
	+ $lines[$key] = trim($match['text']);
	+ $field = $label_map[strtolower($match['field'])];
	+ if (!empty($seen[$field])) {
	+ throw new Exception(
	+ "Field '{$field}' occurs twice in commit message!");
	+ }
	+ $seen[$field] = true;
	+ }
	+ $field_map[$key] = $field;
	+ }
	+
	+ $fields = array();
	+ foreach ($lines as $key => $line) {
	+ $fields[$field_map[$key]][] = $line;
	+ }
	+
	+ // This is a piece of special-cased magic which allows you to omit the
	+ // field labels for "title" and "summary". If the user enters a large block
	+ // of text at the beginning of the commit message with an empty line in it,
	+ // treat everything before the blank line as "title" and everything after
	+ // as "summary".
	+ if (isset($fields['title']) && empty($fields['summary'])) {
	+ $lines = $fields['title'];
	+ for ($ii = 0; $ii < count($lines); $ii++) {
	+ if (strlen(trim($lines[$ii])) == 0) {
	+ break;
	+ }
	+ }
	+ if ($ii != count($lines)) {
	+ $fields['title'] = array_slice($lines, 0, $ii);
	+ $fields['summary'] = array_slice($lines, $ii);
	+ }
	+ }
	+
	+ // Implode all the lines back into chunks of text.
	+ foreach ($fields as $name => $lines) {
	+ $data = rtrim(implode("\n", $lines));
	+ $data = ltrim($data, "\n");
	+ $fields[$name] = $data;
	+ }
	+
	+ return $fields;
	+ }
	+
	+
	}
	diff --git a/src/applications/conduit/method/differential/parsecommitmessage/__init__.php b/src/applications/conduit/method/differential/parsecommitmessage/__init__.php
	index 605cd16f25..ea78e07134 100644
	--- a/src/applications/conduit/method/differential/parsecommitmessage/__init__.php
	+++ b/src/applications/conduit/method/differential/parsecommitmessage/__init__.php
	@@ -1,13 +1,15 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/conduit/method/base');
	-phutil_require_module('phabricator', 'applications/differential/parser/commitmessage');
	+phutil_require_module('phabricator', 'applications/differential/field/selector/base');
	+
	+phutil_require_module('phutil', 'utils');


	phutil_require_source('ConduitAPI_differential_parsecommitmessage_Method.php');
	diff --git a/src/applications/differential/parser/commitmessage/exception/DifferentialCommitMessageParserException.php b/src/applications/differential/field/exception/parse/DifferentialFieldParseException.php
	similarity index 90%
	rename from src/applications/differential/parser/commitmessage/exception/DifferentialCommitMessageParserException.php
	rename to src/applications/differential/field/exception/parse/DifferentialFieldParseException.php
	index e82636a503..49610947e4 100644
	--- a/src/applications/differential/parser/commitmessage/exception/DifferentialCommitMessageParserException.php
	+++ b/src/applications/differential/field/exception/parse/DifferentialFieldParseException.php
	@@ -1,21 +1,21 @@
	<?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 DifferentialCommitMessageParserException extends Exception {
	+final class DifferentialFieldParseException extends Exception {

	}
	diff --git a/src/applications/differential/parser/commitmessage/exception/__init__.php b/src/applications/differential/field/exception/parse/__init__.php
	similarity index 59%
	rename from src/applications/differential/parser/commitmessage/exception/__init__.php
	rename to src/applications/differential/field/exception/parse/__init__.php
	index 1bba8b66ab..3a925359d7 100644
	--- a/src/applications/differential/parser/commitmessage/exception/__init__.php
	+++ b/src/applications/differential/field/exception/parse/__init__.php
	@@ -1,10 +1,10 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/




	-phutil_require_source('DifferentialCommitMessageParserException.php');
	+phutil_require_source('DifferentialFieldParseException.php');
	diff --git a/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php b/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php
	index bf2acb8faf..7b0b1be529 100644
	--- a/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php
	+++ b/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php
	@@ -1,627 +1,747 @@
	<?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.
	*/

	/**
	* Describes and implements the behavior for a custom field on Differential
	* revisions. Along with other configuration, you can extend this class to add
	* custom fields to Differential revisions and commit messages.
	*
	* Generally, you should implement all methods from the storage task and then
	* the methods from one or more interface tasks.
	*
	* @task storage Field Storage
	* @task edit Extending the Revision Edit Interface
	* @task view Extending the Revision View Interface
	* @task conduit Extending the Conduit View Interface
	* @task commit Extending Commit Messages
	* @task load Loading Additional Data
	* @task context Contextual Data
	*/
	abstract class DifferentialFieldSpecification {

	private $revision;
	private $diff;
	private $handles;
	private $diffProperties;
	private $user;


	/* -( Storage )------------------------------------------------------------ */


	/**
	* Return a unique string used to key storage of this field's value, like
	* "mycompany.fieldname" or similar. You can return null (the default) to
	* indicate that this field does not use any storage. This is appropriate for
	* display fields, like @{class:DifferentialLinesFieldSpecification}. If you
	* implement this, you must also implement @{method:getValueForStorage} and
	* @{method:setValueFromStorage}.
	*
	* @return string\|null Unique key which identifies this field in auxiliary
	* field storage. Maximum length is 32. Alternatively,
	* null (default) to indicate that this field does not
	* use auxiliary field storage.
	* @task storage
	*/
	public function getStorageKey() {
	return null;
	}


	/**
	* Return a serialized representation of the field value, appropriate for
	* storing in auxiliary field storage. You must implement this method if
	* you implement @{method:getStorageKey}.
	*
	* @return string Serialized field value.
	* @task storage
	*/
	public function getValueForStorage() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/**
	* Set the field's value given a serialized storage value. This is called
	* when the field is loaded; if no data is available, the value will be
	* null. You must implement this method if you implement
	* @{method:getStorageKey}.
	*
	* @param string\|null Serialized field representation (from
	* @{method:getValueForStorage}) or null if no value has
	* ever been stored.
	* @return this
	* @task storage
	*/
	public function setValueFromStorage($value) {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/* -( Extending the Revision Edit Interface )------------------------------ */


	/**
	* Determine if this field should appear on the "Edit Revision" interface. If
	* you return true from this method, you must implement
	* @{method:setValueFromRequest}, @{method:renderEditControl} and
	* @{method:validateField}.
	*
	* For a concrete example of a field which implements an edit interface, see
	* @{class:DifferentialRevertPlanFieldSpecification}.
	*
	* @return bool True to indicate that this field implements an edit interface.
	* @task edit
	*/
	public function shouldAppearOnEdit() {
	return false;
	}


	/**
	* Set the field's value from an HTTP request. Generally, you should read
	* the value of some field name you emitted in @{method:renderEditControl}
	* and save it into the object, e.g.:
	*
	* $this->value = $request->getStr('my-custom-field');
	*
	* If you have some particularly complicated field, you may need to read
	* more data; this is why you have access to the entire request.
	*
	* You must implement this if you implement @{method:shouldAppearOnEdit}.
	*
	* You should not perform field validation here; instead, you should implement
	* @{method:validateField}.
	*
	* @param AphrontRequest HTTP request representing a user submitting a form
	* with this field in it.
	* @return this
	* @task edit
	*/
	public function setValueFromRequest(AphrontRequest $request) {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/**
	* Build a renderable object (generally, some @{class:AphrontFormControl})
	* which can be appended to a @{class:AphrontFormView} and represents the
	* interface the user sees on the "Edit Revision" screen when interacting
	* with this field.
	*
	* For example:
	*
	* return id(new AphrontFormTextControl())
	* ->setLabel('Custom Field')
	* ->setName('my-custom-key')
	* ->setValue($this->value);
	*
	* You must implement this if you implement @{method:shouldAppearOnEdit}.
	*
	* @return AphrontView\|string Something renderable.
	* @task edit
	*/
	public function renderEditControl() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/**
	* This method will be called after @{method:setValueFromRequest} but before
	* the field is saved. It gives you an opportunity to inspect the field value
	* and throw a @{class:DifferentialFieldValidationException} if there is a
	* problem with the value the user has provided (for example, the value the
	* user entered is not correctly formatted).
	*
	* By default, fields are not validated.
	*
	* @return void
	* @task edit
	*/
	public function validateField() {
	return;
	}

	/**
	* Hook for applying revision changes via the editor. Normally, you should
	* not implement this, but a number of builtin fields use the revision object
	* itself as storage. If you need to do something similar for whatever reason,
	* this method gives you an opportunity to interact with the editor or
	* revision before changes are saved (for example, you can write the field's
	* value into some property of the revision).
	*
	* @param DifferentialRevisionEditor Active editor which is applying changes
	* to the revision.
	* @return void
	* @task edit
	*/
	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	return;
	}

	/**
	* Hook after an edit operation has completed. This allows you to update
	* link tables or do other write operations which should happen after the
	* revision is saved. Normally you don't need to implement this.
	*
	*
	* @param DifferentialRevisionEditor Active editor which has just applied
	* changes to the revision.
	* @return void
	* @task edit
	*/
	public function didWriteRevision(DifferentialRevisionEditor $editor) {
	return;
	}


	/* -( Extending the Revision View Interface )------------------------------ */


	/**
	* Determine if this field should appear on the revision detail view
	* interface. One use of this interface is to add purely informational
	* fields to the revision view, without any sort of backing storage.
	*
	* If you return true from this method, you must implement the methods
	* @{method:renderLabelForRevisionView} and
	* @{method:renderValueForRevisionView}.
	*
	* @return bool True if this field should appear when viewing a revision.
	* @task view
	*/
	public function shouldAppearOnRevisionView() {
	return false;
	}


	/**
	* Return a string field label which will appear in the revision detail
	* table.
	*
	* You must implement this method if you return true from
	* @{method:shouldAppearOnRevisionView}.
	*
	* @return string Label for field in revision detail view.
	* @task view
	*/
	public function renderLabelForRevisionView() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/**
	* Return a markup block representing the field for the revision detail
	* view. Note that you can return null to suppress display (for instance,
	* if the field shows related objects of some type and the revision doesn't
	* have any related objects).
	*
	* You must implement this method if you return true from
	* @{method:shouldAppearOnRevisionView}.
	*
	* @return string\|null Display markup for field value, or null to suppress
	* field rendering.
	* @task view
	*/
	public function renderValueForRevisionView() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}


	/* -( Extending the Conduit Interface )------------------------------------ */


	/**
	* @task conduit
	*/
	public function shouldAppearOnConduitView() {
	return false;
	}

	/**
	* @task conduit
	*/
	public function getValueForConduit() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}

	/**
	* @task conduit
	*/
	public function getKeyForConduit() {
	$key = $this->getStorageKey();
	if ($key === null) {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}
	return $key;
	}


	/* -( Extending Commit Messages )------------------------------------------ */


	/**
	* Determine if this field should appear in commit messages. You should return
	* true if this field participates in any part of the commit message workflow,
	* even if it is not rendered by default.
	*
	* If you implement this method, you must implement
	* @{method:getCommitMessageKey} and
	* @{method:setValueFromParsedCommitMessage}.
	*
	* @return bool True if this field appears in commit messages in any capacity.
	* @task commit
	*/
	public function shouldAppearOnCommitMessage() {
	return false;
	}

	/**
	* Key which identifies this field in parsed commit messages. Commit messages
	* exist in two forms: raw textual commit messages and parsed dictionaries of
	* fields. This method must return a unique string which identifies this field
	* in dictionaries. Principally, this dictionary is shipped to and from arc
	* over Conduit. Keys should be appropriate property names, like "testPlan"
	* (not "Test Plan") and must be globally unique.
	*
	* You must implement this method if you return true from
	* @{method:shouldAppearOnCommitMessage}.
	*
	* @return string Key which identifies the field in dictionaries.
	* @task commit
	*/
	public function getCommitMessageKey() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}

	/**
	* Set this field's value from a value in a parsed commit message dictionary.
	* Afterward, this field will go through the normal write workflows and the
	* change will be permanently stored via either the storage mechanisms (if
	* your field implements them), revision write hooks (if your field implements
	* them) or discarded (if your field implements neither, e.g. is just a
	* display field).
	*
	+ * The value you receive will either be null or something you originally
	+ * returned from @{method:parseValueFromCommitMessage}.
	+ *
	* You must implement this method if you return true from
	* @{method:shouldAppearOnCommitMessage}.
	*
	* @param mixed Field value from a parsed commit message dictionary.
	* @return this
	* @task commit
	*/
	public function setValueFromParsedCommitMessage($value) {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}

	/**
	* In revision control systems which read revision information from the
	* working copy, the user may edit the commit message outside of invoking
	* "arc diff --edit". When they do this, only some fields (those fields which
	* can not be edited by other users) are safe to overwrite. For instance, it
	* is fine to overwrite "Summary" because no one else can edit it, but not
	* to overwrite "Reviewers" because reviewers may have been added or removed
	* via the web interface.
	*
	* If a field is safe to overwrite when edited in a working copy commit
	* message, return true. If the authoritative value should always be used,
	* return false. By default, fields can not be overwritten.
	*
	* @return bool True to indicate the field is save to overwrite.
	* @task commit
	*/
	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return false;
	}

	/**
	* Return true if this field should be suggested to the user during
	* "arc diff --edit". Basicially, return true if the field is something the
	* user might want to fill out (like "Summary"), and false if it's a
	* system/display/readonly field (like "Differential Revision"). If this
	* method returns true, the field will be rendered even if it has no value
	* during edit and update operations.
	*
	* @return bool True to indicate the field should appear in the edit template.
	* @task commit
	*/
	public function shouldAppearOnCommitMessageTemplate() {
	return true;
	}

	/**
	* Render a human-readable label for this field, like "Summary" or
	* "Test Plan". This is distinct from the commit message key, but generally
	* they should be similar.
	*
	* @return string Human-readable field label for commit messages.
	* @task commit
	*/
	public function renderLabelForCommitMessage() {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}

	/**
	* Render a human-readable value for this field when it appears in commit
	* messages (for instance, lists of users should be rendered as user names).
	*
	* The ##$is_edit## parameter allows you to distinguish between commit
	* messages being rendered for editing and those being rendered for amending
	* or commit. Some fields may decline to render a value in one mode (for
	* example, "Reviewed By" appears only when doing commit/amend, not while
	* editing).
	*
	* @param bool True if the message is being edited.
	* @return string Human-readable field value.
	* @task commit
	*/
	public function renderValueForCommitMessage($is_edit) {
	throw new DifferentialFieldSpecificationIncompleteException($this);
	}

	+ /**
	+ * Return one or more labels which this field parses in commit messages. For
	+ * example, you might parse all of "Task", "Tasks" and "Task Numbers" or
	+ * similar. This is just to make it easier to get commit messages to parse
	+ * when users are typing in the fields manually as opposed to using a
	+ * template, by accepting alternate spellings / pluralizations / etc. By
	+ * default, only the label returned from @{method:renderLabelForCommitMessage}
	+ * is parsed.
	+ *
	+ * @return list List of supported labels that this field can parse from commit
	+ * messages.
	+ * @task commit
	+ */
	+ public function getSupportedCommitMessageLabels() {
	+ return array($this->renderLabelForCommitMessage());
	+ }
	+
	+ /**
	+ * Parse a raw text block from a commit message into a canonical
	+ * representation of the field value. For example, the "CC" field accepts a
	+ * comma-delimited list of usernames and emails and parses them into valid
	+ * PHIDs, emitting a PHID list.
	+ *
	+ * If you encounter errors (like a nonexistent username) while parsing,
	+ * you should throw a @{class:DifferentialFieldParseException}.
	+ *
	+ * Generally, this method should accept whatever you return from
	+ * @{method:renderValueForCommitMessage} and parse it back into a sensible
	+ * representation.
	+ *
	+ * You must implement this method if you return true from
	+ * @{method:shouldAppearOnCommitMessage}.
	+ *
	+ * @param string
	+ * @return mixed The canonical representation of the field value. For example,
	+ * you should lookup usernames and object references.
	+ * @task commit
	+ */
	+ public function parseValueFromCommitMessage($value) {
	+ throw new DifferentialFieldSpecificationIncompleteException($this);
	+ }
	+

	/* -( Loading Additional Data )-------------------------------------------- */


	/**
	* Specify which @{class:PhabricatorObjectHandles} need to be loaded for your
	* field to render correctly.
	*
	* This is a convenience method which makes the handles available on all
	* interfaces where the field appears. If your field needs handles on only
	* some interfaces (or needs different handles on different interfaces) you
	* can overload the more specific methods to customize which interfaces you
	* retrieve handles for. Requesting only the handles you need will improve
	* the performance of your field.
	*
	* You can later retrieve these handles by calling @{method:getHandle}.
	*
	* @return list List of PHIDs to load handles for.
	* @task load
	*/
	protected function getRequiredHandlePHIDs() {
	return array();
	}

	/**
	* Specify which @{class:PhabricatorObjectHandles} need to be loaded for your
	* field to render correctly on the view interface.
	*
	* This is a more specific version of @{method:getRequiredHandlePHIDs} which
	* can be overridden to improve field performance by loading only data you
	* need.
	*
	* @return list List of PHIDs to load handles for.
	* @task load
	*/
	public function getRequiredHandlePHIDsForRevisionView() {
	return $this->getRequiredHandlePHIDs();
	}

	/**
	* Specify which @{class:PhabricatorObjectHandles} need to be loaded for your
	* field to render correctly on the edit interface.
	*
	* This is a more specific version of @{method:getRequiredHandlePHIDs} which
	* can be overridden to improve field performance by loading only data you
	* need.
	*
	* @return list List of PHIDs to load handles for.
	* @task load
	*/
	public function getRequiredHandlePHIDsForRevisionEdit() {
	return $this->getRequiredHandlePHIDs();
	}

	/**
	* Specify which @{class:PhabricatorObjectHandles} need to be loaded for your
	* field to render correctly on the commit message interface.
	*
	* This is a more specific version of @{method:getRequiredHandlePHIDs} which
	* can be overridden to improve field performance by loading only data you
	* need.
	*
	* @return list List of PHIDs to load handles for.
	* @task load
	*/
	public function getRequiredHandlePHIDsForCommitMessage() {
	return $this->getRequiredHandlePHIDs();
	}

	-
	/**
	* Specify which diff properties this field needs to load.
	*
	* @return list List of diff property keys this field requires.
	* @task load
	*/
	public function getRequiredDiffProperties() {
	return array();
	}

	+ /**
	+ * Parse a list of users into a canonical PHID list.
	+ *
	+ * @param string Raw list of comma-separated user names.
	+ * @return list List of corresponding PHIDs.
	+ * @task load
	+ */
	+ protected function parseCommitMessageUserList($value) {
	+ return $this->parseCommitMessageObjectList($value, $mailables = false);
	+ }
	+
	+ /**
	+ * Parse a list of mailable objects into a canonical PHID list.
	+ *
	+ * @param string Raw list of comma-separated mailable names.
	+ * @return list List of corresponding PHIDs.
	+ * @task load
	+ */
	+ protected function parseCommitMessageMailableList($value) {
	+ return $this->parseCommitMessageObjectList($value, $mailables = true);
	+ }
	+
	+
	+ /**
	+ * Parse and lookup a list of object names, converting them to PHIDs.
	+ *
	+ * @param string Raw list of comma-separated object names.
	+ * @return list List of corresponding PHIDs.
	+ * @task load
	+ */
	+ private function parseCommitMessageObjectList($value, $include_mailables) {
	+ $value = array_unique(array_filter(preg_split('/[\s,]+/', $value)));
	+ if (!$value) {
	+ return array();
	+ }
	+
	+ $object_map = array();
	+
	+ $users = id(new PhabricatorUser())->loadAllWhere(
	+ '(username IN (%Ls)) OR (email IN (%Ls))',
	+ $value,
	+ $value);
	+ $object_map += mpull($users, 'getPHID', 'getUsername');
	+ $object_map += mpull($users, 'getPHID', 'getEmail');
	+
	+ if ($include_mailables) {
	+ $mailables = id(new PhabricatorMetaMTAMailingList())->loadAllWhere(
	+ '(email IN (%Ls)) OR (name IN (%Ls))',
	+ $value,
	+ $value);
	+ $object_map += mpull($mailables, 'getPHID', 'getName');
	+ $object_map += mpull($mailables, 'getPHID', 'getEmail');
	+ }
	+
	+ $invalid = array();
	+ $results = array();
	+ foreach ($value as $name) {
	+ if (empty($object_map[$name])) {
	+ $invalid[] = $name;
	+ } else {
	+ $results[] = $object_map[$name];
	+ }
	+ }
	+
	+ if ($invalid) {
	+ $invalid = implode(', ', $invalid);
	+ $what = $include_mailables
	+ ? "users and mailing lists"
	+ : "users";
	+ throw new DifferentialFieldParseException(
	+ "Commit message references nonexistent {$what}: {$invalid}.");
	+ }
	+
	+ return array_unique($results);
	+ }
	+

	/* -( Contextual Data )---------------------------------------------------- */


	/**
	* @task context
	*/
	final public function setRevision(DifferentialRevision $revision) {
	$this->revision = $revision;
	$this->didSetRevision();
	return $this;
	}

	/**
	* @task context
	*/
	protected function didSetRevision() {
	return;
	}


	/**
	* @task context
	*/
	final public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}

	/**
	* @task context
	*/
	final public function setHandles(array $handles) {
	$this->handles = $handles;
	return $this;
	}

	/**
	* @task context
	*/
	final public function setDiffProperties(array $diff_properties) {
	$this->diffProperties = $diff_properties;
	return $this;
	}

	/**
	* @task context
	*/
	final public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	/**
	* @task context
	*/
	final protected function getRevision() {
	if (empty($this->revision)) {
	throw new DifferentialFieldDataNotAvailableException($this);
	}
	return $this->revision;
	}

	/**
	* @task context
	*/
	final protected function getDiff() {
	if (empty($this->diff)) {
	throw new DifferentialFieldDataNotAvailableException($this);
	}
	return $this->diff;
	}

	/**
	* @task context
	*/
	final protected function getUser() {
	if (empty($this->user)) {
	throw new DifferentialFieldDataNotAvailableException($this);
	}
	return $this->user;
	}

	/**
	* Get the handle for an object PHID. You must overload
	* @{method:getRequiredHandlePHIDs} (or a more specific version thereof)
	* and include the PHID you want in the list for it to be available here.
	*
	* @return PhabricatorObjectHandle Handle to the object.
	* @task context
	*/
	final protected function getHandle($phid) {
	if ($this->handles === null) {
	throw new DifferentialFieldDataNotAvailableException($this);
	}
	if (empty($this->handles[$phid])) {
	$class = get_class($this);
	throw new Exception(
	"A differential field (of class '{$class}') is attempting to retrieve ".
	"a handle ('{$phid}') which it did not request. Return all handle ".
	"PHIDs you need from getRequiredHandlePHIDs().");
	}
	return $this->handles[$phid];
	}

	/**
	* Get a diff property which this field previously requested by returning
	* the key from @{method:getRequiredDiffProperties}.
	*
	* @param string Diff property key.
	* @return string\|null Diff property, or null if the property does not have
	* a value.
	* @task context
	*/
	final public function getDiffProperty($key) {
	if ($this->diffProperties === null) {
	// This will be set to some (possibly empty) array if we've loaded
	// properties, so null means diff properties aren't available in this
	// context.
	throw new DifferentialFieldDataNotAvailableException($this);
	}
	if (!array_key_exists($key, $this->diffProperties)) {
	$class = get_class($this);
	throw new Exception(
	"A differential field (of class '{$class}') is attempting to retrieve ".
	"a diff property ('{$key}') which it did not request. Return all ".
	"diff property keys you need from getRequiredDiffProperties().");
	}
	return $this->diffProperties[$key];
	}

	}
	diff --git a/src/applications/differential/field/specification/base/__init__.php b/src/applications/differential/field/specification/base/__init__.php
	index 6dcca1a4da..db188c4711 100644
	--- a/src/applications/differential/field/specification/base/__init__.php
	+++ b/src/applications/differential/field/specification/base/__init__.php
	@@ -1,13 +1,18 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/differential/field/exception/incomplete');
	phutil_require_module('phabricator', 'applications/differential/field/exception/notavailable');
	+phutil_require_module('phabricator', 'applications/differential/field/exception/parse');
	+phutil_require_module('phabricator', 'applications/metamta/storage/mailinglist');
	+phutil_require_module('phabricator', 'applications/people/storage/user');
	+
	+phutil_require_module('phutil', 'utils');


	phutil_require_source('DifferentialFieldSpecification.php');
	diff --git a/src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php b/src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php
	index 5fdcea13be..d425476532 100644
	--- a/src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php
	+++ b/src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php
	@@ -1,106 +1,117 @@
	<?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 DifferentialBlameRevisionFieldSpecification
	extends DifferentialFieldSpecification {

	private $value;

	public function getStorageKey() {
	return 'phabricator:blame-revision';
	}

	public function getValueForStorage() {
	return $this->value;
	}

	public function setValueFromStorage($value) {
	$this->value = $value;
	return $this;
	}

	public function shouldAppearOnEdit() {
	return true;
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->value = $request->getStr($this->getStorageKey());
	return $this;
	}

	public function renderEditControl() {
	return id(new AphrontFormTextControl())
	->setLabel('Blame Revision')
	->setCaption('Revision which broke the stuff which this change fixes.')
	->setName($this->getStorageKey())
	->setValue($this->value);
	}

	public function validateField() {
	return;
	}

	public function shouldAppearOnRevisionView() {
	return true;
	}

	public function renderLabelForRevisionView() {
	return 'Blame Revision:';
	}

	public function renderValueForRevisionView() {
	if (!$this->value) {
	return null;
	}
	return phutil_escape_html($this->value);
	}

	public function shouldAppearOnConduitView() {
	return true;
	}

	public function getValueForConduit() {
	return $this->value;
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'blameRevision';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->value = $value;
	return $this;
	}

	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return true;
	}

	public function renderLabelForCommitMessage() {
	return 'Blame Revision';
	}

	public function renderValueForCommitMessage($is_edit) {
	return $this->value;
	}

	+ public function getSupportedCommitMessageLabels() {
	+ return array(
	+ 'Blame Revision',
	+ 'Blame Rev',
	+ );
	+ }
	+
	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php b/src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php
	index 8799bf40fb..55a62bacb3 100644
	--- a/src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php
	+++ b/src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php
	@@ -1,121 +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.
	*/

	final class DifferentialCCsFieldSpecification
	extends DifferentialFieldSpecification {

	private $ccs = array();

	public function shouldAppearOnRevisionView() {
	return true;
	}

	public function getRequiredHandlePHIDsForRevisionView() {
	return $this->getCCPHIDs();
	}

	public function renderLabelForRevisionView() {
	return 'CCs:';
	}

	public function renderValueForRevisionView() {
	$cc_phids = $this->getCCPHIDs();
	if (!$cc_phids) {
	return '<em>None</em>';
	}

	$links = array();
	foreach ($cc_phids as $cc_phid) {
	$links[] = $this->getHandle($cc_phid)->renderLink();
	}

	return implode(', ', $links);
	}

	private function getCCPHIDs() {
	$revision = $this->getRevision();
	return $revision->getCCPHIDs();
	}

	public function shouldAppearOnEdit() {
	return true;
	}

	protected function didSetRevision() {
	$this->ccs = $this->getCCPHIDs();
	}

	public function getRequiredHandlePHIDsForRevisionEdit() {
	return $this->ccs;
	}

	public function getRequiredHandlePHIDsForCommitMessage() {
	return $this->ccs;
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->ccs = $request->getArr('cc');
	return $this;
	}

	public function renderEditControl() {
	$cc_map = array();
	foreach ($this->ccs as $phid) {
	$cc_map[$phid] = $this->getHandle($phid)->getFullName();
	}
	return id(new AphrontFormTokenizerControl())
	->setLabel('CC')
	->setName('cc')
	->setDatasource('/typeahead/common/mailable/')
	->setValue($cc_map);
	}

	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	$editor->setCCPHIDs($this->ccs);
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'ccPHIDs';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->ccs = nonempty($value, array());
	return $this;
	}

	public function renderLabelForCommitMessage() {
	return 'CC';
	}

	public function renderValueForCommitMessage($is_edit) {
	if (!$this->ccs) {
	return null;
	}

	$names = array();
	foreach ($this->ccs as $phid) {
	$names[] = $this->getHandle($phid)->getName();
	}
	return implode(', ', $names);
	}

	+ public function getSupportedCommitMessageLabels() {
	+ return array(
	+ 'CC',
	+ 'CCs',
	+ );
	+ }
	+
	+ public function parseValueFromCommitMessage($value) {
	+ return $this->parseCommitMessageMailableList($value);
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php b/src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php
	index 1fcff06fbf..0b684aeab8 100644
	--- a/src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php
	+++ b/src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php
	@@ -1,49 +1,53 @@
	<?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 DifferentialGitSVNIDFieldSpecification
	extends DifferentialFieldSpecification {

	private $gitSVNID;

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function shouldAppearOnCommitMessageTemplate() {
	return false;
	}

	public function getCommitMessageKey() {
	return 'gitSVNID';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->gitSVNID = $value;
	return $this;
	}

	public function renderLabelForCommitMessage() {
	return 'git-svn-id';
	}

	public function renderValueForCommitMessage($is_edit) {
	return null;
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php b/src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php
	index 790758e4a0..3f9cda19ac 100644
	--- a/src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php
	+++ b/src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php
	@@ -1,106 +1,118 @@
	<?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 DifferentialRevertPlanFieldSpecification
	extends DifferentialFieldSpecification {

	private $value;

	public function getStorageKey() {
	return 'phabricator:revert-plan';
	}

	public function getValueForStorage() {
	return $this->value;
	}

	public function setValueFromStorage($value) {
	$this->value = $value;
	return $this;
	}

	public function shouldAppearOnEdit() {
	return true;
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->value = $request->getStr($this->getStorageKey());
	return $this;
	}

	public function renderEditControl() {
	return id(new AphrontFormTextAreaControl())
	->setLabel('Revert Plan')
	->setName($this->getStorageKey())
	->setCaption('Special steps required to safely revert this change.')
	->setValue($this->value);
	}

	public function validateField() {
	return;
	}

	public function shouldAppearOnRevisionView() {
	return true;
	}

	public function renderLabelForRevisionView() {
	return 'Revert Plan:';
	}

	public function renderValueForRevisionView() {
	if (!$this->value) {
	return null;
	}
	return phutil_escape_html($this->value);
	}

	public function shouldAppearOnConduitView() {
	return true;
	}

	public function getValueForConduit() {
	return $this->value;
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'revertPlan';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->value = $value;
	return $this;
	}

	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return true;
	}

	public function renderLabelForCommitMessage() {
	return 'Revert Plan';
	}

	+
	public function renderValueForCommitMessage($is_edit) {
	return $this->value;
	}

	+ public function getSupportedCommitMessageLabels() {
	+ return array(
	+ 'Revert Plan',
	+ 'Revert',
	+ );
	+ }
	+
	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php b/src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php
	index 78158e4d57..59feb8013c 100644
	--- a/src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php
	+++ b/src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php
	@@ -1,92 +1,96 @@
	<?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 DifferentialReviewedByFieldSpecification
	extends DifferentialFieldSpecification {

	private $reviewedBy;

	protected function didSetRevision() {
	$this->reviewedBy = array();
	$revision = $this->getRevision();

	$status = $revision->getStatus();
	if ($status == DifferentialRevisionStatus::ACCEPTED \|\|
	$status == DifferentialRevisionStatus::COMMITTED) {
	$reviewer = null;
	$comments = $revision->loadComments();
	foreach ($comments as $comment) {
	$action = $comment->getAction();
	if ($action == DifferentialAction::ACTION_ACCEPT) {
	$reviewer = $comment->getAuthorPHID();
	} else if ($action == DifferentialAction::ACTION_REJECT \|\|
	$action == DifferentialAction::ACTION_ABANDON \|\|
	$action == DifferentialAction::ACTION_RETHINK) {
	$reviewer = null;
	}
	}

	if ($reviewer) {
	$this->reviewedBy = array($reviewer);
	}
	}
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'reviewedByPHIDs';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->reviewedBy = $value;
	return $this;
	}

	public function shouldAppearOnCommitMessageTemplate() {
	return false;
	}

	public function renderLabelForCommitMessage() {
	return 'Reviewed By';
	}

	public function getRequiredHandlePHIDsForCommitMessage() {
	return $this->reviewedBy;
	}

	public function renderValueForCommitMessage($is_edit) {
	if ($is_edit) {
	return null;
	}

	if (!$this->reviewedBy) {
	return null;
	}

	$names = array();
	foreach ($this->reviewedBy as $phid) {
	$names[] = $this->getHandle($phid)->getName();
	}

	return implode(', ', $names);
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return $this->parseCommitMessageUserList($value);
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php b/src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php
	index f609494eb5..a40f961e72 100644
	--- a/src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php
	+++ b/src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php
	@@ -1,132 +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.
	*/

	final class DifferentialReviewersFieldSpecification
	extends DifferentialFieldSpecification {

	private $reviewers;
	private $error;

	public function shouldAppearOnRevisionView() {
	return true;
	}

	public function getRequiredHandlePHIDsForRevisionView() {
	return $this->getReviewerPHIDs();
	}

	public function renderLabelForRevisionView() {
	return 'Reviewers:';
	}

	public function renderValueForRevisionView() {
	$reviewer_phids = $this->getReviewerPHIDs();
	if (!$reviewer_phids) {
	return '<em>None</em>';
	}

	$links = array();
	foreach ($reviewer_phids as $reviewer_phid) {
	$links[] = $this->getHandle($reviewer_phid)->renderLink();
	}

	return implode(', ', $links);
	}

	private function getReviewerPHIDs() {
	$revision = $this->getRevision();
	return $revision->getReviewers();
	}

	public function shouldAppearOnEdit() {
	return true;
	}

	protected function didSetRevision() {
	$this->reviewers = $this->getReviewerPHIDs();
	}

	public function getRequiredHandlePHIDsForRevisionEdit() {
	return $this->reviewers;
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->reviewers = $request->getArr('reviewers');
	return $this;
	}

	public function validateField() {
	if (in_array($this->getUser()->getPHID(), $this->reviewers)) {
	$this->error = 'Invalid';
	throw new DifferentialFieldValidationException(
	"You may not review your own revision!");
	}
	}

	public function renderEditControl() {
	$reviewer_map = array();
	foreach ($this->reviewers as $phid) {
	$reviewer_map[$phid] = $this->getHandle($phid)->getFullName();
	}
	return id(new AphrontFormTokenizerControl())
	->setLabel('Reviewers')
	->setName('reviewers')
	->setDatasource('/typeahead/common/users/')
	->setValue($reviewer_map)
	->setError($this->error);
	}

	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	$editor->setReviewers($this->reviewers);
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'reviewerPHIDs';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->reviewers = nonempty($value, array());
	return $this;
	}

	public function renderLabelForCommitMessage() {
	return 'Reviewers';
	}

	public function getRequiredHandlePHIDsForCommitMessage() {
	return $this->reviewers;
	}

	public function renderValueForCommitMessage($is_edit) {
	if (!$this->reviewers) {
	return null;
	}

	$names = array();
	foreach ($this->reviewers as $phid) {
	$names[] = $this->getHandle($phid)->getName();
	}

	return implode(', ', $names);
	}

	+ public function getSupportedCommitMessageLabels() {
	+ return array(
	+ 'Reviewer',
	+ 'Reviewers',
	+ );
	+ }
	+
	+ public function parseValueFromCommitMessage($value) {
	+ return $this->parseCommitMessageUserList($value);
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php b/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php
	index 02eade8f06..190547c942 100644
	--- a/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php
	+++ b/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php
	@@ -1,50 +1,53 @@
	<?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 DifferentialRevisionIDFieldSpecification
	extends DifferentialFieldSpecification {

	private $id;

	protected function didSetRevision() {
	$this->id = $this->getRevision()->getID();
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'revisionID';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->id = $value;
	return $this;
	}

	public function renderLabelForCommitMessage() {
	return 'Differential Revision';
	}

	public function renderValueForCommitMessage($is_edit) {
	return $this->id;
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }

	}
	diff --git a/src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php b/src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php
	index a7e5ad50ed..b3afbe7dfb 100644
	--- a/src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php
	+++ b/src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php
	@@ -1,73 +1,77 @@
	<?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 DifferentialSummaryFieldSpecification
	extends DifferentialFieldSpecification {

	private $summary = '';

	public function shouldAppearOnEdit() {
	return true;
	}

	protected function didSetRevision() {
	$this->summary = $this->getRevision()->getSummary();
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->summary = $request->getStr('summary');
	return $this;
	}

	public function renderEditControl() {
	return id(new AphrontFormTextAreaControl())
	->setLabel('Summary')
	->setName('summary')
	->setValue($this->summary);
	}

	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	$this->getRevision()->setSummary($this->summary);
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'summary';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->summary = (string)$value;
	return $this;
	}

	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return true;
	}

	public function renderLabelForCommitMessage() {
	return 'Summary';
	}

	public function renderValueForCommitMessage($is_edit) {
	return $this->summary;
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }
	+
	}
	diff --git a/src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php b/src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php
	index 14b46a7a9c..c069ee0fdd 100644
	--- a/src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php
	+++ b/src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php
	@@ -1,85 +1,88 @@
	<?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 DifferentialTestPlanFieldSpecification
	extends DifferentialFieldSpecification {

	private $plan;
	private $error = true;

	public function shouldAppearOnEdit() {
	return true;
	}

	protected function didSetRevision() {
	$this->plan = $this->getRevision()->getTestPlan();
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->plan = $request->getStr('testplan');
	$this->error = null;
	return $this;
	}

	public function renderEditControl() {
	return id(new AphrontFormTextAreaControl())
	->setLabel('Test Plan')
	->setName('testplan')
	->setValue($this->plan)
	->setError($this->error);
	}

	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	$this->getRevision()->setTestPlan($this->plan);
	}

	public function validateField() {
	if (!strlen($this->plan)) {
	$this->error = 'Required';
	throw new DifferentialFieldValidationException(
	"You must provide a test plan.");
	}
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'testPlan';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->plan = $value;
	return $this;
	}

	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return true;
	}

	public function renderLabelForCommitMessage() {
	return 'Test Plan';
	}

	public function renderValueForCommitMessage($is_edit) {
	return $this->plan;
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return $value;
	+ }

	}
	diff --git a/src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php b/src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php
	index b4ba293935..9a55539144 100644
	--- a/src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php
	+++ b/src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php
	@@ -1,85 +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 DifferentialTitleFieldSpecification
	extends DifferentialFieldSpecification {

	private $title;
	private $error = true;

	public function shouldAppearOnEdit() {
	return true;
	}

	protected function didSetRevision() {
	$this->title = $this->getRevision()->getTitle();
	}

	public function setValueFromRequest(AphrontRequest $request) {
	$this->title = $request->getStr('title');
	$this->error = null;
	return $this;
	}

	public function renderEditControl() {
	return id(new AphrontFormTextAreaControl())
	->setLabel('Title')
	->setName('title')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setError($this->error)
	->setValue($this->title);
	}

	public function willWriteRevision(DifferentialRevisionEditor $editor) {
	$this->getRevision()->setTitle($this->title);
	}

	public function validateField() {
	if (!strlen($this->title)) {
	$this->error = 'Required';
	throw new DifferentialFieldValidationException(
	"You must provide a title.");
	}
	}

	public function shouldAppearOnCommitMessage() {
	return true;
	}

	public function getCommitMessageKey() {
	return 'title';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->title = $value;
	return $this;
	}

	public function shouldOverwriteWhenCommitMessageIsEdited() {
	return true;
	}

	public function renderLabelForCommitMessage() {
	return 'Title';
	}

	public function renderValueForCommitMessage($is_edit) {
	return $this->title;
	}

	+ public function parseValueFromCommitMessage($value) {
	+ return preg_replace('/\s\n\s/', ' ', $value);
	+ }
	+
	}
	diff --git a/src/applications/differential/parser/commitmessage/DifferentialCommitMessage.php b/src/applications/differential/parser/commitmessage/DifferentialCommitMessage.php
	deleted file mode 100644
	index f0c1dbdc6e..0000000000
	--- a/src/applications/differential/parser/commitmessage/DifferentialCommitMessage.php
	+++ /dev/null
	@@ -1,445 +0,0 @@
	-<?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 DifferentialCommitMessage {
	-
	- protected $rawCorpus;
	-
	- protected $title;
	- protected $summary;
	- protected $testPlan;
	-
	- protected $blameRevision;
	- protected $revertPlan;
	-
	- protected $reviewerNames = array();
	- protected $reviewerPHIDs;
	-
	- protected $reviewedByNames = array();
	- protected $reviewedByPHIDs;
	-
	- protected $ccNames = array();
	- protected $ccPHIDs;
	-
	- protected $revisionID;
	- protected $gitSVNID;
	-
	- protected $tasks = array();
	-
	- protected function __construct() {
	-
	- }
	-
	- public function getReviewerPHIDs() {
	- return $this->reviewerPHIDs;
	- }
	-
	- public function getReviewedByPHIDs() {
	- return $this->reviewedByPHIDs;
	- }
	-
	- public function getCCPHIDs() {
	- return $this->ccPHIDs;
	- }
	-
	- public function setTitle($title) {
	- $this->title = $title;
	- return $this;
	- }
	-
	- public function getTitle() {
	- return $this->title;
	- }
	-
	- public function setRevisionID($revision_id) {
	- $this->revisionID = $revision_id;
	- return $this;
	- }
	-
	- public function getRevisionID() {
	- return $this->revisionID;
	- }
	-
	- public function setSummary($summary) {
	- $this->summary = $summary;
	- return $this;
	- }
	-
	- public function getSummary() {
	- return $this->summary;
	- }
	-
	- public function setTestPlan($test_plan) {
	- $this->testPlan = $test_plan;
	- return $this;
	- }
	-
	- public function getTestPlan() {
	- return $this->testPlan;
	- }
	-
	- public function setBlameRevision($blame_revision) {
	- $this->blameRevision = $blame_revision;
	- return $this;
	- }
	-
	- public function getBlameRevision() {
	- return $this->blameRevision;
	- }
	-
	- public function setRevertPlan($revert_plan) {
	- $this->revertPlan = $revert_plan;
	- return $this;
	- }
	-
	- public function getRevertPlan() {
	- return $this->revertPlan;
	- }
	-
	- public function setReviewerNames($reviewer_names) {
	- $this->reviewerNames = $reviewer_names;
	- return $this;
	- }
	-
	- public function getReviewerNames() {
	- return $this->reviewerNames;
	- }
	-
	- public function setCCNames($cc_names) {
	- $this->ccNames = $cc_names;
	- return $this;
	- }
	-
	- public function getCCNames() {
	- return $this->ccNames;
	- }
	-
	- public function setReviewedByNames($reviewed_by_names) {
	- $this->reviewedByNames = $reviewed_by_names;
	- return $this;
	- }
	-
	- public function getReviewedByNames() {
	- return $this->reviewedByNames;
	- }
	-
	- public function setGitSVNID($git_svn_id) {
	- $this->gitSVNID = $git_svn_id;
	- return $this;
	- }
	-
	- public function getGitSVNID() {
	- return $this->gitSVNID;
	- }
	-
	- public function setReviewerPHIDs(array $phids) {
	- $this->reviewerPHIDs = $phids;
	- return $this;
	- }
	-
	- public function setReviewedByPHIDs(array $phids) {
	- $this->reviewedByPHIDs = $phids;
	- return $this;
	- }
	-
	- public function setCCPHIDs(array $phids) {
	- $this->ccPHIDs = $phids;
	- return $this;
	- }
	-
	- public function setTasks(array $tasks) {
	- $this->tasks = $tasks;
	- return $this;
	- }
	-
	- public function getTasks() {
	- return $this->tasks;
	- }
	-
	- public static function newFromRawCorpus($raw_corpus) {
	- $message = new DifferentialCommitMessage();
	- $message->setRawCorpus($raw_corpus);
	-
	- $fields = $message->parseFields($raw_corpus);
	-
	- foreach ($fields as $field => $data) {
	- switch ($field) {
	- case 'Title':
	- $message->setTitle($data);
	- break;
	- case 'Differential Revision':
	- $message->setRevisionID($data);
	- break;
	- case 'Summary':
	- $message->setSummary($data);
	- break;
	- case 'Test Plan':
	- $message->setTestPlan($data);
	- break;
	- case 'Blame Revision':
	- $message->setBlameRevision($data);
	- break;
	- case 'Revert Plan';
	- $message->setRevertPlan($data);
	- break;
	- case 'Reviewers':
	- $message->setReviewerNames($data);
	- break;
	- case 'Reviewed By':
	- $message->setReviewedByNames($data);
	- break;
	- case 'CC':
	- $message->setCCNames($data);
	- break;
	- case 'git-svn-id':
	- $message->setGitSVNID($data);
	- break;
	- case 'Commenters':
	- // Just drop this.
	- break;
	- case 'Tasks':
	- $message->setTasks($data);
	- break;
	- default:
	- throw new Exception("Unrecognized field '{$field}'.");
	- }
	- }
	-
	- $need_users = array_merge(
	- $message->getReviewerNames(),
	- $message->getReviewedByNames(),
	- $message->getCCNames());
	- $need_mail = $message->getCCNames();
	-
	- if ($need_users) {
	- $users = id(new PhabricatorUser())->loadAllWhere(
	- '(username IN (%Ls)) OR (email IN (%Ls))',
	- $need_users,
	- $need_users);
	- $users = mpull($users, 'getPHID', 'getUsername') +
	- mpull($users, 'getPHID', 'getEmail');
	- } else {
	- $users = array();
	- }
	-
	- if ($need_mail) {
	- $mail = id(new PhabricatorMetaMTAMailingList())->loadAllWhere(
	- '(email in (%Ls)) OR (name IN (%Ls))',
	- $need_mail,
	- $need_mail);
	- $mail = mpull($mail, 'getPHID', 'getName') +
	- mpull($mail, 'getPHID', 'getEmail');
	- } else {
	- $mail = array();
	- }
	-
	- $reviewer_phids = array();
	- foreach ($message->getReviewerNames() as $name) {
	- $phid = idx($users, $name);
	- if (!$phid) {
	- throw new DifferentialCommitMessageParserException(
	- "Commit message references nonexistent 'Reviewer' value '".$name."'");
	- }
	- $reviewer_phids[] = $phid;
	- }
	- $message->setReviewerPHIDs($reviewer_phids);
	-
	- $reviewed_by_phids = array();
	- foreach ($message->getReviewedByNames() as $name) {
	- $phid = idx($users, $name);
	- if (!$phid) {
	- throw new DifferentialCommitMessageParserException(
	- "Commit message references nonexistent 'Reviewed by' value '".
	- $name."'");
	- }
	- $reviewed_by_phids[] = $phid;
	- }
	- $message->setReviewedByPHIDs($reviewed_by_phids);
	-
	- $cc_phids = array();
	- foreach ($message->getCCNames() as $name) {
	- $phid = idx($users, $name);
	- if (!$phid) {
	- $phid = idx($mail, $name);
	- }
	- if (!$phid) {
	- throw new DifferentialCommitMessageParserException(
	- "Commit message references nonexistent 'CC' value '".$name."'");
	- }
	- $cc_phids[] = $phid;
	- }
	- $message->setCCPHIDs($cc_phids);
	-
	- return $message;
	- }
	-
	- public function setRawCorpus($raw_corpus) {
	- $this->rawCorpus = $raw_corpus;
	- return $this;
	- }
	-
	- public function getRawCorpus() {
	- return $this->rawCorpus;
	- }
	-
	- protected function parseFields($message) {
	-
	- $field_spec = array(
	- 'Differential Revision' => 'Differential Revision',
	- 'Title' => 'Title',
	- 'Summary' => 'Summary',
	- 'Test Plan' => 'Test Plan',
	- 'Blame Rev' => 'Blame Revision',
	- 'Blame Revision' => 'Blame Revision',
	- 'Reviewed By' => 'Reviewed By',
	- 'Reviewers' => 'Reviewers',
	- 'CC' => 'CC',
	- 'Revert' => 'Revert Plan',
	- 'Revert Plan' => 'Revert Plan',
	- 'Task ID' => 'Tasks',
	- 'Task IDs' => 'Tasks',
	- 'Tasks' => 'Tasks',
	- 'git-svn-id' => 'git-svn-id',
	-
	- // This appears only in "arc amend"-ed messages, just discard it.
	- 'Commenters' => 'Commenters',
	- );
	-
	- $field_names = array_keys($field_spec);
	- foreach ($field_names as $key => $name) {
	- $field_names[$key] = preg_quote($name, '/');
	- }
	- $field_names = implode('\|', $field_names);
	- $field_pattern = '/^(?P<field>'.$field_names.'):(?P<text>.*)$/i';
	-
	- foreach ($field_spec as $key => $value) {
	- $field_spec[strtolower($key)] = $value;
	- }
	-
	- $message = trim($message);
	- $lines = explode("\n", $message);
	- $this->rawInput = $lines;
	-
	- if (!$message) {
	- $this->fail(
	- null,
	- "Your commit message is empty.");
	- }
	-
	- $field = 'Title';
	- // Note, deliberately not populating $seen with 'Title' because it is
	- // optional to include the 'Title:' header.
	- $seen = array();
	- $field_map = array();
	- foreach ($lines as $key => $line) {
	- $match = null;
	- if (preg_match($field_pattern, $line, $match)) {
	- $lines[$key] = trim($match['text']);
	- $field = $field_spec[strtolower($match['field'])];
	- if (!empty($seen[$field])) {
	- $this->fail(
	- $key,
	- "Field '{$field}' occurs twice in commit message.");
	- }
	- $seen[$field] = true;
	- }
	-
	- $field_map[$key] = $field;
	- }
	-
	- $fields = array();
	- foreach ($lines as $key => $line) {
	- $fields[$field_map[$key]][] = $line;
	- }
	-
	- foreach ($fields as $name => $lines) {
	- if ($name == 'Title') {
	- // If the user enters a title and then a blank line without a summary,
	- // treat the first line as the title and the rest as the summary.
	- if (!isset($fields['Summary'])) {
	- $ii = 0;
	- for ($ii = 0; $ii < count($lines); $ii++) {
	- if (strlen(trim($lines[$ii])) == 0) {
	- break;
	- }
	- }
	- if ($ii != count($lines)) {
	- $fields['Title'] = array_slice($lines, 0, $ii);
	- $fields['Summary'] = array_slice($lines, $ii);
	- }
	- }
	- }
	- }
	-
	- foreach ($fields as $name => $lines) {
	- $data = rtrim(implode("\n", $lines));
	- $data = ltrim($data, "\n");
	- switch ($name) {
	- case 'Title':
	- $data = preg_replace('/\s\n\s/', ' ', $data);
	- break;
	- case 'Tasks':
	- list($pre_comment) = split(' -- ', $data);
	- $data = array_filter(preg_split('/[^\d]+/', $pre_comment));
	- foreach ($data as $k => $v) {
	- $data[$k] = (int)$v;
	- }
	- $data = array_unique($data);
	- break;
	- case 'Blame Revision':
	- case 'Differential Revision':
	- $data = (int)preg_replace('/[^\d]/', '', $data);
	- break;
	- case 'CC':
	- case 'Reviewers':
	- case 'Reviewed By':
	- $data = array_filter(preg_split('/[\s,]+/', $data));
	- break;
	- }
	- if (is_array($data)) {
	- $data = array_values($data);
	- }
	- if ($data) {
	- $fields[$name] = $data;
	- } else {
	- unset($fields[$name]);
	- }
	- }
	-
	- return $fields;
	- }
	-
	- protected function fail($line, $reason) {
	- if ($line !== null) {
	- $lines = $this->rawInput;
	- $min = max(0, $line - 3);
	- $max = min(count($lines) - 1, $line + 3);
	- $reason .= "\n\n";
	- $len = strlen($max);
	- for ($ii = $min; $ii <= $max; $ii++) {
	- $reason .= sprintf(
	- "%8.8s % {$len}d %s\n",
	- $ii == $line ? '>>>' : '',
	- $ii + 1,
	- $lines[$ii]);
	- }
	- }
	- throw new DifferentialCommitMessageParserException($reason);
	- }
	-
	-}
	diff --git a/src/applications/differential/parser/commitmessage/__init__.php b/src/applications/differential/parser/commitmessage/__init__.php
	deleted file mode 100644
	index 6727ce72b8..0000000000
	--- a/src/applications/differential/parser/commitmessage/__init__.php
	+++ /dev/null
	@@ -1,16 +0,0 @@
	-<?php
	-/**
	- * This file is automatically generated. Lint this module to rebuild it.
	- * @generated
	- */
	-
	-
	-
	-phutil_require_module('phabricator', 'applications/differential/parser/commitmessage/exception');
	-phutil_require_module('phabricator', 'applications/metamta/storage/mailinglist');
	-phutil_require_module('phabricator', 'applications/people/storage/user');
	-
	-phutil_require_module('phutil', 'utils');
	-
	-
	-phutil_require_source('DifferentialCommitMessage.php');

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 19:20 (1 d, 20 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127916
Default Alt Text: (166 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions