diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-10-12 08:54:10 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-10-12 08:54:10 +0000 |
| commit | 6832435e85ed5dca261f6ae041e9f78e5ccfa285 (patch) | |
| tree | ac60d879344f26d76e57b5ccfdd040082ab13549 | |
| parent | d95828db91607d1060c4301ab5631cb5a75cc787 (diff) | |
| download | gcc-6832435e85ed5dca261f6ae041e9f78e5ccfa285.zip gcc-6832435e85ed5dca261f6ae041e9f78e5ccfa285.tar.gz gcc-6832435e85ed5dca261f6ae041e9f78e5ccfa285.tar.bz2 | |
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
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/gcc_update | 21 |
2 files changed, 21 insertions, 5 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index c7152af..c2c371c 100644 --- 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 8192d81..b989ffd 100755 --- 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 |