Changeset 265023 in webkit

Timestamp:

Jul 28, 2020 4:56:12 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Pause during ANGLE roll script after rebasing and before deleting temporary Git repo
​https://bugs.webkit.org/show_bug.cgi?id=212717

Patch by Kenneth Russell <​kbr@chromium.org> on 2020-07-28
Reviewed by Dean Jackson.

Give the user the opportunity to manually examine the changes
relative to upstream ANGLE, and to undo any accidental or
undesired ones, before finishing the roll.

• update-angle.sh:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• update-angle.sh (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-07-28  Kenneth Russell  <kbr@chromium.org>
+
+        Pause during ANGLE roll script after rebasing and before deleting temporary Git repo
+        https://bugs.webkit.org/show_bug.cgi?id=212717
+
+        Reviewed by Dean Jackson.
+
+        Give the user the opportunity to manually examine the changes
+        relative to upstream ANGLE, and to undo any accidental or
+        undesired ones, before finishing the roll.
+
+        * update-angle.sh:
+
 2020-07-22  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/ThirdParty/ANGLE/update-angle.sh

@@ -16 +16 @@
     cd "$ANGLE_DIR"
     echo
-    echo "Regenerating changes.diff"
+    echo "Regenerating changes.diff."
+    git diff origin/master --diff-filter=a > changes.diff
+    echo "Pausing to let you examine changes.diff, and the files in"
+    echo "Source/ThirdParty/ANGLE relative to upstream, using git tools."
+    echo "At this point you may undo any undesired changes that you see in"
+    echo "changes.diff."
+    echo "To see the current changes relative to upstream ANGLE, run the"
+    echo "following command in Source/ThirdParty/ANGLE:"
+    echo "    git diff origin/master --diff-filter=a"
+    echo "changes.diff will be regenerated again when this script proceeds;"
+    echo "it isn't necessary to do it manually."
+    read -p "Press ENTER to continue: "
+    echo "Regenerating changes.diff again."
     git diff origin/master --diff-filter=a > changes.diff
     rm -rf .git
@@ -44 +56 @@
 echo "This will clobber any changes you have made in:"
 echo "$ANGLE_DIR"
-read -p "Are you sure? [y/N] " -n 1 -r
+read -p "Are you sure? [y/N] "
 echo
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then