blob: ffa30e70ddc33696a60869dfbc3b16ce59b39644 [file] [log] [blame]
Ed Schoutenbf041d92014-09-02 20:59:13 +00001#!/usr/bin/env python
Daniel Jasper9be2c5c2013-03-20 09:53:23 +00002#
3#===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
4#
5# The LLVM Compiler Infrastructure
6#
7# This file is distributed under the University of Illinois Open Source
8# License. See LICENSE.TXT for details.
9#
10#===------------------------------------------------------------------------===#
11
12r"""
13ClangFormat Diff Reformatter
14============================
15
16This script reads input from a unified diff and reformats all the changed
17lines. This is useful to reformat all the lines touched by a specific patch.
Daniel Jasper2e8600c2014-05-14 09:36:11 +000018Example usage for git/svn users:
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000019
Sylvestre Ledruf4214032016-12-03 23:22:45 +000020 git diff -U0 --no-color HEAD^ | clang-format-diff.py -p1 -i
Daniel Jasper2e8600c2014-05-14 09:36:11 +000021 svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000022
23"""
24
25import argparse
Alexander Kornienko95c009a2013-10-11 21:32:01 +000026import difflib
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000027import re
Alexander Kornienko95c009a2013-10-11 21:32:01 +000028import string
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000029import subprocess
Alexander Kornienko95c009a2013-10-11 21:32:01 +000030import StringIO
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000031import sys
32
33
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000034def main():
35 parser = argparse.ArgumentParser(description=
Alexander Kornienko95c009a2013-10-11 21:32:01 +000036 'Reformat changed lines in diff. Without -i '
Alp Toker0e7f6da2013-12-04 00:48:22 +000037 'option just output the diff that would be '
Alexander Kornienko95c009a2013-10-11 21:32:01 +000038 'introduced.')
39 parser.add_argument('-i', action='store_true', default=False,
40 help='apply edits to files instead of displaying a diff')
Alp Toker8c7cbdf2013-12-10 13:51:53 +000041 parser.add_argument('-p', metavar='NUM', default=0,
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000042 help='strip the smallest prefix containing P slashes')
Alp Toker679bf012013-12-18 21:34:07 +000043 parser.add_argument('-regex', metavar='PATTERN', default=None,
Alexander Kornienko25c68382013-12-16 10:57:30 +000044 help='custom pattern selecting file paths to reformat '
Daniel Jasperdb7933a2013-12-19 10:21:37 +000045 '(case sensitive, overrides -iregex)')
Alexander Kornienko25c68382013-12-16 10:57:30 +000046 parser.add_argument('-iregex', metavar='PATTERN', default=
Daniel Jasper8c68a642015-03-11 14:58:38 +000047 r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hpp|m|mm|inc|js|ts|proto'
Daniel Jasper7c627a02014-12-08 19:39:03 +000048 r'|protodevel|java)',
Alexander Kornienko25c68382013-12-16 10:57:30 +000049 help='custom pattern selecting file paths to reformat '
Daniel Jasperdb7933a2013-12-19 10:21:37 +000050 '(case insensitive, overridden by -regex)')
Daniel Jasperdb125cb2015-10-07 17:00:20 +000051 parser.add_argument('-sort-includes', action='store_true', default=False,
52 help='let clang-format sort include blocks')
Daniel Jasperc6706882014-11-14 13:27:28 +000053 parser.add_argument('-v', '--verbose', action='store_true',
54 help='be more verbose, ineffective without -i')
Daniel Jasper18b1de32016-01-20 18:55:57 +000055 parser.add_argument('-style',
56 help='formatting style to apply (LLVM, Google, Chromium, '
57 'Mozilla, WebKit)')
58 parser.add_argument('-binary', default='clang-format',
59 help='location of binary to use for clang-format')
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000060 args = parser.parse_args()
61
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000062 # Extract changed lines for each file.
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000063 filename = None
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000064 lines_by_file = {}
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000065 for line in sys.stdin:
66 match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
67 if match:
68 filename = match.group(2)
69 if filename == None:
70 continue
71
Alp Toker679bf012013-12-18 21:34:07 +000072 if args.regex is not None:
73 if not re.match('^%s$' % args.regex, filename):
Alexander Kornienko25c68382013-12-16 10:57:30 +000074 continue
75 else:
Alp Toker679bf012013-12-18 21:34:07 +000076 if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
Alexander Kornienko25c68382013-12-16 10:57:30 +000077 continue
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000078
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000079 match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
80 if match:
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000081 start_line = int(match.group(1))
Daniel Jasper164c8e12013-10-02 13:59:03 +000082 line_count = 1
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000083 if match.group(3):
Daniel Jasper164c8e12013-10-02 13:59:03 +000084 line_count = int(match.group(3))
85 if line_count == 0:
86 continue
87 end_line = start_line + line_count - 1;
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000088 lines_by_file.setdefault(filename, []).extend(
89 ['-lines', str(start_line) + ':' + str(end_line)])
Daniel Jasper9be2c5c2013-03-20 09:53:23 +000090
Daniel Jasperdcab7fb2013-09-18 12:14:09 +000091 # Reformat files containing changes in place.
92 for filename, lines in lines_by_file.iteritems():
Daniel Jasperc6706882014-11-14 13:27:28 +000093 if args.i and args.verbose:
94 print 'Formatting', filename
Daniel Jasper18b1de32016-01-20 18:55:57 +000095 command = [args.binary, filename]
Alexander Kornienko95c009a2013-10-11 21:32:01 +000096 if args.i:
97 command.append('-i')
Daniel Jasperdb125cb2015-10-07 17:00:20 +000098 if args.sort_includes:
99 command.append('-sort-includes')
Daniel Jasperdcab7fb2013-09-18 12:14:09 +0000100 command.extend(lines)
101 if args.style:
Daniel Jaspercf627f02013-09-21 10:05:02 +0000102 command.extend(['-style', args.style])
Daniel Jasperdcab7fb2013-09-18 12:14:09 +0000103 p = subprocess.Popen(command, stdout=subprocess.PIPE,
Alp Tokerfcf30322013-12-05 08:14:54 +0000104 stderr=None, stdin=subprocess.PIPE)
Daniel Jasperdcab7fb2013-09-18 12:14:09 +0000105 stdout, stderr = p.communicate()
Daniel Jaspere8845ad2013-10-08 15:54:36 +0000106 if p.returncode != 0:
107 sys.exit(p.returncode);
Daniel Jasper9be2c5c2013-03-20 09:53:23 +0000108
Alexander Kornienko95c009a2013-10-11 21:32:01 +0000109 if not args.i:
110 with open(filename) as f:
111 code = f.readlines()
112 formatted_code = StringIO.StringIO(stdout).readlines()
113 diff = difflib.unified_diff(code, formatted_code,
114 filename, filename,
115 '(before formatting)', '(after formatting)')
116 diff_string = string.join(diff, '')
117 if len(diff_string) > 0:
Alp Tokerfcf30322013-12-05 08:14:54 +0000118 sys.stdout.write(diff_string)
Daniel Jasper9be2c5c2013-03-20 09:53:23 +0000119
120if __name__ == '__main__':
121 main()