llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: None (serge-sans-paille) <details> <summary>Changes</summary> It is quite common to symlink clang-format-diff.py to clang-format-diff, and in that case the help output still refers to the .py version. Compute it instead to work in both setup. --- Full diff: https://github.com/llvm/llvm-project/pull/73491.diff 1 Files Affected: - (modified) clang/tools/clang-format/clang-format-diff.py (+6-3) ``````````diff diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py index 892c1e38a462ff4..facaaf96dd8f90a 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/clang/tools/clang-format/clang-format-diff.py @@ -13,8 +13,8 @@ lines. This is useful to reformat all the lines touched by a specific patch. Example usage for git/svn users: - git diff -U0 --no-color --relative 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 @@ -25,6 +25,7 @@ import argparse import difflib +import os import re import subprocess import sys @@ -36,8 +37,10 @@ def main(): + basename = os.path.basename(sys.argv[0]) parser = argparse.ArgumentParser( - description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + description=__doc__.format(clang_format_diff=basename), + formatter_class=argparse.RawDescriptionHelpFormatter ) parser.add_argument( "-i", `````````` </details> https://github.com/llvm/llvm-project/pull/73491 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
