[gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Robin H. Johnson]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

Hi all,

The Git migration is moving forward, and I'd like to announce a
tentative schedule for that end.
https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status

2015/08/08 15:00 UTC - Freeze
2015/08/08 19:00 UTC - Git commits open for developers
2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
2015/08/11           - History repo available to graft
2015/08/12           - rsync mirrors carry up-to-date changelogs again

I've allocated time for an 8 hour freeze, but hope to be completed much
sooner than that.

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 445 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[NP-Hardass]

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

Three cheers!

Glad to see it happening. Thank you to everyone who helped to make this happen.

--
NP-Hardass

On July 2, 2015 5:39:52 PM EDT, "Robin H. Johnson" <robbat2@gentoo.org> wrote:
>Hi all,
>
>The Git migration is moving forward, and I'd like to announce a
>tentative schedule for that end.
>https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
>
>2015/08/08 15:00 UTC - Freeze
>2015/08/08 19:00 UTC - Git commits open for developers
>2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>2015/08/11           - History repo available to graft
>2015/08/12           - rsync mirrors carry up-to-date changelogs again
>
>I've allocated time for an 8 hour freeze, but hope to be completed much
>sooner than that.
>
>-- 
>Robin Hugh Johnson
>Gentoo Linux: Developer, Infrastructure Lead
>E-Mail     : robbat2@gentoo.org
>GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

-- 
NP-Hardass

[-- Attachment #2: Type: text/html, Size: 1196 bytes --]

[gentoo-dev] Celebration subthread: Re: Git Migration: launch plan & schedule (2015/Aug/08-09)

[Duncan]

[Let this be the celebratory subthread, so people can post if they feel 
the need, but others can safely skip if they so desire...]

NP-Hardass posted on Thu, 02 Jul 2015 17:42:46 -0400 as excerpted:
[Reordered to quote/reply order.]

> On July 2, 2015 5:39:52 PM EDT, "Robin H. Johnson" <robbat2@gentoo.org>
> wrote:
> 
>>The Git migration is moving forward, and I'd like to announce a
>>tentative schedule for that end.
>>
>>https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
>>
>>2015/08/08 15:00 UTC - Freeze
>>2015/08/08 19:00 UTC - Git commits open for developers
>>2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>>2015/08/11           - History repo available to graft
>>2015/08/12           - rsync mirrors carry up-to-date changelogs again
>>
> Three cheers!
> 
> Glad to see it happening. Thank you to everyone who helped to make this
> happen.

I doubt I'm the only one who assigned a well under 50% chance of actually 
seeing it happen, believing gentoo was ultimately destined to become a 
Linux historical footnote due to failure to switch to git!  I've been on 
gentoo over a decade, now, and stuck on CVS, I honestly didn't know if 
it'd last another.

Obviously, I'm VERY glad to see the git switch actually scheduled! =:^)

Thanks... just isn't a sufficient word to convey my gratitude to all the 
folks that have been working on this.  Seriously.  This switch to git 
puts you up with the gentoo greats such as DRobbins, in my book.  Because 
without it, let's face it, gentoo /was/ slipping ever so slowly into 
history, and this really does, I believe, give us a chance to turn that 
around.

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman

Re: [gentoo-dev] Celebration subthread: Re: Git Migration: launch plan & schedule (2015/Aug/08-09)

[Jauhien Piatlicki]

[-- Attachment #1: Type: text/plain, Size: 1864 bytes --]

That's really really great. Thanks to all who contrinuted.

On 07/03/2015 09:02 AM, Duncan wrote:
> [Let this be the celebratory subthread, so people can post if they feel 
> the need, but others can safely skip if they so desire...]
> 
> NP-Hardass posted on Thu, 02 Jul 2015 17:42:46 -0400 as excerpted:
> [Reordered to quote/reply order.]
> 
>> On July 2, 2015 5:39:52 PM EDT, "Robin H. Johnson" <robbat2@gentoo.org>
>> wrote:
>>
>>> The Git migration is moving forward, and I'd like to announce a
>>> tentative schedule for that end.
>>>
>>> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
>>>
>>> 2015/08/08 15:00 UTC - Freeze
>>> 2015/08/08 19:00 UTC - Git commits open for developers
>>> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>>> 2015/08/11           - History repo available to graft
>>> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
>>>
>> Three cheers!
>>
>> Glad to see it happening. Thank you to everyone who helped to make this
>> happen.
> 
> I doubt I'm the only one who assigned a well under 50% chance of actually 
> seeing it happen, believing gentoo was ultimately destined to become a 
> Linux historical footnote due to failure to switch to git!  I've been on 
> gentoo over a decade, now, and stuck on CVS, I honestly didn't know if 
> it'd last another.
> 
> Obviously, I'm VERY glad to see the git switch actually scheduled! =:^)
> 
> Thanks... just isn't a sufficient word to convey my gratitude to all the 
> folks that have been working on this.  Seriously.  This switch to git 
> puts you up with the gentoo greats such as DRobbins, in my book.  Because 
> without it, let's face it, gentoo /was/ slipping ever so slowly into 
> history, and this really does, I believe, give us a chance to turn that 
> around.
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Brian Evans]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 07/02/2015 05:39 PM, Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a 
> tentative schedule for that end. 
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Stat
us
>
>  2015/08/08 15:00 UTC - Freeze 2015/08/08 19:00 UTC - Git commits
> open for developers 2015/08/09 01:00 UTC - Rsync live again (with
> lagged changelog) 2015/08/11           - History repo available to
> graft 2015/08/12           - rsync mirrors carry up-to-date
> changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed
> much sooner than that.
> 

Sounds good.  Thanks to all the hard workers out there.

Does this mean that https://wiki.gentoo.org/wiki/Gentoo_git_workflow
is no longer draft or needs work or another document is meant to
display the new flow?

Brian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0

iQJ8BAEBCgBmBQJVlelqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO243gQAJDjnfy15Pq0sBjRbVwEf+fg
9yKUHLMRreB35/mt9ywqX6i/qgm02V1Nzhm0mfA56zZIkg1rAQXIznojH22SQhzy
P24c9zcCKXUTHaar/qOsGXfFqdSxVjAYsNwcurbUm1z0HvcvbmO+CP4AE3paqHXo
xEAO+vQx38oBx+hItcSshXBuPYew/cKUKEwGYaL7U1KsUXwKT0dWM1n3yuxezTOr
bOlzX1EGVlu9VJ9/svEEkxHfzD5GYpuHiDnDfKsdswFzdwaZEqh4jCB9fjPL1ewQ
uLUZLD6kJgaYxVCY7fNUMZXS7qgoeCYHKQw5+tgVxXayb+x6szhH9SJ0f0ZYNInE
85xpE2i10WaAkbVWMsRSzitUaq/DwIwjrQAged/YXsKA9MU4nLD8nVKkQbEbeglU
lpGs5JMOeTOct4G+Og4yZLyxEbi99Zs/kT6g6eAOHEYGzZZuJ4m/gWjAK/vvPtJQ
ebb5IBoeaON+riMgCNT79Bk2eGT+VZnSHA7Uz6MbI8lyt0sCld5cOoM4tnmmLI08
wRAZZjdDNJgCW3NT2hPXPIxCRojudHHHj4NW8rrGPba++m2IW96/Xc0fbDZjQKJR
4Xv4kaRpdQDcw+B5nATdB2sUJXyItTsIzHHCXzbKPmyphURSNQJaHKr2vnsLebBI
uKI4JA2Caw5N/idZaTC7
=hFP9
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Robin H. Johnson]

On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> Does this mean that https://wiki.gentoo.org/wiki/Gentoo_git_workflow
> is no longer draft or needs work or another document is meant to
> display the new flow?
It does cover most of the things needed.

It could use some revision regarding gkeys, and I'd like to also mandate
signed pushes in addition to signed commits.

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > Does this mean that https://wiki.gentoo.org/wiki/Gentoo_git_workflow
> > is no longer draft or needs work or another document is meant to
> > display the new flow?
> It does cover most of the things needed.
> 
> It could use some revision regarding gkeys, and I'd like to also mandate
> signed pushes in addition to signed commits.

A push doesn't create any data, it just uploads it to the repo, so how
do you sign a push?

William


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[NP-Hardass]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On Fri, 3 Jul 2015 11:19:13 -0500
William Hubbs <williamh@gentoo.org> wrote:

> On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> > On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > > Does this mean that
> > > https://wiki.gentoo.org/wiki/Gentoo_git_workflow is no longer
> > > draft or needs work or another document is meant to display the
> > > new flow?
> > It does cover most of the things needed.
> > 
> > It could use some revision regarding gkeys, and I'd like to also
> > mandate signed pushes in addition to signed commits.
> 
> A push doesn't create any data, it just uploads it to the repo, so how
> do you sign a push?
> 
> William
> 

Repoman may need to be adjusted. Git commit has support for a "-S"
flag which signs the commit.

- --
NP-Hardass
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVlrdKAAoJEBzZQR2yrxj7XBIP/0rWguE1R0EueAdmI0ApY2Wg
lvkkWkW0P4uJnHri522dvmIeiQ9j/2NFQy5uXCHXE+TQRszog03YwP2xu9lQnoMm
OURcAUDNO1uCSUp+xYH6UDi9K/t19pkncLskNHs774ka6LLZvrnRPeU2MP6q5VuZ
flK479q8LWIfArjh/Qqi5rZ5+0boyTS5SxKjlwIaj4kUd81ph1xNHX3pEJhPL7ZW
sqt9sVmGQa+ucCWJ8zyyhNX3F8cVHQP43BPKMI51SsMo9X5xwqaccWQWoYioBoFM
9W0HwWQ/IsMxIG337KvqmCZXDQ+1CmYqWHV0f3FQScJk9DOxXpmSNBv16s2GuM5p
n0GqL4wNhvQZDIczOaH87/2I5G3L2kFETLiMQ0mY9MKxji5TrCG7Hyy9jV+lhk2V
tJS6HBHhU1wa5sayzNhxPly2W2Kw34hLbBQTscGl6hBK/hwzWrcWtLQoZO0kswWr
OvlD58uDgIxX21sCftdLANTQ9l3zn7kqsFOV0Sb6oykrek+NQpYW6J5mZg3vDO86
4Pc4Cbiqy3D9vVGg5jNlP3J0gT1cN6VFnxaSydx0kSIMUq0OxSayz3Y290U5lieF
ouCu6TaIZRFzzbTC9fyRPLROQmW/1AZOsbN7GLkFKWZ0A+T1zoTqU6zoWQPyHL5N
kwc+xJ1ffAb6Mf745Sh7
=F2sd
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Jason Zaman]

On Fri, Jul 03, 2015 at 12:24:42PM -0400, NP-Hardass wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
> 
> On Fri, 3 Jul 2015 11:19:13 -0500
> William Hubbs <williamh@gentoo.org> wrote:
> 
> > On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> > > On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > > > Does this mean that
> > > > https://wiki.gentoo.org/wiki/Gentoo_git_workflow is no longer
> > > > draft or needs work or another document is meant to display the
> > > > new flow?
> > > It does cover most of the things needed.
> > > 
> > > It could use some revision regarding gkeys, and I'd like to also
> > > mandate signed pushes in addition to signed commits.
> > 
> > A push doesn't create any data, it just uploads it to the repo, so how
> > do you sign a push?
> > 
> > William
> > 
> 
> Repoman may need to be adjusted. Git commit has support for a "-S"
> flag which signs the commit.

No that is different. There are two signing things involved here.
1) git commit -S. ie sign the commit in the tree, and git log will show
that signature later.

2) git push -S, this is signing the push itself. The client will sign
everything that it pushes to the server. Then the server can verify that
it was pushed by a dev (which is different from the commit since a dev
might be pushing a commit that was made by a user). The server will save
this push certificate so that it can also be verified later on.

We'll want to have both of these on. It may require some repoman changes
but should not be that much.

-- Jason

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[NP-Hardass]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On Fri, 3 Jul 2015 11:19:13 -0500
William Hubbs <williamh@gentoo.org> wrote:

> On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> > On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > > Does this mean that
> > > https://wiki.gentoo.org/wiki/Gentoo_git_workflow is no longer
> > > draft or needs work or another document is meant to display the
> > > new flow?
> > It does cover most of the things needed.
> > 
> > It could use some revision regarding gkeys, and I'd like to also
> > mandate signed pushes in addition to signed commits.
> 
> A push doesn't create any data, it just uploads it to the repo, so how
> do you sign a push?
> 
> William
> 

Oh, you said push specifically, instead of commit.  My apologies.  I'm
unaware of a means to do this.  I guess you could theoretically sign
and commit a list of the pushed commit hashes.

- --
NP-Hardass
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVlrnuAAoJEBzZQR2yrxj73C0P/003J46FmqXNYIk3cVoktvCj
hJ74J9DcAC7ZvqJjAeASdWN83AWlUNFQQeA6eSkmtJXOot7VfrfVw/ZlWReEcq1p
ZMFhUdawTDcfeH5fBx0vJLeLkyWHBIYoMBQchSzQpugEt7X378C1BL4ttrWYpOu1
Z494tvZVvZ9+hN17IT+A3wejsfWkDT2oFECXjZJuZQXR7b3qlUVZJsKAxrpZThBX
ciifiy/84sHRx6fXpU7RtqsYJXLt8dAjppPDH7ci2sh+YjJqL1nj58QZprdlvNc/
R2EupWfphv7sKdN3/yPpT5RWjERKJqYkt15UzZceLEMjhpMxW2b3Rfcz4CE+MXS2
e1/MgvoMoJI7/7x9cg8bykkYa6NmTdQ7nXtqP9s/cADtPho7mllA+FVW7aH8CE46
LG2s0AsIWAV0rR1H+d77O2bhknczlPKgKDEO+sFwy+Y7I/2V37nEkSZR8LqWVmse
RKPmxjimX0iSEUIiaX5LPR48hmkosSvIHkmwO7XIK5NCtIoMOjBXyIenYQi67+fs
PV1+ZgBxWufn1BEDXDQc8TN9IvvRpRvv2O5lKYZ096pLon9ZVB/O0BscGjk7HeL0
JCpZ4fJ6d3o/4xlsmX9n++X1zbdJyMvrHBL6mZa6wcZPMMe1L0w2/zFo8sG8mKpD
Ag/E/1m/6OXzsJCJOAbE
=1FB0
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Andrew Savchenko]

[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]

Hi,

On Fri, 3 Jul 2015 11:19:13 -0500 William Hubbs wrote:
> On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> > On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > > Does this mean that https://wiki.gentoo.org/wiki/Gentoo_git_workflow
> > > is no longer draft or needs work or another document is meant to
> > > display the new flow?
> > It does cover most of the things needed.
> > 
> > It could use some revision regarding gkeys, and I'd like to also mandate
> > signed pushes in addition to signed commits.
> 
> A push doesn't create any data, it just uploads it to the repo, so how
> do you sign a push?

As I see from git docs only commits and tags may be signed. There
is no way to sign a push. Moreover there is no need to sign each
commit, see what Linux says on that:
http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html

''
Btw, there's a final reason, and probably the really real one.
Signing each commit is totally stupid. It just means that you
automate it, and you make the signature worth less. It also doesn't
add any real value, since the way the git DAG-chain of SHA1's work,
you only ever need _one_ signature to make all the commits
reachable from that one be effectively covered by that one. So
signing each commit is simply missing the point.
''

Best regards,
Andrew Savchenko

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Michael Orlitzky]

On 07/03/2015 05:19 PM, Andrew Savchenko wrote:
> 
> As I see from git docs only commits and tags may be signed. There
> is no way to sign a push.

This was new to me, but check out the "--signed" flag of git-push (1).


> Moreover there is no need to sign each
> commit, see what Linux says on that:
> http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html
> 
> ''
> Btw, there's a final reason, and probably the really real one.
> Signing each commit is totally stupid. It just means that you
> automate it, and you make the signature worth less. It also doesn't
> add any real value, since the way the git DAG-chain of SHA1's work,
> you only ever need _one_ signature to make all the commits
> reachable from that one be effectively covered by that one. So
> signing each commit is simply missing the point.
> ''

I think the next sentence is relevant:

  IOW, you don't _ever_ have a reason to sign anything but the "tip".

My interpretation is that it doesn't make sense to sign commits one
through nine if you're going to sign the tenth before pushing. But most
of our commits are small and self-contained so it's probably easier to
automate the signing with repoman than it would be to come up with a
to-sign-or-not-to-sign guide a mile long.

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Brian Dolbec]

On Sat, 4 Jul 2015 00:19:41 +0300
Andrew Savchenko <bircoph@gentoo.org> wrote:

> Hi,
> 
> On Fri, 3 Jul 2015 11:19:13 -0500 William Hubbs wrote:
> > On Fri, Jul 03, 2015 at 06:34:41AM +0000, Robin H. Johnson wrote:
> > > On Thu, Jul 02, 2015 at 09:46:18PM -0400, Brian Evans wrote:
> > > > Does this mean that
> > > > https://wiki.gentoo.org/wiki/Gentoo_git_workflow is no longer
> > > > draft or needs work or another document is meant to display the
> > > > new flow?
> > > It does cover most of the things needed.
> > > 
> > > It could use some revision regarding gkeys, and I'd like to also
> > > mandate signed pushes in addition to signed commits.
> > 
> > A push doesn't create any data, it just uploads it to the repo, so
> > how do you sign a push?
> 
> As I see from git docs only commits and tags may be signed. There
> is no way to sign a push. Moreover there is no need to sign each
> commit, see what Linux says on that:
> http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html
> 
...
> 
> Best regards,
> Andrew Savchenko

Newer version(s) of git do have git push --sign capability.  Sorry, I
don't know the versions that it applies to. It was recently added as a
feature. It also makes the push sig and data readily available for hook
use.

-- 
Brian Dolbec <dolsen>

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Robin H. Johnson]

On Sat, Jul 04, 2015 at 12:19:41AM +0300, Andrew Savchenko wrote:
> As I see from git docs only commits and tags may be signed. There
> is no way to sign a push. Moreover there is no need to sign each
> commit, see what Linux says on that:
> http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html
That was Linus's 2009 opinion, and he changed his mind since then, with
the research into further attacks on SHA1.

Git (since 2.2) DOES support signed push. Look at the manpage for
git-push, for the --signed option:
http://git-scm.com/docs/git-push

The point of signed commits is to authenticate the creator of each
commit.

The point of signed pushes is to authenticate who introduced a commit
(it might NOT be the person who signed the commits) and intended it to
be on a specific branch.

A slightly out of date, but good backgrounder on signed commits is here:
http://mikegerwitz.com/papers/git-horror-story

The StackOverflow asking about signed push is a good reference as well:
http://stackoverflow.com/questions/27299355/why-does-git-need-signed-pushes

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Andrew Savchenko]

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

On Fri, 3 Jul 2015 21:40:50 +0000 Robin H. Johnson wrote:
> On Sat, Jul 04, 2015 at 12:19:41AM +0300, Andrew Savchenko wrote:
> > As I see from git docs only commits and tags may be signed. There
> > is no way to sign a push. Moreover there is no need to sign each
> > commit, see what Linux says on that:
> > http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html
> That was Linus's 2009 opinion, and he changed his mind since then, with
> the research into further attacks on SHA1.
> 
> Git (since 2.2) DOES support signed push. Look at the manpage for
> git-push, for the --signed option:
> http://git-scm.com/docs/git-push

We have a rule of "one year compatibility period". ChangeLog shows
that git-2.2.0 was introduced on 02 Dec 2014. So pushed commits
can't be enforced before 02 Dec 2015. (And yes, my laptop
still uses an older version, that's why I was unable to find --sign
in the git-push manual.)
 
Best regards,
Andrew Savchenko

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Rich Freeman]

On Fri, Jul 3, 2015 at 7:10 PM, Andrew Savchenko <bircoph@gentoo.org> wrote:
>
> We have a rule of "one year compatibility period". ChangeLog shows
> that git-2.2.0 was introduced on 02 Dec 2014. So pushed commits
> can't be enforced before 02 Dec 2015. (And yes, my laptop
> still uses an older version, that's why I was unable to find --sign
> in the git-push manual.)
>

In general we try to avoid breaking the upgrade path for user systems
that only upgrade annually, but no such limitation applies to
developers.  I don't think it is too much to expect a developer to use
a recent version of git.  Users don't need git push signing support to
use Gentoo.

By all means debate the importance of the feature/etc, but I don't see
a need to freeze any new git feature for a year before making use of
it with the gentoo repository.

If it really bothers you, do your pushes from a chroot.  It isn't like
I close any gcc-5 bugs with "can't be bothered to look at gcc-5 - give
me a call in a year or two."

-- 
Rich

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Rich Freeman]

On Fri, Jul 3, 2015 at 5:40 PM, Robin H. Johnson <robbat2@gentoo.org> wrote:
> On Sat, Jul 04, 2015 at 12:19:41AM +0300, Andrew Savchenko wrote:
>> As I see from git docs only commits and tags may be signed. There
>> is no way to sign a push. Moreover there is no need to sign each
>> commit, see what Linux says on that:
>> http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html
> That was Linus's 2009 opinion, and he changed his mind since then, with
> the research into further attacks on SHA1.
>

A few things.  I agree with where you're going, Robin, but I do take
issue with just one bit of your email.

First, signing commits in no way protects against attacks on SHA1.
The only thing that binds a commit record to the actual data in the
tree is an SHA1 hash.  If you are able to break SHA1 then all you need
to do is tamper with a file in the tree however you want, then add or
tamper with another file anywhere else in the tree such that the two
changes "cancel each other out" and result in the same SHA1 hash.
Then you swap out any blobs/trees you modified in the repository and
nobody is the wiser, especially with something like Gentoo where you
can stick something in a random filesdir anywhere in the tree where
nobody will notice it for a long time.  The commit record itself is
not touched, so its signature verifies just fine.

That said, I do support commit signing. It makes a lot more sense for
a project like Gentoo than a project like Linux.

With Linux, the distributed repositories everybody actually uses have
only one committer each for the most part.  The only person who
commits to mainline is Linus himself.  Then there is a release process
where all the commits for the week go out with a git tag, which is
signed.  Linus basically does the final QA on the mainline kernel
before it is released, and he assumes responsibility for every commit
that went into it.

In contrast, Gentoo has numerous committers and changes go right from
the dev's repository to every user's desktop.  When I make a commit
I'm only responsible for my own change - I don't do QA on the last 47
commits other random devs have made.  So, if the last commit doesn't
interact with mine in any way, chances are I won't do any testing of
it at all before I add my own signature - I won't even run repoman on
the entire tree.  So, a dev's commit signature is really a stamp of
quality on the diff between their commit and the last, not the tree as
a whole.  So, it really makes sense to the signing at the commit
level, and not at some higher level.  In fact, to do the signing at a
higher level really does amount to rubber-stamping changes in a way
that commit signing does not, based on how we assign responsibility.

If we were a release-based distro then tag signing would be much more important.

Finally, signing commits is really cheap, so why not just do it?

-- 
Rich

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Justin (jlec)]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

On 02/07/15 23:39, Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> 
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.
> 

That's cool, so we are much closer than my latest information was!!!

Thanks for your great work,

Justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 951 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Mikle Kolyada]

03.07.2015 00:39, Robin H. Johnson пишет:
> Hi all,
>
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
>
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
>
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.
>
Thanks Robbin and whole the Infrastructure team! Great and i'd even say
historical news!

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Daniel Campbell (zlg)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 07/02/2015 02:39 PM, Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a 
> tentative schedule for that end. 
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Stat
us
>
>  2015/08/08 15:00 UTC - Freeze 2015/08/08 19:00 UTC - Git commits
> open for developers 2015/08/09 01:00 UTC - Rsync live again (with
> lagged changelog) 2015/08/11           - History repo available to
> graft 2015/08/12           - rsync mirrors carry up-to-date
> changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed
> much sooner than that.
> 
This is great news! I assume docs have been written for git-commit
standards as well?

- -- 
Daniel Campbell
OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net
fpr: AE03 9064 AE00 053C 270C  1DE4 6F7A 9091 1EA0 55D6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVlkrrAAoJEAEkDpRQOeFwxooP/iKN3RvNrITSwvihcIG4B8e8
w7acqsgCfIQTTza9sq+SQ5HXsmVadC+u702RSa5CqfgYw9JXSAdwhPVksGCt0iiL
9WdhVsRm8LE3O8B8gqGZLvG7+8OB19RCsbPN+fy0aQi+R2rtyQItibdpLLfzHw90
qfsw/JdI09ndRLh21gpmJnrC/fgelafQE0o/Z8Sl6akjwl44+dkAtPTDOroev3IF
xDs1FyhSS2gzfAKcrXFoTetdmccUs/rQcCNzB3VeqciwfDvmJvAXtnN50VefpNt0
yID2ud7DDAPDTBH74gZEteARv6abQTqdToCEiczzaDSggiJGD/mS/F4jRgeWTeOP
zgUcNyaLcjXIbb1QoBIEgBQHFXsOaiHegkuoGlNqCTCpffKBblDD38rBq/GBssce
Y4cG8jvmapXKjph0c4BC+1V3p3Slj4AcnKfIk/Rkoc+YeLcGr5VUcOJXNHvJ85ZG
M9c9kEW2X8/cscuRiS5tBMOROzculEAdEOOJZB6RJm2qk+yJ64MaiZVBd7Z6aUIx
QmJvAenWeVZcw9Pz6MSmOCszLMD6MJOWx9tUCSUiiXEd9KoSAeKrXUraZpj76fOV
Qv8jpCUd045RHTWvBqWs9g+ZPvb28rRoDzi5Xu+XU4FiTn9m079LJ5GUZvhsVFHn
exhczY0a0hFXJaExF5R7
=MoQS
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Igor Savlook]

On Thursday 02 July 2015 21:39:52 Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> 
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.

So dev-vcs/git now by default in stage3?

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Justin (jlec)]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

On 03/07/15 10:51, Igor Savlook wrote:
> On Thursday 02 July 2015 21:39:52 Robin H. Johnson wrote:
>> Hi all,
>>
>> The Git migration is moving forward, and I'd like to announce a
>> tentative schedule for that end.
>> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
>>
>> 2015/08/08 15:00 UTC - Freeze
>> 2015/08/08 19:00 UTC - Git commits open for developers
>> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>> 2015/08/11           - History repo available to graft
>> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
>>
>> I've allocated time for an 8 hour freeze, but hope to be completed much
>> sooner than that.
> 
> So dev-vcs/git now by default in stage3?
> 
> 

Why that? rsync is and will be the default sync method. We are switching for
development not the sync clients.

Justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 951 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Igor Savlook]

On Friday 03 July 2015 11:08:16 Justin wrote:
> On 03/07/15 10:51, Igor Savlook wrote:
> > On Thursday 02 July 2015 21:39:52 Robin H. Johnson wrote:
> >> Hi all,
> >> 
> >> The Git migration is moving forward, and I'd like to announce a
> >> tentative schedule for that end.
> >> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> >> 
> >> 2015/08/08 15:00 UTC - Freeze
> >> 2015/08/08 19:00 UTC - Git commits open for developers
> >> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> >> 2015/08/11           - History repo available to graft
> >> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> >> 
> >> I've allocated time for an 8 hour freeze, but hope to be completed much
> >> sooner than that.
> > 
> > So dev-vcs/git now by default in stage3?
> 
> Why that? rsync is and will be the default sync method. We are switching for
> development not the sync clients.
> 
> Justin
Ahhh i see. Thx for info.

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Donnerstag, 2. Juli 2015, 23:39:52 schrieb Robin H. Johnson:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> 
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.

That's excellent news- thanks a lot for your work!

- -- 
Andreas K. Huettel
Gentoo Linux developer (council, perl, libreoffice)
dilfridge@gentoo.org
http://www.akhuettel.de/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJVlntdAAoJEB9VdM6hupKV6y8QAIT9Y7Qn0kTXezAsqs0lVyg2
V/urjQiCa0lVwxTyvTNe3vO075D4nCHSUM0VkR0MsBSESlDBboswMwRcBvUyw0jC
g7v11t9R4yQKC59Tw7aZPkQRaTcWjOkEcICTQKr4pOf0hxLribwIbUHsWDtU4iOs
fQK9XKdPnJNBFm7/j//Nodon6Ruez4Zv6jgYl2zDZbFJJzP0KykfBrH0/NNxwWXr
jRze2B6P279znRhho3sEL6hAnlYFFxzJt8CjVq3k0RfF4rqxQiyOY7EkRzOsjyHd
efj40dvsa9WwZR+hR2B0w8IZrUBlBoV0oUfoXlNlGgWs6hGVEXxG0FxY4uq6W1sL
nok8Ny2MHT8p3Z0FMViy/PfLUD7udcP8qCf93EPYLoqGvZ8+QEz/9hJlmP0FQ9W3
agWmdUnFxA0q3SwAB6nLDxHozfE4bZXKVeXs8Y6gjk1A9MKOc+wo33dGmSAF04d1
vS+s7AqNwQRO9Uq7v2QhaB8T4NSkAM+Xp7X7KmhwaJDeEgM8Xz3bT0p8HP42zCEx
X1mDVrkP+sCfCKrTti3CRdTfa7PgIi2qcnYYmVq7AVZWqqLQAcx+cxnPczsunuBt
xDWIng5wjRHrBFP9/fywzeHfv7EC4x5PQWiovlMBvH9bnKLoPYFxttojY4EzvyBM
UvqcO4hanUVjDxa13RJC
=+TyC
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Manuel Rüger]

[-- Attachment #1: Type: text/plain, Size: 868 bytes --]

On 02.07.2015 23:39, Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> 
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.
> 

Thanks to all who helped to make this possible! :-)

Are there still any plans to use a code review system like gerrit that
will avoid merges, rebases etc. to the tree by just accepting and
serializing patches?

Manuel


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 951 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Robin H. Johnson]

On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> 
> I've allocated time for an 8 hour freeze, but hope to be completed much
> sooner than that.
Starting late due to $reasons, freeze is now at 18:00 UTC (14 minutes
from now).

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

[gentoo-dev] Git Migration: go-live!

[Robin H. Johnson]

On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> > 2015/08/08 15:00 UTC - Freeze
> > 2015/08/08 19:00 UTC - Git commits open for developers
This is going live in a few minutes. There was a lot of delays and snags
that were hit. QA has a lot of reviewing to do of in-tree patches with
long-standing CVS keyword damage. gkeys is also not sufficiently baked,
so we're using some scripting for now instead [1].

The new setup DOES enforce that commits AND pushes are signed.

I'm only 90% sure that everything works, but I've spent almost the
entire day on it, and there's more to go tomorrow.

Other old CVS repos are still closed for the moment, they will re-open
tomorrow.

> > 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> > 2015/08/11           - History repo available to graft
> > 2015/08/12           - rsync mirrors carry up-to-date changelogs again
These parts are still pending.

Quick instructions:
Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your make.conf
$ git config user.signingkey 0xLONG-GPG-KEY
$ git clone git+ssh://git@git.gentoo.org/repo/gentoo.git
$ vim ...
$ repoman commit -m '...' [2] 
$ git push --signed

(some time later, when you have local unpushed commits you want to
rebase instead of merging)
$ git pull --rebase -S
$ vim ...
$ repoman commit -m '...'
$ git push --signed

(some time later, when you have a local branch you want to merge)
$ git merge -S some-branch
$ git push --signed

[1]
The keys as they are in LDAP right now have been used. If you need to
change your key, please ping infra as well, so I can update the
temporary setup.
$ ldapsearch 'gentooStatus=active' gpgfingerprint -Z -LLL \
	|grep gpgfingerprint |cut -d: -f2- |tr -d ' '  \
	|grep -v 'undefined'  | xargs gpg --recv 

[2]
If you commit directly with "git commit" you MUST pass -S (and ideally
-s).

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

Re: [gentoo-dev] Git Migration: go-live!

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

Hi,

Great work! Semi-related question though...

Dnia 2015-08-09, o godz. 05:36:16
"Robin H. Johnson" <robbat2@gentoo.org> napisał(a):

> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> [...]
> Quick instructions:
> Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your make.conf
> $ git config user.signingkey 0xLONG-GPG-KEY
> $ git clone git+ssh://git@git.gentoo.org/repo/gentoo.git

I see you've finally decided on the 'repo/' prefix. Should I create
new dev, user and project overlays in 'repo/' namespace as well now?

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]

Re: [gentoo-dev] Git Migration: go-live!

[Michael Weber]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
> I'm only 90% sure that everything works, but I've spent almost the 
> entire day on it, and there's more to go tomorrow.
Thanks a lot!

use case: my cvs tree had uncommitted ebuild work (yes, you caught me
actually doing something).
now `cvs diff` no longer works, how can i track down my local changes?
besides diffing against git tree, brain memory aka shell history and
find -newer?

Michael

- -- 
Michael Weber
Gentoo Developer
web: https://xmw.de/
mailto: Michael Weber <xmw@gentoo.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iL4EAREKAGYFAlXHFrxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBaSAD+MaDxkEjuQUfgbA4yJtnzFfim
il9V7HWdrouTgQ3Lnh8A/05Ilegavg/+zP9hf5BsMa5+kJVHOuAIFiB16/66AKfC
=njMM
-----END PGP SIGNATURE-----

Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!

[Marc Schiffbauer]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

* Michael Weber schrieb am 09.08.15 um 11:00 Uhr:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
> 
> On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
> > I'm only 90% sure that everything works, but I've spent almost the 
> > entire day on it, and there's more to go tomorrow.
> Thanks a lot!
> 
> use case: my cvs tree had uncommitted ebuild work (yes, you caught me
> actually doing something).
> now `cvs diff` no longer works, how can i track down my local changes?
> besides diffing against git tree, brain memory aka shell history and
> find -newer?

I'd say: 

- tar your *.ebuild and files/* stuff away
- then "git clone" the new git repo.
- untar your files in the new git repo
- use "git diff"


-Marc


-- 
0x35A64134 - 8AAC 5F46 83B4 DB70 8317
             3723 296C 6CCA 35A6 4134

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]

On 09 Aug 2015 11:31, Marc Schiffbauer wrote:
> * Michael Weber schrieb am 09.08.15 um 11:00 Uhr:
> > On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
> > > I'm only 90% sure that everything works, but I've spent almost the 
> > > entire day on it, and there's more to go tomorrow.
> > Thanks a lot!
> > 
> > use case: my cvs tree had uncommitted ebuild work (yes, you caught me
> > actually doing something).
> > now `cvs diff` no longer works, how can i track down my local changes?
> > besides diffing against git tree, brain memory aka shell history and
> > find -newer?
> 
> I'd say: 
> 
> - tar your *.ebuild and files/* stuff away
> - then "git clone" the new git repo.
> - untar your files in the new git repo
> - use "git diff"

there will be a ton of cvs keyword noise in there though.  need to run
a sed on the files to clear it out.

it also will include noise where your local checkout was behind the latest
tree, so it'll only really work if you ran `cvs up` in the whole tree just
before it was shutdown.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!

[Francisco Blas Izquierdo Riera (klondike)]

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]

El 09/08/15 a las 12:02, Mike Frysinger escribió:
> On 09 Aug 2015 11:31, Marc Schiffbauer wrote:
>> * Michael Weber schrieb am 09.08.15 um 11:00 Uhr:
>>> On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
>>>> I'm only 90% sure that everything works, but I've spent almost the 
>>>> entire day on it, and there's more to go tomorrow.
>>> Thanks a lot!
>>>
>>> use case: my cvs tree had uncommitted ebuild work (yes, you caught me
>>> actually doing something).
>>> now `cvs diff` no longer works, how can i track down my local changes?
>>> besides diffing against git tree, brain memory aka shell history and
>>> find -newer?
>> I'd say: 
>>
>> - tar your *.ebuild and files/* stuff away
>> - then "git clone" the new git repo.
>> - untar your files in the new git repo
>> - use "git diff"
> there will be a ton of cvs keyword noise in there though.  need to run
> a sed on the files to clear it out.
>
> it also will include noise where your local checkout was behind the latest
> tree, so it'll only really work if you ran `cvs up` in the whole tree just
> before it was shutdown.
> -mike
Out of curiosity, is it impossible to have a read only CVS server with
the state at the time of the freeze?


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!

[Andrew Savchenko]

[-- Attachment #1: Type: text/plain, Size: 1502 bytes --]

On Sun, 9 Aug 2015 12:04:43 +0200 Francisco Blas Izquierdo Riera
(klondike) wrote:
> El 09/08/15 a las 12:02, Mike Frysinger escribió:
> > On 09 Aug 2015 11:31, Marc Schiffbauer wrote:
> >> * Michael Weber schrieb am 09.08.15 um 11:00 Uhr:
> >>> On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
> >>>> I'm only 90% sure that everything works, but I've spent almost the 
> >>>> entire day on it, and there's more to go tomorrow.
> >>> Thanks a lot!
> >>>
> >>> use case: my cvs tree had uncommitted ebuild work (yes, you caught me
> >>> actually doing something).
> >>> now `cvs diff` no longer works, how can i track down my local changes?
> >>> besides diffing against git tree, brain memory aka shell history and
> >>> find -newer?
> >> I'd say: 
> >>
> >> - tar your *.ebuild and files/* stuff away
> >> - then "git clone" the new git repo.
> >> - untar your files in the new git repo
> >> - use "git diff"
> > there will be a ton of cvs keyword noise in there though.  need to run
> > a sed on the files to clear it out.
> >
> > it also will include noise where your local checkout was behind the latest
> > tree, so it'll only really work if you ran `cvs up` in the whole tree just
> > before it was shutdown.
> > -mike
> Out of curiosity, is it impossible to have a read only CVS server with
> the state at the time of the freeze?
 
Seconded here. Read-only CVS should not consume much resources, but
will facilitate migration.

Best regards,
Andrew Savchenko

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Git Migration: go-live!

[Robin H. Johnson]

On Sun, Aug 09, 2015 at 01:16:19PM +0300, Andrew Savchenko wrote:
> > Out of curiosity, is it impossible to have a read only CVS server with
> > the state at the time of the freeze?
> Seconded here. Read-only CVS should not consume much resources, but
> will facilitate migration.
Read-only access to gentoo-x86 is restored (and write to the other CVS
repos).

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

Re: [gentoo-dev] Git Migration: go-live!

[Andrew Savchenko]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

On Sun, 9 Aug 2015 21:04:35 +0000 Robin H. Johnson wrote:
> On Sun, Aug 09, 2015 at 01:16:19PM +0300, Andrew Savchenko wrote:
> > > Out of curiosity, is it impossible to have a read only CVS server with
> > > the state at the time of the freeze?
> > Seconded here. Read-only CVS should not consume much resources, but
> > will facilitate migration.
> Read-only access to gentoo-x86 is restored (and write to the other CVS
> repos).
 
Thanks.

Best regards,
Andrew Savchenko

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Git Migration: go-live!

[Mike Gilbert]

On Sun, Aug 9, 2015 at 5:00 AM, Michael Weber <xmw@gentoo.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
>
> On 08/09/2015 07:36 AM, Robin H. Johnson wrote:
>> I'm only 90% sure that everything works, but I've spent almost the
>> entire day on it, and there's more to go tomorrow.
> Thanks a lot!
>
> use case: my cvs tree had uncommitted ebuild work (yes, you caught me
> actually doing something).
> now `cvs diff` no longer works, how can i track down my local changes?
> besides diffing against git tree, brain memory aka shell history and
> find -newer?

It seems you have one final use for my "cvs-status" script. That will
do an offline status check by comparing timestamps.

http://floppym.blogspot.com/2012/02/cvs-status-display-cvs-checkout-in-svn.html

[gentoo-dev] Re: Git Migration: go-live!

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]

On Sun, 9 Aug 2015 05:36:16 +0000
"Robin H. Johnson" <robbat2@gentoo.org> wrote:

> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> > On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> > > 2015/08/08 15:00 UTC - Freeze
> > > 2015/08/08 19:00 UTC - Git commits open for developers
> This is going live in a few minutes. There was a lot of delays and snags
> that were hit. QA has a lot of reviewing to do of in-tree patches with
> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
> so we're using some scripting for now instead [1].
> 
> The new setup DOES enforce that commits AND pushes are signed.
> 
> I'm only 90% sure that everything works, but I've spent almost the
> entire day on it, and there's more to go tomorrow.
> 
> Other old CVS repos are still closed for the moment, they will re-open
> tomorrow.

So for someone who hasn't been following any of this, is there an idiot's guide
on how make the Gentoo?


-- 
Ryan Hill                        psn: dirtyepic_sk
   gcc-porting/toolchain/wxwidgets @ gentoo.org

47C3 6D62 4864 0E49 8E9E  7F92 ED38 BD49 957A 8463

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 475 bytes --]

Re: [gentoo-dev] Re: Git Migration: go-live!

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

On 09 Aug 2015 04:16, Ryan Hill wrote:
> On Sun, 9 Aug 2015 05:36:16 +0000 "Robin H. Johnson" wrote:
> > On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> > > On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> > > > 2015/08/08 15:00 UTC - Freeze
> > > > 2015/08/08 19:00 UTC - Git commits open for developers
> > This is going live in a few minutes. There was a lot of delays and snags
> > that were hit. QA has a lot of reviewing to do of in-tree patches with
> > long-standing CVS keyword damage. gkeys is also not sufficiently baked,
> > so we're using some scripting for now instead [1].
> > 
> > The new setup DOES enforce that commits AND pushes are signed.
> > 
> > I'm only 90% sure that everything works, but I've spent almost the
> > entire day on it, and there's more to go tomorrow.
> > 
> > Other old CVS repos are still closed for the moment, they will re-open
> > tomorrow.
> 
> So for someone who hasn't been following any of this, is there an idiot's guide
> on how make the Gentoo?

Robin's set of insns had everything i needed to get going, and i've never
done git signing before

the only thing to note is that our documentation has generally said you
should generate a dedicated key for signing (with a short expiration),
but the set of gpg keys in ldap generally have been your long-lived key
that you use for e-mail/etc...  so if you followed that, your ebuild key
won't be in ldap (so add it using the ldap wiki guide), and you'll have
to wait for the keys to be synced by infra before you can push.

what were you having trouble with ?
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Re: Git Migration: go-live!

[hasufell]

On 08/09/2015 12:16 PM, Ryan Hill wrote:
> On Sun, 9 Aug 2015 05:36:16 +0000
> "Robin H. Johnson" <robbat2@gentoo.org> wrote:
> 
>> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
>>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
>>>> 2015/08/08 15:00 UTC - Freeze
>>>> 2015/08/08 19:00 UTC - Git commits open for developers
>> This is going live in a few minutes. There was a lot of delays and snags
>> that were hit. QA has a lot of reviewing to do of in-tree patches with
>> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
>> so we're using some scripting for now instead [1].
>>
>> The new setup DOES enforce that commits AND pushes are signed.
>>
>> I'm only 90% sure that everything works, but I've spent almost the
>> entire day on it, and there's more to go tomorrow.
>>
>> Other old CVS repos are still closed for the moment, they will re-open
>> tomorrow.
> 
> So for someone who hasn't been following any of this, is there an idiot's guide
> on how make the Gentoo?
> 
> 

https://wiki.gentoo.org/wiki/Gentoo_git_workflow

Re: [gentoo-dev] Re: Git Migration: go-live!

[Aaron W. Swenson]

[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]

On 2015-08-09 13:22, hasufell wrote:
> On 08/09/2015 12:16 PM, Ryan Hill wrote:
> > On Sun, 9 Aug 2015 05:36:16 +0000
> > "Robin H. Johnson" <robbat2@gentoo.org> wrote:
> > 
> >> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> >>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> >>>> 2015/08/08 15:00 UTC - Freeze
> >>>> 2015/08/08 19:00 UTC - Git commits open for developers
> >> This is going live in a few minutes. There was a lot of delays and snags
> >> that were hit. QA has a lot of reviewing to do of in-tree patches with
> >> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
> >> so we're using some scripting for now instead [1].
> >>
> >> The new setup DOES enforce that commits AND pushes are signed.
> >>
> >> I'm only 90% sure that everything works, but I've spent almost the
> >> entire day on it, and there's more to go tomorrow.
> >>
> >> Other old CVS repos are still closed for the moment, they will re-open
> >> tomorrow.
> > 
> > So for someone who hasn't been following any of this, is there an idiot's guide
> > on how make the Gentoo?
> > 
> > 
> 
> https://wiki.gentoo.org/wiki/Gentoo_git_workflow
> 

That page is missing the first step in working with our new Git
Overlord: cloning the repository.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 345 bytes --]

Re: [gentoo-dev] Re: Git Migration: go-live!

[hasufell]

On 08/09/2015 01:55 PM, Aaron W. Swenson wrote:
> On 2015-08-09 13:22, hasufell wrote:
>> On 08/09/2015 12:16 PM, Ryan Hill wrote:
>>> On Sun, 9 Aug 2015 05:36:16 +0000
>>> "Robin H. Johnson" <robbat2@gentoo.org> wrote:
>>>
>>>> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
>>>>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
>>>>>> 2015/08/08 15:00 UTC - Freeze
>>>>>> 2015/08/08 19:00 UTC - Git commits open for developers
>>>> This is going live in a few minutes. There was a lot of delays and snags
>>>> that were hit. QA has a lot of reviewing to do of in-tree patches with
>>>> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
>>>> so we're using some scripting for now instead [1].
>>>>
>>>> The new setup DOES enforce that commits AND pushes are signed.
>>>>
>>>> I'm only 90% sure that everything works, but I've spent almost the
>>>> entire day on it, and there's more to go tomorrow.
>>>>
>>>> Other old CVS repos are still closed for the moment, they will re-open
>>>> tomorrow.
>>>
>>> So for someone who hasn't been following any of this, is there an idiot's guide
>>> on how make the Gentoo?
>>>
>>>
>>
>> https://wiki.gentoo.org/wiki/Gentoo_git_workflow
>>
> 
> That page is missing the first step in working with our new Git
> Overlord: cloning the repository.
> 

It was just added.

[gentoo-dev] Re: Git Migration: go-live!

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]

On Sun, 9 Aug 2015 13:22:43 +0200
hasufell <hasufell@gentoo.org> wrote:

> On 08/09/2015 12:16 PM, Ryan Hill wrote:
> > On Sun, 9 Aug 2015 05:36:16 +0000
> > "Robin H. Johnson" <robbat2@gentoo.org> wrote:
> > 
> >> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
> >>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
> >>>> 2015/08/08 15:00 UTC - Freeze
> >>>> 2015/08/08 19:00 UTC - Git commits open for developers
> >> This is going live in a few minutes. There was a lot of delays and snags
> >> that were hit. QA has a lot of reviewing to do of in-tree patches with
> >> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
> >> so we're using some scripting for now instead [1].
> >>
> >> The new setup DOES enforce that commits AND pushes are signed.
> >>
> >> I'm only 90% sure that everything works, but I've spent almost the
> >> entire day on it, and there's more to go tomorrow.
> >>
> >> Other old CVS repos are still closed for the moment, they will re-open
> >> tomorrow.
> > 
> > So for someone who hasn't been following any of this, is there an idiot's
> > guide on how make the Gentoo?
> > 
> > 
> 
> https://wiki.gentoo.org/wiki/Gentoo_git_workflow

There it is.



-- 
Ryan Hill                        psn: dirtyepic_sk
   gcc-porting/toolchain/wxwidgets @ gentoo.org

47C3 6D62 4864 0E49 8E9E  7F92 ED38 BD49 957A 8463

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 475 bytes --]

[gentoo-dev] Re: [gentoo-core] Git Migration: go-live!

[Agostino Sarubbo]

On Sunday 09 August 2015 05:36:16 Robin H. Johnson wrote:
> Quick instructions:
> Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your make.conf
> $ git config user.signingkey 0xLONG-GPG-KEY
> $ git clone git+ssh://git@git.gentoo.org/repo/gentoo.git
> $ vim ...
> $ repoman commit -m '...' [2] 
> $ git push --signed

2 questions:

1) The git workflow [1] does not mention to add PORTAGE_GPG_KEY to make.conf 
and neither to use the long gpg key. Does the short create a problem?

2) The git workflow [1] says to do git config --local commit.gpgsign 1 - Do we 
need to use git push --signed if was already in the config ?

I'm asking just for have an up-to-date documentation, and maybe add all the 
notes there.

Thanks.

[1]: https://wiki.gentoo.org/wiki/Gentoo_git_workflow


-- 
Agostino Sarubbo
Gentoo Linux Developer

[gentoo-dev] Re: [gentoo-core] Git Migration: go-live!

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On 09 Aug 2015 12:18, Agostino Sarubbo wrote:
> 1) The git workflow [1] does not mention to add PORTAGE_GPG_KEY to make.conf 
> and neither to use the long gpg key. Does the short create a problem?

it does not

> 2) The git workflow [1] says to do git config --local commit.gpgsign 1 - Do we 
> need to use git push --signed if was already in the config ?

yes.  commit & push are independent operations.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Git Migration: go-live!

[Alexey Shvetsov]

Hi all!

Current repoman complains about headers in ebuilds

>>> Creating Manifest for /home/alexxy/Gentoo/gentoo/sys-cluster/open-mx
   ebuild.badheader              1
    sys-cluster/open-mx/open-mx-1.5.4.ebuild: Malformed CVS Header on 
line: 3

So may be its better to drop $Id: $ completely?

Robin H. Johnson писал 09-08-2015 08:36:
> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
>> > 2015/08/08 15:00 UTC - Freeze
>> > 2015/08/08 19:00 UTC - Git commits open for developers
> This is going live in a few minutes. There was a lot of delays and 
> snags
> that were hit. QA has a lot of reviewing to do of in-tree patches with
> long-standing CVS keyword damage. gkeys is also not sufficiently baked,
> so we're using some scripting for now instead [1].
> 
> The new setup DOES enforce that commits AND pushes are signed.
> 
> I'm only 90% sure that everything works, but I've spent almost the
> entire day on it, and there's more to go tomorrow.
> 
> Other old CVS repos are still closed for the moment, they will re-open
> tomorrow.
> 
>> > 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>> > 2015/08/11           - History repo available to graft
>> > 2015/08/12           - rsync mirrors carry up-to-date changelogs again
> These parts are still pending.
> 
> Quick instructions:
> Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your make.conf
> $ git config user.signingkey 0xLONG-GPG-KEY
> $ git clone git+ssh://git@git.gentoo.org/repo/gentoo.git
> $ vim ...
> $ repoman commit -m '...' [2]
> $ git push --signed
> 
> (some time later, when you have local unpushed commits you want to
> rebase instead of merging)
> $ git pull --rebase -S
> $ vim ...
> $ repoman commit -m '...'
> $ git push --signed
> 
> (some time later, when you have a local branch you want to merge)
> $ git merge -S some-branch
> $ git push --signed
> 
> [1]
> The keys as they are in LDAP right now have been used. If you need to
> change your key, please ping infra as well, so I can update the
> temporary setup.
> $ ldapsearch 'gentooStatus=active' gpgfingerprint -Z -LLL \
> 	|grep gpgfingerprint |cut -d: -f2- |tr -d ' '  \
> 	|grep -v 'undefined'  | xargs gpg --recv
> 
> [2]
> If you commit directly with "git commit" you MUST pass -S (and ideally
> -s).

-- 
Best Regards,
Alexey 'Alexxy' Shvetsov
Best Regards,
Alexey 'Alexxy' Shvetsov, PhD
Department of Molecular and Radiation Biophysics
FSBI Petersburg Nuclear Physics Institute, NRC Kurchatov Institute,
Leningrad region, Gatchina, Russia
Gentoo Team Ru
Gentoo Linux Dev
mailto:alexxyum@gmail.com
mailto:alexxy@gentoo.org
mailto:alexxy@omrb.pnpi.spb.ru

Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

On 09 Aug 2015 14:54, Alexey Shvetsov wrote:
> Hi all!

please don't top post

> Current repoman complains about headers in ebuilds
> 
> >>> Creating Manifest for /home/alexxy/Gentoo/gentoo/sys-cluster/open-mx
>    ebuild.badheader              1
>     sys-cluster/open-mx/open-mx-1.5.4.ebuild: Malformed CVS Header on 
> line: 3
> 
> So may be its better to drop $Id: $ completely?

it should look like:
# $Id$

but even then, yes, we should just trim the line
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!

[Alexey Shvetsov]

Mike Frysinger писал 09-08-2015 15:43:
> On 09 Aug 2015 14:54, Alexey Shvetsov wrote:
>> Hi all!
> 
> please don't top post
> 
>> Current repoman complains about headers in ebuilds
>> 
>> >>> Creating Manifest for /home/alexxy/Gentoo/gentoo/sys-cluster/open-mx
>>    ebuild.badheader              1
>>     sys-cluster/open-mx/open-mx-1.5.4.ebuild: Malformed CVS Header on
>> line: 3
>> 
>> So may be its better to drop $Id: $ completely?
> 
> it should look like:
> # $Id$
> 
> but even then, yes, we should just trim the line
> -mike

Since repoman do comparison with header.txt which contains


alexxy@x240 ~/Gentoo/gentoo $ cat header.txt
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

So we can change last line to $Id$ or since it dont actualy needed we 
can simply drop it.

-- 
Best Regards,
Alexey 'Alexxy' Shvetsov
Best Regards,
Alexey 'Alexxy' Shvetsov, PhD
Department of Molecular and Radiation Biophysics
FSBI Petersburg Nuclear Physics Institute, NRC Kurchatov Institute,
Leningrad region, Gatchina, Russia
Gentoo Team Ru
Gentoo Linux Dev
mailto:alexxyum@gmail.com
mailto:alexxy@gentoo.org
mailto:alexxy@omrb.pnpi.spb.ru

Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!

[Rich Freeman]

On Sun, Aug 9, 2015 at 8:43 AM, Mike Frysinger <vapier@gentoo.org> wrote:
> On 09 Aug 2015 14:54, Alexey Shvetsov wrote:
>> Hi all!
>
> please don't top post
>
>> Current repoman complains about headers in ebuilds
>>
>> >>> Creating Manifest for /home/alexxy/Gentoo/gentoo/sys-cluster/open-mx
>>    ebuild.badheader              1
>>     sys-cluster/open-mx/open-mx-1.5.4.ebuild: Malformed CVS Header on
>> line: 3
>>
>> So may be its better to drop $Id: $ completely?
>
> it should look like:
> # $Id$
>

We shouldn't do anything (besides adapting repoman to the $Id$ format)
without some discussion first.  However...

Do we really need to have ANY keywords in our files?  Keyword
expansion was just a PITA all-around with cvs.  Do we really need to
embed them in our git files?

At least git doesn't expand them in the actual repository.

I'm not really a big fan of any kind of in-band signaling.  I guess
the one advantage of this is that if you find a file OUTSIDE of a
repository you know where it came from, but how important is that?

-- 
Rich

Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!

[Robin H. Johnson]

On Sun, Aug 09, 2015 at 09:10:30AM -0400, Rich Freeman wrote:
> We shouldn't do anything (besides adapting repoman to the $Id$ format)
> without some discussion first.  However...
> 
> Do we really need to have ANY keywords in our files?  Keyword
> expansion was just a PITA all-around with cvs.  Do we really need to
> embed them in our git files?
> 
> At least git doesn't expand them in the actual repository.
> 
> I'm not really a big fan of any kind of in-band signaling.  I guess
> the one advantage of this is that if you find a file OUTSIDE of a
> repository you know where it came from, but how important is that?
The expansion is ONLY for the rsync export, so that we can identify the
version of the file on a user's system.

When previously discussed, that was a strongly requested item, as
developers DO sometimes ask users to please test rev 1.xyz of an ebuild.

-- 
Robin Hugh Johnson
Gentoo Linux: Developer, Infrastructure Lead
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85

Re: [gentoo-dev] Git Migration: go-live!

[Daniel Campbell (zlg)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 08/08/2015 10:36 PM, Robin H. Johnson wrote:
> On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote:
>> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson
>> wrote:
>>> 2015/08/08 15:00 UTC - Freeze 2015/08/08 19:00 UTC - Git
>>> commits open for developers
> This is going live in a few minutes. There was a lot of delays and
> snags that were hit. QA has a lot of reviewing to do of in-tree
> patches with long-standing CVS keyword damage. gkeys is also not
> sufficiently baked, so we're using some scripting for now instead
> [1].
> 
> The new setup DOES enforce that commits AND pushes are signed.
> 
> I'm only 90% sure that everything works, but I've spent almost the 
> entire day on it, and there's more to go tomorrow.
> 
> Other old CVS repos are still closed for the moment, they will
> re-open tomorrow.
> 
>>> 2015/08/09 01:00 UTC - Rsync live again (with lagged
>>> changelog) 2015/08/11           - History repo available to
>>> graft 2015/08/12           - rsync mirrors carry up-to-date
>>> changelogs again
> These parts are still pending.
> 
> Quick instructions: Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your
> make.conf $ git config user.signingkey 0xLONG-GPG-KEY $ git clone
> git+ssh://git@git.gentoo.org/repo/gentoo.git $ vim ... $ repoman
> commit -m '...' [2] $ git push --signed
> 
> (some time later, when you have local unpushed commits you want to 
> rebase instead of merging) $ git pull --rebase -S $ vim ... $
> repoman commit -m '...' $ git push --signed
> 
> (some time later, when you have a local branch you want to merge) $
> git merge -S some-branch $ git push --signed
> 
> [1] The keys as they are in LDAP right now have been used. If you
> need to change your key, please ping infra as well, so I can update
> the temporary setup. $ ldapsearch 'gentooStatus=active'
> gpgfingerprint -Z -LLL \ |grep gpgfingerprint |cut -d: -f2- |tr -d
> ' '  \ |grep -v 'undefined'  | xargs gpg --recv
> 
> [2] If you commit directly with "git commit" you MUST pass -S (and
> ideally -s).
> 

I'd like to thank you and anyone else who's worked on the Git
migration. It's not a trivial undertaking and I look forward to
working on ebuilds with Git! The workflow wiki page is very helpful;
I've added it to my Watchlist so I can stay up to date on changes.

Thanks again for your efforts! If you'd like any assistance in setting
up hooks, I'd be glad to help.

- -- 
Daniel Campbell - Gentoo Developer
OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net
fpr: AE03 9064 AE00 053C 270C  1DE4 6F7A 9091 1EA0 55D6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVx7H1AAoJEAEkDpRQOeFwYloQAIPXgVMhCvT6xLxPd6OVtOtU
pDHuRUS3aGXWowGnf4BFTvV3ILpca/qm/ExVe+As1B7atCkP3XeRYP4y0TB31Ol1
QQMNvIZ8XkItjbQg8QTg0EMqA45IKMV//4ZwVdsAjPq3686nLOtfjAREB6SwO3nS
5huXcJ2+D1wxKAAAORGwkNYIjKzwGd/BnbDWTyNR/pUekrd6nBo/du5v7vo5j00S
ORsc4JXjhoQ56KCvNDz4kkzcCiPE0equto7b/7ZL7Cb7hkV6d8u5YmwzQPGwzk4I
OztEF88xpOvDHsgVuV1UStOLX3trVmkUZElwIektw7+ZOZZ7IwLzPRGHUDronSR/
mO6gdxaPqUCfjMNsg7n54dJVUNhkPjCu/8IispfnfmFJ/xGdnznAizkW25zJH5Vx
+DVC8wac46/74SBmJlipRuMiMKAQu5kZP4szGFd/n4bYyQplnQ/7u+aX/IbMQoY+
JWWNHRZfjHYKjJcWA+sxYuWQp5RwcL//o07BR3zjjv7LOTEVwtnOApppV+E9bOyF
2OgTDPOhLao+D5Gm0b7T7nMT34DAw9Io2D7Nbo29YQFuXim6/6jPB9uJeSswan5J
uUUJQnJOElSiM85EUJm4ZjKXS0zHjNMoiyFTWi7C8eUu1eeJgCsTNqFb0/3vDOct
9OfweV2Hm2CY/G6Vwk00
=2eg6
-----END PGP SIGNATURE-----

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Mikle Kolyada]

08.08.2015 20:47, Robin H. Johnson пишет:
> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson wrote:
>> 2015/08/08 15:00 UTC - Freeze
>> 2015/08/08 19:00 UTC - Git commits open for developers
>> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
>> 2015/08/11           - History repo available to graft
>> 2015/08/12           - rsync mirrors carry up-to-date changelogs again
>>
>> I've allocated time for an 8 hour freeze, but hope to be completed much
>> sooner than that.
> Starting late due to $reasons, freeze is now at 18:00 UTC (14 minutes
> from now).
>
<hat type="recruiter">
Where and how should we add new developers these days to grant them
access to the portage tree?
</hat>

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Andrew Savchenko]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

Hi,

On Thu, 2 Jul 2015 21:39:52 +0000 Robin H. Johnson wrote:
> Hi all,
> 
> The Git migration is moving forward, and I'd like to announce a
> tentative schedule for that end.
> https://wiki.gentoo.org/wiki/Project:Infrastructure/Git_migration#Status
> 
> 2015/08/08 15:00 UTC - Freeze
> 2015/08/08 19:00 UTC - Git commits open for developers
> 2015/08/09 01:00 UTC - Rsync live again (with lagged changelog)
> 2015/08/11           - History repo available to graft
> 2015/08/12           - rsync mirrors carry up-to-date changelogs again

Any news on when git repo with historical commits will be
available? Or am I missing something and it is already online?

Having rsync mirrors with up-to-date ChangeLogs will be great too :)

Best regards,
Andrew Savchenko

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] Git Migration: launch plan & schedule (2015/Aug/08-09)

[Rich Freeman]

On Sun, Aug 23, 2015 at 8:01 AM, Andrew Savchenko <bircoph@gentoo.org> wrote:
>
> Any news on when git repo with historical commits will be
> available? Or am I missing something and it is already online?
>

I have no news on anything official but I've posted one at:
https://github.com/gentoo/gentoo-gitmig-20150809-draft

I'm not aware of any issues with it, but let me know if you see any.
With git-replace we can of course fix it as many times as we need to.

-- 
Rich