[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40903] trunk/blender/source/blender/ blenkernel: header cleanup (no functional changes)

Campbell Barton ideasman42 at gmail.com
Mon Oct 10 13:55:34 CEST 2011


Good points, lets review after 2.60 release.
http://thedepression.org.au/wp-content/uploads/2010/04/Leunig-1024x604.jpg

On Mon, Oct 10, 2011 at 10:26 PM, Joshua Leung <aligorith at gmail.com> wrote:
> Rather, we should ask, why do we still have them?
>
> As far as I'm concerned, they're ancient relics from the CVS days that
> no sane developer in the 21st century should be using (unless they're
> web developers pushing stuff onto thousands of servers, but that's not
> a sane occupation anyway :P), especially given that we can easily grab
> ask SVN to tell you this info anyway.
>
> My main gripes with it are as follows:
> 1) Every time you do a commit, svn goes and modifies your files
> 2) Every time you commit, you're forced to do a recompile of all the
> stuff you'd already recompiled, perhaps stuff that you'd ended up
> sitting around for a few minutes earlier waiting for a full recompile
> on, and now, after committing, are forced to end up recompiling again
> just because SVN says you have to.
> 3) Having your text editor bleap "file has changed. reload file"
> dialogs for however many files you just changed (and in the process,
> sometimes/often wiping off any bookmarks you'd kept, and had intended
> to return to working on)
> 4) Most diffing tools run into strife with these lines. I've had merge
> conflicts which nearly ended up corrupting badly a branch being hosted
> in another SCM system as a result of one or two insidious expanded
> $Id$ lines
> 5) When working with other SCM systems locally, needing to remember to
> do a second commit or wait until you've done a "proper" commit so that
> the $Id$ tags will get included for that commit, and won't cause
> trouble later down the track as above
> 6) It is pointless info that's bloating my source files. If I want to
> know the bloody revision number of a file, I ask svn what version I've
> got.
> 7) There is no way to turn off these keyword expansions on a "global"
> scale. That is, I've searched for ages and ages, and still haven't
> found any option that I can just set in a config file somewhere and
> forget about that just turns this stuff off so that I can happily
> ignore the fact that they are in place
> 8) Working copy files != files on server
> 9) Have I mentioned something about this being a CVS artifact, whose
> original inclusion justification was that migrating CVS users with
> years of brainwashing would be willing to jump ship?
> 10) I've had enough of running into all of the above!
>
> IMO, we should consider it one of the priorities for at least early
> 2.61 (even then I think it's a bit late) to just strip these from the
> whole codebase. They're just more pain than they're worth to perhaps 1
> or 1.5 people out there.
>
> On Mon, Oct 10, 2011 at 11:58 PM, Campbell Barton <ideasman42 at gmail.com> wrote:
>> Whats wrong with ID tag? - pretty much all our files have them, why
>> have exceptions?
>>
>> On Mon, Oct 10, 2011 at 8:40 PM, Joshua Leung <aligorith at gmail.com> wrote:
>>> Noooo!!!! The return of the hated id tag!
>>>
>>> On Mon, Oct 10, 2011 at 10:38 PM, Campbell Barton <ideasman42 at gmail.com> wrote:
>>>> Revision: 40903
>>>>          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40903
>>>> Author:   campbellbarton
>>>> Date:     2011-10-10 09:38:02 +0000 (Mon, 10 Oct 2011)
>>>> Log Message:
>>>> -----------
>>>> header cleanup (no functional changes)
>>>>
>>>> Modified Paths:
>>>> --------------
>>>>    trunk/blender/source/blender/blenkernel/BKE_action.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_anim.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_animsys.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_armature.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_bullet.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_customdata.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_displist.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_icons.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_mesh.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_nla.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_paint.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_pointcache.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_subsurf.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_suggestions.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_unit.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
>>>>    trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h
>>>>    trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
>>>>    trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h
>>>>    trunk/blender/source/blender/blenkernel/intern/action.c
>>>>    trunk/blender/source/blender/blenkernel/intern/anim.c
>>>>    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
>>>>    trunk/blender/source/blender/blenkernel/intern/armature.c
>>>>    trunk/blender/source/blender/blenkernel/intern/blender.c
>>>>    trunk/blender/source/blender/blenkernel/intern/bmfont.c
>>>>    trunk/blender/source/blender/blenkernel/intern/boids.c
>>>>    trunk/blender/source/blender/blenkernel/intern/bullet.c
>>>>    trunk/blender/source/blender/blenkernel/intern/bvhutils.c
>>>>    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
>>>>    trunk/blender/source/blender/blenkernel/intern/colortools.c
>>>>    trunk/blender/source/blender/blenkernel/intern/constraint.c
>>>>    trunk/blender/source/blender/blenkernel/intern/curve.c
>>>>    trunk/blender/source/blender/blenkernel/intern/customdata.c
>>>>    trunk/blender/source/blender/blenkernel/intern/deform.c
>>>>    trunk/blender/source/blender/blenkernel/intern/displist.c
>>>>    trunk/blender/source/blender/blenkernel/intern/effect.c
>>>>    trunk/blender/source/blender/blenkernel/intern/fcurve.c
>>>>    trunk/blender/source/blender/blenkernel/intern/fmodifier.c
>>>>    trunk/blender/source/blender/blenkernel/intern/font.c
>>>>    trunk/blender/source/blender/blenkernel/intern/gpencil.c
>>>>    trunk/blender/source/blender/blenkernel/intern/icons.c
>>>>    trunk/blender/source/blender/blenkernel/intern/image.c
>>>>    trunk/blender/source/blender/blenkernel/intern/image_gen.c
>>>>    trunk/blender/source/blender/blenkernel/intern/ipo.c
>>>>    trunk/blender/source/blender/blenkernel/intern/key.c
>>>>    trunk/blender/source/blender/blenkernel/intern/lattice.c
>>>>    trunk/blender/source/blender/blenkernel/intern/material.c
>>>>    trunk/blender/source/blender/blenkernel/intern/mball.c
>>>>    trunk/blender/source/blender/blenkernel/intern/mesh.c
>>>>    trunk/blender/source/blender/blenkernel/intern/modifier.c
>>>>    trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
>>>>    trunk/blender/source/blender/blenkernel/intern/nla.c
>>>>    trunk/blender/source/blender/blenkernel/intern/object.c
>>>>    trunk/blender/source/blender/blenkernel/intern/packedFile.c
>>>>    trunk/blender/source/blender/blenkernel/intern/particle.c
>>>>    trunk/blender/source/blender/blenkernel/intern/particle_system.c
>>>>    trunk/blender/source/blender/blenkernel/intern/property.c
>>>>    trunk/blender/source/blender/blenkernel/intern/scene.c
>>>>    trunk/blender/source/blender/blenkernel/intern/script.c
>>>>    trunk/blender/source/blender/blenkernel/intern/seqcache.c
>>>>    trunk/blender/source/blender/blenkernel/intern/sequencer.c
>>>>    trunk/blender/source/blender/blenkernel/intern/sketch.c
>>>>    trunk/blender/source/blender/blenkernel/intern/smoke.c
>>>>    trunk/blender/source/blender/blenkernel/intern/softbody.c
>>>>    trunk/blender/source/blender/blenkernel/intern/speaker.c
>>>>    trunk/blender/source/blender/blenkernel/intern/text.c
>>>>    trunk/blender/source/blender/blenkernel/intern/texture.c
>>>>    trunk/blender/source/blender/blenkernel/intern/world.c
>>>>    trunk/blender/source/blender/blenkernel/intern/writeavi.c
>>>>    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
>>>>    trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_action.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_action.h        2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_action.h        2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,4 +1,6 @@
>>>>  /*
>>>> + * $Id:
>>>> + *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>  *
>>>>  * This program is free software; you can redistribute it and/or
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_anim.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_anim.h  2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_anim.h  2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,4 +1,6 @@
>>>>  /*
>>>> + * $Id:
>>>> + *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>  *
>>>>  * This program is free software; you can redistribute it and/or
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_animsys.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_animsys.h       2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_animsys.h       2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,4 +1,6 @@
>>>>  /*
>>>> + * $Id:
>>>> + *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>  *
>>>>  * This program is free software; you can redistribute it and/or
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_armature.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_armature.h      2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_armature.h      2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,4 +1,6 @@
>>>>  /*
>>>> + * $Id:
>>>> + *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>  *
>>>>  * This program is free software; you can redistribute it and/or
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_bullet.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_bullet.h        2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_bullet.h        2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,5 +1,4 @@
>>>>  /*
>>>> - *
>>>>  * $Id$
>>>>  *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h 2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h 2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,31 +1,31 @@
>>>>  /*
>>>> -* $Id$
>>>> -*
>>>> -* ***** BEGIN GPL LICENSE BLOCK *****
>>>> -*
>>>> -* This program is free software; you can redistribute it and/or
>>>> -* modify it under the terms of the GNU General Public License
>>>> -* as published by the Free Software Foundation; either version 2
>>>> -* of the License, or (at your option) any later version.
>>>> -*
>>>> -* This program is distributed in the hope that it will be useful,
>>>> -* but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> -* GNU General Public License for more details.
>>>> -*
>>>> -* You should have received a copy of the GNU General Public License
>>>> -* along with this program; if not, write to the Free Software  Foundation,
>>>> -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> -*
>>>> -* The Original Code is Copyright (C) 2006 Blender Foundation.
>>>> -* All rights reserved.
>>>> -*
>>>> -* The Original Code is: all of this file.
>>>> -*
>>>> -* Contributor(s): Ben Batt <benbatt at gmail.com>
>>>> -*
>>>> -* ***** END GPL LICENSE BLOCK *****
>>>> -*/
>>>> + * $Id$
>>>> + *
>>>> + * ***** BEGIN GPL LICENSE BLOCK *****
>>>> + *
>>>> + * This program is free software; you can redistribute it and/or
>>>> + * modify it under the terms of the GNU General Public License
>>>> + * as published by the Free Software Foundation; either version 2
>>>> + * of the License, or (at your option) any later version.
>>>> + *
>>>> + * This program is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> + * GNU General Public License for more details.
>>>> + *
>>>> + * You should have received a copy of the GNU General Public License
>>>> + * along with this program; if not, write to the Free Software  Foundation,
>>>> + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> + *
>>>> + * The Original Code is Copyright (C) 2006 Blender Foundation.
>>>> + * All rights reserved.
>>>> + *
>>>> + * The Original Code is: all of this file.
>>>> + *
>>>> + * Contributor(s): Ben Batt <benbatt at gmail.com>
>>>> + *
>>>> + * ***** END GPL LICENSE BLOCK *****
>>>> + */
>>>>
>>>>  /** \file BKE_cdderivedmesh.h
>>>>  *  \ingroup bke
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_customdata.h    2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_customdata.h    2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,31 +1,31 @@
>>>>  /*
>>>> -* $Id$
>>>> -*
>>>> -* ***** BEGIN GPL LICENSE BLOCK *****
>>>> -*
>>>> -* This program is free software; you can redistribute it and/or
>>>> -* modify it under the terms of the GNU General Public License
>>>> -* as published by the Free Software Foundation; either version 2
>>>> -* of the License, or (at your option) any later version.
>>>> -*
>>>> -* This program is distributed in the hope that it will be useful,
>>>> -* but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> -* GNU General Public License for more details.
>>>> -*
>>>> -* You should have received a copy of the GNU General Public License
>>>> -* along with this program; if not, write to the Free Software  Foundation,
>>>> -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> -*
>>>> -* The Original Code is Copyright (C) 2006 Blender Foundation.
>>>> -* All rights reserved.
>>>> -*
>>>> -* The Original Code is: all of this file.
>>>> -*
>>>> -* Contributor(s): Ben Batt <benbatt at gmail.com>
>>>> -*
>>>> -* ***** END GPL LICENSE BLOCK *****
>>>> -*/
>>>> + * $Id$
>>>> + *
>>>> + * ***** BEGIN GPL LICENSE BLOCK *****
>>>> + *
>>>> + * This program is free software; you can redistribute it and/or
>>>> + * modify it under the terms of the GNU General Public License
>>>> + * as published by the Free Software Foundation; either version 2
>>>> + * of the License, or (at your option) any later version.
>>>> + *
>>>> + * This program is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> + * GNU General Public License for more details.
>>>> + *
>>>> + * You should have received a copy of the GNU General Public License
>>>> + * along with this program; if not, write to the Free Software  Foundation,
>>>> + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> + *
>>>> + * The Original Code is Copyright (C) 2006 Blender Foundation.
>>>> + * All rights reserved.
>>>> + *
>>>> + * The Original Code is: all of this file.
>>>> + *
>>>> + * Contributor(s): Ben Batt <benbatt at gmail.com>
>>>> + *
>>>> + * ***** END GPL LICENSE BLOCK *****
>>>> + */
>>>>
>>>>  /** \file BKE_customdata.h
>>>>  *  \ingroup bke
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_displist.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_displist.h      2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_displist.h      2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,5 +1,5 @@
>>>>  /*
>>>> -       $Id$
>>>> + * $Id$
>>>>  *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>>  *
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_icons.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_icons.h 2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_icons.h 2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,32 +1,31 @@
>>>>  /*
>>>> -* $Id$
>>>> -*
>>>> -* ***** BEGIN GPL LICENSE BLOCK *****
>>>> -*
>>>> -* This program is free software; you can redistribute it and/or
>>>> -* modify it under the terms of the GNU General Public License
>>>> -* as published by the Free Software Foundation; either version 2
>>>> -* of the License, or (at your option) any later version.
>>>> -*
>>>> -* This program is distributed in the hope that it will be useful,
>>>> -* but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> -* GNU General Public License for more details.
>>>> -*
>>>> -* You should have received a copy of the GNU General Public License
>>>> -* along with this program; if not, write to the Free Software Foundation,
>>>> -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> -*
>>>> -* The Original Code is Copyright (C) 2006-2007 Blender Foundation.
>>>> -* All rights reserved.
>>>> -*
>>>> -* The Original Code is: all of this file.
>>>> -*
>>>> -* Contributor(s): none yet.
>>>> -*
>>>> -* ***** END GPL LICENSE BLOCK *****
>>>> -*
>>>> -*/
>>>> + * $Id$
>>>> + *
>>>> + * ***** BEGIN GPL LICENSE BLOCK *****
>>>> + *
>>>> + * This program is free software; you can redistribute it and/or
>>>> + * modify it under the terms of the GNU General Public License
>>>> + * as published by the Free Software Foundation; either version 2
>>>> + * of the License, or (at your option) any later version.
>>>> + *
>>>> + * This program is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> + * GNU General Public License for more details.
>>>> + *
>>>> + * You should have received a copy of the GNU General Public License
>>>> + * along with this program; if not, write to the Free Software Foundation,
>>>> + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>>>> + *
>>>> + * The Original Code is Copyright (C) 2006-2007 Blender Foundation.
>>>> + * All rights reserved.
>>>> + *
>>>> + * The Original Code is: all of this file.
>>>> + *
>>>> + * Contributor(s): none yet.
>>>> + *
>>>> + * ***** END GPL LICENSE BLOCK *****
>>>> + */
>>>>
>>>>  #ifndef BKE_ICONS_H
>>>>  #define BKE_ICONS_H
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/BKE_mesh.h  2011-10-10 08:25:28 UTC (rev 40902)
>>>> +++ trunk/blender/source/blender/blenkernel/BKE_mesh.h  2011-10-10 09:38:02 UTC (rev 40903)
>>>> @@ -1,6 +1,4 @@
>>>>  /*
>>>> - * blenlib/BKE_mesh.h (mar-2001 nzc)
>>>> - *
>>>>  * $Id$
>>>>  *
>>>>  * ***** BEGIN GPL LICENSE BLOCK *****
>>>> @@ -24,7 +22,7 @@
>>>>  *
>>>>  * The Original Code is: all of this file.
>>>>  *
>>>> - * Contributor(s): none yet.
>>>> + * Contributor(s): (mar-2001 nzc)
>>>>  *
>>>>
>>>> @@ Diff output truncated at 10240 characters. @@
>>>> _______________________________________________
>>>> Bf-blender-cvs mailing list
>>>> Bf-blender-cvs at blender.org
>>>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>>>
>>> _______________________________________________
>>> Bf-committers mailing list
>>> Bf-committers at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>>
>>
>>
>>
>> --
>> - Campbell
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>



-- 
- Campbell


More information about the Bf-committers mailing list