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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 done | 172 done |
173 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do | 173 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do |
174 BUG=$(git log -1 $HASH | grep "BUG=" | awk -F '=' '{print $NF}') | 174 BUG=$(git log -1 $HASH | grep "BUG=" | awk -F '=' '{print $NF}') |
175 if [ -n "$BUG" ] ; then | 175 if [ -n "$BUG" ] ; then |
176 [[ -n "$BUG_AGGREGATE" ]] && BUG_AGGREGATE="$BUG_AGGREGATE," | 176 [[ -n "$BUG_AGGREGATE" ]] && BUG_AGGREGATE="$BUG_AGGREGATE," |
177 BUG_AGGREGATE="$BUG_AGGREGATE$BUG" | 177 BUG_AGGREGATE="$BUG_AGGREGATE$BUG" |
178 fi | 178 fi |
179 done | 179 done |
180 if [ -n "$BUG_AGGREGATE" ] ; then | 180 if [ -n "$BUG_AGGREGATE" ] ; then |
181 echo "BUG=$BUG_AGGREGATE" >> $COMMITMSG_FILE | 181 echo "BUG=$BUG_AGGREGATE" >> $COMMITMSG_FILE |
| 182 echo "LOG=N" >> $COMMITMSG_FILE |
182 fi | 183 fi |
183 persist "NEW_COMMIT_MSG" | 184 persist "NEW_COMMIT_MSG" |
184 persist "REVISION_LIST" | 185 persist "REVISION_LIST" |
185 persist_patch_commit_hashes | 186 persist_patch_commit_hashes |
186 fi | 187 fi |
187 | 188 |
188 let CURRENT_STEP+=1 | 189 let CURRENT_STEP+=1 |
189 if [ $START_STEP -le $CURRENT_STEP ] ; then | 190 if [ $START_STEP -le $CURRENT_STEP ] ; then |
190 echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions." | 191 echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions." |
191 restore_if_unset "MERGE_TO_BRANCH" | 192 restore_if_unset "MERGE_TO_BRANCH" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 restore_version_if_unset "NEW" | 288 restore_version_if_unset "NEW" |
288 common_cleanup | 289 common_cleanup |
289 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then | 290 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then |
290 echo "*** SUMMARY ***" | 291 echo "*** SUMMARY ***" |
291 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" | 292 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" |
292 echo "branch: $TO_URL" | 293 echo "branch: $TO_URL" |
293 echo "svn revision: $SVN_REVISION" | 294 echo "svn revision: $SVN_REVISION" |
294 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" | 295 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" |
295 fi | 296 fi |
296 fi | 297 fi |
OLD | NEW |