contrib: Update clang-format-diff #29251

1. 
   TheCharlatan commented at 4:44 pm on January 15, 2024: contributor

   This was taken from https://github.com/llvm/llvm-project/blob/900bb318b5b8c485e57cf810253a656b0fb683bc/clang/tools/clang-format/clang-format-diff.py and is useful for systems where clang tools are shipped with a version suffix.
2. 
   DrahtBot commented at 4:44 pm on January 15, 2024: contributor

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Code Coverage

   For detailed information about the code coverage, see the test coverage report.

   Reviews

   See the guideline for information on the review process.

   Type	Reviewers
   ACK	maflcko

   If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

3. DrahtBot added the label Scripts and tools on Jan 15, 2024
4. TheCharlatan renamed this:
   contrib: Add --binary option to clang-format-diff
   contrib: Add -binary option to clang-format-diff
   on Jan 15, 2024
5. 
   maflcko commented at 9:12 am on January 16, 2024: member

   I think you can just pull the latest version?
6. 
   TheCharlatan commented at 9:22 am on January 16, 2024: contributor

   There were a bunch of changes made to this file to make it “Bitcoin Core” style. Re-applying all of them seems a bit burdensome. Would it be ok to just overwrite these?
7. 
   maflcko commented at 9:24 am on January 16, 2024: member

   Sure. Seems fine to drop them. (If there are any important, you can re-cherry-pick them again on top)?
8. contrib: Latest clang-format-diff.py script

   This was take from
   https://github.com/llvm/llvm-project/blob/900bb318b5b8c485e57cf810253a656b0fb683bc/clang/tools/clang-format/clang-format-diff.py
   
   Updating it introduces some new options. For example specifying the
   clang-format binary, which is useful for systems where clang tools are
   shipped with a version suffix.

   008e81e025
9. TheCharlatan force-pushed on Jan 17, 2024
10. 
    TheCharlatan commented at 8:33 am on January 17, 2024: contributor

    Updated c7cb63a12e1a90fe46471cca4001a472078b5ccf -> 008e81e025d64c33e1e71b5a2fe63dfdf6b31437 (ClangFormatDiffBinaryOption_0 -> ClangFormatDiffBinaryOption_1, compare)

    • Addressed @maflcko’s comment, updating to the latest clang-format-diff.py script: https://github.com/llvm/llvm-project/blob/900bb318b5b8c485e57cf810253a656b0fb683bc/clang/tools/clang-format/clang-format-diff.py
11. TheCharlatan renamed this:
    contrib: Add -binary option to clang-format-diff
    contrib: Update clang-format-diff
    on Jan 17, 2024
12. 
    maflcko commented at 9:48 am on January 17, 2024: member

    You’d have to fixup the linter in one way or another. I think it would be fine to add a commit to modify the script in the two places, or add an exclusion, or something else.
13. contrib: Fix clang-format-diff.py lint errors

    We assume to be using python3, so don't check for it. This removes a
    type error on the line `from io import BytesIO as StringIO`.
    
    Specify the encoding as "utf8" when opening a file.

    52149b7a2c
14. DrahtBot added the label CI failed on Jan 17, 2024
15. 
    DrahtBot commented at 10:16 am on January 17, 2024: contributor

    🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the documentation.

    Possibly this is due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.

    Leave a comment here, if you need help tracking down a confusing failure.

    Debug: https://github.com/bitcoin/bitcoin/runs/20563036485

16. 
    TheCharlatan commented at 10:16 am on January 17, 2024: contributor

    Updated 008e81e025d64c33e1e71b5a2fe63dfdf6b31437 -> 52149b7a2c2b48ed4a4c0900c74cda4bb52a1ea5 (ClangFormatDiffBinaryOption_1 -> ClangFormatDiffBinaryOption_2, compare)

    • Added a commit fixing the lint errors by removing a python2 check and specifying “utf8” encoding when opening a file.
17. maflcko approved
18. 
    maflcko commented at 11:38 am on January 17, 2024: member

    lgtm ACK 52149b7a2c2b48ed4a4c0900c74cda4bb52a1ea5 🌱

    Signature:

    0untrusted comment: signature from minisign secret key on empty file; verify via: minisign -Vm "${path_to_any_empty_file}" -P RWTRmVTMeKV5noAMqVlsMugDDCyyTSbA3Re5AkUrhvLVln0tSaFWglOw -x "${path_to_this_whole_four_line_signature_blob}"
    1RUTRmVTMeKV5npGrKx1nqXCw5zeVHdtdYURB/KlyA/LMFgpNCs+SkW9a8N95d+U4AP1RJMi+krxU1A3Yux4bpwZNLvVBKy0wLgM=
    2trusted comment: lgtm ACK 52149b7a2c2b48ed4a4c0900c74cda4bb52a1ea5  🌱
    3OvfYlA4NC+vgQi+PK7fancIkRgGFUMoF0GnyeDigp2SjZhMD7QeiPlg8jfTtivZi0xWiOM2gSMUV1FNgPS2pCg==
    

19. fanquake merged this on Jan 17, 2024
20. fanquake closed this on Jan 17, 2024

    ---

Contributors
TheCharlatan DrahtBot maflcko

Labels
Scripts and tools CI failed