Index: rcs2log
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/rcs2log,v
retrieving revision 1.50
diff -C3 -r1.50 rcs2log
*** rcs2log	3 Feb 2002 17:31:31 -0000	1.50
--- rcs2log	16 Jul 2003 23:42:51 -0000
***************
*** 20,26 ****
    -l LENGTH  Try to limit log lines to LENGTH characters (default 79).
    -L FILE  Use rlog-format FILE for source of logs.
    -R  If no FILEs are given and RCS is used, recurse through working directory.
!   -r OPTION  Pass OPTION to subsidiary log command.
    -t TABWIDTH  Tab stops are every TABWIDTH characters (default 8).
    -u "LOGIN<tab>FULLNAME<tab>MAILADDR"  Assume LOGIN has FULLNAME and MAILADDR.
    -v  Append RCS revision to file names in log lines.
--- 20,27 ----
    -l LENGTH  Try to limit log lines to LENGTH characters (default 79).
    -L FILE  Use rlog-format FILE for source of logs.
    -R  If no FILEs are given and RCS is used, recurse through working directory.
!   -r OPTION  Pass OPTION to subsidiary log command.  If OPTION starts with -d
!              then the date of the last change log entry won'"'"'t be used.
    -t TABWIDTH  Tab stops are every TABWIDTH characters (default 8).
    -u "LOGIN<tab>FULLNAME<tab>MAILADDR"  Assume LOGIN has FULLNAME and MAILADDR.
    -v  Append RCS revision to file names in log lines.
***************
*** 193,204 ****
  '')
  	rlogfile=$logdir/r
  
! 	# 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
! 	'')
  		if test -s "$changelog"
  		then
  			e='
--- 194,217 ----
  '')
  	rlogfile=$logdir/r
  
! 	# If no rlog -d option is 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.
! 
! 	got_d_option=no
! 	oldIFS=$IFS
! 	IFS=$nl
! 	for opt in $rlog_options
! 	do
! 	  case $opt in
! 	  -d*) got_d_option=yes;;
! 	  esac
! 	done
! 	IFS=$oldIFS
! 
! 	if test $got_d_option = no
! 	then
  		if test -s "$changelog"
  		then
  			e='
***************
*** 221,228 ****
  			case $d in
  			?*) datearg="-d>$d";;
  			esac
! 		fi;;
! 	esac
  
  	# Use TZ specified by ChangeLog local variable, if any.
  	if test -s "$changelog"
--- 234,241 ----
  			case $d in
  			?*) datearg="-d>$d";;
  			esac
! 		fi
! 	fi
  
  	# Use TZ specified by ChangeLog local variable, if any.
  	if test -s "$changelog"
***************
*** 281,286 ****
--- 294,315 ----
  			esac
  		done
  
+ 		# If there is a branch tag in CVS/Tag then add a -rTheTag to
+ 		# the log command.  FIXME: This should be handled for each
+ 		# directory individually when doing a recursive operation.
+ 		if test -f CVS/Tag
+ 		then
+ 			tag=`cat CVS/Tag`
+ 			case $tag in
+ 			T*)
+ 				branch=`expr "$tag" : 'T\(.*\)'`
+ 				case $rlog_options in
+ 				'') rlog_options=-r$branch;;
+ 				?*) rlog_options=-r$branch$nl$rlog_options;;
+ 				esac
+ 				;;
+ 			esac
+ 		fi
  	fi
  
  	# Use $rlog's -zLT option, if $rlog supports it.