diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php --- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php +++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php @@ -274,6 +274,11 @@ 'security.allow-conduit-act-as-user' => pht( 'Impersonating users over the API is no longer supported.'), + + 'differential.generated-paths' => pht( + 'Generated paths should be specified in the '. + '`%s` file in the repository.', + '.arcconfig'), ); return $ancient_config; diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php --- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php +++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php @@ -120,20 +120,6 @@ 'sketchy and implies the revision may not actually be receiving '. 'thorough review. You can enable "!accept" by setting this '. 'option to true.')), - $this->newOption('differential.generated-paths', 'list<regex>', array()) - ->setSummary(pht('File regexps to treat as automatically generated.')) - ->setDescription( - pht( - 'List of file regexps that should be treated as if they are '. - 'generated by an automatic process, and thus be hidden by '. - 'default in Differential.'. - "\n\n". - 'NOTE: This property is cached, so you will need to purge the '. - 'cache after making changes if you want the new configuration '. - 'to affect existing revisions. For instructions, see '. - '**[[ %s | Managing Caches ]]** in the documentation.', - $caches_href)) - ->addExample("/config\.h$/\n#/autobuilt/#", pht('Valid Setting')), $this->newOption('differential.sticky-accept', 'bool', true) ->setBoolOptions( array( diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php --- a/src/applications/differential/parser/DifferentialChangesetParser.php +++ b/src/applications/differential/parser/DifferentialChangesetParser.php @@ -499,40 +499,17 @@ } private function markGenerated($new_corpus_block = '') { - $generated_guess = (strpos($new_corpus_block, '@'.'generated') !== false); + $generated = (strpos($new_corpus_block, '@'.'generated') !== false); - if (!$generated_guess) { + if (!$generated) { foreach ($this->generatedPaths as $regex) { if (preg_match($regex, $this->changeset->getFilename())) { - $generated_guess = true; + $generated = true; break; } } } - // The following is deprecated and should not be used. - if (!$generated_guess) { - $key = 'differential.generated-paths'; - $generated_path_regexps = PhabricatorEnv::getEnvConfig($key); - - foreach ($generated_path_regexps as $regexp) { - if (preg_match($regexp, $this->changeset->getFilename())) { - $generated_guess = true; - break; - } - } - } - - $event = new PhabricatorEvent( - PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED, - array( - 'corpus' => $new_corpus_block, - 'is_generated' => $generated_guess, - ) - ); - PhutilEventEngine::dispatchEvent($event); - - $generated = $event->getValue('is_generated'); $this->specialAttributes[self::ATTR_GENERATED] = $generated; }