forked from domob1812/namecoin-core
-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
526 additions
and
395 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,166 +1,190 @@ | ||
| #!/usr/bin/env python3 | ||
| # | ||
| #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===# | ||
| # ===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===# | ||
| # | ||
| # The LLVM Compiler Infrastructure | ||
| # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| # See https://llvm.org/LICENSE.txt for license information. | ||
| # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| # | ||
| # This file is distributed under the University of Illinois Open Source | ||
| # License. | ||
| # | ||
| # ============================================================ | ||
| # | ||
| # University of Illinois/NCSA | ||
| # Open Source License | ||
| # | ||
| # Copyright (c) 2007-2015 University of Illinois at Urbana-Champaign. | ||
| # All rights reserved. | ||
| # | ||
| # Developed by: | ||
| # | ||
| # LLVM Team | ||
| # | ||
| # University of Illinois at Urbana-Champaign | ||
| # | ||
| # http://llvm.org | ||
| # | ||
| # Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| # this software and associated documentation files (the "Software"), to deal with | ||
| # the Software without restriction, including without limitation the rights to | ||
| # use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | ||
| # of the Software, and to permit persons to whom the Software is furnished to do | ||
| # so, subject to the following conditions: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, | ||
| # this list of conditions and the following disclaimers. | ||
| # | ||
| # * Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the following disclaimers in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # | ||
| # * Neither the names of the LLVM Team, University of Illinois at | ||
| # Urbana-Champaign, nor the names of its contributors may be used to | ||
| # endorse or promote products derived from this Software without specific | ||
| # prior written permission. | ||
| # | ||
| # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| # FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| # CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE | ||
| # SOFTWARE. | ||
| # | ||
| # ============================================================ | ||
| # | ||
| #===------------------------------------------------------------------------===# | ||
|
|
||
| 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/svn users: | ||
| git diff -U0 HEAD^ | clang-format-diff.py -p1 -i | ||
| svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i | ||
| git diff -U0 --no-color --relative HEAD^ | {clang_format_diff} -p1 -i | ||
| svn diff --diff-cmd=diff -x-U0 | {clang_format_diff} -i | ||
| It should be noted that the filename contained in the diff is used unmodified | ||
| to determine the source file to update. Users calling this script directly | ||
| should be careful to ensure that the path in the diff is correct relative to the | ||
| current working directory. | ||
| """ | ||
| from __future__ import absolute_import, division, print_function | ||
|
|
||
| import argparse | ||
| import difflib | ||
| import io | ||
| import re | ||
| import subprocess | ||
| import sys | ||
|
|
||
|
|
||
| # Change this to the full path if clang-format is not on the path. | ||
| binary = 'clang-format' | ||
| from io import StringIO | ||
|
|
||
|
|
||
| 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'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hpp|m|mm|inc|js|ts|proto' | ||
| r'|protodevel|java)', | ||
| help='custom pattern selecting file paths to reformat ' | ||
| '(case insensitive, overridden by -regex)') | ||
| parser.add_argument('-sort-includes', action='store_true', default=False, | ||
| help='let clang-format sort include blocks') | ||
| parser.add_argument('-v', '--verbose', action='store_true', | ||
| help='be more verbose, ineffective without -i') | ||
| args = parser.parse_args() | ||
|
|
||
| # Extract changed lines for each file. | ||
| filename = None | ||
| lines_by_file = {} | ||
| for line in sys.stdin: | ||
| match = re.search(r'^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line) | ||
| if match: | ||
| filename = match.group(2) | ||
| if filename is 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(r'^@@.*\+(\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.items(): | ||
| if args.i and args.verbose: | ||
| print('Formatting {}'.format(filename)) | ||
| command = [binary, filename] | ||
| if args.i: | ||
| command.append('-i') | ||
| if args.sort_includes: | ||
| command.append('-sort-includes') | ||
| command.extend(lines) | ||
| command.extend(['-style=file', '-fallback-style=none']) | ||
| p = subprocess.Popen(command, | ||
| stdout=subprocess.PIPE, | ||
| stderr=None, | ||
| stdin=subprocess.PIPE, | ||
| text=True) | ||
| stdout, stderr = p.communicate() | ||
| if p.returncode != 0: | ||
| sys.exit(p.returncode) | ||
|
|
||
| if not args.i: | ||
| with open(filename, encoding="utf8") as f: | ||
| code = f.readlines() | ||
| formatted_code = io.StringIO(stdout).readlines() | ||
| diff = difflib.unified_diff(code, formatted_code, | ||
| filename, filename, | ||
| '(before formatting)', '(after formatting)') | ||
| diff_string = ''.join(diff) | ||
| if len(diff_string) > 0: | ||
| sys.stdout.write(diff_string) | ||
|
|
||
| if __name__ == '__main__': | ||
| main() | ||
| parser = argparse.ArgumentParser( | ||
| description=__doc__.format(clang_format_diff="%(prog)s"), | ||
| formatter_class=argparse.RawDescriptionHelpFormatter, | ||
| ) | ||
| 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".*\.(?:cpp|cc|c\+\+|cxx|cppm|ccm|cxxm|c\+\+m|c|cl|h|hh|hpp" | ||
| r"|hxx|m|mm|inc|js|ts|proto|protodevel|java|cs|json|s?vh?)", | ||
| help="custom pattern selecting file paths to reformat " | ||
| "(case insensitive, overridden by -regex)", | ||
| ) | ||
| parser.add_argument( | ||
| "-sort-includes", | ||
| action="store_true", | ||
| default=False, | ||
| help="let clang-format sort include blocks", | ||
| ) | ||
| parser.add_argument( | ||
| "-v", | ||
| "--verbose", | ||
| action="store_true", | ||
| help="be more verbose, ineffective without -i", | ||
| ) | ||
| parser.add_argument( | ||
| "-style", | ||
| help="formatting style to apply (LLVM, GNU, Google, Chromium, " | ||
| "Microsoft, Mozilla, WebKit)", | ||
| ) | ||
| parser.add_argument( | ||
| "-fallback-style", | ||
| help="The name of the predefined style used as a" | ||
| "fallback in case clang-format is invoked with" | ||
| "-style=file, but can not find the .clang-format" | ||
| "file to use.", | ||
| ) | ||
| parser.add_argument( | ||
| "-binary", | ||
| default="clang-format", | ||
| help="location of binary to use for clang-format", | ||
| ) | ||
| args = parser.parse_args() | ||
|
|
||
| # Extract changed lines for each file. | ||
| filename = None | ||
| lines_by_file = {} | ||
| for line in sys.stdin: | ||
| match = re.search(r"^\+\+\+\ (.*?/){%s}(\S*)" % args.p, line) | ||
| if match: | ||
| filename = match.group(2) | ||
| if filename is 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(r"^@@.*\+(\d+)(?:,(\d+))?", line) | ||
| if match: | ||
| start_line = int(match.group(1)) | ||
| line_count = 1 | ||
| if match.group(2): | ||
| line_count = int(match.group(2)) | ||
| # The input is something like | ||
| # | ||
| # @@ -1, +0,0 @@ | ||
| # | ||
| # which means no lines were added. | ||
| if line_count == 0: | ||
| continue | ||
| # Also format lines range if line_count is 0 in case of deleting | ||
| # surrounding statements. | ||
| end_line = start_line | ||
| if line_count != 0: | ||
| end_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.items(): | ||
| if args.i and args.verbose: | ||
| print("Formatting {}".format(filename)) | ||
| command = [args.binary, filename] | ||
| if args.i: | ||
| command.append("-i") | ||
| if args.sort_includes: | ||
| command.append("-sort-includes") | ||
| command.extend(lines) | ||
| if args.style: | ||
| command.extend(["-style", args.style]) | ||
| if args.fallback_style: | ||
| command.extend(["-fallback-style", args.fallback_style]) | ||
|
|
||
| try: | ||
| p = subprocess.Popen( | ||
| command, | ||
| stdout=subprocess.PIPE, | ||
| stderr=None, | ||
| stdin=subprocess.PIPE, | ||
| universal_newlines=True, | ||
| ) | ||
| except OSError as e: | ||
| # Give the user more context when clang-format isn't | ||
| # found/isn't executable, etc. | ||
| raise RuntimeError( | ||
| 'Failed to run "%s" - %s"' % (" ".join(command), e.strerror) | ||
| ) | ||
|
|
||
| stdout, stderr = p.communicate() | ||
| if p.returncode != 0: | ||
| sys.exit(p.returncode) | ||
|
|
||
| if not args.i: | ||
| with open(filename, encoding="utf8") as f: | ||
| code = f.readlines() | ||
| formatted_code = StringIO(stdout).readlines() | ||
| diff = difflib.unified_diff( | ||
| code, | ||
| formatted_code, | ||
| filename, | ||
| filename, | ||
| "(before formatting)", | ||
| "(after formatting)", | ||
| ) | ||
| diff_string = "".join(diff) | ||
| if len(diff_string) > 0: | ||
| sys.stdout.write(diff_string) | ||
| sys.exit(1) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() |
Oops, something went wrong.