diff options
author | Vikram S. Adve <vadve@cs.uiuc.edu> | 2002-10-31 15:32:24 +0000 |
---|---|---|
committer | Vikram S. Adve <vadve@cs.uiuc.edu> | 2002-10-31 15:32:24 +0000 |
commit | 38bb2ff8283bb1d7ba6cfcee8f5d32145f442d10 (patch) | |
tree | 29b29e3ae84a17f63dc6976890db38e7b32e9bed /utils | |
parent | 7e51c8741f88d45557880839fbdf83bdcfce2f71 (diff) | |
download | external_llvm-38bb2ff8283bb1d7ba6cfcee8f5d32145f442d10.zip external_llvm-38bb2ff8283bb1d7ba6cfcee8f5d32145f442d10.tar.gz external_llvm-38bb2ff8283bb1d7ba6cfcee8f5d32145f442d10.tar.bz2 |
Do not print "NEW FILES AND DIRECTORIES" unless requested separately
because this is usually such a long list that it makes the output
useless anyway.
Disable checking exit status until we can find something more precise.
The exit status is too coarse-grain to be useful.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4468 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/cvsupdate | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/utils/cvsupdate b/utils/cvsupdate index 9ef6b8e..e661266 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,6 +24,8 @@ 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 @@ -31,13 +34,13 @@ end if ($doit == 1) then /bin/mv -f cvs.out cvs.out.bak 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:" @@ -53,7 +56,11 @@ echo ""; echo " FILES SUCCESSFULLY MERGED (or locally modified):" grep '^M' cvs.out | grep -v Merging 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 "" |