[Paraview-developers] [ANNOUNCE] ParaView coding style transition: use clang-format

Shawn Waldon shawn.waldon at kitware.com
Wed Oct 19 09:50:39 EDT 2016


Hi all,

The branch to switch to clang-format was just merged.

For those creating a new branch, you can use the script in
Utilities/Scripts/clang-format.bash to apply formatting before you commit
your changes.  You will need to have clang-format 3.8 or higher installed.

If you have any outstanding branches they will need to be rebased across
the transition.  The process to do this is:
1) Rebase your work on the empty commit prior to the transition
(609f2afcd5e2f963e4fe36203b08d2ebfc0476f9).  This will require you to fix
any changes that conflict with the doxygen style comment update.  ParaView
switched to /** style doxygen comments like VTK did last month.
2) Run `git filter-branch --tree-filter 'Utilties/Scripts/clang-format.bash
--tracked' 609f2afcd5e2f963e4fe36203b08d2ebfc0476f9~..HEAD`  This will
rewrite each commit from the empty commit to the top of your branch to have
the new format.  The empty commit's rewrite will become equivalent to the
convert-to-clang-format commit.
3) Run `git rebase b41d27999a4ac854f4a0e61d98d09c53e7583a60` to rebase your
branch onto the commit where the clang-format changes were merged.  The
"empty commit" should go away since all of its changes were applied by the
'apply clang-format' commit and only the rewritten commits in your branch
should remain.

That will get your branch rebased across the style transition.  You can
then rebase it on master or put it up for review if there are no further
conflicts.

Shawn
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20161019/3650d578/attachment.html>


More information about the Paraview-developers mailing list