Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 18:51:01 +0200
changeset 16831 7af70dd0a378
parent 16830 b6607ce9fa8d (current diff)
parent 16824 faa51a420c63 (diff)
child 16933 0ce55c34af84
Merge
--- a/.hgtags-top-repo	Tue Apr 23 09:27:07 2013 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:51:01 2017 +0200
@@ -207,3 +207,4 @@
 466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83
 01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84
 7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85
+df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86
--- a/make/scripts/webrev.ksh	Tue Apr 23 09:27:07 2013 -0700
+++ b/make/scripts/webrev.ksh	Wed Jul 05 18:51:01 2017 +0200
@@ -27,7 +27,7 @@
 # Documentation is available via 'webrev -h'.
 #
 
-WEBREV_UPDATED=23.18-hg+jbs
+WEBREV_UPDATED=24.0-hg+jbs
 
 HTML='<?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -1443,11 +1443,10 @@
     if [ ! -f $FLIST ]; then
         # hg commit hasn't been run see what is lying around
         print "\n No outgoing, perhaps you haven't commited."
-        NO_OUTGOING=
         print " File list from hg fstatus -mard ...\c"
         FSTAT_OPT=
         fstatus
-        HG_LIST_FROM_COMMIT=0
+        HG_LIST_FROM_COMMIT=
     fi
     print " Done."
 }
@@ -1629,7 +1628,6 @@
         else
             # hg commit hasn't been run see what is lying around
             print "\n No outgoing, perhaps you haven't commited."
-            NO_OUTGOING=
         fi
 	# First let's list all the modified or deleted files
 
@@ -2112,6 +2110,7 @@
 done
 
 FLIST=/tmp/$$.flist
+HG_LIST_FROM_COMMIT=
 
 if [[ -n $wflag && -n $lflag ]]; then
 	usage
@@ -2554,6 +2553,7 @@
     SACURL='http://www.opensolaris.org/os/community/arc/caselog'
 
 rm -f $WDIR/$WNAME.patch
+rm -f $WDIR/$WNAME.changeset
 rm -f $WDIR/$WNAME.ps
 rm -f $WDIR/$WNAME.pdf
 
@@ -2783,9 +2783,10 @@
 	    cleanse_rmfile="sed 's/^\(@@ [0-9+,-]*\) [0-9+,-]* @@$/\1 +0,0 @@/'"
 	    cleanse_newfile="sed 's/^@@ [0-9+,-]* \([0-9+,-]* @@\)$/@@ -0,0 \1/'"
 
-            if [[ -v NO_OUTGOING ]];
+            if [[ ! "$HG_LIST_FROM_COMMIT" -eq 1 || ! $flist_mode == "auto" ]];
             then
               # Only need to generate a patch file here if there are no commits in outgoing
+              # or if we've specified a file list
               rm -f $WDIR/$DIR/$F.patch
               if [[ -z $rename ]]; then
                   if [ ! -f $ofile ]; then
@@ -2909,7 +2910,7 @@
 
 # Create the new style mercurial patch here using hg export -r [all-revs] -g -o $CHANGESETPATH
 if [[ $SCM_MODE == "mercurial" ]]; then
-  if [[ !(-v NO_OUTGOING) ]]; then
+  if [[ "$HG_LIST_FROM_COMMIT" -eq 1 && $flist_mode == "auto" ]]; then
     EXPORTCHANGESET="$WNAME.changeset"
     CHANGESETPATH=${WDIR}/${EXPORTCHANGESET}
     rm -f $CHANGESETPATH
@@ -2925,7 +2926,7 @@
 
     if [[ -n $rev_opt ]]; then
       (cd $CWS;hg export -g $rev_opt -o $CHANGESETPATH)
-      # echo "Created new-patch: $CHANGESETPATH" 1>&2
+      echo "Created changeset: $CHANGESETPATH" 1>&2
       # Use it in place of the jdk.patch created above
       rm -f $WDIR/$WNAME.patch
     fi
jdk-sandbox