[vtk-developers] Scripts for reformatting

[David E DeMarle]

This was the business end of the doxygen changeover:
commit 6a7e5148ed56b3cb44c1550c8c9e697d65b99595
Date:   Fri Sep 23 12:10:37 2016 -0400

    replace VTK's nonstandard Doxygen with standard markup

    generated via:
    cd $VTKSRC
    perl Utilities/Doxygen/doc_header2doxygen.pl --to ~/tmp/vtkheaders .
    cp -r ~/tmp/vtkheaders/* .


David E DeMarle
Kitware, Inc.
R&D Engineer
21 Corporate Drive
Clifton Park, NY 12065-8662
Phone: 518-881-4909

On Mon, Feb 6, 2017 at 11:20 AM, Shawn Waldon <shawn.waldon at kitware.com>
wrote:

> Except that that email applied to ParaView not VTK.  VTK changed its brace
> style last summer.  See the MRs here for the changes to VTK:
> https://gitlab.kitware.com/vtk/vtk/merge_requests/1932
> https://gitlab.kitware.com/vtk/vtk/merge_requests/1911
>
> There may be instructions in the commit messages (or at least the commands
> run to produce them.
> As far as rebasing across the transition, I don't know if there are
> instructions for VTK.  I can't find them searching my old email but I may
> be missing them.  Does anyone else on the list have instructions for Jon to
> help rebase his branches?
>
> Shawn
>
> On Mon, Feb 6, 2017 at 11:02 AM, Haocheng Liu <haocheng.liu at kitware.com>
> wrote:
>
>> excerpt From Shawn's email:
>>
>> 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.
>>
>>
>> Hope it helps.
>>
>> On Mon, Feb 6, 2017 at 10:44 AM, Biddiscombe, John A. <biddisco at cscs.ch>
>> wrote:
>>
>>> Apologies for duplicate posts, might have sent this twice by mistake
>>>
>>>
>>>
>>> Dear list,
>>>
>>>
>>>
>>> I have many branches of VTK development that go back some years and have
>>> not been well maintained recently. I tried updating some of my code over
>>> the weekend and have thousands of conflicts due to the reformatting of VTK
>>> to change the indentation and some other mass changes.
>>>
>>>
>>>
>>> Is there a wiki entry anywhere that can help me run some reformat
>>> scripts on my branches to minimize some of the conflicts I’m getting.
>>>
>>>
>>>
>>> Many thanks
>>>
>>>
>>>
>>> JB
>>>
>>>
>>>
>>> --
>>>
>>> John Biddiscombe,                        email:biddisco @.at.@ cscs.ch
>>>
>>> http://www.cscs.ch/
>>>
>>> CSCS, Swiss National Supercomputing Centre  | Tel:  +41 (91) 610.82.07
>>> <+41%2091%20610%2082%2007>
>>>
>>> Via Trevano 131, 6900 Lugano, Switzerland   | Fax:  +41 (91) 610.82.82
>>> <+41%2091%20610%2082%2082>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> Powered by www.kitware.com
>>>
>>> Visit other Kitware open-source projects at
>>> http://www.kitware.com/opensource/opensource.html
>>>
>>> Search the list archives at: http://markmail.org/search/?q=
>>> vtk-developers
>>>
>>> Follow this link to subscribe/unsubscribe:
>>> http://public.kitware.com/mailman/listinfo/vtk-developers
>>>
>>>
>>>
>>
>>
>> --
>> Best regards
>> Haocheng
>>
>> Haocheng LIU
>> Kitware, Inc.
>> R&D Engineer
>> 21 Corporate Drive
>> Clifton Park, NY 12065-8662
>> Phone: 518-881-4421 <(518)%20881-4421>
>>
>> _______________________________________________
>> Powered by www.kitware.com
>>
>> Visit other Kitware open-source projects at
>> http://www.kitware.com/opensource/opensource.html
>>
>> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>>
>> Follow this link to subscribe/unsubscribe:
>> http://public.kitware.com/mailman/listinfo/vtk-developers
>>
>>
>>
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/
> opensource/opensource.html
>
> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/mailman/listinfo/vtk-developers
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20170206/66fc6648/attachment.html>