On Monday 04 July 2011 14:15:07 Marcus Hüwe wrote:

Hi,

here's a small summary of the 6th (coding) week. Unfortunately I had to spent more time with university stuff than I expected - that's why I didn't finish the complete todo for this week. I did some code restructuring and started to work on the class for the source route.

TODO: - rewrite the project and package working copy classes: * the new working copy format will be incompatible with the current format. * the basic layout will look like this: prj

---> .osc/ (stores prj _and_ pkg metadata)

---> pkg1

---> <files> ...

---> pkgN

---> <files>

So all metadata is stored in the prj/.osc dir instead of prj/pkg/.osc The advantage is that we can support a complete package "restore" (without the need to download the package again): cd prj; rm -r pkg; osc revert/restore pkg; (that's possible because the metadata is stored in the prj/.osc dir). * to convert old project/package working copies to the new format the "osc repairwc" command can be used (at least that's the plan) One thing, IMO it's better if there is no such command as 'repairwc' at all. It the wc is broken, osc should ideally know why. Whether that can always be achieved is a different matter, but this case is rather clear. -- Mit freundlichen Grüßen, Sascha Peilicke

On 2011-07-07 22:06:53 +0200, Vincent Untz wrote:

Le lundi 04 juillet 2011, à 14:15 +0200, Marcus Hüwe a écrit :

...

TODO: - rewrite the project and package working copy classes: * the new working copy format will be incompatible with the current format. * the basic layout will look like this: prj | ---> .osc/ (stores prj _and_ pkg metadata) | ---> pkg1 | ---> <files> ... | ---> pkgN | ---> <files>

I don't know about others, but this doesn't fit my usage of osc: I actually dislike that, by default, we reproduce the prj/pkg/ hierarchy and I prefer a "flat" view of things: I usually check out all packages in the same directory (osc co -c).

My rationale for that is that I work (99% of the time) on packages that will end in openSUSE:Factory, and while I know the devel projects and all this, when checking out a package, I don't care if it comes from GNOME:Apps, GNOME:Factory, multimedia:libs or Base:System. I will care about devel projects when I think "should I push the changes from GNOME:Factory to openSUSE:Factory?", but not when I think "should I do this change in the package?".

So, hrm, is there hope for me? :-)

Hehe yes - I just thought about it again: - packages will still have the .osc dir: * if checked out in a prj/pkg hierarchy pkg/.osc is just a link to ../.osc/data/pkg * if checked out in a flat structure pkg/.osc is a directory instead of a link This way we can still support the "flat checkout" and the "advantage" of keeping the metadata in the project's .osc dir (if a prj/pkg hierarchy is used). Note: something like cp -r prj/pkg . cd pkg; osc <cmd> won't work in this case. Does this fit to your osc usage?

(of course, there are cases when I use the prj/pkg/ hierarchy, but that's mostly when dealing with maintenance updates)

Marcus -- To unsubscribe, e-mail: opensuse-project+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-project+help@opensuse.org