GStreamer-devel

GIT test repositories

Classic

List

Threaded

8 messages Options

Edward Hervey

GIT test repositories

Administrator

Hi all,

Long time without any git updates, sincere apologies about that. There
was some confusion/delays between Tim and myself regarding the
conversion :(

I've finally done a test conversion of all main modules from the state
they were in 2 days ago. You can find them here under my personal
repository section (~bilboed/<modulename>):
http://cgit.freedesktop.org/

These repositories include the full history contained in cvs (first
commit is January 2000 by omega).

I did a few fixups during the conversion, namely:

* Using common as a git submodule
git submodules are the natural way to share a module between several
others. The problem was that we want to keep the coherence between
checkouts of the parent module and common, so that if you check out a
revision of core from a year ago, you will end up with the revision of
common which was used at that time.
All converted git modules have therefore been re-parsed to contain
those updates and the initial .gitmodules file that contains the link to
which submodule to check out and where (currently pointing to where I
stored the common repository).
> git checkout <acommit>
> git submodule update
# you will end up with common being in the state it was when
# <acommit> was done.

* Renaming .cvsignore to .gitignore
Those special files have been renamed throughout the whole history of
the modules. So you should end up with the same behaviour

* Attributing authorship to patch authors
GIT makes a difference between the person who committed a patch and
the author of that patch.
I parsed all the commit messages to extract (as much as I could) the
author of the patches to set that properly.
Example here :
http://cgit.freedesktop.org/~bilboed/common/commit/?id=80627bb8053f6a10f28015e834778b098fc9c391

So at this point... we need testing ! Check out the modules, compile
them, check out various revisions, report issues, etc...

Final word of caution : hopefully these repositories will not require
any fixups, but DO NOT ASSUME that these will be the final official
repositories. If we have to do some more fixups, it will change the hash
of the revisions and the work/branches you based on these repositories
will be lost (not quite lost, but it'll be painful to rebase your work
against the new repositories).

To sum up:

*** do not use these repositories for production use yet ! ***

... but please test them all the same :)

Edward

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Edward Hervey

Re: GIT test repositories

Administrator

Hi again,

At the general request, I've also created a commit message filter in
order to have a saner view of the commits.

The general rule is that I tried to condense as much information in
one line (a summary if you wish).

I haven't checked ALL commits to make sure there aren't any
inconsistencies, but the original cvs commit message is present after
the one-liner summary (for historical purposes).

As mentionned previously... this breaks compatibility with the
previously released repositories.

As usual, comments/feedbacks/.. are welcome,

Edward

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Andy Wingo

Re: GIT test repositories

On Tue 09 Sep 2008 10:48, Edward Hervey <[hidden email]> writes:

> At the general request, I've also created a commit message filter in
> order to have a saner view of the commits.

Edward this looks great. YOU ARE A HERO

--
http://wingolog.org/

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Edward Hervey

Re: GIT test repositories

Administrator

On Wed, 2008-09-10 at 21:47 +0200, Andy Wingo wrote:
> On Tue 09 Sep 2008 10:48, Edward Hervey <[hidden email]> writes:
>
> > At the general request, I've also created a commit message filter in
> > order to have a saner view of the commits.
>
> Edward this looks great. YOU ARE A HERO
>

Cheers :)

Alas, I had to take off my superhero stockings for a while, and
realized that the conversion wasn't correct (the common submodule refs
were wrong).

I've been fixing the scripts used to do the conversion. I'll upload
new converted modules and links to the conversion script later on today.

Next step is to create a wiki page with information on the git
workflow specific to GStreamer development (Changelog usage, patches,
releases, etc...). If anyone's interested, help is most welcome.

Edward

--
It's a bird ? It's a plane ?
No... it's git-filter-branch !

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Edward Hervey

Re: GIT test repositories

Administrator

Hi again,

So new *fixed* repositories are uploaded, at the same location.

For those interested, the scripts I used are located here:

http://git.collabora.co.uk/?p=user/edward/gst-git-migration;a=summary

Edward

On Thu, 2008-09-11 at 14:07 +0200, Edward Hervey wrote:

> On Wed, 2008-09-10 at 21:47 +0200, Andy Wingo wrote:
> > On Tue 09 Sep 2008 10:48, Edward Hervey <[hidden email]> writes:
> >
> > > At the general request, I've also created a commit message filter in
> > > order to have a saner view of the commits.
> >
> > Edward this looks great. YOU ARE A HERO
> >
>
> Cheers :)
>
> Alas, I had to take off my superhero stockings for a while, and
> realized that the conversion wasn't correct (the common submodule refs
> were wrong).
>
> I've been fixing the scripts used to do the conversion. I'll upload
> new converted modules and links to the conversion script later on today.
>
> Next step is to create a wiki page with information on the git
> workflow specific to GStreamer development (Changelog usage, patches,
> releases, etc...). If anyone's interested, help is most welcome.
>
> Edward
>
> --
> It's a bird ? It's a plane ?
> No... it's git-filter-branch !
>

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Jan Schmidt-6

Re: GIT test repositories

In reply to this post by Edward Hervey

On Sun, 2008-09-07 at 15:34 +0200, Edward Hervey wrote:

> * Using common as a git submodule
> git submodules are the natural way to share a module between several
> others. The problem was that we want to keep the coherence between
> checkouts of the parent module and common, so that if you check out a
> revision of core from a year ago, you will end up with the revision of
> common which was used at that time.
> All converted git modules have therefore been re-parsed to contain
> those updates and the initial .gitmodules file that contains the link to
> which submodule to check out and where (currently pointing to where I
> stored the common repository).
> > git checkout <acommit>
> > git submodule update
> # you will end up with common being in the state it was when
> # <acommit> was done.
>

I didn't have any luck with common/ - in each of core, base and -good
that I've tried so far, common/ is empty after cloning. I tried 'git
submodule update', and it stays empty.

Am I missing something?

J.
--
Jan Schmidt <[hidden email]>

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel

Edward Hervey

Re: GIT test repositories

Administrator

git submodule init
git submodule update

On Thu, 2008-10-09 at 13:52 +0100, Jan Schmidt wrote:

> On Sun, 2008-09-07 at 15:34 +0200, Edward Hervey wrote:
>
> > * Using common as a git submodule
> > git submodules are the natural way to share a module between several
> > others. The problem was that we want to keep the coherence between
> > checkouts of the parent module and common, so that if you check out a
> > revision of core from a year ago, you will end up with the revision of
> > common which was used at that time.
> > All converted git modules have therefore been re-parsed to contain
> > those updates and the initial .gitmodules file that contains the link to
> > which submodule to check out and where (currently pointing to where I
> > stored the common repository).
> > > git checkout <acommit>
> > > git submodule update
> > # you will end up with common being in the state it was when
> > # <acommit> was done.
> >
>
> I didn't have any luck with common/ - in each of core, base and -good
> that I've tried so far, common/ is empty after cloning. I tried 'git
> submodule update', and it stays empty.
>
> Am I missing something?
>
> J.

Edward Hervey

Re: GIT test repositories

Administrator

And for those about to say "oh, but that's YET another step I need to
do", it's not true.

Those two commands are the same which are required for checking out and
updating the common module in cvs. You don't have to type those commands
for cvs because they are in the gst-autogen.sh script.

I can add a conversion to the gst-git-migration tools so that it
converts the contents of gst-autogen.sh to automatically checkout/update
the common submodule a-la-git.

Edward

On Thu, 2008-10-09 at 16:59 +0200, Edward Hervey wrote:

> git submodule init
> git submodule update
>
> On Thu, 2008-10-09 at 13:52 +0100, Jan Schmidt wrote:
> > On Sun, 2008-09-07 at 15:34 +0200, Edward Hervey wrote:
> >
> > > * Using common as a git submodule
> > > git submodules are the natural way to share a module between several
> > > others. The problem was that we want to keep the coherence between
> > > checkouts of the parent module and common, so that if you check out a
> > > revision of core from a year ago, you will end up with the revision of
> > > common which was used at that time.
> > > All converted git modules have therefore been re-parsed to contain
> > > those updates and the initial .gitmodules file that contains the link to
> > > which submodule to check out and where (currently pointing to where I
> > > stored the common repository).
> > > > git checkout <acommit>
> > > > git submodule update
> > > # you will end up with common being in the state it was when
> > > # <acommit> was done.
> > >
> >
> > I didn't have any luck with common/ - in each of core, base and -good
> > that I've tried so far, common/ is empty after cloning. I tried 'git
> > submodule update', and it stays empty.
> >
> > Am I missing something?
> >
> > J.
>