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 @@ -110,14 +110,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', 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 get hidden by '. - 'default in differential.')) - ->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 @@ -406,39 +406,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) { - $generated_path_regexps = PhabricatorEnv::getEnvConfig( - 'differential.generated-paths'); - 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; }