Debian JP master SVN www commits (rev.943)

[Debian JP webadmin <webadmin@debian.or.jp>]

=======================================================
Repository: /org/svn.debian.or.jp/repos
  Revision: 943
  Commiter: kmuto
      Date: 2009-10-13 11:32:23 +0900 (火, 13 10月 2009)
=======================================================
Log:

cvs up before running commit

=======================================================
Changed:

U   webwml-sync/trunk/webwml-patch-commit

Modified: webwml-sync/trunk/webwml-patch-commit
===================================================================
--- webwml-sync/trunk/webwml-patch-commit	2009-10-13 02:31:24 UTC (rev 942)
+++ webwml-sync/trunk/webwml-patch-commit	2009-10-13 02:32:23 UTC (rev 943)
@@ -14,6 +14,9 @@
 git pull
 git format-patch -o $patchesdir $(cat $lastcommitfile)
 
+cd $cvsdir
+cvs -q update -d -P english japanese
+
 cd $patchesdir
 for pf in $(ls *.patch); do
   sha1=$(head -n 1 $pf | sed -e "s/From //" -e "s/ .*//")
@@ -40,7 +43,7 @@
     else
       logmsg=$(head -n 4 $patchesdir/$pf | grep Subject: | sed -e "s/Subject: \[PATCH\] //")
       while true; do
-        echo -n "[COMMIT] $pf as $logmsg. OK? [y/n/p/s]"
+        echo -n "[COMMIT] $pf as '$logmsg'. Apply? [y/n/p/s]"
         read yn
         if [ "$yn" = "y" ]; then # apply
           patch -p1 -f < ${patchesdir}/$pf
@@ -52,6 +55,9 @@
         elif [ "$yn" = "n" ]; then # keep and skip
           break
         elif [ "$yn" = "p" ]; then # pager
+          if [ -z "$PAGER" ]; then
+            PAGER=lv
+          fi
           $PAGER $patchesdir/$pf
         elif [ "$yn" = "s" ]; then # skip and move to patched
           mv $patchesdir/$pf $patcheddir/$patchedprefix$pf