| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright 2013 the V8 project authors. All rights reserved. | 2 # Copyright 2013 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | grep -o "[0-9]\+$" \ | 101 | grep -o "[0-9]\+$" \ |
| 102 | tr "\\n" ".") | 102 | tr "\\n" ".") |
| 103 echo ${rev%?} | 103 echo ${rev%?} |
| 104 } | 104 } |
| 105 | 105 |
| 106 merges_to_branch() { | 106 merges_to_branch() { |
| 107 git cherry -v svn/trunk svn/$1 | while read merge; do | 107 git cherry -v svn/trunk svn/$1 | while read merge; do |
| 108 h=$(echo $merge | cut -d" " -f2) | 108 h=$(echo $merge | cut -d" " -f2) |
| 109 svn=$(svn_rev $1 $h) | 109 svn=$(svn_rev $1 $h) |
| 110 merges=$(echo $merge | grep -o "r[0-9]\+") | 110 merges=$(echo $merge | grep -o "r[0-9]\+") |
| 111 echo branches/$1 r$svn $merges | 111 rev=$(v8_rev $h) |
| 112 echo $rev r$svn $merges |
| 112 done | 113 done |
| 113 } | 114 } |
| 114 | 115 |
| 115 ########## Option parsing | 116 ########## Option parsing |
| 116 | 117 |
| 117 while getopts ":hi:v:m:p:" OPTION ; do | 118 while getopts ":hi:v:m:p:" OPTION ; do |
| 118 case $OPTION in | 119 case $OPTION in |
| 119 h) usage | 120 h) usage |
| 120 exit 0 | 121 exit 0 |
| 121 ;; | 122 ;; |
| 122 i) tag_version $OPTARG | 123 i) tag_version $OPTARG |
| 123 ;; | 124 ;; |
| 124 v) v8_rev $(svn_rev trunk r$OPTARG) | 125 v) v8_rev $(svn_rev trunk r$OPTARG) |
| 125 ;; | 126 ;; |
| 126 m) merges_to_branch $OPTARG | 127 m) merges_to_branch $OPTARG |
| 127 ;; | 128 ;; |
| 128 p) point_merges "$(tag_log $(v8_hash $OPTARG)^1)" | 129 p) point_merges "$(tag_log $(v8_hash $OPTARG)^1)" |
| 129 ;; | 130 ;; |
| 130 ?) echo "Illegal option: -$OPTARG" | 131 ?) echo "Illegal option: -$OPTARG" |
| 131 usage | 132 usage |
| 132 exit 1 | 133 exit 1 |
| 133 ;; | 134 ;; |
| 134 esac | 135 esac |
| 135 done | 136 done |
| OLD | NEW |