1.1 --- a/make/scripts/webrev.ksh Thu Apr 11 19:13:13 2013 -0700
1.2 +++ b/make/scripts/webrev.ksh Tue Apr 16 13:25:39 2013 -0400
1.3 @@ -27,7 +27,7 @@
1.4 # Documentation is available via 'webrev -h'.
1.5 #
1.6
1.7 -WEBREV_UPDATED=23.18-hg+jbs
1.8 +WEBREV_UPDATED=24.0-hg+jbs
1.9
1.10 HTML='<?xml version="1.0"?>
1.11 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1.12 @@ -1443,11 +1443,10 @@
1.13 if [ ! -f $FLIST ]; then
1.14 # hg commit hasn't been run see what is lying around
1.15 print "\n No outgoing, perhaps you haven't commited."
1.16 - NO_OUTGOING=
1.17 print " File list from hg fstatus -mard ...\c"
1.18 FSTAT_OPT=
1.19 fstatus
1.20 - HG_LIST_FROM_COMMIT=0
1.21 + HG_LIST_FROM_COMMIT=
1.22 fi
1.23 print " Done."
1.24 }
1.25 @@ -1629,7 +1628,6 @@
1.26 else
1.27 # hg commit hasn't been run see what is lying around
1.28 print "\n No outgoing, perhaps you haven't commited."
1.29 - NO_OUTGOING=
1.30 fi
1.31 # First let's list all the modified or deleted files
1.32
1.33 @@ -2112,6 +2110,7 @@
1.34 done
1.35
1.36 FLIST=/tmp/$$.flist
1.37 +HG_LIST_FROM_COMMIT=
1.38
1.39 if [[ -n $wflag && -n $lflag ]]; then
1.40 usage
1.41 @@ -2554,6 +2553,7 @@
1.42 SACURL='http://www.opensolaris.org/os/community/arc/caselog'
1.43
1.44 rm -f $WDIR/$WNAME.patch
1.45 +rm -f $WDIR/$WNAME.changeset
1.46 rm -f $WDIR/$WNAME.ps
1.47 rm -f $WDIR/$WNAME.pdf
1.48
1.49 @@ -2783,9 +2783,10 @@
1.50 cleanse_rmfile="sed 's/^\(@@ [0-9+,-]*\) [0-9+,-]* @@$/\1 +0,0 @@/'"
1.51 cleanse_newfile="sed 's/^@@ [0-9+,-]* \([0-9+,-]* @@\)$/@@ -0,0 \1/'"
1.52
1.53 - if [[ -v NO_OUTGOING ]];
1.54 + if [[ ! "$HG_LIST_FROM_COMMIT" -eq 1 || ! $flist_mode == "auto" ]];
1.55 then
1.56 # Only need to generate a patch file here if there are no commits in outgoing
1.57 + # or if we've specified a file list
1.58 rm -f $WDIR/$DIR/$F.patch
1.59 if [[ -z $rename ]]; then
1.60 if [ ! -f $ofile ]; then
1.61 @@ -2909,7 +2910,7 @@
1.62
1.63 # Create the new style mercurial patch here using hg export -r [all-revs] -g -o $CHANGESETPATH
1.64 if [[ $SCM_MODE == "mercurial" ]]; then
1.65 - if [[ !(-v NO_OUTGOING) ]]; then
1.66 + if [[ "$HG_LIST_FROM_COMMIT" -eq 1 && $flist_mode == "auto" ]]; then
1.67 EXPORTCHANGESET="$WNAME.changeset"
1.68 CHANGESETPATH=${WDIR}/${EXPORTCHANGESET}
1.69 rm -f $CHANGESETPATH
1.70 @@ -2925,7 +2926,7 @@
1.71
1.72 if [[ -n $rev_opt ]]; then
1.73 (cd $CWS;hg export -g $rev_opt -o $CHANGESETPATH)
1.74 - # echo "Created new-patch: $CHANGESETPATH" 1>&2
1.75 + echo "Created changeset: $CHANGESETPATH" 1>&2
1.76 # Use it in place of the jdk.patch created above
1.77 rm -f $WDIR/$WNAME.patch
1.78 fi
