| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 let MIN_EXPECTED_ARGS=2-$REVERT_FROM_BLEEDING_EDGE | 111 let MIN_EXPECTED_ARGS=2-$REVERT_FROM_BLEEDING_EDGE |
| 112 if [ ${#@} -lt $MIN_EXPECTED_ARGS ] ; then | 112 if [ ${#@} -lt $MIN_EXPECTED_ARGS ] ; then |
| 113 if [ -z "$EXTRA_PATCH" ] ; then | 113 if [ -z "$EXTRA_PATCH" ] ; then |
| 114 die "Either a patch file or revision numbers must be specified" | 114 die "Either a patch file or revision numbers must be specified" |
| 115 fi | 115 fi |
| 116 if [ -z "$NEW_COMMIT_MSG" ] ; then | 116 if [ -z "$NEW_COMMIT_MSG" ] ; then |
| 117 die "You must specify a merge comment if no patches are specified" | 117 die "You must specify a merge comment if no patches are specified" |
| 118 fi | 118 fi |
| 119 fi | 119 fi |
| 120 echo ">>> Step $CURRENT_STEP: Preparation" | 120 echo ">>> Step $CURRENT_STEP: Preparation" |
| 121 if [ $REVERT_FROM_BLEEDING_EDGE==1 ] ; then | 121 if [ $REVERT_FROM_BLEEDING_EDGE -eq 1 ] ; then |
| 122 MERGE_TO_BRANCH="bleeding_edge" | 122 MERGE_TO_BRANCH="bleeding_edge" |
| 123 else | 123 else |
| 124 MERGE_TO_BRANCH=$1 | 124 MERGE_TO_BRANCH=$1 |
| 125 [[ -n "$MERGE_TO_BRANCH" ]] || die "Please specify a branch to merge to" | 125 [[ -n "$MERGE_TO_BRANCH" ]] || die "Please specify a branch to merge to" |
| 126 shift | 126 shift |
| 127 fi | 127 fi |
| 128 persist "MERGE_TO_BRANCH" | 128 persist "MERGE_TO_BRANCH" |
| 129 common_prepare | 129 common_prepare |
| 130 fi | 130 fi |
| 131 | 131 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 restore_version_if_unset "NEW" | 287 restore_version_if_unset "NEW" |
| 288 common_cleanup | 288 common_cleanup |
| 289 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then | 289 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then |
| 290 echo "*** SUMMARY ***" | 290 echo "*** SUMMARY ***" |
| 291 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" | 291 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" |
| 292 echo "branch: $TO_URL" | 292 echo "branch: $TO_URL" |
| 293 echo "svn revision: $SVN_REVISION" | 293 echo "svn revision: $SVN_REVISION" |
| 294 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" | 294 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" |
| 295 fi | 295 fi |
| 296 fi | 296 fi |
| OLD | NEW |