git-pre-commit.py (11509:d7e83588e5bc) | git-pre-commit.py (11716:95a34c2188f2) |
---|---|
1#!/usr/bin/env python 2# 3# Copyright (c) 2016 ARM Limited 4# All rights reserved 5# 6# The license below extends only to copyright in the software and shall 7# not be construed as granting a license to any other intellectual 8# property including but not limited to intellectual property relating --- 23 unchanged lines hidden (view full) --- 32# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 33# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 34# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 35# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 36# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 37# 38# Authors: Andreas Sandberg 39 | 1#!/usr/bin/env python 2# 3# Copyright (c) 2016 ARM Limited 4# All rights reserved 5# 6# The license below extends only to copyright in the software and shall 7# not be construed as granting a license to any other intellectual 8# property including but not limited to intellectual property relating --- 23 unchanged lines hidden (view full) --- 32# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 33# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 34# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 35# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 36# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 37# 38# Authors: Andreas Sandberg 39 |
40from tempfile import TemporaryFile |
|
40import os | 41import os |
42import subprocess |
|
41import sys 42 43from style.repo import GitRepo 44from style.verifiers import all_verifiers, all_regions 45from style.style import StdioUI, check_ignores 46 47import argparse 48 --- 8 unchanged lines hidden (view full) --- 57git = GitRepo() 58 59opts = {} 60repo_base = git.repo_base() 61ui = StdioUI() 62 63os.chdir(repo_base) 64failing_files = set() | 43import sys 44 45from style.repo import GitRepo 46from style.verifiers import all_verifiers, all_regions 47from style.style import StdioUI, check_ignores 48 49import argparse 50 --- 8 unchanged lines hidden (view full) --- 59git = GitRepo() 60 61opts = {} 62repo_base = git.repo_base() 63ui = StdioUI() 64 65os.chdir(repo_base) 66failing_files = set() |
67staged_mismatch = set() |
|
65 66for status, fname in git.status(filter="MA", cached=True): 67 if args.verbose: 68 print "Checking %s..." % fname 69 if check_ignores(fname): 70 continue 71 if status == "M": 72 regions = git.staged_regions(fname) 73 else: 74 regions = all_regions 75 | 68 69for status, fname in git.status(filter="MA", cached=True): 70 if args.verbose: 71 print "Checking %s..." % fname 72 if check_ignores(fname): 73 continue 74 if status == "M": 75 regions = git.staged_regions(fname) 76 else: 77 regions = all_regions 78 |
79 # Show they appropriate object and dump it to a file 80 status = git.file_from_index(fname) 81 f = TemporaryFile() 82 f.write(status) 83 |
|
76 verifiers = [ v(ui, opts, base=repo_base) for v in all_verifiers ] 77 for v in verifiers: | 84 verifiers = [ v(ui, opts, base=repo_base) for v in all_verifiers ] 85 for v in verifiers: |
78 if not v.skip(fname) and v.check(fname, regions): | 86 f.seek(0) 87 # It is prefered that the first check is silent as it is in the 88 # staged file. If the check fails, then we will do it non-silently 89 # on the current file, reporting meaningful shortcomings 90 if not v.skip(fname) and v.check(fname, regions, fobj=f, silent=True): |
79 failing_files.add(fname) | 91 failing_files.add(fname) |
92 if not v.check(fname, regions): 93 staged_mismatch.add(fname) 94 f.close() |
|
80 81if failing_files: | 95 96if failing_files: |
82 print >> sys.stderr 83 print >> sys.stderr, "Style checker failed for the following files:" 84 for f in failing_files: 85 print >> sys.stderr, "\t%s" % f 86 print >> sys.stderr 87 print >> sys.stderr, \ | 97 if len(failing_files) > len(staged_mismatch): 98 print >> sys.stderr 99 print >> sys.stderr, "Style checker failed for the following files:" 100 for f in failing_files: 101 if f not in staged_mismatch: 102 print >> sys.stderr, "\t%s" % f 103 print >> sys.stderr 104 print >> sys.stderr, \ |
88 "Please run the style checker manually to fix the offending files.\n" \ 89 "To check your modifications, run: util/style.py -m" | 105 "Please run the style checker manually to fix the offending files.\n" \ 106 "To check your modifications, run: util/style.py -m" |
107 108 print >> sys.stderr 109 if staged_mismatch: 110 print >> sys.stderr, \ 111 "It looks like you have forgotten to stage your fixes for commit in\n"\ 112 "the following files: " 113 for f in staged_mismatch: 114 print >> sys.stderr, "\t%s" % f 115 print >> sys.stderr, "Please `git --add' them" |
|
90 sys.exit(1) | 116 sys.exit(1) |