diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 19:56:49 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 19:56:49 +0000 |
| commit | b8079ae4a88a75d51a665bcce707de0886c89359 (patch) | |
| tree | 6e45fc3fabca13239d7f57a6ffc3a6c1eecaed5e /PRESUBMIT.py | |
| parent | b3cbad18d0dfda956b782ce575b632f4de785d55 (diff) | |
| download | chromium_src-b8079ae4a88a75d51a665bcce707de0886c89359.zip chromium_src-b8079ae4a88a75d51a665bcce707de0886c89359.tar.gz chromium_src-b8079ae4a88a75d51a665bcce707de0886c89359.tar.bz2 | |
Add a presubmit check to prevent committing .rej/.orig patch files
This is a follow-up to me having to remove some of these by hand in r171143.
R=maruel@chromium.org
NOTRY=true
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11448014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 6ab4491..f16d273 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -669,6 +669,7 @@ def _CommonChecks(input_api, output_api): results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api)) results.extend(_CheckIncludeOrder(input_api, output_api)) results.extend(_CheckForVersionControlConflicts(input_api, output_api)) + results.extend(_CheckPatchFiles(input_api, output_api)) if any('PRESUBMIT.py' == f.LocalPath() for f in input_api.AffectedFiles()): results.extend(input_api.canned_checks.RunUnitTestsInDirectory( @@ -752,6 +753,16 @@ def _CheckAuthorizedAuthor(input_api, output_api): return [] +def _CheckPatchFiles(input_api, output_api): + problems = [f.LocalPath() for f in input_api.AffectedFiles() + if f.LocalPath().endswith(('.orig', '.rej'))] + if problems: + return [output_api.PresubmitError( + "Don't commit .rej and .orig files.", problems)] + else: + return [] + + def CheckChangeOnUpload(input_api, output_api): results = [] results.extend(_CommonChecks(input_api, output_api)) |