cpp/openttd-patchpack/source Changeset - r10281:446aefa38244

Changeset - r10281:446aefa38244

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-10-22 22:07:43
rubidium@openttd.org

(svn r14519) -Fix [FS#2376]: do not use the short hash form for getting a specific mercurial/git revision as those can collide quite easily causing reversion detection to fail (PhilSophus)

1 file changed with 4 insertions and 4 deletions:

findversion.sh

0 comments (0 inline, 0 general)

findversion.sh

➞

Show inline comments

@@ @@ -73,35 +73,35 @@ if [ -d "$ROOT_DIR/.svn" ]; then @@
 	TAG=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*tags/ { split($2, a, "/"); for(i in a) if (a[i]=="tags") { print a[i+1]; break } }'`
 	REV_NR=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^Last Changed Rev:/ { print $4 }'`
 	if [ -n "$TAG" ]; then
 		REV=$TAG
 	else
 		REV="r$REV_NR"
 	fi
 elif [ -d "$ROOT_DIR/.git" ]; then
 	# We are a git checkout
 	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8`
 	REV="g$HASH"
 	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~"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8`
 	REV="h$HASH"
 	HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3`
 	REV="h`echo $HASH | cut -c1-8`"
 	BRANCH=`hg branch | sed 's~^default$~~'`
 	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
 else
 	# We don't know
 	MODIFIED="1"
 	BRANCH=""
 	REV=""
 	REV_NR=""
 fi
 if [ "$MODIFIED" -eq "2" ]; then
 	REV="${REV}M"

0 comments (0 inline, 0 general)