[MPlayer-dev-eng] [PATCH] proper version info for git.mplayerhq.hu

[Rudolf Polzer]

On Wed, Dec 08, 2010 at 03:19:33PM +0100, Clément Bœsch wrote:
> On Sat, Dec 04, 2010 at 03:51:29PM +0100, Rudolf Polzer wrote:
> > On Sat, Dec 04, 2010 at 11:41:09AM +0100, Clément Bœsch wrote:
> > > On Sat, Dec 04, 2010 at 10:41:55AM +0100, Rudolf Polzer wrote:
> > > > As I got no further reply to this, and would really like to see this applied, I
> > > > attached the current version of this again and ask: is anything important
> > > > missing? Can this get applied?
> > > > 
> > > > It:
> > > > - clearly changes nothing for svn users
> > > > - if a user of our official git repo has an unmodified repo, he will see the
> > > >   same version number as if he has used svn
> > > 
> > > And "LOCAL".
> > 
> > If the changes are also not committed, yes.
> > 
> > > > - if he has changes to svn, he gets SVN-r12345+3eb79c1 to also contain his git
> > > >   hash
> > > > - if the SVN revision cannot be identified (e.g. because he pulled from another
> > > >   repo, e.g. uau's in case uau merges this change), you just git git-3eb79c1
> > > >   (possibly appended with +1f9a317 for local changes)
> > > > 
> > > > I get, for example:
> > > > MPlayer SVN-r32671+12b7526-4.5.1 (C) 2000-2010 MPlayer Team
> > > > 
> > > > Best regards,
> > > > 
> > > 
> > > Btw, since your working on "helpers", having a .gitignore and an update
> > > script in TOOLS with sth like "(cd ffmpeg; git pull); (cd
> > > ffmpeg/libswscale; git pull); (cd libdvdnav/; svn up); (cd libdvdread4/;
> > > svn up)" could be nice... And maybe an init script too :-)
> > > 
> > > But well, that's not what your patch is about.
> > > 
> > > Regarding the patch, what happen if git is not installed on the user
> > > system?
> > 
> > This code never gets called unless this is a git checkout. So this shouldn't be
> > a problem. It only runs if finding the svn revision failed using svn means.
> > 
> 
> If you don't have the .svn directory (some kind of snapshot done with a
> svn export for example), and then don't have git, it will print garbage.
> Just do what you said on IRC about redirecting to /dev/null, just like
> it's done at the moment for every svn revision wrappers.

Then the attached one should be better.

Best regards,

Rudolf Polzer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: git-revision-in-version-sh.diff
Type: text/x-diff
Size: 1669 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20101209/725e1d23/attachment.diff>