diff options
| author | Paul Eggert <eggert@twinsun.com> | 2004-02-15 07:41:58 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@twinsun.com> | 2004-02-15 07:41:58 +0000 |
| commit | 83d48514ec1b20443fb6be1160113c0d0624a55b (patch) | |
| tree | 8de7f6b6ede4a317415cab1de42333150b5ed6e4 /lib-src/rcs2log | |
| parent | 584b627ec9208019291752150efc322aa501f56e (diff) | |
| download | emacs-83d48514ec1b20443fb6be1160113c0d0624a55b.tar.gz | |
Work correctly if CVSROOT specifies :fork: or
:local: methods, or omits the colon between the hostname
and the path. Allow :/ in repository path, since CVS does.
Fix typo: "pository" should be set from $CVSROOT, not $repository.
This fixes a bug reported by Wolfgang Scherer in
<http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-02/msg00085.html>,
along with some related bugs I discovered by inspecting how
CVS itself parses $CVSROOT.
Diffstat (limited to 'lib-src/rcs2log')
| -rwxr-xr-x | lib-src/rcs2log | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 9528e6b1d9c..b7466b6c134 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -29,10 +29,10 @@ Options: Report bugs to <bug-gnu-emacs@gnu.org>.' -Id='$Id: rcs2log,v 1.51 2003/09/01 15:45:03 miles Exp $' +Id='$Id: rcs2log,v 1.52 2003/12/27 08:18:08 uid65632 Exp $' -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, +# 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ Id='$Id: rcs2log,v 1.51 2003/09/01 15:45:03 miles Exp $' # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -Copyright='Copyright (C) 2003 Free Software Foundation, Inc. +Copyright='Copyright (C) 2004 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. @@ -251,18 +251,24 @@ case $rlogfile in rlog='cvs -q log' repository=`sed 1q <CVS/Repository` || exit test ! -f CVS/Root || CVSROOT=`cat <CVS/Root` || exit + pository= case $CVSROOT in - *:/*:/*) - echo >&2 "$0: $CVSROOT: CVSROOT has multiple ':/'s" - exit 1;; - *:/*) + /* | :fork:* | :local:*) ;; + */*) # remote repository - pository=`expr "X$repository" : '.*:\(/.*\)'`;; - *) + pository=`expr "X$CVSROOT" : '[^/]*\(.*\)'`;; + esac + case $pository in + '') # local repository case $repository in /*) ;; - *) repository=${CVSROOT?}/$repository;; + *) + repository=${CVSROOT?}/$repository + case $repository in + :fork:* | :local:*) + repository=`expr "$repository" : ':[^:]*:\(.*\)'`;; + esac;; esac if test ! -d "$repository" then |