(datearg): If rlog options are specified explicitly,

omit the implicit '-d>DATE' option. (repository, rlog): Allow absolute paths to CVS repositories. Look only at the first line of CVS/Repository.
author: Paul Eggert 1995-04-30 15:34:52 +0000
committer: Paul Eggert 1995-04-30 15:34:52 +0000
commit: 64736f55e159ae981a7331e9b3fbd178d84c2655 (patch)
tree: eb7640a05c50f69e05666d6dc53ee0fe7728b153
parent: 5949c48ae043f464bc5f0f52ff9068d4e0551ca4 (diff)
download: emacs-64736f55e159ae981a7331e9b3fbd178d84c2655.tar.gz
emacs-64736f55e159ae981a7331e9b3fbd178d84c2655.zip
1 files changed, 70 insertions, 58 deletions
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 831010e77c7..63c4b71ca8c 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -12,7 +12,7 @@
 # Author: Paul Eggert <eggert@twinsun.com>
-# $Id: rcs2log,v 1.20 1995/03/21 23:14:41 eggert Exp eggert $
+# $Id: rcs2log,v 1.22 1995/04/30 15:34:52 eggert Exp $
 # Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -42,7 +42,7 @@ nl='
 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 mailaddresses of
+logins= # login names for people we know fullnames and mailaddrs of
 loginFullnameMailaddrs= # login<tab>fullname<tab>mailaddr triplets
 recursive= # t if we want recursive rlog
 rlog_options= # options to pass to rlog
@@ -116,69 +116,78 @@ month_data='
 '
-# Log into $rlogout the revisions checked in since the first ChangeLog entry.
+# Put rlog output into $rlogout.
-date=1970
+# If no rlog options are given,
-if test -s ChangeLog
+# log the revisions checked in since the first ChangeLog entry.
-then
+case $rlog_options in
-        # Add 1 to seconds to avoid duplicating most recent log.
+'')
-        e='
+        date=1970
-                /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{
+        if test -s ChangeLog
-                        '"$month_data"'
+        then
-                        year = $5
+                # Add 1 to seconds to avoid duplicating most recent log.
-                        for (i=0; i<=11; i++) if (m[i] == $2) break
+                e='
-                        dd = $3
+                        /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{
-                        hh = substr($0,12,2)
+                                '"$month_data"'
-                        mm = substr($0,15,2)
+                                year = $5
-                        ss = substr($0,18,2)
+                                for (i=0; i<=11; i++) if (m[i] == $2) break
-                        ss++
+                                dd = $3
-                        if (ss == 60) {
+                                hh = substr($0,12,2)
-                                ss = 0
+                                mm = substr($0,15,2)
-                                mm++
+                                ss = substr($0,18,2)
-                                if (mm == 60) {
+                                ss++
-                                        mm = 0
+                                if (ss == 60) {
-                                        hh++
+                                        ss = 0
-                                        if (hh == 24) {
+                                        mm++
-                                                hh = 0
+                                        if (mm == 60) {
-                                                dd++
+                                                mm = 0
-                                                monthdays = mo[i+1] - mo[i]
+                                                hh++
-                                                if (i == 1 && year%4 == 0 && (year%100 != 0 || year%400 == 0)) monthdays++
+                                                if (hh == 24) {
-                                                if (dd == monthdays + 1) {
+                                                        hh = 0
-                                                        dd = 1
+                                                        dd++
-                                                        i++
+                                                        monthdays = mo[i+1] - mo[i]
-                                                        if (i == 12) {
+                                                        if (i == 1 && year%4 == 0 && (year%100 != 0 || year%400 == 0)) monthdays++
-                                                                i = 0
+                                                        if (dd == monthdays + 1) {
-                                                                year++
+                                                                dd = 1
+                                                                i++
+                                                                if (i == 12) {
+                                                                        i = 0
+                                                                        year++
+                                                                }
                                                        }
                                                }
                                        }
                                }
+                                printf "%d/%02d/%02d %02d:%02d:%02d\n", year,i+1,dd,hh,mm,ss
+                                exit
                        }
-                        printf "%d/%02d/%02d %02d:%02d:%02d\n", year, i+1, dd, hh, mm, ss
+                '
-                        exit
+                d=`$AWK "$e" <ChangeLog` || exit
-                }
+                case $d in
-        '
+                ?*) date=$d
-        d=`$AWK "$e" <ChangeLog` || exit
+                esac
-        case $d in
+        fi
-        ?*) date=$d
+        datearg="-d>$date"
-        esac
+esac
-fi
-datearg="-d>$date"
-repository=
+# If CVS is in use, examine its repository, not the normal RCS files.
-rlog=rlog
+if test ! -f CVS/Repository
-case $CVSROOT in
+then
-?*)
+        rlog=rlog
-        if test -d "$CVSROOT" && test -f CVS/Repository
+        repository=
+else
+        rlog='cvs log'
+        repository=`sed 1q <CVS/Repository` || exit
+        case $repository in
+        /*) ;;
+        *) repository=${CVSROOT?}/$repository
+        esac
+        if test ! -d "$repository"
        then
-                r=`cat <CVS/Repository` || exit
+                echo >&2 "$0: $repository: bad repository (see CVS/Repository)"
-                if test -d "$CVSROOT/$r"
+                exit 1
-                then
-                        repository=$CVSROOT/$r
-                        rlog='cvs log'
-                fi
        fi
-esac
+fi
 # With no arguments, examine all files under the RCS directory.
 case $# in
@@ -226,7 +235,10 @@ rlogout=$TMPDIR/rcs2log$$r
 trap exit 1 2 13 15
 trap "rm -f $llogout $rlogout; exit 1" 0
-$rlog "$datearg" $rlog_options ${1+"$@"} >$rlogout || exit
+case $rlog_options in
+?*) $rlog $rlog_options ${1+"$@"} >$rlogout;;
+'') $rlog "$datearg" ${1+"$@"} >$rlogout
+esac || exit
 # Get the full name of each author the logs mention, and set initialize_fullname
@@ -450,7 +462,7 @@ sort +1 -3r +3 +0 |
 # Finally, reformat the sorted log entries.
 $AWK '
        BEGIN {
-                # Some awks do not understand "\r" or "\013", so we have to
+                # 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.
author	Paul Eggert	1995-04-30 15:34:52 +0000
committer	Paul Eggert	1995-04-30 15:34:52 +0000
commit	64736f55e159ae981a7331e9b3fbd178d84c2655 (patch)
tree	eb7640a05c50f69e05666d6dc53ee0fe7728b153
parent	5949c48ae043f464bc5f0f52ff9068d4e0551ca4 (diff)
download	emacs-64736f55e159ae981a7331e9b3fbd178d84c2655.tar.gz emacs-64736f55e159ae981a7331e9b3fbd178d84c2655.zip

diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 831010e77c7..63c4b71ca8c 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log
@@ -12,7 +12,7 @@
12		12
13	# Author: Paul Eggert <eggert@twinsun.com>	13	# Author: Paul Eggert <eggert@twinsun.com>
14		14
15	# $Id: rcs2log,v 1.20 1995/03/21 23:14:41 eggert Exp eggert $	15	# $Id: rcs2log,v 1.22 1995/04/30 15:34:52 eggert Exp $
16		16
17	# Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.	17	# Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
18		18
@@ -42,7 +42,7 @@ nl='
42	hostname= # name of local host (if empty, will deduce it later)	42	hostname= # name of local host (if empty, will deduce it later)
43	indent=8 # indent of log line	43	indent=8 # indent of log line
44	length=79 # suggested max width of log line	44	length=79 # suggested max width of log line
45	logins= # login names for people we know fullnames and mailaddresses of	45	logins= # login names for people we know fullnames and mailaddrs of
46	loginFullnameMailaddrs= # login<tab>fullname<tab>mailaddr triplets	46	loginFullnameMailaddrs= # login<tab>fullname<tab>mailaddr triplets
47	recursive= # t if we want recursive rlog	47	recursive= # t if we want recursive rlog
48	rlog_options= # options to pass to rlog	48	rlog_options= # options to pass to rlog
@@ -116,69 +116,78 @@ month_data='
116	'	116	'
117		117
118		118
119	# Log into $rlogout the revisions checked in since the first ChangeLog entry.	119	# Put rlog output into $rlogout.
120		120
121	date=1970	121	# If no rlog options are given,
122	if test -s ChangeLog	122	# log the revisions checked in since the first ChangeLog entry.
123	then	123	case $rlog_options in
124	# Add 1 to seconds to avoid duplicating most recent log.	124	'')
125	e='	125	date=1970
126	/^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{	126	if test -s ChangeLog
127	'"$month_data"'	127	then
128	year = $5	128	# Add 1 to seconds to avoid duplicating most recent log.
129	for (i=0; i<=11; i++) if (m[i] == $2) break	129	e='
130	dd = $3	130	/^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{
131	hh = substr($0,12,2)	131	'"$month_data"'
132	mm = substr($0,15,2)	132	year = $5
133	ss = substr($0,18,2)	133	for (i=0; i<=11; i++) if (m[i] == $2) break
134	ss++	134	dd = $3
135	if (ss == 60) {	135	hh = substr($0,12,2)
136	ss = 0	136	mm = substr($0,15,2)
137	mm++	137	ss = substr($0,18,2)
138	if (mm == 60) {	138	ss++
139	mm = 0	139	if (ss == 60) {
140	hh++	140	ss = 0
141	if (hh == 24) {	141	mm++
142	hh = 0	142	if (mm == 60) {
143	dd++	143	mm = 0
144	monthdays = mo[i+1] - mo[i]	144	hh++
145	if (i == 1 && year%4 == 0 && (year%100 != 0 \|\| year%400 == 0)) monthdays++	145	if (hh == 24) {
146	if (dd == monthdays + 1) {	146	hh = 0
147	dd = 1	147	dd++
148	i++	148	monthdays = mo[i+1] - mo[i]
149	if (i == 12) {	149	if (i == 1 && year%4 == 0 && (year%100 != 0 \|\| year%400 == 0)) monthdays++
150	i = 0	150	if (dd == monthdays + 1) {
151	year++	151	dd = 1
		152	i++
		153	if (i == 12) {
		154	i = 0
		155	year++
		156	}
152	}	157	}
153	}	158	}
154	}	159	}
155	}	160	}
		161	printf "%d/%02d/%02d %02d:%02d:%02d\n", year,i+1,dd,hh,mm,ss
		162	exit
156	}	163	}
157	printf "%d/%02d/%02d %02d:%02d:%02d\n", year, i+1, dd, hh, mm, ss	164	'
158	exit	165	d=`$AWK "$e" <ChangeLog` \|\| exit
159	}	166	case $d in
160	'	167	?*) date=$d
161	d=`$AWK "$e" <ChangeLog` \|\| exit	168	esac
162	case $d in	169	fi
163	?*) date=$d	170	datearg="-d>$date"
164	esac	171	esac
165	fi
166	datearg="-d>$date"
167		172
168	repository=	173	# If CVS is in use, examine its repository, not the normal RCS files.
169	rlog=rlog	174	if test ! -f CVS/Repository
170	case $CVSROOT in	175	then
171	?*)	176	rlog=rlog
172	if test -d "$CVSROOT" && test -f CVS/Repository	177	repository=
		178	else
		179	rlog='cvs log'
		180	repository=`sed 1q <CVS/Repository` \|\| exit
		181	case $repository in
		182	/*) ;;
		183	*) repository=${CVSROOT?}/$repository
		184	esac
		185	if test ! -d "$repository"
173	then	186	then
174	r=`cat <CVS/Repository` \|\| exit	187	echo >&2 "$0: $repository: bad repository (see CVS/Repository)"
175	if test -d "$CVSROOT/$r"	188	exit 1
176	then
177	repository=$CVSROOT/$r
178	rlog='cvs log'
179	fi
180	fi	189	fi
181	esac	190	fi
182		191
183	# With no arguments, examine all files under the RCS directory.	192	# With no arguments, examine all files under the RCS directory.
184	case $# in	193	case $# in
@@ -226,7 +235,10 @@ rlogout=$TMPDIR/rcs2log$$r
226	trap exit 1 2 13 15	235	trap exit 1 2 13 15
227	trap "rm -f $llogout $rlogout; exit 1" 0	236	trap "rm -f $llogout $rlogout; exit 1" 0
228		237
229	$rlog "$datearg" $rlog_options ${1+"$@"} >$rlogout \|\| exit	238	case $rlog_options in
		239	?*) $rlog $rlog_options ${1+"$@"} >$rlogout;;
		240	'') $rlog "$datearg" ${1+"$@"} >$rlogout
		241	esac \|\| exit
230		242
231		243
232	# Get the full name of each author the logs mention, and set initialize_fullname	244	# Get the full name of each author the logs mention, and set initialize_fullname
@@ -450,7 +462,7 @@ sort +1 -3r +3 +0 \|
450	# Finally, reformat the sorted log entries.	462	# Finally, reformat the sorted log entries.
451	$AWK '	463	$AWK '
452	BEGIN {	464	BEGIN {
453	# Some awks do not understand "\r" or "\013", so we have to	465	# Some awk variants do not understand "\r" or "\013", so we have to
454	# put a carriage return directly in the file.	466	# put a carriage return directly in the file.
455	CR=" " # <-- There is a single CR between the " chars here.	467	CR=" " # <-- There is a single CR between the " chars here.
456		468