Changeset 85668 in vbox for trunk

Timestamp:

Aug 10, 2020 3:25:45 PM (4 years ago)

Author:

vboxsync

Message:

Forwardported r139797: backport*.sh: acceept revision ranges on the command line too, sharing code with the svn:merge-info parsing.

Location:

trunk

Files:

trunk

Property svn:mergeinfo

old	new
10	10	/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
11	11	/branches/VBox-6.0:130474-130475,130477,130479,131352
12		/branches/VBox-6.1:139660
	12	/branches/VBox-6.1:139660,139797
13	13	/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095
14	14	/branches/andy/draganddrop:90781-91268

-              r85586
+              r85668
                 ;;
             [0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+                MY_REV_FIRST=${MY_REV%-*}
+                MY_REV_LAST=${MY_REV#*-}
+                if test -z "${MY_REV_FIRST}" -o -z "${MY_REV_LAST}" -o '(' '!' "${MY_REV_FIRST}" -lt "${MY_REV_LAST}" ')'; then
+                    echo "error: failed to get revisions from svn:mergeinfo - MY_REV_FIRST=${MY_REV_FIRST} MY_REV_LAST=${MY_REV_LAST} MY_REV=${MY_REV}"
+                    exit 1
+                fi
+                MY_REV=${MY_REV_FIRST}
+                while test ${MY_REV} -le ${MY_REV_LAST};
+                do
+                    AddRevision "${MY_REV}"
+                    MY_REV=$(${MY_EXPR} ${MY_REV} + 1)
+                done
+                AddRevisionRange "${MY_REV}"
                 ;;

-              r85589
+              r85668
+}
+AddRevisionRange()
+{
+    MY_REV=$1
+    MY_REV_FIRST=${MY_REV%-*}
+    MY_REV_LAST=${MY_REV#*-}
+    if test -z "${MY_REV_FIRST}" -o -z "${MY_REV_LAST}" -o '(' '!' "${MY_REV_FIRST}" -lt "${MY_REV_LAST}" ')'; then
+        echo "error: Failed to parse revision range: MY_REV_FIRST=${MY_REV_FIRST} MY_REV_LAST=${MY_REV_LAST} MY_REV=${MY_REV}"
+        exit 1
+    fi
+    MY_REV=${MY_REV_FIRST}
+    while test ${MY_REV} -le ${MY_REV_LAST};
+    do
+        AddRevision "${MY_REV}"
+        MY_REV=$(${MY_EXPR} ${MY_REV} + 1)
+    done
+}
+#
 # Figure default branch given the script location.
 …
         [0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9][0-9])
             AddRevision ${ARG}
+            ;;
+        [0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]|[0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+            AddRevisionRange ${ARG}
+            ;;
+        r[0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9]|r[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]|r[0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+            MY_REV=`echo "${ARG}" | "${MY_SED}" -e 's/^r//'`
+            AddRevisionRange ${MY_REV}
             ;;

Note: See TracChangeset for help on using the changeset viewer.