On 2015-06-22 14:34-0400 Jim Dishaw wrote: > > >> On Jun 22, 2015, at 1:50 PM, Alan W. Irwin <ir...@beluga.phys.uvic.ca> wrote: >> >>> On 2015-06-21 23:50-0400 Jim Dishaw wrote: >>> >>> I fixed the compilation error on cairo.c and I am working on a fix to cairo >>> so that it actually resizes the plot (at least for xcairo, not sure when I >>> can fix wincairo) when the window changes size. >>> >>> I will also take a look at xwin when I get a chance. I think the problem >>> has to do with the sequencing of the events. >>> >>> I pushed the changes to the repository. >> >> Hi Jim: >> >> Thanks very much for that work, and I am looking forward to your further >> work on cairo.c and xwin.c. >> >> There are three minor issues with your current push which you will >> likely want to address for your future pushes. >> >> 1. The results needed to be styled which I did (8025ebe). I emphasize >> that is no trouble for me, and I am willing to do that indefinitely, >> but it does mean your rebasing in future can get complicated if any of >> those white space styling changes I make are in an area of the file >> you are working on. Therefore, to avoid that potential issue I >> suggest you contact Phil to figure out how to style your further >> commits on Windows (and me if you want to style your further commits >> on your OS X box). > > I ran scripts/style_sources.sh on my Mac. I do all my commits from that > machine. I see it list the files that I have changed. Perhaps it is silently > failing? I will try to single-step the script.
Try scripts/style_sources.sh --help to find documentation of all options for the script. With no arguments that script simple lists the files that would be changed (which is likely the results you saw) without actually changing any of the files. With the --apply argument, and if you answer the further question with "yes" it will do the wholesale style change to all files that it lists. I designed the script this way (opt-in twice) because it potentially is extremely intrusive. So you might also want to try the --diff -au option to see what the style changes would be. In the last couple of years of experience with this script, I have rarely seen any problems introduced by it, but there has been at least one of those in the last 6 months due to an uncrustify bug so I always try to make it a habit to test styled results rather than results before styling. > >> >> 2. The commit message had no separate short initial line summarizing >> the commit. That style of commit message is recommended in both >> <http://who-t.blogspot.be/2009/12/on-commit-messages.html> and [Pro >> Git Book](http://git-scm.com/book). The reason for that recommendation >> is many git tools make use of the first separate line of the commit >> message to help identify commits for humans. > > The browse tool shows my commit message. Do I need to make it more > descriptive? Oh. Sorry. That style commit message style is fine. I just completely misread the ascii markdown format feed data although now it is obvious in those ascii results (and also their html equivalent) that you have followed the recommended style with an initial separate summary line. > >> >> 3. When I styled your changes, my git software recognized there was >> a permissions issue on one of the files you changed, i.e., >> >> mode change 100755 => 100644 drivers/wingcc.c >> > > I think that is an artifact of moving the file from the windows machine to > the mac. OK. Glad that is explained, and I believe that terminates this topic. However, on the different topic of incorrect permissions set by commits other than your recent ones, I have decided to follow up by checking all our current file permissions to make sure nothing else like this has crept in from any of our historical commits. So from find $(ls | grep "/") -type f -a '!' -name "*.sh*" -a '!' \ -perm u=rw,go=r |less I find 183 files in our source tree that are not named "*.sh" and which do not have rw-r--r-- permissions. Some of those have obviously wrong permissions (such as one of our README files). Tonight or tomorrow I plan to improve those find stanzas to eliminate files that should have permissions different than rw-r--r-- in any case (such as the *.sh* files I have already eliminated from consideration), and then go through the remaining files that are found and manually fix any bad permissions that turn up. 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); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); 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 __________________________ ------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
