contrib: Update clang-format-diff #29251
Conversation
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. |
TheCharlatan
changed the title
|
I think you can just pull the latest version? |
|
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? |
|
Sure. Seems fine to drop them. (If there are any important, you can re-cherry-pick them again on top)? |
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.
TheCharlatan
force-pushed
the
ClangFormatDiffBinaryOption
branch
from
c7cb63a
to
008e81e
Compare
|
Updated c7cb63a -> 008e81e (ClangFormatDiffBinaryOption_0 -> ClangFormatDiffBinaryOption_1, compare)
|
TheCharlatan
changed the title
|
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. |
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.
|
🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the Possibly this is due to a silent merge conflict (the changes in this pull request being Leave a comment here, if you need help tracking down a confusing failure. |
|
Updated 008e81e -> 52149b7 (ClangFormatDiffBinaryOption_1 -> ClangFormatDiffBinaryOption_2, compare)
|
There was a problem hiding this comment.
lgtm ACK 52149b7 🌱
Show signature
Signature:
untrusted 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}"
RUTRmVTMeKV5npGrKx1nqXCw5zeVHdtdYURB/KlyA/LMFgpNCs+SkW9a8N95d+U4AP1RJMi+krxU1A3Yux4bpwZNLvVBKy0wLgM=
trusted comment: lgtm ACK 52149b7a2c2b48ed4a4c0900c74cda4bb52a1ea5 🌱
OvfYlA4NC+vgQi+PK7fancIkRgGFUMoF0GnyeDigp2SjZhMD7QeiPlg8jfTtivZi0xWiOM2gSMUV1FNgPS2pCg==
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.