gcc_update: Run $GCC_HG pull and update separately.

	* gcc_update: Run $GCC_HG pull and update separately.
	Check parents for SVN revision.

From-SVN: r165352

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index c7152afe1699da4bdb97e234893369ba930eefca..c2c371cce9fe6e92a5fae560273819f7179404d5 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * gcc_update: Run $GCC_HG pull and update separately.
+       Check parents for SVN revision.
+
 2010-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * test_recheck: New script.

diff --git a/contrib/gcc_update b/contrib/gcc_update
index 8192d81110224968f0f31e171345ce35e0d2e128..b989ffdc574b71890552927a5c475ec9597d42b2 100755 (executable)
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -311,17 +311,28 @@ case $vcs_type in
        # Update tree, but make sure to only pull the default branch.
        # Otherwise all branches in the upstream repo are added, even if
        # only a single one has been cloned.
-       $GCC_HG pull -u ${silent+-q} -r`$GCC_HG branch` ${1+"$@"}
+       $GCC_HG pull ${silent+-q} -r`$GCC_HG branch` ${1+"$@"}
        if [ $? -ne 0 ]; then
             (touch_files_reexec)
             echo "hg pull of full tree failed." >&2
             exit 1
        fi
 
-       # Extract SVN revision corresponding to tip, as stored by hg convert.
-       # Before hg 1.4.3, there's no template keyword corresponding to the
-       # extra: tag, so need to use hg log --debug to extract the info.
-       revision=`$GCC_HG log --debug -l1 | \
+       # Update tree.  Needs to be done separately from pull so
+       # gcc_update -rREV works.
+       $GCC_HG update ${silent+-q} ${1+"$@"}
+       if [ $? -ne 0 ]; then
+            (touch_files_reexec)
+            echo "hg update of full tree failed." >&2
+            exit 1
+       fi
+
+       # Extract SVN revision corresponding to parents, as stored by
+       # hg convert.  Before hg 1.4.3, there's no template keyword
+       # 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 | \
            sed -ne "/^extra:.*convert_revision=svn:/ {
                s%^.*@%%
                p