From: Alan W. I. <ir...@be...> - 2010-01-20 06:46:39
|
On 2010-01-19 22:31-0500 Hazen Babcock wrote: > Alan W. Irwin wrote: >> On 2010-01-06 16:38-0500 Hazen Babcock wrote: >> >>> [...]I also ran uncrustify on the file since we seem to be using a tab >>> spacing that is not the emacs default. Unfortunately this seems to have >>> introduced a lot of other changes unrelated to the changes that I actually >>> made, which were only to the plP_text function. >> >> Were you using "scripts/style_source.sh --apply"? That script should style >> all our files with uncrustify in the proper way including no tabs anywhere. >> When I ran "scripts/style_source.sh --diff -au |less" here I found there >> were some incorrect whitespace changes introduced by your commit which I >> fixed by running "scripts/style_source.sh --apply" (revision 10739). >> >> If you want to find out more about that script, please run >> "scripts/style_source.sh --help". > > How hard is it to make it so that you specify that it just run on one > particular file. Maybe something like? > > ./scripts/style_source.sh --file ./drivers/cairo.c --apply Hi Hazen (moved to plplot-devel for obvious reasons). I assume that option would be straightforward for someone to implement, but I am not convinced that would be useful, and you may start feeling the same way once you get more experience with the script. The point of the script is to bring all our C, D, C++, and Java files into conformance with our style as expressed by all the options we have collected in uncrustify.cfg. I definitely want to avoid the case where we apply uncrustify to some of our C, etc., files but not others. In fact, I just did an svn update to capture all your recent changes, and they are already in conformity with our style. Also, scripts/style_source.sh --diff -au |less showed only drivers/tk.c had some minor whitespace style changes required to bring it into conformity with our style so I ran scripts/style_source.sh --apply to change that file appropriately and committed those minor changes as revision 10760. Anybody else with access to bash, uncrustify, and with commit privileges could have done this as well and is encouraged to do so. Hazen, what happens if you simply run scripts/style_source.sh now? There are currently absolutely no results here meaning our committed files are all styled properly with no changes required. Do you get the same clean style result there (aside from further local changes you have made)? Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ |