Add google-java-format-diff.py from the public repository.
Note that the alternate license for this file is already referenced in
the LICENSE file in this folder.
Also add our own trivial launcher script to launch the formatter,
as google-java-format-diff.py expects such a launcher to exist.
Bug: 31552314
Test: Exercised script from new repohook
Change-Id: Ibbbf8a1eb54c73fd6e3d669ed09a4d625536b111
diff --git a/common/google-java-format/PREBUILT b/common/google-java-format/PREBUILT
index 2f48597..e57b6dd 100644
--- a/common/google-java-format/PREBUILT
+++ b/common/google-java-format/PREBUILT
@@ -9,3 +9,6 @@
google-java-format-1.0-all-deps.jar was built from SHA-1:
f8a2688f012bbc10f30cce5234d1b5370f4a4865
with tag google-java-format-1.0
+
+google-java-format-diff.py was fetched at SHA-1:
+ba6bd8c12d63f60450fcc6ec41acb0d2e63acb64
diff --git a/common/google-java-format/google-java-format b/common/google-java-format/google-java-format
new file mode 100755
index 0000000..ce6e42b
--- /dev/null
+++ b/common/google-java-format/google-java-format
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar `dirname "$0"`/google-java-format-1.0-all-deps.jar "$@"
diff --git a/common/google-java-format/google-java-format-diff.py b/common/google-java-format/google-java-format-diff.py
new file mode 100755
index 0000000..8e9c803
--- /dev/null
+++ b/common/google-java-format/google-java-format-diff.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python2.7
+#
+#===- google-java-format-diff.py - google-java-format Diff Reformatter -----===#
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+#===------------------------------------------------------------------------===#
+
+"""
+google-java-format 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/svn users:
+
+ git diff -U0 HEAD^ | google-java-format-diff.py -p1 -i
+ svn diff --diff-cmd=diff -x-U0 | google-java-format-diff.py -i
+
+"""
+
+import argparse
+import difflib
+import re
+import string
+import subprocess
+import StringIO
+import sys
+from distutils.spawn import find_executable
+
+binary = find_executable('google-java-format') or '/usr/bin/google-java-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=None,
+ help='custom pattern selecting file paths to reformat '
+ '(case sensitive, overrides -iregex)')
+ parser.add_argument('-iregex', metavar='PATTERN', default=r'.*\.java',
+ help='custom pattern selecting file paths to reformat '
+ '(case insensitive, overridden by -regex)')
+ parser.add_argument('-v', '--verbose', action='store_true',
+ help='be more verbose, ineffective without -i')
+ parser.add_argument('-a', '--aosp', action='store_true',
+ help='use AOSP style instead of Google Style (4-space indentation)')
+ 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 args.regex is not None:
+ if not re.match('^%s$' % args.regex, filename):
+ continue
+ else:
+ if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
+ 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():
+ if args.i and args.verbose:
+ print 'Formatting', filename
+ command = [binary]
+ if args.i:
+ command.append('-i')
+ if args.aosp:
+ command.append('--aosp')
+ command.extend(lines)
+ command.append(filename)
+ 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()
