cpp/openttd-patchpack/source Changeset - r15397:3a2110328d0a

Changeset - r15397:3a2110328d0a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 14 years ago 2010-07-02 16:34:15
michi_cc@openttd.org

(svn r20050) -Add: git revision detection for custom git-svn clones.

2 files changed with 17 insertions and 2 deletions:

findversion.sh

projects/determineversion.vbs

0 comments (0 inline, 0 general)

findversion.sh

➞

Show inline comments

@@ @@ -94,8 +94,12 @@ elif [ -d "$ROOT_DIR/.git" ]; then @@
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
 	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
 	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 	BRANCH=`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@;s@^master$@@'`
 	REV_NR=`LC_ALL=C git log --pretty=format:%s --grep="^(svn r[0-9]*)" -1 -- "$SRC_DIR" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 	if [ -z "$REV_NR" ]; then
 		# No rev? Maybe it is a custom git-svn clone
 		REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 -- "$SRC_DIR" | sed "s@.*\@\([0-9]*\).*@\1@"`
 	fi
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then

projects/determineversion.vbs

➞

Show inline comments

@@ @@ -203,6 +203,17 @@ Function DetermineSVNVersion() @@
 						revision = Mid(oExec.StdOut.ReadLine(), 7)
 						revision = Mid(revision, 1, InStr(revision, ")") - 1)
 					End If ' Err.Number = 0
 					If revision = "" Then
 						' No revision? Maybe it is a custom git-svn clone
 						' Reset error number as WshShell.Exec will not do that on success
 						Err.Clear
 						Set oExec = WshShell.Exec("git log --pretty=format:%b --grep=" & Chr(34) & "git-svn-id:.*@[0-9]*" & Chr(34) & " -1 ../src")
 						If Err.Number = 0 Then
 							revision = oExec.StdOut.ReadLine()
 							revision = Mid(revision, InStr(revision, "@") + 1)
 							revision = Mid(revision, 1, InStr(revision, " ") - 1)
 						End If ' Err.Number = 0
 					End If ' revision = ""
 				End If ' Err.Number = 0
 			End If ' oExec.ExitCode = 0
 		End If ' Err.Number = 0

0 comments (0 inline, 0 general)