Closed trws closed 4 months ago
trws
commented
5 months ago Now that the release is together, I rebased the reformat here. Short of adding CI to verify it, which might accidentally work because it's in the format script now that I think about it, this should be good to go.
trws
commented
4 months ago @milroy, what do you think of just getting this in? I've rebased and reapplied the formatting. I've also created a pull request to your rank-based-partial-release branch with a rebase of your branch on top of this with the reformatting applied to every commit to preserve all your changes. If you have new changes that aren't in there, or just want to do it yourself, this script completely automates it assuming you have fetched my reformat branch and are currently on your "partial-release" branch, or any other branch for that matter:
export BEFORE_MASS_FORMAT=af44d3b53457240d511bd2a32a3485fbdb91246d
export MASS_FORMAT=78b80b195bc36186abb438f499adbee5bef4a025
git rebase \
--strategy-option theirs \
--empty=drop \
--exec "$(echo './scripts/format' \
'|| echo prettier failed its ok; ' \
'git commit -a --amend --no-verify --no-edit' \
)" \
--onto $MASS_FORMAT $BEFORE_MASS_FORMAT;This is also now enforced in CI in this PR.
trws
commented
4 months ago Apologies if anyone looked at this during the churn after the last comment. Had to switch our format infrastructure to use pre-commit like core does to ensure we get consistent versions and avoid formatting differences from that. Now all straightened up, and using clang-format 18.1.6.
trws
commented
4 months ago Reminder to self: When we're ready to pull the trigger here, I need to change the name of the action in the branch protection rules so this and other PRs with the new name can pass.
milroy
commented
4 months ago Sorry for the delay. I'll review this PR tonight.
milroy
commented
4 months ago I've also created a pull request to your rank-based-partial-release branch with a rebase of your branch on top of this with the reformatting applied to every commit to preserve all your changes. If you have new changes that aren't in there, or just want to do it yourself, this script completely automates it assuming you have fetched my reformat branch and are currently on your "partial-release" branch, or any other branch for that matter
Thanks a lot for providing an automated way to update my PR. I've made a few changes to the branch so I I'll run the command myself.
codecov[bot]
commented
1 month ago Attention: Patch coverage is 79.58225% with 391 lines in your changes missing coverage. Please review.
Project coverage is 74.4%. Comparing base (
fc4fcde) to head (806f8fc). Report is 139 commits behind head on master.
Two small tweaks to add this to the format script and remove the special-casing for pack/unpack, then apply formatting. Once we're happy with this, I intend to add a .git-ignore-revs or similar file we can use to ignore the global reformat commit in blame, but it has to have the commit sha in full in the file.