[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-19 Thread Martin Vaeth
Diamond diam...@hi-net.ru wrote: There's no git cp command. git mv is just git rm + git add. I think there is a misunderstanding about how git works. If you are used to e.g. svn (I suppose with CVS it is similar) then it makes an important difference whether you use svn cp A B or /bin/cp A B,

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread Michał Górny
Dnia 2014-09-16, o godz. 12:30:59 Alan McKinnon alan.mckin...@gmail.com napisał(a): On 16/09/2014 12:18, hasufell wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? I'm a user and I don't care. I use diff. I only go to the Changelog when I can't

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread Michał Górny
Dnia 2014-09-16, o godz. 10:52:13 W. Trevor King wk...@tremily.us napisał(a): $ git pull --depth=1 for subsequent syncs. pym/_emerge/actions.py currently hardcodes ‘git pull’ for the latter, and doesn't seem to have any code for the former. On the other hand, it wouldn't be too terrible

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread Michał Górny
Dnia 2014-09-16, o godz. 10:18:35 hasufell hasuf...@gentoo.org napisał(a): Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? A bit off-topic but asking such a question usually makes some developers point out that they are users too and they do care :).

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread Ulrich Mueller
On Wed, 17 Sep 2014, Michał Górny wrote: Dnia 2014-09-16, o godz. 10:18:35 hasufell hasuf...@gentoo.org napisał(a): Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? A bit off-topic but asking such a question usually makes some developers point out that

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread Rich Freeman
On Wed, Sep 17, 2014 at 5:56 AM, Ulrich Mueller u...@gentoo.org wrote: So the research that needs to be done first is to find out how often our ChangeLog entries differ from the commit log. If it turns out that they are identical in 99 % of all cases, then it obviously makes no sense to

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-17 Thread W. Trevor King
On Wed, Sep 17, 2014 at 10:36:45AM +0200, Michał Górny wrote: Dnia 2014-09-16, o godz. 10:52:13 W. Trevor King napisał(a): $ git pull --depth=1 for subsequent syncs. pym/_emerge/actions.py currently hardcodes ‘git pull’ for the latter, and doesn't seem to have any code for the

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Ulrich Mueller
On Mon, 15 Sep 2014, Rich Freeman wrote: I'll add this to the next Council agenda. I think this is ripe for discussion. The last discussion of this really wasn't aimed at git anyway. Some of the arguments back then were that a) ChangeLogs are aimed at users, so they don't necessarily

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread hasufell
Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care?

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Alan McKinnon
On 16/09/2014 12:18, hasufell wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? I'm a user and I don't care. I use diff. I only go to the Changelog when I can't determine the maintainers intent from diff and the ebuild content. That happens maybe

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Rich Freeman
On Tue, Sep 16, 2014 at 6:18 AM, hasufell hasuf...@gentoo.org wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? I'm sure somebody will reply and say that they care. It still seems like a lot of overhead to me for a very one-off workflow. Maybe if portage

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread hasufell
Rich Freeman: On Tue, Sep 16, 2014 at 6:18 AM, hasufell hasuf...@gentoo.org wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? I'm sure somebody will reply and say that they care. It still seems like a lot of overhead to me for a very one-off

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Pacho Ramos
El mar, 16-09-2014 a las 07:26 -0400, Rich Freeman escribió: On Tue, Sep 16, 2014 at 6:18 AM, hasufell hasuf...@gentoo.org wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? I'm sure somebody will reply and say that they care. It still seems

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Rich Freeman
On Tue, Sep 16, 2014 at 9:44 AM, Pacho Ramos pa...@gentoo.org wrote: Maybe one option would be to kill Changelogs and provide a script to let people get git messages and reformat them in a way similar as current ChangeLog files, that way people will still be able to save this information for

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Pacho Ramos
El mar, 16-09-2014 a las 09:55 -0400, Rich Freeman escribió: On Tue, Sep 16, 2014 at 9:44 AM, Pacho Ramos pa...@gentoo.org wrote: Maybe one option would be to kill Changelogs and provide a script to let people get git messages and reformat them in a way similar as current ChangeLog files,

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Duncan
Anthony G. Basile posted on Mon, 15 Sep 2014 17:43:09 -0400 as excerpted: We could just push out the word that ChangeLogs are going away and they have to read the git repo. That might be the easiest solution. I do have users that quote my ChangeLogs though. As such a user... Given the

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Duncan
W. Trevor King posted on Mon, 15 Sep 2014 13:33:46 -0700 as excerpted: On Mon, Sep 15, 2014 at 01:29:44PM -0700, W. Trevor King wrote: I don't see any benefit to using rsync vs. a shallow clone as the transmission protocol. Other than the fact that before you dropped it you'd need to push a

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread W. Trevor King
On Tue, Sep 16, 2014 at 05:35:08PM +, Duncan wrote: W. Trevor King posted on Mon, 15 Sep 2014 13:33:46 -0700 as excerpted: On Mon, Sep 15, 2014 at 01:29:44PM -0700, W. Trevor King wrote: I don't see any benefit to using rsync vs. a shallow clone as the transmission protocol. Other

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Duncan
Rich Freeman posted on Tue, 16 Sep 2014 09:55:31 -0400 as excerpted: Or they could just clone the git tree, and they can look at per-file logs anytime they want to. Give me ro access to a current git repo and I'll *VERY* happily leave changelogs to history along with 8-track tapes and

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread W. Trevor King
On Tue, Sep 16, 2014 at 10:52:13AM -0700, W. Trevor King wrote: Oh, lovely :). Looks like that landed in 2.2.0 with 47e8d22d (Add support for multiple repositories in `emerge --sync`, 2013-07-23). Actually, ‘git pull’ support in one form or another dates back to ba797c11 (Add --sync support

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Duncan
W. Trevor King posted on Tue, 16 Sep 2014 10:52:13 -0700 as excerpted: Also, I don't see a way to say “use Git to sync, but keep a shallow repository”. Presumably at some point we'd get the PORTAGE_GIT* equivalent of the PORTAGE_RSYNC* settings from make.conf, but settable in both make.conf

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Brian Dolbec
On Tue, 16 Sep 2014 10:52:13 -0700 W. Trevor King wk...@tremily.us wrote: On Tue, Sep 16, 2014 at 05:35:08PM +, Duncan wrote: W. Trevor King posted on Mon, 15 Sep 2014 13:33:46 -0700 as excerpted: On Mon, Sep 15, 2014 at 01:29:44PM -0700, W. Trevor King wrote: I don't see any

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread viv...@gmail.com
Il 16/09/2014 20:02, Duncan ha scritto: Rich Freeman posted on Tue, 16 Sep 2014 09:55:31 -0400 as excerpted: Or they could just clone the git tree, and they can look at per-file logs anytime they want to. Give me ro access to a current git repo and I'll *VERY* happily leave changelogs to

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-16 Thread Daniel Campbell
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 09/16/2014 05:18 AM, hasufell wrote: Ulrich Mueller: ChangeLogs are aimed at users Did any1 ask them if they care? If the tree switches to git and there's an option within Portage/emerge to fetch via git instead of rsync, then I'd rather

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Fabian Groffen
On 14-09-2014 16:56:24 +0200, Michał Górny wrote: Rich Freeman ri...@gentoo.org napisał(a): So, I don't really have a problem with your design. I still question whether we still need to be generating changelogs - they seem incredibly redundant. But, if people really want a redundant copy

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread William Hubbs
On Mon, Sep 15, 2014 at 09:53:43AM +0200, Fabian Groffen wrote: On 14-09-2014 16:56:24 +0200, Michał Górny wrote: Rich Freeman ri...@gentoo.org napisał(a): So, I don't really have a problem with your design. I still question whether we still need to be generating changelogs - they seem

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Anthony G. Basile
On 09/15/14 15:30, William Hubbs wrote: On Mon, Sep 15, 2014 at 09:53:43AM +0200, Fabian Groffen wrote: On 14-09-2014 16:56:24 +0200, Michał Górny wrote: Rich Freeman ri...@gentoo.org napisał(a): So, I don't really have a problem with your design. I still question whether we still need to be

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Rich Freeman
On Mon, Sep 15, 2014 at 3:55 PM, Anthony G. Basile bluen...@gentoo.org wrote: On 09/15/14 15:30, William Hubbs wrote: I would have no problem with the council revisiting/changing this. I tend to agree that the ChangeLogs in the portage tree will be obsoleted when we switch to git because

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Michał Górny
Dnia 2014-09-15, o godz. 15:55:35 Anthony G. Basile bluen...@gentoo.org napisał(a): On 09/15/14 15:30, William Hubbs wrote: On Mon, Sep 15, 2014 at 09:53:43AM +0200, Fabian Groffen wrote: On 14-09-2014 16:56:24 +0200, Michał Górny wrote: Rich Freeman ri...@gentoo.org napisał(a): So, I

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread W. Trevor King
On Mon, Sep 15, 2014 at 10:18:39PM +0200, Michał Górny wrote: Dnia 2014-09-15, o godz. 15:55:35 Anthony G. Basile napisał(a): If the argument is that there are no Changelogs in rsync, then let's write git hooks to generate them when the repository is mirrored to the rsync host. The only

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread W. Trevor King
On Mon, Sep 15, 2014 at 01:29:44PM -0700, W. Trevor King wrote: I don't see any benefit to using rsync vs. a shallow clone as the transmission protocol. Other than the fact that before you dropped it you'd need to push a ‘emerge sync’ that could handle either rsync or Git, stabilize that

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Rich Freeman
On Mon, Sep 15, 2014 at 4:18 PM, Michał Górny mgo...@gentoo.org wrote: Can't we just kill rsync then? The whole ChangeLog seems to take more effort than the actual benefit it gives. I'm not sure ditching rsync entirely is necessary - it might be more trouble than it is worth as it is a very

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread hasufell
Rich Freeman: I'm not sure ditching rsync entirely is necessary - it might be more trouble than it is worth as it is a very effective simple way to distribute the tree. However, I'm not really opposed to it either. The few people I personally know who use gentoo never use rsync for

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Anthony G. Basile
On 09/15/14 16:49, Rich Freeman wrote: On Mon, Sep 15, 2014 at 4:18 PM, Michał Górny mgo...@gentoo.org wrote: Can't we just kill rsync then? The whole ChangeLog seems to take more effort than the actual benefit it gives. I'm not sure ditching rsync entirely is necessary - it might be more

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-15 Thread Fabian Groffen
On 15-09-2014 15:58:00 -0400, Rich Freeman wrote: If the argument is that there are no Changelogs in rsync, then let's write git hooks to generate them when the repository is mirrored to the rsync host. The only problem I see is with this is then adding ChangeLog to the manifest and gpg

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Ulrich Mueller
On Sun, 14 Sep 2014, Michał Górny wrote: I think we should also merge gentoo-news glsa herds.xml into the repository. They all reference Gentoo packages at a particular state in time, and it would be much nicer to have them synced properly. Not a good idea, because we may want to grant

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Johannes Huber
Am Sonntag 14 September 2014, 15:17:41 schrieb Ulrich Mueller: On Sun, 14 Sep 2014, Michał Górny wrote: I think we should also merge gentoo-news glsa herds.xml into the repository. They all reference Gentoo packages at a particular state in time, and it would be much nicer to have them

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Ulrich Mueller
On Sun, 14 Sep 2014, Johannes Huber wrote: Am Sonntag 14 September 2014, 15:17:41 schrieb Ulrich Mueller: On Sun, 14 Sep 2014, Michał Górny wrote: I think we should also merge gentoo-news glsa herds.xml into the repository. They all reference Gentoo packages at a particular state in

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Rich Freeman
On Sun, Sep 14, 2014 at 8:03 AM, Michał Górny mgo...@gentoo.org wrote: I'm quite tired of promises and all that perfectionist non-sense which locks us up with CVS for next 10 years of bikeshed. While I tend to agree with the sentiment, I don't think you're actually targeting the problems that

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Michał Górny
Dnia 2014-09-14, o godz. 15:17:41 Ulrich Mueller u...@gentoo.org napisał(a): On Sun, 14 Sep 2014, Michał Górny wrote: I think we should also merge gentoo-news glsa herds.xml into the repository. They all reference Gentoo packages at a particular state in time, and it would be much

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Michał Górny
Dnia 2014-09-14, o godz. 10:33:03 Rich Freeman ri...@gentoo.org napisał(a): Of course, that assumes infra is going to cooperate quickly or someone else is willing to provide the infra for it. The infra components to a git infrastructure are one of the main blockers at this point. I

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Rich Freeman
On Sun, Sep 14, 2014 at 10:56 AM, Michał Górny mgo...@gentoo.org wrote: Dnia 2014-09-14, o godz. 10:33:03 With git, we can finally do stuff like preparing everything and pushing in one go. Rebasing or merging will be much easier then, since the effective push rate will be smaller than current

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread hasufell
Rich Freeman: On Sun, Sep 14, 2014 at 10:56 AM, Michał Górny mgo...@gentoo.org wrote: Dnia 2014-09-14, o godz. 10:33:03 With git, we can finally do stuff like preparing everything and pushing in one go. Rebasing or merging will be much easier then, since the effective push rate will be

Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Dirkjan Ochtman
On Sun, Sep 14, 2014 at 6:10 PM, hasufell hasuf...@gentoo.org wrote: Let's try it with push access for every developer. +1. I'm pretty strongly opposed to leaving the history behind. I'd tend to agree with Rich when he says that history conversion is pretty much a solved problem, anyway.

[gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it)

2014-09-14 Thread Duncan
hasufell posted on Sun, 14 Sep 2014 13:50:32 + as excerpted: Jauhien Piatlicki: Again, how will user check the integrity and authenticity if Manifests are unsigned? There is no regression if this isn't solved. People who really care use emerge-webrsync. If we use the proposed