From ac55c9d4194a6aff02611c23d7107fba533690a0 Mon Sep 17 00:00:00 2001
From: Florian Rathgeber <florian.rathgeber@gmail.com>
Date: Sat, 26 Oct 2013 13:58:37 -0500
Subject: [PATCH] Git hook respects local configuration files

If none of the Git hook default parameters are overridden, do not
pass them in to the StyleGuide to not override the local
configuration.
---
 flake8/hooks.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/flake8/hooks.py b/flake8/hooks.py
index 400fc91..90f1d87 100644
--- a/flake8/hooks.py
+++ b/flake8/hooks.py
@@ -44,10 +44,22 @@ def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
 
     # Returns the exit code, list of files modified, list of error messages
     _, files_modified, _ = run(gitcmd)
+
+    # We only want to pass ignore and max_complexity if they differ from the
+    # defaults so that we don't override a local configuration file
+    options = {}
+    if ignore:
+        options['ignore'] = ignore
+    if complexity > -1:
+        options['max_complexity'] = complexity
+
     files_modified = [f for f in files_modified if f.endswith('.py')]
 
     flake8_style = get_style_guide(
-        config_file=DEFAULT_CONFIG, ignore=ignore, max_complexity=complexity)
+        parse_argv=True,
+        config_file=DEFAULT_CONFIG,
+        **options
+        )
 
     # Copy staged versions to temporary directory
     tmpdir = mkdtemp()
@@ -90,14 +102,23 @@ def hg_hook(ui, repo, **kwargs):
     """
     complexity = ui.config('flake8', 'complexity', default=-1)
     strict = ui.configbool('flake8', 'strict', default=True)
+    ignore = ui.config('flake8', 'ignore', default=None)
     config = ui.config('flake8', 'config', default=True)
     if config is True:
         config = DEFAULT_CONFIG
 
     paths = _get_files(repo, **kwargs)
 
-    flake8_style = get_style_guide(
-        config_file=config, max_complexity=complexity)
+    # We only want to pass ignore and max_complexity if they differ from the
+    # defaults so that we don't override a local configuration file
+    options = {}
+    if ignore:
+        options['ignore'] = ignore
+    if complexity > -1:
+        options['max_complexity'] = complexity
+
+    flake8_style = get_style_guide(parse_argv=True, config_file=config,
+                                   **options)
     report = flake8_style.check_files(paths)
 
     if strict: