[vtk-developers] hold of on merges for an hour or so please

[David Gobbi]

I don't think that just running the scripts will magically clear
conflicts... it would have to be part of a larger workflow, and I'm not
enough of a git master to develop such a workflow.

In any case, here's how to run my script on a few files:

    python Utilities/Maintenance/vtk_reindent_code.py file1.h file2.cxx ...

and on all of VTK, which a person can do after a rebase in order to make
sure no brace changes were missed anywhere:

    for d in Charts Common Deprecated Domains Examples Filters GUISupport \
             Geovis IO Imaging Infovis Interaction Parallel Rendering \
             Testing Views Web Wrapping; do
      for e in cxx cxx.in txx txx.in hxx hxx.in h h.in c c.in; do
        find "${d}" -name "*.${e}" -exec \
          python Utilities/Maintenance/vtk_reindent_code.py {} +
      done
    done

Running it on all of VTK can take a while, so running it on just a few
files is best in most cases.  It's possible to see all files changed by a
branch with the following command:

    git diff --name-only origin/master...branch

Regarding the doxygen script, it can be run like this:

    perl Utilities/Doxygen/doc_header2doxygen.pl --to output/ file1.h
file2.h ...

So unlike the reindent script, it doesn't modify the files in-place, it
needs an output directory.

 - David

On Fri, Sep 23, 2016 at 1:10 PM, Bill Lorensen <bill.lorensen at gmail.com>
wrote:

> They can just run the Daves' scripts. You may want to remind us...
>
>
> On Fri, Sep 23, 2016 at 2:52 PM, David Gobbi <david.gobbi at gmail.com>
> wrote:
> > Now is when the devs come after us with torches and pitchforks because
> all
> > outstanding branches have merge conflicts...
> >
> >
> > On Fri, Sep 23, 2016 at 12:33 PM, David E DeMarle <
> dave.demarle at kitware.com>
> > wrote:
> >>
> >> All set.
> >> merge away
> >>
> >> David E DeMarle
> >> Kitware, Inc.
> >> R&D Engineer
> >> 21 Corporate Drive
> >> Clifton Park, NY 12065-8662
> >> Phone: 518-881-4909
> >>
> >> On Fri, Sep 23, 2016 at 1:24 PM, David Gobbi <david.gobbi at gmail.com>
> >> wrote:
> >>>
> >>> Apparently this request didn't reach the crew over in France. So it
> looks
> >>> like we'll be delayed for a while longer.
> >>>
> >>>
> >>> On Fri, Sep 23, 2016 at 10:00 AM, David E DeMarle
> >>> <dave.demarle at kitware.com> wrote:
> >>>>
> >>>> Hey gang,
> >>>>
> >>>> Please hold off on merging anything into master for the next hour or
> so.
> >>>> That will help us get the big formatting change in cleanly.
> >>>>
> >>>> thanks
> >>>>
> >>>> David E DeMarle
> >>>> Kitware, Inc.
> >>>> R&D Engineer
> >>>> 21 Corporate Drive
> >>>> Clifton Park, NY 12065-8662
> >>>> Phone: 518-881-4909
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20160923/6c138c5d/attachment.html>