jdk8-mips64-public: comparison make/scripts/webrev.ksh

-:fc1e08c2bb27
+:26a4456cb19e
 function flist_from_mercurial_forest
 {
 rm -f $FLIST
 if [ -z "$Nflag" ]; then
-	print " File list from hg foutgoing $PWS ..."
+print " File list from hg foutgoing $PWS ..."
 outgoing_from_mercurial_forest
 HG_LIST_FROM_COMMIT=1
 fi
 if [ ! -f $FLIST ]; then
 # hg commit hasn't been run see what is lying around
-	print "\n No outgoing, perhaps you haven't commited."
+print "\n No outgoing, perhaps you haven't commited."
-	print " File list from hg fstatus -mard ...\c"
+NO_OUTGOING=
+print " File list from hg fstatus -mard ...\c"
 FSTAT_OPT=
 fstatus
 HG_LIST_FROM_COMMIT=0
 fi
 print " Done."
 do
 echo $TREE/$F
 done >> $FLIST
 # Then all the added files
-# But some of these could have been "moved" or renamed ones
+# But some of these could have been "moved" or renamed ones or copied ones
 # so let's make sure we get the proper info
 # hg status -aC will produce something like:
 #	A subdir/File3
 #	A subdir/File4
 #	  File4
 #	A subdir/File5
 # The first and last are simple addition while the middle one
-# is a move/rename
+# is a move/rename or a copy.  We can't distinguish from a rename vs a copy
+# without also getting the status of removed files.  The middle case above
+# is a rename if File4 is also shown a being removed.  If File4 is not a
+# removed file, then the middle case is a copy from File4 to subdir/File4
+# FIXME - we're not distinguishing copy from rename
 $HGCMD -aC | $FILTER | while read LINE; do
 	ldone=""
 	while [ -z "$ldone" ]; do
 	    ldone="1"
 	    set - $LINE
 elif [[ -n $OUTREV ]]; then
 STATUS_REV="--rev $OUTREV"
 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
 	hg status $STATUS_REV -mdn | $FILTER > $FLIST
 	# hg status -aC will produce something like:
 	#	A subdir/File3
 	#	A subdir/File4
 	#	  File4
 	#	A subdir/File5
-	# The first and last are simple addition while the middle one
+# The first and last are simple addition while the middle one
-	# is a move/rename
+# is a move/rename or a copy.  We can't distinguish from a rename vs a copy
+# without also getting the status of removed files.  The middle case above
+# is a rename if File4 is also shown a being removed.  If File4 is not a
+# removed file, then the middle case is a copy from File4 to subdir/File4
+# FIXME - we're not distinguishing copy from rename
 	hg status $STATUS_REV -aC | $FILTER >$FLIST.temp
 	while read LINE; do
 	    ldone=""
 	    while [ -z "$ldone" ]; do
 		    # the full path
 		    $parent cat --rev $parentrev --output $olddir/$DIR/$F $DIR/$F 2>/dev/null
 		fi
 	    fi
 	else
-	    # It's a rename (or a move), so let's make sure we move
+	    # It's a rename (or a move), or a copy, so let's make sure we move
 	    # to the right directory first, then restore it once done
 	    current_dir=`pwd`
 	    cd $CWS/$PDIR
 	    if [ -n "$rflag" ]; then
 		parentrev=$PARENT_REV
 	    #	    [to del a file] @@ -X,Y +1,0 @@  -->  @@ -X,Y +0,0 @@
 	    #
 	    cleanse_rmfile="sed 's/^\(@@ [0-9+,-]*\) [0-9+,-]* @@$/\1 +0,0 @@/'"
 	    cleanse_newfile="sed 's/^@@ [0-9+,-]* \([0-9+,-]* @@\)$/@@ -0,0 \1/'"
-	    rm -f $WDIR/$DIR/$F.patch
+if [[ -v NO_OUTGOING ]];
-	    if [[ -z $rename ]]; then
+then
-		if [ ! -f $ofile ]; then
+# Only need to generate a patch file here if there are no commits in outgoing
-		    diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
+rm -f $WDIR/$DIR/$F.patch
-			> $WDIR/$DIR/$F.patch
+if [[ -z $rename ]]; then
-		elif [ ! -f $nfile ]; then
+if [ ! -f $ofile ]; then
-		    diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
+diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
-			> $WDIR/$DIR/$F.patch
+> $WDIR/$DIR/$F.patch
-		else
+elif [ ! -f $nfile ]; then
-		    diff -u $ofile $nfile > $WDIR/$DIR/$F.patch
+diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
-		fi
+> $WDIR/$DIR/$F.patch
-	    else
+else
-		diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
+diff -u $ofile $nfile > $WDIR/$DIR/$F.patch
-		    > $WDIR/$DIR/$F.patch
+fi
+else
-		diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
+diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
-		    >> $WDIR/$DIR/$F.patch
+> $WDIR/$DIR/$F.patch
-	    fi
+diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
+>> $WDIR/$DIR/$F.patch
-	#
+fi
-	# Tack the patch we just made onto the accumulated patch for the
-	# whole wad.
-	#
+#
-	    cat $WDIR/$DIR/$F.patch >> $WDIR/$WNAME.patch
+# Tack the patch we just made onto the accumulated patch for the
+# whole wad.
-	    print " patch\c"
+#
+cat $WDIR/$DIR/$F.patch >> $WDIR/$WNAME.patch
+fi
+print " patch\c"
 	    if [[ -f $ofile && -f $nfile && -z $mv_but_nodiff ]]; then
 		${CDIFFCMD:-diff -bt -C 5} $ofile $nfile > $WDIR/$DIR/$F.cdiff
 		diff_to_html $F $DIR/$F "C" "$COMM" < $WDIR/$DIR/$F.cdiff \
 	fi
 	print
 done < $FLIST
+# 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
+EXPORTCHANGESET="$WNAME.changeset"
+CHANGESETPATH=${WDIR}/${EXPORTCHANGESET}
+rm -f $CHANGESETPATH
+touch $CHANGESETPATH
+if [[ -n $ALL_CREV ]]; then
+rev_opt=
+for rev in $ALL_CREV; do
+rev_opt="$rev_opt --rev $rev"
+done
+elif [[ -n $FIRST_CREV ]]; then
+rev_opt="--rev $FIRST_CREV"
+fi
+if [[ -n $rev_opt ]]; then
+(cd $CWS;hg export -g $rev_opt -o $CHANGESETPATH)
+# echo "Created new-patch: $CHANGESETPATH" 1>&2
+# Use it in place of the jdk.patch created above
+rm -f $WDIR/$WNAME.patch
+fi
+set +x
+fi
+fi
 frame_nav_js > $WDIR/ancnav.js
 frame_navigation > $WDIR/ancnav.html
 if [[ -f $WDIR/$WNAME.ps && -x $CODEREVIEW && -x $PS2PDF ]]; then
 	print " Generating PDF: \c"
 print "<tr><th>Summary of changes:</th><td>"
 printCI $TOTL $TINS $TDEL $TMOD $TUNC
 print "</td></tr>"
 if [[ -f $WDIR/$WNAME.patch ]]; then
-	print "<tr><th>Patch of changes:</th><td>"
+print "<tr><th>Patch of changes:</th><td>"
-	print "<a href=\"$WNAME.patch\">$WNAME.patch</a></td></tr>"
+print "<a href=\"$WNAME.patch\">$WNAME.patch</a></td></tr>"
-fi
+elif [[ -f $CHANGESETPATH ]]; then
+print "<tr><th>Changeset:</th><td>"
+print "<a href=\"$EXPORTCHANGESET\">$EXPORTCHANGESET</a></td></tr>"
+fi
 if [[ -f $WDIR/$WNAME.pdf ]]; then
 	print "<tr><th>Printable review:</th><td>"
 	print "<a href=\"$WNAME.pdf\">$WNAME.pdf</a></td></tr>"
 fi

Mercurial > jdk8-mips64-public / file comparison

comparison: make/scripts/webrev.ksh

make/scripts/webrev.ksh