Changeset 83679 in vbox for trunk

Timestamp:

Apr 11, 2020 6:37:52 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137170

Message:

tools/bin/backport-*: Adding a --first-rev option to check that the branch is empty.

Location:

trunk/tools/bin

Files:

• backport-common.sh (modified) (3 diffs)
• backport-merge.sh (modified) (1 diff)

trunk/tools/bin/backport-common.sh

@@ -125 +125 @@
             ;;
 
+        --first-rev|--first|-1)
+            MY_FIRST_REV=1
+            ;;
+
         --extra)
             if test $# -eq 0; then
@@ -140 +144 @@
         # usage
         --h*|-h*|-?|--?)
-            echo "usage: $0 [--trunk-dir <dir>] [--branch <ver>] [--branch-dir <dir>] [--extra <svn-arg>] rev1 [rev2..[revN]]]"
+            echo "usage: $0 [--trunk-dir <dir>] [--branch <ver>] [--branch-dir <dir>] [--extra <svn-arg>] [--first-rev] rev1 [rev2..[revN]]]"
             echo ""
             echo "Options:"
@@ -149 +153 @@
             echo "  --branch <ver>"
             echo "    The name of the branch being backported to. default: auto"
+            echo "  --first-rev, --first, -1"
+            echo "    Merge only: Check that the branch does not have any pending changes."
             echo "  --extra <svn-arg>"
             echo "    Additional arguments to specify to SVN."

trunk/tools/bin/backport-merge.sh

@@ -33 +33 @@
 MY_SCRIPT_NAME="backport-merge.sh"
 . "${MY_SCRIPT_DIR}/backport-common.sh"
+
+#
+# Check that the branch is clean if first revision.
+#
+if test -n "${MY_FIRST_REV}"; then
+    MY_STATUS=`"${MY_SVN}" status -q "${MY_BRANCH_DIR}"`
+    if test -n "${MY_STATUS}"; then
+        echo "error: Branch already has changes pending..."
+        "${MY_SVN}" status -q "${MY_BRANCH_DIR}"
+        exit 1;
+    else
+        test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
+    fi
+fi
 
 #