Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: tools/push-to-trunk.sh

Issue 10073010: Small improvements to push-to-trunk.sh and merge-to-branch.sh. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « tools/common-includes.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 COMMITS=$(git log $LASTPUSH..HEAD --format=%H) 123 COMMITS=$(git log $LASTPUSH..HEAD --format=%H)
124 for commit in $COMMITS ; do 124 for commit in $COMMITS ; do
125 # Get the commit's title line. 125 # Get the commit's title line.
126 git log -1 $commit --format="%w(80,8,8)%s" >> "$CHANGELOG_ENTRY_FILE" 126 git log -1 $commit --format="%w(80,8,8)%s" >> "$CHANGELOG_ENTRY_FILE"
127 # Grep for "BUG=xxxx" lines in the commit message and convert them to 127 # Grep for "BUG=xxxx" lines in the commit message and convert them to
128 # "(issue xxxx)". 128 # "(issue xxxx)".
129 git log -1 $commit --format="%B" \ 129 git log -1 $commit --format="%B" \
130 | grep "^BUG=" | grep -v "BUG=$" | grep -v "BUG=none$" \ 130 | grep "^BUG=" | grep -v "BUG=$" | grep -v "BUG=none$" \
131 | sed -e 's/^/ /' \ 131 | sed -e 's/^/ /' \
132 | sed -e 's/BUG=v8:\(.*\)$/(issue \1)/' \ 132 | sed -e 's/BUG=v8:\(.*\)$/(issue \1)/' \
133 | sed -e 's/BUG=chromium:\(.*\)$/(Chromium issue \1)/' \
133 | sed -e 's/BUG=\(.*\)$/(Chromium issue \1)/' \ 134 | sed -e 's/BUG=\(.*\)$/(Chromium issue \1)/' \
134 >> "$CHANGELOG_ENTRY_FILE" 135 >> "$CHANGELOG_ENTRY_FILE"
135 # Append the commit's author for reference. 136 # Append the commit's author for reference.
136 git log -1 $commit --format="%w(80,8,8)(%an)" >> "$CHANGELOG_ENTRY_FILE" 137 git log -1 $commit --format="%w(80,8,8)(%an)" >> "$CHANGELOG_ENTRY_FILE"
137 echo "" >> "$CHANGELOG_ENTRY_FILE" 138 echo "" >> "$CHANGELOG_ENTRY_FILE"
138 done 139 done
139 echo " Performance and stability improvements on all platforms." \ 140 echo " Performance and stability improvements on all platforms." \
140 >> "$CHANGELOG_ENTRY_FILE" 141 >> "$CHANGELOG_ENTRY_FILE"
141 fi 142 fi
142 143
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 fi 314 fi
314 315
315 let CURRENT_STEP+=1 316 let CURRENT_STEP+=1
316 if [ $START_STEP -le $CURRENT_STEP ] ; then 317 if [ $START_STEP -le $CURRENT_STEP ] ; then
317 echo ">>> Step $CURRENT_STEP: Tag the new revision." 318 echo ">>> Step $CURRENT_STEP: Tag the new revision."
318 restore_version_if_unset 319 restore_version_if_unset
319 git svn tag $MAJOR.$MINOR.$BUILD -m "Tagging version $MAJOR.$MINOR.$BUILD" \ 320 git svn tag $MAJOR.$MINOR.$BUILD -m "Tagging version $MAJOR.$MINOR.$BUILD" \
320 || die "'git svn tag' failed." 321 || die "'git svn tag' failed."
321 fi 322 fi
322 323
324 if [ -z "$CHROME_PATH" ] ; then
325 echo ">>> (asking for Chromium checkout)"
326 echo -n "Do you have a \"NewGit\" Chromium checkout and want this script \
327 to automate creation of the roll CL? If yes, enter the path to (and including) \
328 the \"src\" directory here, otherwise just press <Return>: "
329 read CHROME_PATH
330 fi
331
323 if [ -n "$CHROME_PATH" ] ; then 332 if [ -n "$CHROME_PATH" ] ; then
324 333
325 let CURRENT_STEP+=1 334 let CURRENT_STEP+=1
326 if [ $START_STEP -le $CURRENT_STEP ] ; then 335 if [ $START_STEP -le $CURRENT_STEP ] ; then
327 echo ">>> Step $CURRENT_STEP: Switch to Chromium checkout." 336 echo ">>> Step $CURRENT_STEP: Switch to Chromium checkout."
328 V8_PATH=$(pwd) 337 V8_PATH=$(pwd)
329 persist "V8_PATH" 338 persist "V8_PATH"
330 cd "$CHROME_PATH" 339 cd "$CHROME_PATH"
331 initial_environment_checks 340 initial_environment_checks
332 # Check for a clean workdir. 341 # Check for a clean workdir.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 update the v8rel spreadsheet:" 392 update the v8rel spreadsheet:"
384 else 393 else
385 echo "Congratulations, you have successfully created the trunk revision \ 394 echo "Congratulations, you have successfully created the trunk revision \
386 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ 395 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \
387 Chromium, and to update the v8rel spreadsheet:" 396 Chromium, and to update the v8rel spreadsheet:"
388 fi 397 fi
389 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" 398 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION"
390 common_cleanup 399 common_cleanup
391 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH 400 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH
392 fi 401 fi
OLDNEW
« no previous file with comments | « tools/common-includes.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698