cvs-debian-rsc2log.patch

   1 #
   2 # Patch to make the rcs2log script cope with old-format (5 parameter)
   3 # and new-format (6 parameter) log output. Bug#258140
   4 #
   5 # Patch from Ludovic Rousseau <rousseau@debian.org>
   6 diff -ruN cvs-1.12.13-old/contrib/rcs2log.sh cvs-1.12.13/contrib/rcs2log.sh
   7 --- cvs-1.12.13-old/contrib/rcs2log.sh  2005-07-12 22:12:55.000000000 +0800
   8 +++ cvs-1.12.13/contrib/rcs2log.sh      2006-02-26 17:43:11.000000000 +0800
   9 @@ -416,11 +416,24 @@
  10         : ;;
  11  esac >$llogout || exit
  12
  13 +# the date format in 'cvs -q log' changed
  14 +# it was
  15 +# date: 2003/05/06 21:23:30;  author: rousseau;  state: Exp;  lines: +29 -31
  16 +# it is now
  17 +# date: 2003-05-06 21:23:30 +0000;  author: rousseau;  state: Exp;  lines: +29 -31
  18  output_authors='/^date: / {
  19 -       if ($2 ~ /^[0-9]*[-\/][0-9][0-9][-\/][0-9][0-9]$/ && $3 ~ /^[0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9:]*;$/ && $4 == "author:" && $5 ~ /^[^;]*;$/) {
  20 -               print substr($5, 1, length($5)-1)
  21 -       }
  22 +       # old date format
  23 +       if ($2 ~ /^[0-9]*[-\/][0-9][0-9][-\/][0-9][0-9]$/ && $3 ~ /^[0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9:]*;$/ && $4 == "author:" && $5 ~ /^[^;]*;$/) {
  24 +               print substr($5, 1, length($5)-1)
  25 +       }
  26 +       else {
  27 +               # new date format
  28 +               if ($2 ~ /^[0-9]*[-\/][0-9][0-9][-\/][0-9][0-9]$/ && $3 ~ /^[0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9:]*$/ && $5 == "author:" && $6 ~ /^[^;]*;$/) {
  29 +                       print substr($6, 1, length($6)-1)
  30 +               }
  31 +        }
  32  }'
  33 +
  34  authors=`
  35         $AWK "$output_authors" <"$rlogfile" | sort -u | comm -23 - $llogout
  36  `
  37 @@ -611,7 +624,11 @@
  38                                 date = newdate date
  39                         }
  40                         time = substr($3, 1, length($3) - 1)
  41 -                       author = substr($5, 1, length($5)-1)
  42 +            author = substr($5, 1, length($5)-1)
  43 +            if (author ~ /author/) {
  44 +                # new date format
  45 +                author = substr($6, 1, length($6)-1)
  46 +            }
  47                         printf "%s%s%s%s%s%s%s%s%s%s", filename, SOH, rev, SOH, date, SOH, time, SOH, author, SOH
  48                         rev = "?"
  49                         next