From: Erik Naggum Date: Sat, 24 Aug 1996 21:11:14 +0000 (+0000) Subject: Use ISO 8601 date format, with time zone appended if X-Git-Tag: emacs-20.1~4033 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b8b6c7ad97e193faad229a96a6ab06f7efb5ec2;p=emacs.git Use ISO 8601 date format, with time zone appended if change-log-time-zone-rule is non-nil, instead of traditional Unix date format. (datearg): When computing default from ChangeLog, handle ISO format dates in addition to old-fashioned dates from Emacs 19.31 and earlier. Don't worry about hh:mm:ss since the resolution is now by day. Use emtpy datearg, not empty rlog_options, to decide whether to pass "$datearg" option to $rlog. (logTZ): New variable, set to TZ specified by change-log-time-zone-rule. (month_data): Remove `mo'; no longer needed. (rlog_options): Use -zLT for localltime output, if `rlog' supports it. (extractTZ): Use UTC if the zone is t. Match `revision' line of rlog output more accurately. Add -c, -v options. --- diff --git a/lib-src/rcs2log b/lib-src/rcs2log index dcc8f472030..e9474f65ade 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -12,7 +12,7 @@ # Author: Paul Eggert -# $Id: rcs2log,v 1.27 1996/01/15 01:17:56 eggert Exp kwzh $ +# $Id: rcs2log,v 1.28 1996/07/20 18:08:03 kwzh Exp erik $ # Copyright 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. @@ -20,12 +20,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -40,18 +40,23 @@ nl=' # defaults : ${AWK=awk} : ${TMPDIR=/tmp} +changelog=ChangeLog # change log file name +datearg= # rlog date option hostname= # name of local host (if empty, will deduce it later) indent=8 # indent of log line length=79 # suggested max width of log line logins= # login names for people we know fullnames and mailaddrs of loginFullnameMailaddrs= # loginfullnamemailaddr triplets +logTZ= # time zone for log dates (if empty, use local time) recursive= # t if we want recursive rlog +revision= # t if we want revision numbers rlog_options= # options to pass to rlog tabwidth=8 # width of horizontal tab while : do case $1 in + -c) changelog=${2?}; shift;; -i) indent=${2?}; shift;; -h) hostname=${2?}; shift;; -l) length=${2?}; shift;; @@ -93,10 +98,12 @@ do -r) rlog_options=$rlog_options$nl${2?}; shift;; -R) recursive=t;; -t) tabwidth=${2?}; shift;; + -v) revision=t;; -*) echo >&2 "$0: usage: $0 [options] [file ...] Options: - [-h hostname] [-i indent] [-l length] [-R] [-r rlog_option] - [-t tabwidth] [-u 'loginfullnamemailaddr']..." + [-c changelog] [-h hostname] [-i indent] [-l length] [-R] + [-r rlog_option] [-t tabwidth] [-v] + [-u 'loginfullnamemailaddr']..." exit 1;; *) break esac @@ -108,12 +115,6 @@ month_data=' m[3]="Apr"; m[4]="May"; m[5]="Jun" m[6]="Jul"; m[7]="Aug"; m[8]="Sep" m[9]="Oct"; m[10]="Nov"; m[11]="Dec" - - # days in non-leap year thus far, indexed by month (0-12) - mo[0]=0; mo[1]=31; mo[2]=59; mo[3]=90 - mo[4]=120; mo[5]=151; mo[6]=181; mo[7]=212 - mo[8]=243; mo[9]=273; mo[10]=304; mo[11]=334 - mo[12]=365 ' @@ -121,50 +122,30 @@ month_data=' # If no rlog options are given, # log the revisions checked in since the first ChangeLog entry. +# Since ChangeLog is only by date, some of these revisions may be duplicates of +# what's already in ChangeLog; it's the user's responsibility to remove them. case $rlog_options in '') date=1970 - if test -s ChangeLog + if test -s "$changelog" then - # Add 1 to seconds to avoid duplicating most recent log. e=' + /^[0-9]+-[0-9][0-9]-[0-9][0-9]/{ + # ISO 8601 date + print $1 + exit + } /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{ + # old-fashioned date and time (Emacs 19.31 and earlier) '"$month_data"' year = $5 for (i=0; i<=11; i++) if (m[i] == $2) break dd = $3 - hh = substr($0,12,2) - mm = substr($0,15,2) - ss = substr($0,18,2) - ss++ - if (ss == 60) { - ss = 0 - mm++ - if (mm == 60) { - mm = 0 - hh++ - if (hh == 24) { - hh = 0 - dd++ - monthdays = mo[i+1] - mo[i] - if (i == 1 && year%4 == 0 && (year%100 != 0 || year%400 == 0)) monthdays++ - if (dd == monthdays + 1) { - dd = 1 - i++ - if (i == 12) { - i = 0 - year++ - } - } - } - } - } - # Output comma instead of space to avoid CVS 1.5 bug. - printf "%d/%02d/%02d,%02d:%02d:%02d\n", year,i+1,dd,hh,mm,ss + printf "%d-%02d-%02d\n", year, i+1, dd exit } ' - d=`$AWK "$e" &1` in +*'unknown option'*) ;; +*) rlog_options=-zLT$nl$rlog_options +esac + +# Use TZ specified by ChangeLog local variable, if any. +if test -s "$changelog" +then + extractTZ=' + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*"\([^"]*\)".*/{ + s//\1/; p; q + } + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*t.*/{ + s//UTC0/; p; q + } + ' + logTZ=`tail "$changelog" | sed -n "$extractTZ"` + case $logTZ in + ?*) TZ=$logTZ; export TZ + esac +fi + # If CVS is in use, examine its repository, not the normal RCS files. if test ! -f CVS/Repository then @@ -245,9 +249,9 @@ rlogout=$TMPDIR/rcs2log$$r trap exit 1 2 13 15 trap "rm -f $llogout $rlogout; exit 1" 0 -case $rlog_options in -?*) $rlog $rlog_options ${1+"$@"} >$rlogout;; -'') $rlog "$datearg" ${1+"$@"} >$rlogout +case $datearg in +?*) $rlog $rlog_options "$datearg" ${1+"$@"} >$rlogout;; +'') $rlog $rlog_options ${1+"$@"} >$rlogout esac || exit @@ -413,6 +417,9 @@ printlogline='{ } }' +# Pattern to match the `revision' line of rlog output. +rlog_revision_pattern='^revision [0-9]+\.[0-9]+(\.[0-9]+\.[0-9]+)*(['"$tab"' ]+locked by: [^'"$tab"' $,.0-9:;@]*[^'"$tab"' $,:;@][^'"$tab"' $,.0-9:;@]*;)?['"$tab"' ]*$' + case $hostname in '') hostname=`( @@ -450,43 +457,53 @@ $AWK <$rlogout ' filename = substr(filename, 1, length(filename) - 2) } } + rev = "?" } /^Working file:/ { if (repository == "") filename = $3 } - /^date: /, /^(-----------*|===========*)$/ { - if ($0 ~ /^branches: /) { next } + /'"$rlog_revision_pattern"'/, /^(-----------*|===========*)$/ { + if ($0 ~ /'"$rlog_revision_pattern"'/) { + rev = $2 + next + } if ($0 ~ /^date: [0-9][- +\/0-9:]*;/) { date = $2 - if (date ~ /-/) { - # An ISO format date. Replace all "-"s with "/"s. + if (date ~ /\//) { + # This is a traditional RCS format date YYYY/MM/DD. + # Replace "/"s with "-"s to get ISO format. newdate = "" - while ((i = index(date, "-")) != 0) { - newdate = newdate substr(date, 1, i-1) "/" + while ((i = index(date, "/")) != 0) { + newdate = newdate substr(date, 1, i-1) "-" date = substr(date, i+1) } date = newdate date } - # Ignore any time zone; ChangeLog has no room for it. - time = substr($3, 1, 8) + time = substr($3, 1, length($3) - 1) author = substr($5, 1, length($5)-1) - printf "%s %s %s %s %c", filename, date, time, author, 13 + printf "%s %s %s %s %s %c", filename, rev, date, time, author, 13 + rev = "?" next } + if ($0 ~ /^branches: /) { next } if ($0 ~ /^(-----------*|===========*)$/) { print ""; next } printf "%s%c", $0, 13 } ' | # Now each line is of the form -# FILENAME YYYY/MM/DD HH:MM:SS AUTHOR \rLOG +# FILENAME REVISION YYYY-MM-DD HH:MM:SS[+-TIMEZONE] AUTHOR \rLOG # where \r stands for a carriage return, # and each line of the log is terminated by \r instead of \n. # Sort the log entries, first by date+time (in reverse order), -# then by author, then by log entry, and finally by file name (just in case). -sort +1 -3r +3 +0 | +# then by author, then by log entry, and finally by file name and revision +# (just in case). +sort +2 -4r +4 +0 | # Finally, reformat the sorted log entries. $AWK ' BEGIN { + logTZ = "'"$logTZ"'" + revision = "'"$revision"'" + # Some awk variants do not understand "\r" or "\013", so we have to # put a carriage return directly in the file. CR=" " # <-- There is a single CR between the " chars here. @@ -503,19 +520,6 @@ $AWK ' indent_string = indent_string "\t" while (1 <= i--) indent_string = indent_string " " - - # Set up date conversion tables. - # RCS uses a nice, clean, sortable format, - # but ChangeLog wants the traditional, ugly ctime format. - - # January 1, 0 AD (Gregorian) was Saturday = 6 - EPOCH_WEEKDAY = 6 - # Of course, there was no 0 AD, but the algorithm works anyway. - - w[0]="Sun"; w[1]="Mon"; w[2]="Tue"; w[3]="Wed" - w[4]="Thu"; w[5]="Fri"; w[6]="Sat" - - '"$month_data"' } { @@ -524,7 +528,7 @@ $AWK ' # Ignore log entries prefixed by "#". if (newlog ~ /^#/) { next } - if (Log != newlog || date != $2 || author != $4) { + if (Log != newlog || date != $3 || author != $5) { # The previous log and this log differ. @@ -555,33 +559,25 @@ $AWK ' filesknown[i] = 0 files = "" } - if (date != $2 || author != $4) { + if (date != $3 || author != $5) { # The previous date+author and this date+author differ. # Print the new one. - date = $2 - author = $4 - - # Convert nice RCS date like "1992/01/03 00:03:44" - # into ugly ctime date like "Fri Jan 3 00:03:44 1992". - # Calculate day of week from Gregorian calendar. - i = index($2, "/") - year = substr($2, 1, i-1) + 0 - monthday = substr($2, i+1) - i = index(monthday, "/") - month = substr(monthday, 1, i-1) + 0 - day = substr(monthday, i+1) + 0 - leap = 0 - if (2 < month && year%4 == 0 && (year%100 != 0 || year%400 == 0)) leap = 1 - days_since_Sunday_before_epoch = EPOCH_WEEKDAY + year * 365 + int((year + 3) / 4) - int((year + 99) / 100) + int((year + 399) / 400) + mo[month-1] + leap + day - 1 - - # Print "date fullname (email address)". + date = $3 + time = $4 + author = $5 + + zone = "" + if (logTZ && ((i = index(time, "-")) || (i = index(time, "+")))) + zone = " " substr(time, i) + + # Print "date[ timezone] fullname ". # Get fullname and email address from associative arrays; # default to author and author@hostname if not in arrays. if (fullname[author]) auth = fullname[author] else auth = author - printf "%s %s %2d %s %d %s ", w[days_since_Sunday_before_epoch%7], m[month-1], day, $3, year, auth + printf "%s%s %s ", date, zone, auth if (mailaddr[author]) printf "<%s>\n\n", mailaddr[author] else @@ -591,6 +587,7 @@ $AWK ' filesknown[$1] = 1 if (files == "") files = " " $1 else files = files ", " $1 + if (revision && $2 != "?") files = files " " $2 } } END { @@ -606,3 +603,7 @@ $AWK ' # Exit successfully. exec rm -f $llogout $rlogout + +# Local Variables: +# tab-width:4 +# End: