blob: 4d5c9a393ed1557fed8d43796d57f7888370cc75 [file] [log] [blame]
Simon Hertereee38cb2015-09-22 12:56:43 +02001#!/usr/bin/env python2.7
eaftan98320b42015-07-07 09:54:29 -07002#
3#===- google-java-format-diff.py - google-java-format Diff Reformatter -----===#
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
Jake Wharton4ccbc362015-08-25 19:57:00 -040012"""
eaftan98320b42015-07-07 09:54:29 -070013google-java-format 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.
18Example usage for git/svn users:
19
20 git diff -U0 HEAD^ | google-java-format-diff.py -p1 -i
21 svn diff --diff-cmd=diff -x-U0 | google-java-format-diff.py -i
22
23"""
24
25import argparse
26import difflib
27import re
28import string
29import subprocess
30import StringIO
31import sys
Scott Bessler09f47092015-12-10 14:57:45 -080032from distutils.spawn import find_executable
eaftan98320b42015-07-07 09:54:29 -070033
Scott Bessler09f47092015-12-10 14:57:45 -080034binary = find_executable('google-java-format') or '/usr/bin/google-java-format'
eaftan98320b42015-07-07 09:54:29 -070035
36def main():
37 parser = argparse.ArgumentParser(description=
38 'Reformat changed lines in diff. Without -i '
39 'option just output the diff that would be '
40 'introduced.')
41 parser.add_argument('-i', action='store_true', default=False,
42 help='apply edits to files instead of displaying a diff')
43
44 parser.add_argument('-p', metavar='NUM', default=0,
45 help='strip the smallest prefix containing P slashes')
46 parser.add_argument('-regex', metavar='PATTERN', default=None,
47 help='custom pattern selecting file paths to reformat '
48 '(case sensitive, overrides -iregex)')
49 parser.add_argument('-iregex', metavar='PATTERN', default=r'.*\.java',
50 help='custom pattern selecting file paths to reformat '
51 '(case insensitive, overridden by -regex)')
52 parser.add_argument('-v', '--verbose', action='store_true',
53 help='be more verbose, ineffective without -i')
54 args = parser.parse_args()
55
56 # Extract changed lines for each file.
57 filename = None
58 lines_by_file = {}
59
60 for line in sys.stdin:
61 match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
62 if match:
63 filename = match.group(2)
64 if filename == None:
65 continue
66
67 if args.regex is not None:
68 if not re.match('^%s$' % args.regex, filename):
69 continue
70 else:
71 if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
72 continue
73
74 match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
75 if match:
76 start_line = int(match.group(1))
77 line_count = 1
78 if match.group(3):
79 line_count = int(match.group(3))
80 if line_count == 0:
81 continue
82 end_line = start_line + line_count - 1;
83 lines_by_file.setdefault(filename, []).extend(
84 ['-lines', str(start_line) + ':' + str(end_line)])
85
86 # Reformat files containing changes in place.
87 for filename, lines in lines_by_file.iteritems():
88 if args.i and args.verbose:
89 print 'Formatting', filename
90 command = [binary]
91 if args.i:
92 command.append('-i')
93 command.extend(lines)
94 command.append(filename)
95 p = subprocess.Popen(command, stdout=subprocess.PIPE,
96 stderr=None, stdin=subprocess.PIPE)
97 stdout, stderr = p.communicate()
98 if p.returncode != 0:
99 sys.exit(p.returncode);
100
101 if not args.i:
102 with open(filename) as f:
103 code = f.readlines()
104 formatted_code = StringIO.StringIO(stdout).readlines()
105 diff = difflib.unified_diff(code, formatted_code,
106 filename, filename,
107 '(before formatting)', '(after formatting)')
108 diff_string = string.join(diff, '')
109 if len(diff_string) > 0:
110 sys.stdout.write(diff_string)
111
112if __name__ == '__main__':
113 main()