X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Fcvsupdate;h=e5a58266327344e8a3c6f275e4af954bc18f0dde;hb=488580c1ed06ea156e3b0c9709f528ecc8bd2dc2;hp=2d21d21eda428900cbcded3986c9dcfc3d72088e;hpb=5e1a0d96695b797b6f060a6d976551ff4c86d629;p=oota-llvm.git

diff --git a/utils/cvsupdate b/utils/cvsupdate
index 2d21d21eda4..e5a58266327 100755
--- a/utils/cvsupdate
+++ b/utils/cvsupdate
@@ -16,6 +16,7 @@ onintr cleanup
 alias usage 'echo "USAGE: $0:t [-h][-n]"; set pstatus = 1; goto cleanup'
 
 set doit = 1
+set printnew = 0
 unset options_done
 while ( !( $?options_done ) && ($#argv > 0))
     switch ($argv[1])
@@ -23,34 +24,46 @@ while ( !( $?options_done ) && ($#argv > 0))
 	    usage
 	case -n :
 	    set doit = 0; shift argv; breaksw
+	case -new :
+	    set printnew = 1; shift argv; breaksw
 	default :
 	    set options_done; breaksw
     endsw
 end
 
 if ($doit == 1) then
-    /bin/mv -f cvs.out cvs.out.bak
+    /bin/mv -f cvs.out cvs.out.bak >&/dev/null
     cvs update -P -d >& cvs.out
-    if ($status != 0) then
-        echo "ERROR: CVS update failed: "
-	cat cvs.out
-	exit 1
+##    if ($status != 0) then
+##        echo "ERROR: CVS update failed: "
+##	cat cvs.out
+##	exit 1
     endif
 else
-    echo ""; echo "Not updating files."; echo ""
+    echo ""; echo "NOT UPDATING FILES.  RESULTS FROM LAST RUN:"; echo ""
 endif
 
 echo ""; echo "	FILES UPDATED:"
-grep '^U' cvs.out
+grep '^[UP] ' cvs.out
 
 echo ""; echo "	UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES:"
-grep '^C' cvs.out
+grep '^C ' cvs.out
+
+echo ""; echo "	NEW FILES THAT NEED TO BE COMMITTED:"
+grep '^[AR] ' cvs.out
+
+echo ""; echo "	FILES REMOVED FROM YOUR DIRECTORY:"
+grep 'no longer in the repository' cvs.out
 
 echo ""; echo "	FILES SUCCESSFULLY MERGED (or locally modified):"
-grep '^M' cvs.out | grep -v Merging
+grep '^M ' cvs.out
 
 echo ""; echo "	NEW FILES AND DIRECTORIES:"
-grep '^\?' cvs.out | & grep -v '\.bc' | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v '\.mc$' | grep -v '\.s$' | grep -v '\.native'
+if ($printnew != 0) then
+    grep '^\?' cvs.out | & grep -v '\.bc' | grep -v Updating | grep -v cvsup | grep -v 'cvs.out' | grep -v gnumake.out | grep -v '\.mc$' | grep -v '\.s$' | grep -v '\.native'
+else
+    echo '(USE "cvsupdate -n -new" TO SEE NEW FILES AND DIRECTORIES.)'
+endif
 
 echo ""