Small improvements to push-to-trunk.sh and merge-to-branch.sh.

tools/push-to-trunk.sh

 #!/bin/bash
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 112 matching lines @@
   COMMITS=$(git log $LASTPUSH..HEAD --format=%H)
   for commit in $COMMITS ; do
     # Get the commit's title line.
     git log -1 $commit --format="%w(80,8,8)%s" >> "$CHANGELOG_ENTRY_FILE"
     # Grep for "BUG=xxxx" lines in the commit message and convert them to
     # "(issue xxxx)".
     git log -1 $commit --format="%B" \
         | grep "^BUG=" | grep -v "BUG=$" | grep -v "BUG=none$" \
         | sed -e 's/^/        /' \
         | sed -e 's/BUG=v8:\(.*\)$/(issue \1)/' \
+        | sed -e 's/BUG=chromium:\(.*\)$/(Chromium issue \1)/' \
         | sed -e 's/BUG=\(.*\)$/(Chromium issue \1)/' \
         >> "$CHANGELOG_ENTRY_FILE"
     # Append the commit's author for reference.
     git log -1 $commit --format="%w(80,8,8)(%an)" >> "$CHANGELOG_ENTRY_FILE"
     echo "" >> "$CHANGELOG_ENTRY_FILE"
   done
   echo "        Performance and stability improvements on all platforms." \
     >> "$CHANGELOG_ENTRY_FILE"
 fi
 
@@ skipping 170 matching lines @@
 fi
 
 let CURRENT_STEP+=1
 if [ $START_STEP -le $CURRENT_STEP ] ; then
   echo ">>> Step $CURRENT_STEP: Tag the new revision."
   restore_version_if_unset
   git svn tag $MAJOR.$MINOR.$BUILD -m "Tagging version $MAJOR.$MINOR.$BUILD" \
     || die "'git svn tag' failed."
 fi
 
+if [ -z "$CHROME_PATH" ] ; then
+  echo ">>> (asking for Chromium checkout)"
+  echo -n "Do you have a \"NewGit\" Chromium checkout and want this script \
+to automate creation of the roll CL? If yes, enter the path to (and including) \
+the \"src\" directory here, otherwise just press <Return>: "
+  read CHROME_PATH
+fi
+
 if [ -n "$CHROME_PATH" ] ; then
 
   let CURRENT_STEP+=1
   if [ $START_STEP -le $CURRENT_STEP ] ; then
     echo ">>> Step $CURRENT_STEP: Switch to Chromium checkout."
     V8_PATH=$(pwd)
     persist "V8_PATH"
     cd "$CHROME_PATH"
     initial_environment_checks
     # Check for a clean workdir.
@@ skipping 50 matching lines @@
 update the v8rel spreadsheet:"
   else
     echo "Congratulations, you have successfully created the trunk revision \
 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \
 Chromium, and to update the v8rel spreadsheet:"
   fi
   echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION"
   common_cleanup
   [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH
 fi