8c7cbdf53a
Add support for more filename extensions based on the list in the clang plus JavaScript. Also adds a -regex option so users can override defaults if they have unusual file extensions or want to format everything in the diff. Keeping with tradition the flag is modelled on Unix conventions, this time matching the semantics of find(1). llvm-svn: 196917
107 lines
3.4 KiB
Python
Executable File
107 lines
3.4 KiB
Python
Executable File
#!/usr/bin/python
|
|
#
|
|
#===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
|
|
#
|
|
# The LLVM Compiler Infrastructure
|
|
#
|
|
# This file is distributed under the University of Illinois Open Source
|
|
# License. See LICENSE.TXT for details.
|
|
#
|
|
#===------------------------------------------------------------------------===#
|
|
|
|
r"""
|
|
ClangFormat Diff Reformatter
|
|
============================
|
|
|
|
This script reads input from a unified diff and reformats all the changed
|
|
lines. This is useful to reformat all the lines touched by a specific patch.
|
|
Example usage for git users:
|
|
|
|
git diff -U0 HEAD^ | clang-format-diff.py -p1 -i
|
|
|
|
"""
|
|
|
|
import argparse
|
|
import difflib
|
|
import re
|
|
import string
|
|
import subprocess
|
|
import StringIO
|
|
import sys
|
|
|
|
|
|
# Change this to the full path if clang-format is not on the path.
|
|
binary = 'clang-format'
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=
|
|
'Reformat changed lines in diff. Without -i '
|
|
'option just output the diff that would be '
|
|
'introduced.')
|
|
parser.add_argument('-i', action='store_true', default=False,
|
|
help='apply edits to files instead of displaying a diff')
|
|
parser.add_argument('-p', metavar='NUM', default=0,
|
|
help='strip the smallest prefix containing P slashes')
|
|
parser.add_argument('-regex', metavar='PATTERN', default=
|
|
r'.*\.(cpp|cc|CPP|C|c\+\+|cxx|c|h|hpp|m|mm|inc|js)',
|
|
help='custom pattern selecting file paths to reformat')
|
|
parser.add_argument(
|
|
'-style',
|
|
help=
|
|
'formatting style to apply (LLVM, Google, Chromium, Mozilla, WebKit)')
|
|
args = parser.parse_args()
|
|
|
|
# Extract changed lines for each file.
|
|
filename = None
|
|
lines_by_file = {}
|
|
for line in sys.stdin:
|
|
match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
|
|
if match:
|
|
filename = match.group(2)
|
|
if filename == None:
|
|
continue
|
|
|
|
if not re.match(args.regex, filename):
|
|
continue
|
|
|
|
match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
|
|
if match:
|
|
start_line = int(match.group(1))
|
|
line_count = 1
|
|
if match.group(3):
|
|
line_count = int(match.group(3))
|
|
if line_count == 0:
|
|
continue
|
|
end_line = start_line + line_count - 1;
|
|
lines_by_file.setdefault(filename, []).extend(
|
|
['-lines', str(start_line) + ':' + str(end_line)])
|
|
|
|
# Reformat files containing changes in place.
|
|
for filename, lines in lines_by_file.iteritems():
|
|
command = [binary, filename]
|
|
if args.i:
|
|
command.append('-i')
|
|
command.extend(lines)
|
|
if args.style:
|
|
command.extend(['-style', args.style])
|
|
p = subprocess.Popen(command, stdout=subprocess.PIPE,
|
|
stderr=None, stdin=subprocess.PIPE)
|
|
stdout, stderr = p.communicate()
|
|
if p.returncode != 0:
|
|
sys.exit(p.returncode);
|
|
|
|
if not args.i:
|
|
with open(filename) as f:
|
|
code = f.readlines()
|
|
formatted_code = StringIO.StringIO(stdout).readlines()
|
|
diff = difflib.unified_diff(code, formatted_code,
|
|
filename, filename,
|
|
'(before formatting)', '(after formatting)')
|
|
diff_string = string.join(diff, '')
|
|
if len(diff_string) > 0:
|
|
sys.stdout.write(diff_string)
|
|
|
|
if __name__ == '__main__':
|
|
main()
|