first cut at svn committing changed tpm's.

git-svn-id: svn://tug.org/texlive/trunk@1501 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 22 insertions, 38 deletions

diff --git a/Master/Tools/tlrebuild b/Master/Tools/tlrebuild
index 9692d43df14..4bb9e52a93e 100755
--- a/Master/Tools/tlrebuild
+++ b/Master/Tools/tlrebuild
@@ -59,58 +59,42 @@ message "#4"
 message "tpm-check"
 tpm-check || exit 1
 
-#master=`cd $mydir/.. && pwd`
-#for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do
-#  cd $master/$dir || exit 1
-#  message "$dir: finding changed tpms"
-#  changelist=`p4 diff -se ...`
-#  if test -n "$changelist"; then
-#    echo "$changelist" | p4 -x - edit 2>&1 | grep -v 'opened for edit'
-#    for f in $changelist; do
-##echo "checking $f for unimportant change..."
-#      # revert tpms that differ only in the date.
-#      diff="`p4 diff $f \
-#             | egrep -v '^===|^---|^[0-9]+c[0-9]|TPM:Date' 2>/dev/null`"
-#      if test -z "$diff"; then
-#        p4 revert $f 2>&1 | grep -v 'was edit'
-#      else
-#        echo $f diff: $diff
-#      fi
-#    done
-#  fi
-#
-#  # new tpms not in depot
+for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do
+  cd $master/$dir || exit 1
+  message "$dir: finding changed tpms"
+  for f in "$@"; do
+    diff="`svn --diff-cmd=diff -x -u0 diff $f \
+           | egrep -v '^[-+=@]{2,3}|TPM:Date|Index' 2>/dev/null`"
+    if test -z "$diff"; then
+      svn revert $f
+    else
+      echo " $f diff:"
+      echo "$diff"
+    fi
+  done
+
+#  # new tpms not in depot  xx must svn add/remove somehow
 #  message "$dir: finding new tpms"
 #  find . -type f | p4 -x - add 2>&1 \
 #  | egrep -v 'already opened|add.*existing file'
 #
 #  message "$dir: finding obsolete tpms"
 #  p4 diff -sd ... | p4 -x - delete  # old tpms no longer needed
-#done
+
+  svn commit -m'tlrebuild [tpm] autoupdate' 
+
+  # keep writable for next time, trying to have rahtz/staw share /home/tlprod.
+  chmod a+rw * >&/dev/null
+done
 
 # lists files used by the Unix installer.
 message "update-lists for Unix installer"
 update-lists || exit 1
 
-
-# 
-# if we have any files, submit to perforce (frightening but necessary).
-if false p4 change -o | grep '^Files:' >/dev/null; then
-  message "submitting to p4"
-  p4 change -o \
-  | sed "s!<enter description here>!regenerated by $0!" \
-  | p4 submit -i
-else
-  message "no changes to submit to p4"
-fi
-
-# keep writable for next time, trying to have rahtz/staw share /home/tlprod.
-#chmod a+rw $master/*/tpm/* >&/dev/null
-
 message "ls-R updates"
 update-lsr
 
-fi  # end no-tpm
+fi  # end --no-tpm
 
 # 
 $no_images && exit 0