Changeset 84269 in vbox

Timestamp:

May 12, 2020 9:18:29 AM (4 years ago)

Author:

vboxsync

Message:

tools/bin/backport-*: Added --show-diff switch for showing an optional unified diff before committing.

Location:

trunk/tools/bin

Files:

• backport-commit.sh (modified) (2 diffs)
• backport-common.sh (modified) (3 diffs)

trunk/tools/bin/backport-commit.sh

@@ -97 +97 @@
 # Do the committing.
 #
+if [ -n "${MY_SHOW_DIFF}" ]; then
+    echo "***"
+    echo "*** Diff:"
+    "${MY_SVN}" diff --internal-diff
+    echo "*** end diff ***"
+    echo "***"
+    echo ""
+fi
 echo "***"
 echo "*** Commit message:"
@@ -130 +138 @@
 done
 exit 1;
-

trunk/tools/bin/backport-common.sh

@@ -74 +74 @@
 MY_DEBUG=
 MY_FORCE=
+MY_SHOW_DIFF=
 
 while test $# -ge 1;
@@ -136 +137 @@
         --update-first|--update|-u)
             MY_UPDATE_FIRST=1
+            ;;
+
+        --show-diff)
+            MY_SHOW_DIFF=1
             ;;
 
@@ -169 +174 @@
             echo "  --force"
             echo "    Forces backporting, regardless of ancestry. Use with caution!"
+            echo "  --show-diff"
+            echo "    Shows unified diff before backporting."
             echo "  --update-first, --update, -u"
             echo "    Merge only: Update the branch before merging."