LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/1] [Scripts] add svn revision information to setlocalversion
@ 2008-01-30 10:15 Bryan Wu
  2008-01-30 10:24 ` Sam Ravnborg
  0 siblings, 1 reply; 5+ messages in thread
From: Bryan Wu @ 2008-01-30 10:15 UTC (permalink / raw)
  To: sam; +Cc: linux-kernel, Bryan Wu

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
---
 scripts/setlocalversion |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 52f032e..2d6645c 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -25,6 +25,10 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	# All done with git
 	exit
 fi
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null | grep '^Revision' | awk '{print $NF}'` ; then
+        printf -- '-svn%s' $rev
+fi
 
 # Check for mercurial and a mercurial repo.
 if hgid=`hg id 2>/dev/null`; then
-- 
1.5.3.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] [Scripts] add svn revision information to setlocalversion
  2008-01-30 10:15 [PATCH 1/1] [Scripts] add svn revision information to setlocalversion Bryan Wu
@ 2008-01-30 10:24 ` Sam Ravnborg
  2008-01-30 16:00   ` Bryan Wu
  2008-01-30 16:39   ` [PATCH 1/1 try#2] " Bryan Wu
  0 siblings, 2 replies; 5+ messages in thread
From: Sam Ravnborg @ 2008-01-30 10:24 UTC (permalink / raw)
  To: Bryan Wu; +Cc: linux-kernel

On Wed, Jan 30, 2008 at 06:15:25PM +0800, Bryan Wu wrote:
> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
> ---
>  scripts/setlocalversion |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/scripts/setlocalversion b/scripts/setlocalversion
> index 52f032e..2d6645c 100644
> --- a/scripts/setlocalversion
> +++ b/scripts/setlocalversion
> @@ -25,6 +25,10 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
>  	# All done with git
>  	exit
>  fi
> +# Check for svn and a svn repo.
> +if rev=`svn info 2>/dev/null | grep '^Revision' | awk '{print $NF}'` ; then
> +        printf -- '-svn%s' $rev
> +fi
>  
>  # Check for mercurial and a mercurial repo.
>  if hgid=`hg id 2>/dev/null`; then

Hi Bryna.

Can I ask you to change the shell script to use
a chained if so if we find git we do not try mercurial nor svn.

I should have done so initially when adding the patch with mercurial
support but it slipped my mind.

	Sam

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] [Scripts] add svn revision information to setlocalversion
  2008-01-30 10:24 ` Sam Ravnborg
@ 2008-01-30 16:00   ` Bryan Wu
  2008-01-30 16:39   ` [PATCH 1/1 try#2] " Bryan Wu
  1 sibling, 0 replies; 5+ messages in thread
From: Bryan Wu @ 2008-01-30 16:00 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Bryan Wu, linux-kernel

On Jan 30, 2008 6:24 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> On Wed, Jan 30, 2008 at 06:15:25PM +0800, Bryan Wu wrote:
> > Signed-off-by: Bryan Wu <bryan.wu@analog.com>
> > ---
> >  scripts/setlocalversion |    4 ++++
> >  1 files changed, 4 insertions(+), 0 deletions(-)
> >
> > diff --git a/scripts/setlocalversion b/scripts/setlocalversion
> > index 52f032e..2d6645c 100644
> > --- a/scripts/setlocalversion
> > +++ b/scripts/setlocalversion
> > @@ -25,6 +25,10 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
> >       # All done with git
> >       exit
> >  fi
> > +# Check for svn and a svn repo.
> > +if rev=`svn info 2>/dev/null | grep '^Revision' | awk '{print $NF}'` ; then
> > +        printf -- '-svn%s' $rev
> > +fi
> >
> >  # Check for mercurial and a mercurial repo.
> >  if hgid=`hg id 2>/dev/null`; then
>
> Hi Bryna.
>
> Can I ask you to change the shell script to use
> a chained if so if we find git we do not try mercurial nor svn.
>

Do you mean follow the git and mercurial style to rewrite this svn patch?
No problem I will update it.

> I should have done so initially when adding the patch with mercurial
> support but it slipped my mind.
>

We add svn to this for some time, but I forget to sent it out.
Now I hope it can fix this hole.

Thanks
-Bryan

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1 try#2] [Scripts] add svn revision information to setlocalversion
  2008-01-30 10:24 ` Sam Ravnborg
  2008-01-30 16:00   ` Bryan Wu
@ 2008-01-30 16:39   ` Bryan Wu
  2008-02-02 18:24     ` Sam Ravnborg
  1 sibling, 1 reply; 5+ messages in thread
From: Bryan Wu @ 2008-01-30 16:39 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Bryan Wu, linux-kernel

>From f2adf444236eb3a4dcf5104dfbc1c5e1d5886c76 Mon Sep 17 00:00:00 2001
From: Bryan Wu <bryan.wu@analog.com>
Date: Thu, 31 Jan 2008 00:38:16 +0800
Subject: [PATCH] [Scripts] add svn revision information to setlocalversion

[try #2]: follow git and mercurial style, add uncommitted changes detect

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
---
 scripts/setlocalversion |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/setlocalversion

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
old mode 100644
new mode 100755
index 52f032e..17b0028
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -45,3 +45,18 @@ if hgid=`hg id 2>/dev/null`; then
 	# All done with mercurial
 	exit
 fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null | grep '^Revision' | awk '{print $NF}'` ; then
+	changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
+
+	# Are there uncommitted changes?
+	if [ $changes != 0 ]; then
+		printf -- '-svn%s%s%s' "$rev" -dirty "$changes"
+	else
+		printf -- '-svn%s' "$rev"
+	fi
+
+	# All done with svn
+	exit
+fi
-- 
1.5.3.4


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1 try#2] [Scripts] add svn revision information to setlocalversion
  2008-01-30 16:39   ` [PATCH 1/1 try#2] " Bryan Wu
@ 2008-02-02 18:24     ` Sam Ravnborg
  0 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2008-02-02 18:24 UTC (permalink / raw)
  To: Bryan Wu; +Cc: linux-kernel

On Thu, Jan 31, 2008 at 12:39:39AM +0800, Bryan Wu wrote:
> >From f2adf444236eb3a4dcf5104dfbc1c5e1d5886c76 Mon Sep 17 00:00:00 2001
> From: Bryan Wu <bryan.wu@analog.com>
> Date: Thu, 31 Jan 2008 00:38:16 +0800
> Subject: [PATCH] [Scripts] add svn revision information to setlocalversion
> 
> [try #2]: follow git and mercurial style, add uncommitted changes detect
> 
> Signed-off-by: Bryan Wu <bryan.wu@analog.com>

Thanks - applied.

	Sam

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-02-02 18:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-30 10:15 [PATCH 1/1] [Scripts] add svn revision information to setlocalversion Bryan Wu
2008-01-30 10:24 ` Sam Ravnborg
2008-01-30 16:00   ` Bryan Wu
2008-01-30 16:39   ` [PATCH 1/1 try#2] " Bryan Wu
2008-02-02 18:24     ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).