Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jgit-dev] Re: [egit-dev] Rewriting JGit history and standard comment template

2010/2/10 Alex Blewitt <alex.blewitt@xxxxxxxxx>
Shawn,

I undersand your pain and frustration with the rewriting of the headers. However, I'd like to help out if I can.

I think that even though the road is bumpy, the EGit project and the wider Eclipse community will benefit if we can keep JGit where it is. Not only that, but if we were to move JGit elsewhere, then we'd have a situation where the CQs for getting updated JGit binaries into Orbit (and awaiting subsequent releases) is likely to be as painful, if not more so, than the initial contribution hump. This would subsequently impact future changes to EGit that needed new JGit features.

My experience of working with Eclipse projects is that contributions are rarely mentioned in the header unless they're significant. So a few lines here and there probably doesn't count as needing a contribution - though exactly what level change is needed is a bit undefined. Do we report (in the IP log) all contributions, or only those where the change size is above a certain threshold?

The iplog tool Shawn implemented extracts all contributions.
 
If we've got a full list of contributors (and by mail address, which is usually the way forward), then hopefully we can generate a new set of headers for each file change.

Is there a template we need to follow for the EDL header, either on the web in an existing project, or by a template which was provided to you?

I am on the way to extend Shawn's script http://repo.or.cz/w/jgit.git/commit/53a2cc3f6144ddcc10954d3abf68a5b90ed95248
he used to fix the license headers for the initial contribution. This script uses git blame to find out which authors did code changes.
I plan to run this under git filter-branch to fix the headers in all revisions. I'll post the script as soon as it does anything reasonable.
This might take a bit since it's been a while since I used Perl last time. If you are faster your help is of course appreciated :)

Using the commit author information for the copyright is straight forward, the tricky part I am not yet sure about is how to honor explicitly
added copyright statements which do not match the commit author (e.g. author could be "Joe Developer <joe@xxxxxxx>" but copyrights
claimed for his changes could be owned by his company "Joe Inc." but then we should not add Joe Developer in the copyright statement).

EMO provided the template they want us to use for JGit sources :

Please see the following template and license information which will need to be appended to all JGIT source files for Eclipse Distribution:

 

***********

Copyright (c) {DATE} {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}.

All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Development License v1.0 which accompanies this distribution, is reproduced below, and available at http://www.eclipse.org/org/documents/edl-v10.php

 

Contributors:

{INITIAL AUTHOR} - initial API and implementation and/or initial documentation

 

 

Eclipse Distribution License - v 1.0

 

Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.

 

All rights reserved.

 

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

 

    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

    * Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

 

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

***********


--
Matthias

Back to the top