Reviewers: danno,
Message:
Once more, these changes are untested :-)
But they're neither scary nor dangerous. Please take a look.
Description:
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.
Please review this at https://chromiumcodereview.appspot.com/10073010/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M tools/common-includes.sh
M tools/push-to-trunk.sh
Index: tools/common-includes.sh
diff --git a/tools/common-includes.sh b/tools/common-includes.sh
index
d1b8b01473bd85e536130b7191904a15e2192a20..2b806caa5f44e143ebf70b7d25e55f27786b98b8
100644
--- a/tools/common-includes.sh
+++ b/tools/common-includes.sh
@@ -184,7 +184,8 @@ the uploaded CL."
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"
}
Index: tools/push-to-trunk.sh
diff --git a/tools/push-to-trunk.sh b/tools/push-to-trunk.sh
index
3fb5b34ed3f30fd5361986290f8345313066365b..ff6dd1d776fc42f798dc235a3052b09fd0cd040a
100755
--- a/tools/push-to-trunk.sh
+++ b/tools/push-to-trunk.sh
@@ -130,6 +130,7 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
| 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 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
|| 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
