Re: [gentoo-dev] Git Migration: go-live!
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 +, Robin H. Johnson wrote: On Thu, Jul 02, 2015 at 09:39:52PM +, 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://g...@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:alexx...@gmail.com mailto:ale...@gentoo.org mailto:ale...@omrb.pnpi.spb.ru
Re: [gentoo-dev] Git Migration: go-live!
Hi, Great work! Semi-related question though... Dnia 2015-08-09, o godz. 05:36:16 Robin H. Johnson robb...@gentoo.org napisał(a): On Sat, Aug 08, 2015 at 05:47:14PM +, 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://g...@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/ pgpTOIM_3joIM.pgp Description: OpenPGP digital signature
Re: [gentoo-dev] Git Migration: go-live!
-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 x...@gentoo.org -BEGIN PGP SIGNATURE- Version: GnuPG v2 iL4EAREKAGYFAlXHFrxfFIAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBaSAD+MaDxkEjuQUfgbA4yJtnzFfim il9V7HWdrouTgQ3Lnh8A/05Ilegavg/+zP9hf5BsMa5+kJVHOuAIFiB16/66AKfC =njMM -END PGP SIGNATURE-
Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!
* 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 signature.asc Description: Digital signature
Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!
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 : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
Re: [gentoo-dev] Git Migration: go-live!
On Sun, Aug 9, 2015 at 5:00 AM, Michael Weber x...@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
Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!
On Sun, Aug 9, 2015 at 8:43 AM, Mike Frysinger vap...@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!
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 signature.asc Description: Digital signature
Re: [gentoo-scm] Re: [gentoo-dev] Git Migration: go-live!
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:alexx...@gmail.com mailto:ale...@gentoo.org mailto:ale...@omrb.pnpi.spb.ru
Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!
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 pgpbFzgWffu5i.pgp Description: PGP signature
Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!
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? signature.asc Description: OpenPGP digital signature
Re: [gentoo-core] [gentoo-dev] Git Migration: go-live!
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 signature.asc Description: Digital signature
Re: [gentoo-dev] Git Migration: go-live!
On Sun, 9 Aug 2015 21:04:35 + 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 pgpBLYIMhwIpG.pgp Description: PGP signature
Re: [gentoo-dev] Git Migration: go-live!
-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 +, Robin H. Johnson wrote: On Thu, Jul 02, 2015 at 09:39:52PM +, 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://g...@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: go-live!
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 : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
[gentoo-dev] Git Migration: go-live!
On Sat, Aug 08, 2015 at 05:47:14PM +, Robin H. Johnson wrote: On Thu, Jul 02, 2015 at 09:39:52PM +, 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://g...@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 : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
