scripted-diff: Remove trailing whitespaces #13753

pull promag wants to merge 1 commits into bitcoin:master from promag:remove-trailing-whitespaces changing 46 files +152 −152

promag commented at 3:09 PM on July 24, 2018: member

The script test/lint/lint-whitespace.sh should prevent new cases.

This happens in some pulls where the code editor and the author 'git add's them, so this would fix it all.
Sjors commented at 3:15 PM on July 24, 2018: member

Ironically rejected by a linter :-)

Concept ACK: means I can turn "remove trailing whitespace" on again in my editor, without it changing stuff all over the file.
promag force-pushed on Jul 24, 2018
promag commented at 3:24 PM on July 24, 2018: member

means I can turn "remove trailing whitespace" on again in my editor, without it changing stuff all over the file

Right, or skip hunks. Or this #13248 (review).
MarcoFalke commented at 3:54 PM on July 24, 2018: member

ACK b3ce5956291cd25ddb654e1dfb543658f87cdeb1, any difference between [[:space:]][[:space:]]* and [[:space:]]+?
promag force-pushed on Jul 24, 2018
promag commented at 4:02 PM on July 24, 2018: member

@MarcoFalke in order to use + extended regular expressions must be used. Updated to use them.
MarcoFalke commented at 4:06 PM on July 24, 2018: member

Note that the flag for gnu sed is --regexp-extended, not -E and for git it is --extended-regexp :p
promag force-pushed on Jul 24, 2018
MarcoFalke commented at 5:21 PM on July 24, 2018: member

You'd have to remove the trailing '' after the -i option, no?

scripted-diff: Remove trailing whitespaces

-BEGIN VERIFY SCRIPT-

sed --in-place'' --regexp-extended 's/[[:space:]]+$//g' $(git grep -I --files-with-matches --extended-regexp '[[:space:]]+$' -- src test  ':!*.svg' ':!src/crypto/sha256_sse4*' ':!src/leveldb' ':!src/qt/locale' ':!src/secp256k1' ':!src/univalue')

-END VERIFY SCRIPT-

12dd101345

promag force-pushed on Jul 24, 2018
promag commented at 8:31 PM on July 24, 2018: member

@MarcoFalke done :feelsgood:
mess110 commented at 9:50 PM on July 24, 2018: contributor

utACK 12dd101
fanquake added the label Scripts and tools on Jul 24, 2018
MarcoFalke commented at 11:50 PM on July 24, 2018: member

utACK 12dd1013454a3b4913e8e6bbac251887e7e82ff0
MarcoFalke added the label Refactoring on Jul 24, 2018
MarcoFalke removed the label Scripts and tools on Jul 24, 2018
DrahtBot commented at 11:53 PM on July 24, 2018: member
Note to reviewers: This pull request conflicts with the following ones:
- #13529 (Use new Qt5 connect syntax by promag)
- #10785 (Serialization improvements by sipa)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
fanquake commented at 11:03 AM on July 25, 2018: member

utACK https://github.com/bitcoin/bitcoin/pull/13753/commits/12dd1013454a3b4913e8e6bbac251887e7e82ff0

Have not checked the scripted diff or if this is has removed all the trailing whitespace, but if according to @DrahtBot this doesn't disrupt much else, LJGTM.
fanquake added this to the "Mergeable" column in a project

MarcoFalke merged this on Jul 25, 2018
MarcoFalke closed this on Jul 25, 2018
MarcoFalke referenced this in commit a140953907 on Jul 25, 2018
fanquake removed this from the "Mergeable" column in a project

Empact commented at 2:45 PM on July 25, 2018: member

So glad this is done. Thanks @promag!
PastaPastaPasta referenced this in commit c49e506176 on Jul 29, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Labels