diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-12-22 23:45:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 23:45:27 +0000 |
| commit | 1f99b7db967b0a80fbe523a6d701355970d10ba2 (patch) | |
| tree | a9662a2e6651be7b0f9608001b0b1b785adbd9ef | |
| parent | b7b810ad5ae55786aec798b41a32c0afec70c6c9 (diff) | |
| parent | d1fd88b71ce4b8b1b65de1081a592510e259fc2c (diff) | |
| download | repohooks-1f99b7db967b0a80fbe523a6d701355970d10ba2.tar.gz | |
Add support for automatic fixups to google-java-format
am: d1fd88b71c
Change-Id: I35b45f777e4162c8a54ce03c99ea1c8ec62442c1
| -rw-r--r-- | rh/hooks.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rh/hooks.py b/rh/hooks.py index 47926bc..4e456e1 100644 --- a/rh/hooks.py +++ b/rh/hooks.py @@ -315,10 +315,13 @@ def check_google_java_format(project, commit, _desc, _diff, options=None): tool = get_helper_path('google-java-format.py') google_java_format = options.tool_path('google-java-format') google_java_format_diff = options.tool_path('google-java-format-diff') - cmd = [tool, '--google-java-format', google_java_format, - '--google-java-format-diff', google_java_format_diff, - '--commit', commit] + options.args() - return _check_cmd('google-java-format', project, commit, cmd) + tool_args = ['--google-java-format', google_java_format, + '--google-java-format-diff', google_java_format_diff, + '--commit', commit] + options.args() + cmd = [tool] + tool_args + fixup_func = _fixup_func_caller([tool, '--fix'] + tool_args) + return _check_cmd('google-java-format', project, commit, cmd, + fixup_func=fixup_func) def check_commit_msg_bug_field(project, commit, desc, _diff, options=None): |