| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright 2012 the V8 project authors. All rights reserved. | 2 # Copyright 2012 the V8 project authors. All rights reserved. |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following | 10 # copyright notice, this list of conditions and the following |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 cat ChangeLog | awk --posix '{ | 204 cat ChangeLog | awk --posix '{ |
| 205 if ($0 ~ /^[0-9]{4}-[0-9]{2}-[0-9]{2}:/) { | 205 if ($0 ~ /^[0-9]{4}-[0-9]{2}-[0-9]{2}:/) { |
| 206 if (in_firstblock == 1) { | 206 if (in_firstblock == 1) { |
| 207 exit 0; | 207 exit 0; |
| 208 } else { | 208 } else { |
| 209 in_firstblock = 1; | 209 in_firstblock = 1; |
| 210 } | 210 } |
| 211 }; | 211 }; |
| 212 print $0; | 212 print $0; |
| 213 }' > "$CHANGELOG_ENTRY_FILE" | 213 }' > "$CHANGELOG_ENTRY_FILE" |
| 214 git cl dcommit || die "'git cl dcommit' failed, please try again." | 214 PRESUBMIT_TREE_CHECK="skip" git cl dcommit \ |
| 215 || die "'git cl dcommit' failed, please try again." |
| 215 fi | 216 fi |
| 216 | 217 |
| 217 let CURRENT_STEP+=1 | 218 let CURRENT_STEP+=1 |
| 218 if [ $START_STEP -le $CURRENT_STEP ] ; then | 219 if [ $START_STEP -le $CURRENT_STEP ] ; then |
| 219 echo ">>> Step $CURRENT_STEP: Fetch straggler commits that sneaked in \ | 220 echo ">>> Step $CURRENT_STEP: Fetch straggler commits that sneaked in \ |
| 220 since this script was started." | 221 since this script was started." |
| 221 git svn fetch || die "'git svn fetch' failed." | 222 git svn fetch || die "'git svn fetch' failed." |
| 222 git checkout svn/bleeding_edge | 223 git checkout svn/bleeding_edge |
| 223 restore_if_unset "PREPARE_COMMIT_MSG" | 224 restore_if_unset "PREPARE_COMMIT_MSG" |
| 224 PREPARE_COMMIT_HASH=$(git log -1 --format=%H --grep="$PREPARE_COMMIT_MSG") | 225 PREPARE_COMMIT_HASH=$(git log -1 --format=%H --grep="$PREPARE_COMMIT_MSG") |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 update the v8rel spreadsheet:" | 403 update the v8rel spreadsheet:" |
| 403 else | 404 else |
| 404 echo "Congratulations, you have successfully created the trunk revision \ | 405 echo "Congratulations, you have successfully created the trunk revision \ |
| 405 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ | 406 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ |
| 406 Chromium, and to update the v8rel spreadsheet:" | 407 Chromium, and to update the v8rel spreadsheet:" |
| 407 fi | 408 fi |
| 408 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" | 409 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" |
| 409 common_cleanup | 410 common_cleanup |
| 410 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH | 411 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH |
| 411 fi | 412 fi |
| OLD | NEW |