[gentoo-dev] Re: Removal of CVS headers

[Ulrich Mueller]

>>>>> On Sat, 25 Feb 2017, Ulrich Mueller wrote:

> As the council has decided in its 2014-10-14 meeting (and confirmed
> again in the 2016-11-13 meeting), CVS headers should be removed after
> the migration to Git. Until recently, this was blocked by repoman
> still checking for the $Id$ line. The latter is now fixed in the
> stable repoman version.

> Therefore, I am going to remove the remaining CVS headers throughout
> the tree (except for patches, of course) in two days from now.

So, let's schedule this. I will remove the headers on Tuesday,
2017-02-28, between 06:00 and 07:00 UTC.

You can help me by not pushing to the gentoo repository during that
hour (or until you see my commit). Especially any ebuild removals
would inevitably cause merge conflicts.

Also, after the conversion no new files with $Id$ lines should be
added, of course. Hopefully repoman will enforce that soon [1].

Since I've been asked about the conversion script: This isn't rocket
science, so there is no sophisticated script. :) Conversion will be
done in two passes. The first pass is automatic and will remove all
$Id$ lines in comment blocks that resemble our standard header:

find -type f ! -name Manifest ! -name '*.diff' ! -name '*.patch' \
    -exec grep -l '^# \$\(Id\|Header\)\(: .*\)\?\$$' '{}' + | xargs sed -i \
    '1,4{/^#.*\<Copyright\>.*\<Gentoo\>/!b;:x;n;/^# \$\(Id\|Header\)\(: .*\)\?\$$/d;/^#/bx;}'

This first pass will modify about 40000 files. It is followed by a
second pass, finding any remaining files with Id or Header keywords:

find -type f ! -name Manifest ! -name '*.diff' ! -name '*.patch' \
    -exec grep -l '\$\(Id\|Header\)\>' '{}' +

This turns up about 240 files which can be fixed manually.
A preliminary version of that fix is available for review in [2].

Ulrich

[1] https://bugs.gentoo.org/610954
[2] https://dev.gentoo.org/~ulm/id-removal-2.diff