add svn revision information to setlocalversion
PATCH 1/1 add svn revision information to setlocalversion
--- scripts/setlocalversion | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
scripts/setlocalversion +4 -0
@@ -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
Signature · 1 line
1.5.3.4
Quoted 10 lines · Bryan Wu
Signed-off-by Bryan Wu <[email protected]>--- scripts/setlocalversion | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)scripts/setlocalversion +0
-0
scripts/setlocalversion if head=`git rev-parse --verify HEAD 2>/dev/null`; then · line 34
Quoted 10 lines
scripts/setlocalversion +4
-0@@ -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
Quoted 19 lines · Sam Ravnborg
Quoted 18 lines · Bryan Wu
Signed-off-by Bryan Wu <[email protected]>--- scripts/setlocalversion | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)scripts/setlocalversion +4
-0@@ -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
Quoted 8 lines
scripts/setlocalversion if head=`git rev-parse --verify HEAD 2>/dev/null`; then · line 34
Quoted 2 lines
scripts/setlocalversion +0
-0# Check for mercurial and a mercurial repo. if hgid=`hg id 2>/dev/null`; thenHi 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.
Quoted 3 lines
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
PATCH 1/1 add svn revision information to setlocalversion
In reply to Sam RavnborgQuoted 1 line
From
f2adf444236eb3a4dcf5104dfbc1c5e1d5886c76Mon Sep 17 00:00:00 2001
From: Bryan Wu <[email protected]>
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
--- scripts/setlocalversion | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/setlocalversion
scripts/setlocalversion +15 -0
@@ -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
Signature · 1 line
1.5.3.4
Quoted 8 lines · Bryan Wu
Quoted 1 line
From
f2adf444236eb3a4dcf5104dfbc1c5e1d5886c76Mon Sep 17 00:00:00 2001From: Bryan Wu <[email protected]>
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 <[email protected]>
Thanks - applied.
Sam