From 39b75e51ecf427f4d40ba33367ae0887d25a0a28 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 25 Aug 2011 09:16:52 +0000 Subject: [PATCH] Don't assume hg convert in gcc_update * gcc_update: Determine svn branch from hg convert_revision. From-SVN: r178056 --- contrib/ChangeLog | 4 ++++ contrib/gcc_update | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e68679dd1ac..07adb585d28 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2011-08-25 Rainer Orth + + * gcc_update: Determine svn branch from hg convert_revision. + 2011-07-18 Rainer Orth * config-list.mk (i586-netware): Remove. diff --git a/contrib/gcc_update b/contrib/gcc_update index c368936e51e..c7195023c79 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -340,14 +340,13 @@ case $vcs_type in # corresponding to the extra: tag, so need to use hg log --debug # to extract the info. parents=`$GCC_HG parents --template '{rev}'` - revision=`$GCC_HG log --debug -r$parents | \ + convert_revision=`$GCC_HG log --debug -r$parents | \ sed -ne "/^extra:.*convert_revision=svn:/ { - s%^.*@%% + s%^[^/]*/%% p }"` - branch=`$GCC_HG branch` - # trunk in SVN parlance shows up as default branch in hg. - [ x$branch = x"default" ] && branch="trunk" + revision=`echo $convert_revision | sed -e 's/.*@//'` + branch=`echo $convert_revision | sed -e 's%branches/%%' -e 's/@.*//'` ;; svn)