Bug 1360595 - Make the ESLint Mercurial pre-commit hook be run in and…

… pass flake8 validation. r=mossop MozReview-Commit-ID: 1GW59lKpVrI --HG-- extra : rebase_source : bad1919b52fc29a9874090f314ad682e72840f70
dothq · Apr 28, 2017 · 046debb · 046debb
1 parent 7f43e4e
commit 046debb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tools/lint/flake8.lint.py b/tools/lint/flake8.lint.py
@@ -188,6 +188,7 @@ def lint(files, **lintargs):
         'testing/mochitest',
         'testing/talos/',
         'tools/lint',
+        'tools/mercurial',
         'toolkit/components/telemetry',
     ],
     'exclude': ['testing/mochitest/pywebsocket'],

diff --git a/tools/mercurial/eslintvalidate.py b/tools/mercurial/eslintvalidate.py
@@ -2,17 +2,18 @@
 # GNU General Public License version 2 or any later version.
 
 import os
-import sys
 import re
 import json
 from subprocess import check_output, CalledProcessError
 
 lintable = re.compile(r'.+\.(?:js|jsm|jsx|xml|html)$')
 ignored = 'File ignored because of a matching ignore pattern. Use "--no-ignore" to override.'
 
+
 def is_lintable(filename):
     return lintable.match(filename)
 
+
 def display(ui, output):
     results = json.loads(output)
     for file in results:
@@ -22,10 +23,12 @@ def display(ui, output):
                 continue
 
             if "line" in message:
-                ui.warn("%s:%d:%d %s\n" % (path, message["line"], message["column"], message["message"]))
+                ui.warn("%s:%d:%d %s\n" % (path, message["line"], message["column"],
+                        message["message"]))
             else:
                 ui.warn("%s: %s\n" % (path, message["message"]))
 
+
 def eslinthook(ui, repo, node=None, **opts):
     ctx = repo[node]
     if len(ctx.parents()) > 1:
@@ -50,15 +53,17 @@ def eslinthook(ui, repo, node=None, **opts):
             eslint_path = os.path.join(dir, "eslint.cmd")
         output = check_output([eslint_path,
                                "--format", "json", "--plugin", "html"] + files,
-                               cwd=basepath)
+                              cwd=basepath)
         display(ui, output)
     except CalledProcessError as ex:
         display(ui, ex.output)
         ui.warn("ESLint found problems in your changes, please correct them.\n")
 
+
 def reposetup(ui, repo):
     ui.setconfig('hooks', 'commit.eslint', eslinthook)
 
+
 def get_project_root():
     file_found = False
     folder = os.getcwd()