Revision: 11321
Author: [email protected]
Date: Fri Apr 13 09:00:31 2012
Log: Small improvements to push-to-trunk.sh and merge-to-branch.sh.
1.) When a back-merged patch applied at an offset, ignore the "Hunk #1
succeeded at ..." lines instead of printing a scary warning.
2.) When push-to-trunk was not called with "-c /path/to/chrome/src",
explicitly ask for the path to help discoverability of the feature.
3.) Correctly convert "BUG=chromium:123" to "(Chromium issue 123)" in the
pre-made ChangeLog entry.
Review URL: https://chromiumcodereview.appspot.com/10073010
http://code.google.com/p/v8/source/detail?r=11321
Modified:
/branches/bleeding_edge/tools/common-includes.sh
/branches/bleeding_edge/tools/push-to-trunk.sh
=======================================
--- /branches/bleeding_edge/tools/common-includes.sh Thu Mar 29 00:01:36
2012
+++ /branches/bleeding_edge/tools/common-includes.sh Fri Apr 13 09:00:31
2012
@@ -184,7 +184,8 @@
apply_patch() {
patch $REVERSE_PATCH -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \
{ cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."; }
- tee < "$PATCH_OUTPUT_FILE" >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")
+ tee < "$PATCH_OUTPUT_FILE" >(grep "patching file" \
+ | awk '{print $NF}'
"$TOUCHED_FILES_FILE")
rm "$PATCH_OUTPUT_FILE"
}
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk.sh Fri Mar 23 03:22:45 2012
+++ /branches/bleeding_edge/tools/push-to-trunk.sh Fri Apr 13 09:00:31 2012
@@ -130,6 +130,7 @@
| 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.
@@ -320,6 +321,14 @@
|| 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
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
