Re: kdelibs, kdebase moving to Git this Saturday
Alle venerdì 28 gennaio 2011, Nicolas Alvarez ha scritto: What do you all think of removing wallpapers from these git repositories? We could put them in a separate git repository, or even keep them in SVN. Now that the workspace repository was pushed without them (so breaking history, past tags and branches), where are the wallpapers now? -- Pino Toscano signature.asc Description: This is a digitally signed message part.
Re: kdelibs, kdebase moving to Git this Saturday
On Wednesday 26 January 2011, Ian Monroe wrote: The basic schedule will be that sometime on Saturday the repos listed in the subject will be made read-only, we'll make the conversion and upload them to git.kde.org. The subversion directories will be emptied and replaced with a README. *Both* the 4.6 and trunk branches are moving. For up to one week if someone finds a major problem in the history a re-push will be considered. After that we'll just live with it. ...but far better would be for any problem to be found now. Please note that the repo names are not the final ones (they will be konsole, kde-baseapps, kde-workspace, kde-runtime, kdelibs). git://anongit.kde.org/scratch/nalvarez/kdelibs-convtest git://anongit.kde.org/scratch/ianmonroe/kdebase-apps git://anongit.kde.org/scratch/ianmonroe/kdebase-runtime git://anongit.kde.org/scratch/ianmonroe/kdebase-workspace git://anongit.kde.org/scratch/ianmonroe/konsole in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. Cheers, Marco Martin
Re: kdelibs, kdebase moving to Git this Saturday
On 1/30/2011 1:17 PM, Marco Martin wrote: in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. kde-runtime is currently set read-only for that and other reasons, the conversion seems to be flawed. Unfortunately the guys writing the conversion script are in bed or afk right now. -- Best regards, Eike Hein
Re: kdelibs, kdebase moving to Git this Saturday
On Sunday 30 January 2011 13:17:01 Marco Martin wrote: On Wednesday 26 January 2011, Ian Monroe wrote: The basic schedule will be that sometime on Saturday the repos listed in the subject will be made read-only, we'll make the conversion and upload them to git.kde.org. The subversion directories will be emptied and replaced with a README. *Both* the 4.6 and trunk branches are moving. For up to one week if someone finds a major problem in the history a re-push will be considered. After that we'll just live with it. ...but far better would be for any problem to be found now. Please note that the repo names are not the final ones (they will be konsole, kde-baseapps, kde-workspace, kde-runtime, kdelibs). git://anongit.kde.org/scratch/nalvarez/kdelibs-convtest git://anongit.kde.org/scratch/ianmonroe/kdebase-apps git://anongit.kde.org/scratch/ianmonroe/kdebase-runtime git://anongit.kde.org/scratch/ianmonroe/kdebase-workspace git://anongit.kde.org/scratch/ianmonroe/konsole in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. Found more beasties like that in other repos as well. Fixing them as I go, but kde-runtime is read-only (asked on #kde-sysadmin the conversion of that one might have issues they're looking into it) so I can't push my fixes for that one. Regards. -- Kévin Ottens, http://ervin.ipsquad.net KDAB - proud patron of KDE, http://www.kdab.com signature.asc Description: This is a digitally signed message part.
Re: kdelibs, kdebase moving to Git this Saturday
We've allowed Kevin to push two commits to the repo that fix the build failure to minimize interruptions, but the repo otherwise remains read-only for now until the his- tory conversion problems are dealt with. -- Best regards, Eike Hein
Re: kdelibs, kdebase moving to Git this Saturday
- Original Message - On 1/30/2011 1:17 PM, Marco Martin wrote: in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. kde-runtime is currently set read-only for that and other reasons, the conversion seems to be flawed. Unfortunately the guys writing the conversion script are in bed or afk right now. Additionally we've made kde-workspace read-only too, as #kwin found a missing file, which means we have a problem there too. I'ld like to ask everyone to check the repo's NOW, so the conversion people can have a full list of problems and we don't have to repush 3 times this week, but only once. Best, -- Tom Albers KDE Sysadmin
Re: kdelibs, kdebase moving to Git this Saturday
On Sunday 30 January 2011 14.38.17 Tom Albers wrote: - Original Message - On 1/30/2011 1:17 PM, Marco Martin wrote: in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. kde-runtime is currently set read-only for that and other reasons, the conversion seems to be flawed. Unfortunately the guys writing the conversion script are in bed or afk right now. Additionally we've made kde-workspace read-only too, as #kwin found a missing file, which means we have a problem there too. I'ld like to ask everyone to check the repo's NOW, so the conversion people can have a full list of problems and we don't have to repush 3 times this week, but only once. enterprise branches missing from kdelibs /Regards Torgny
Re: kdelibs, kdebase moving to Git this Saturday
On Sunday 30 January 2011, Tom Albers wrote: - Original Message - On 1/30/2011 1:17 PM, Marco Martin wrote: in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. kde-runtime is currently set read-only for that and other reasons, the conversion seems to be flawed. Unfortunately the guys writing the conversion script are in bed or afk right now. Additionally we've made kde-workspace read-only too, as #kwin found a missing file, which means we have a problem there too. actually, doesn't seem a missing file. the file in question is oxygenhelper.h in workspace/libs/oxygen included by workspace/kwin/clients/oxygen/oxygendecohelper.h but even if existing the file is not found, while building from svn that file is found fine. Cheers, Marco Martin
Re: kdelibs, kdebase moving to Git this Saturday
2011/1/30 Marco Martin: On Sunday 30 January 2011, Tom Albers wrote: - Original Message - On 1/30/2011 1:17 PM, Marco Martin wrote: Additionally we've made kde-workspace read-only too, as #kwin found a missing file, which means we have a problem there too. actually, doesn't seem a missing file. the file in question is oxygenhelper.h in workspace/libs/oxygen included by workspace/kwin/clients/oxygen/oxygendecohelper.h but even if existing the file is not found, while building from svn that file is found fine. The file oxygenhelper.h is actually in kde-workspace/libs/oxygen/, it seems that it's not found properly at that location. Could it be that noone noticed that problem before the git migration because the very recent commit http://websvn.kde.org/?view=revisionrevision=1217934 added oxygendecohelper.cpp as a source file for the new build target oxygen-shadow-demo? Maybe the reason why the error didn't appear earlier is that oxygendecohelper.cpp was never compiled before that commit, so noone noticed that the missing header isn't there...
Re: kdelibs, kdebase moving to Git this Saturday
On Sunday 30 January 2011 15:06:53 Marco Martin wrote: On Sunday 30 January 2011, Tom Albers wrote: - Original Message - On 1/30/2011 1:17 PM, Marco Martin wrote: in the runtime repository, the pics directory doesn't seem available, but the main CMakelist.txt still looks for it. kde-runtime is currently set read-only for that and other reasons, the conversion seems to be flawed. Unfortunately the guys writing the conversion script are in bed or afk right now. Additionally we've made kde-workspace read-only too, as #kwin found a missing file, which means we have a problem there too. actually, doesn't seem a missing file. the file in question is oxygenhelper.h in workspace/libs/oxygen included by workspace/kwin/clients/oxygen/oxygendecohelper.h but even if existing the file is not found, while building from svn that file is found fine. I fixed both issues already, pushed like an hour or two ago. One looked like a missing commit indeed, the other one is because in that module we used KDEBASE_WORKSPACE_SOURCE_DIR everywhere, but nothing is setting it anymore after the split. Regards. -- Kévin Ottens, http://ervin.ipsquad.net KDAB - proud patron of KDE, http://www.kdab.com signature.asc Description: This is a digitally signed message part.
Re: kdelibs, kdebase moving to Git this Saturday
2011/1/28 Nicolas Alvarez: The kdebase-runtime repository is currently 260MB, and kdebase-workspace is 300MB. Apparently it's because of wallpapers and icons, either in the current revision or in the past. Removing wallpapers from kdebase-workspace would bring it down to 190MB (100MB less). I haven't yet tested kdebase-runtime. What do you all think of removing wallpapers from these git repositories? We could put them in a separate git repository, or even keep them in SVN. Looks like a good idea to me. The wallpapers and even the wallpaper history will not be of much use to most developers, so having them in kdebase-workspace would cost lots of hard drive space and bandwidth with no real benefit. Cheers, Frank
Re: kdelibs, kdebase moving to Git this Saturday
Nicolás Alvarez wrote: Ian Monroe wrote: git://anongit.kde.org/scratch/nalvarez/kdelibs-convtest git://anongit.kde.org/scratch/ianmonroe/kdebase-apps git://anongit.kde.org/scratch/ianmonroe/kdebase-runtime git://anongit.kde.org/scratch/ianmonroe/kdebase-workspace git://anongit.kde.org/scratch/ianmonroe/konsole Some problems were found in the kdelibs repository, mostly in old tags. r411963 is particularly good at messing up conversions... The new repository (shall we call it RC2?) is in: git://anongit.kde.org/scratch/ianmonroe/kdelibs-trial kdebase repos seem to have similar problems; new git repos will be up once the rules are fixed. Please, help review the repositories before migration! Unlike KDE software, here we won't have point releases to fix bugs later :) The kdebase repositories have been re-pushed with tags and branches fixed. Same URLs as before. -- Nicolas
Re: kdelibs, kdebase moving to Git this Saturday
A Dissabte, 29 de gener de 2011, Frank Reininghaus va escriure: 2011/1/28 Nicolas Alvarez: The kdebase-runtime repository is currently 260MB, and kdebase-workspace is 300MB. Apparently it's because of wallpapers and icons, either in the current revision or in the past. Removing wallpapers from kdebase-workspace would bring it down to 190MB (100MB less). I haven't yet tested kdebase-runtime. What do you all think of removing wallpapers from these git repositories? We could put them in a separate git repository, or even keep them in SVN. Looks like a good idea to me. The wallpapers and even the wallpaper history will not be of much use to most developers, so having them in kdebase-workspace would cost lots of hard drive space and bandwidth with no real benefit. I disagree, wallpapers *are* part of the history, if i want to go abck to 4.5 and install kdebase i want to get what we had, not something less because that new shiny tool we have is not able to cope with wallpapers. Albert Cheers, Frank
Re: kdelibs, kdebase moving to Git this Saturday
On Saturday 29 January 2011 13:16:32 Albert Astals Cid wrote: I disagree, wallpapers *are* part of the history, if i want to go abck to 4.5 and install kdebase i want to get what we had, not something less because that new shiny tool we have is not able to cope with wallpapers. I don't know how much work that is, but if possible, only the default wallpaper should always be in the repository (including those of kdm, ksplash, or whereever they appear). What the user can select later from, is totally uninteresting in kdebase; they could be moved (including history) to the artwork addon package, where extra wallpapers live anyway. Christoph Feck (kdepepo)
Re: kdelibs, kdebase moving to Git this Saturday
On Sat, Jan 29, 2011 at 02:56:33PM +0100, Christoph Feck wrote: On Saturday 29 January 2011 13:16:32 Albert Astals Cid wrote: I disagree, wallpapers *are* part of the history, if i want to go abck to 4.5 and install kdebase i want to get what we had, not something less because that new shiny tool we have is not able to cope with wallpapers. that won't work anyway, as we are rewriting history due to the splitup. I don't know how much work that is, but if possible, only the default wallpaper should always be in the repository (including those of kdm, ksplash, or whereever they appear). that makes no sense conceptually. once something is in the repo, it will stay there forever. and the default wallpaper changes at least once per release. so by doing a history cut now, you'd only postpone the problem, and create a royal mess on the way. shallow clones (whenever they may come) should fix the history bloat problem for local clones, so there isn't a really strong reason long-term to externalize the multimedia data. i'm not against such a carve out (i'm even slightly pro, especially short-term), but it would have to be done properly.
Re: kdelibs, kdebase moving to Git this Saturday
On Saturday, January 29, 2011, Albert Astals Cid wrote: I disagree, wallpapers *are* part of the history, if i want to go abck to 4.5 and install kdebase i want to get what we had, not something less because that new shiny tool we have is not able to cope with wallpapers. not less, but different perhaps. the wallpapers are really not related to the plasma workspace devel at all, however, and would probably be better off in their own repository as a result. it's an art esign thing, not a code thing. there is only a runtime dependency on _one_ wallpaper: the default. that dependency is actually defined by the theme, and the default theme actually resides in kde-runtime. we do need to decide how to deal with the wallpapers, but i don't think keeping them in kde-workspace is a good answer. it does increaese the size considerably for something that is really a different kind of beast. i am seriously considering proposing shipping just one wallpaper as part of an artwork package and making the rest of them available via synchrotron. -- Aaron J. Seigo humru othro a kohnu se GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA EE75 D6B7 2EB1 A7F1 DB43 KDE core developer sponsored by Qt Development Frameworks signature.asc Description: This is a digitally signed message part.
Re: kdelibs, kdebase moving to Git this Saturday
On Friday 28 January 2011 00.06.21 Nicolas Alvarez wrote: John Tapsell wrote: 2011/1/27 Nicolás Alvarez nicolas.alva...@gmail.com: Please, help review the repositories before migration! Unlike KDE software, here we won't have point releases to fix bugs later :) I have quite a few commits in kdebase-workspace with the commit message: SVN_SILENT: Do blahblah and GUI: do blah blah Since git places a high important on the very first line, could we mangle these into SVN_SILENT: Do blahblah and GUI: do blah blah ? So check if the first line contains only a keyword, and if so combine with next line? It's technically possible, but it may involve a lot of manual work. And many people (not including me) disagree with this kind of history edits; for example: Sho_ IMHO the objective is to import the SVN history faithfully and accurately While I agree with Eike here, I think that in this case we can make an exception, however I do not like the idea of git-filter-branch. How about we simply rewrite the message in svn2git? /Regards Torgny
Re: kdelibs, kdebase moving to Git this Saturday
On Friday 28 January 2011 11.05.43 Johannes Sixt wrote: Am 1/28/2011 10:31, schrieb Torgny Nyblom: On Friday 28 January 2011 00.06.21 Nicolas Alvarez wrote: John Tapsell wrote: 2011/1/27 Nicolás Alvarez nicolas.alva...@gmail.com: Please, help review the repositories before migration! Unlike KDE software, here we won't have point releases to fix bugs later :) I have quite a few commits in kdebase-workspace with the commit message: SVN_SILENT: Do blahblah and GUI: do blah blah Since git places a high important on the very first line, could we mangle these into SVN_SILENT: Do blahblah and GUI: do blah blah It's technically possible, but it may involve a lot of manual work. And many people (not including me) disagree with this kind of history edits; for example: Sho_ IMHO the objective is to import the SVN history faithfully and accurately While I agree with Eike here, I think that in this case we can make an exception, however I do not like the idea of git-filter-branch. How about we simply rewrite the message in svn2git? Doesn't it operate with a git-fast-import stream? Wouldn't it just mean to flip a LF to a SP here and there? You wouldn't even have to change the byte-length of the commit messages. Well yes, but that would potentionaly give us messages like SVN_SILENT CCBUG: 123456 BUG: 123455 Fix foo bar. Wouldn't it be better to move these messages to the end of the message if there is a valid line to show. /Regards Torgny
Re: kdelibs, kdebase moving to Git this Saturday
Am 1/28/2011 12:19, schrieb Torgny Nyblom: On Friday 28 January 2011 11.05.43 Johannes Sixt wrote: Doesn't it operate with a git-fast-import stream? Wouldn't it just mean to flip a LF to a SP here and there? You wouldn't even have to change the byte-length of the commit messages. Well yes, but that would potentionaly give us messages like SVN_SILENT CCBUG: 123456 BUG: 123455 Fix foo bar. Wouldn't it be better to move these messages to the end of the message if there is a valid line to show. That would be much better, of course. I just tried to help find a low-hanging-fruit solution. -- Hannes
Re: kdelibs, kdebase moving to Git this Saturday
On Fri, Jan 28, 2011 at 05:27, Johannes Sixt j.s...@viscovery.net wrote: Am 1/28/2011 12:19, schrieb Torgny Nyblom: On Friday 28 January 2011 11.05.43 Johannes Sixt wrote: Doesn't it operate with a git-fast-import stream? Wouldn't it just mean to flip a LF to a SP here and there? You wouldn't even have to change the byte-length of the commit messages. Well yes, but that would potentionaly give us messages like SVN_SILENT CCBUG: 123456 BUG: 123455 Fix foo bar. Wouldn't it be better to move these messages to the end of the message if there is a valid line to show. That would be much better, of course. I just tried to help find a low-hanging-fruit solution. Well it was always too late for any solution, conversion is tomorrow. Ian
Re: kdelibs, kdebase moving to Git this Saturday
On Friday 28 January 2011 16.13.31 Nicolas Alvarez wrote: Ian Monroe wrote: For up to one week if someone finds a major problem in the history a re-push will be considered. After that we'll just live with it. ...but far better would be for any problem to be found now. Please note that the repo names are not the final ones (they will be konsole, kde-baseapps, kde-workspace, kde-runtime, kdelibs). git://anongit.kde.org/scratch/nalvarez/kdelibs-convtest git://anongit.kde.org/scratch/ianmonroe/kdebase-apps git://anongit.kde.org/scratch/ianmonroe/kdebase-runtime git://anongit.kde.org/scratch/ianmonroe/kdebase-workspace git://anongit.kde.org/scratch/ianmonroe/konsole The kdebase-runtime repository is currently 260MB, and kdebase-workspace is 300MB. Apparently it's because of wallpapers and icons, either in the current revision or in the past. Removing wallpapers from kdebase-workspace would bring it down to 190MB (100MB less). I haven't yet tested kdebase-runtime. Is that with all wallpapers removed or only those in trunk? What do you all think of removing wallpapers from these git repositories? We could put them in a separate git repository, or even keep them in SVN. From trunk - do what ever you like (my vote would be on git, but not neccecarily the same repo, to keep things together) From the hole repo - No way, not unless you also skip all branches and tags. /Regars Torgny
