This commit was manufactured by cvs2svn to create tag 'V0_5'.

git-svn-id: http://viewvc.tigris.org/svn/viewvc/tags/V0_5@140 8cb11bc2-c004-0410-86c3-e597b4017df7

INSTALL

@@ -9,20 +9,32 @@ INSTALLING VIEWCVS
    You need to have RCS installed. Specifically, "rlog", "rcsdiff",
    and "co". This script was tested against RedHat's rcs-5.7-10.rpm
 
-   Note, that the viewcvs.cgi-script needs to have READ-ONLY, physical
-   access to the repository (or a copy of it).  Therefore, rsh/ssh or
+   Note, that the viewcvs.cgi script needs to have READ-ONLY, physical
+   access to the CVS repository (or a copy of it).  Therefore, rsh/ssh or
    pserver access doesn't work yet.
 
-2) Copy viewcvs.cgi to the cgi-script location of your web server.
+   For the checkin database to work, you will need MySQL >= 3.22, 
+   and the Python DBAPI 2.0 module, MySQLdb.  This was tested with
+   MySQLdb 1.12.
 
-   If Python is not located in /usr/local/bin, then you'll need to
-   edit the first line of viewcvs.cgi.
+2) Installation is handled by the ./viewcvs-install script.  Run this
+   script and you will be prompted for a installation root path.
+   The default is /usr/local/viewcvs.  The installer sets the install 
+   path in some of the files, and ViewCVS cannot be moved to a 
+   different path after the install.
 
-3) Copy viewcvs.conf.dist to the same directory and RENAME it to
-   viewcvs.conf
+   Note: while 'root' is usually required to create /usr/local/viewcvs,
+   ViewCVS does not have to be installed as root, nor does it run as root.
+   It is just as valid to place ViewCVS in a home directory, too.
 
-4) Edit viewcvs.conf for your specific configuration. In particular,
-   examine the following configuration options:
+   Note: viewcvs-install will create directories if needed. It will
+   prompt before overwriting files that may have been modified (such
+   as viewcvs.conf), thus making it safe to install over the top of
+   a previous installation. It will always overwrite program files,
+   however.
+
+3) Edit <install-root>viewcvs.conf for your specific configuration. 
+   In particular, examine the following configuration options:
 
       cvs_roots
       default_root
@@ -32,11 +44,96 @@ INSTALLING VIEWCVS
    There are some other options that are usually nice to change. See
    viewcvs.conf for more information.
 
-5) That's it. Try it out.
+4) The CGI programs are in <install-root>/cgi/.  You can symlink to this
+   directory from somewhere in your published HTTP server path if your 
+   webserver is configured to follow symbolic links.  You can also copy
+   the installed <install-root>/cgi/*.cgi scripts after the install
+   (unlike the other files in ViewCVS, the CGI scripts can be moved).
 
-   Warning: ViewCVS has not been tested on web servers operating on the
-            Win32 platform.
+   NOTE: for security reasons, it is not advisable to install ViewCVS
+   directly into your published HTTP directory tree (due to the MySQL
+   passwords in viewcvs.conf).
 
+5) That's it for repository browsing.  Instructions for getting the
+   SQL checkin database working are below.
+
+
+WARNING: ViewCVS has not been tested on web servers operating on the
+         Win32 platform.
+
+
+
+SQL Checkin Database
+--------------------
+
+This feature is a clone of the Mozilla Project's Bonsai database.  It
+catalogs every commit in the CVS repository into a SQL database.  In fact,
+the databases are 100% compatible.
+
+Various queries can be preformed on the database.  After installing ViewCVS,
+there are some additional steps required to get the database working.
+
+1) You need MySQL >= 3.22, and the Python module MySQLdb >= 1.12 installed.
+
+2) You need to create a MySQL user who has permission to create databases.
+   Optionally, you can create a second user with read-only access to the
+   database.
+
+3) Run the <install-root>/make-database script.  It will prompt you for
+   your MySQL user, password, and the name of database you want to 
+   create.  The database name defaults to "ViewCVS".  This script creates
+   the database and sets up the empty tables.  If you run this on a 
+   existing ViewCVS database, you will loose all your data!
+
+4) Edit your <install-root>/viewcvs.conf file.  There is a [cvsdb]
+   section.  You will need to set:
+     
+      
+      host =             # MySQL database server host
+      database_name =    # the name of the database you created with
+                         # make-database
+      user =             # the read/write database user
+      passwd =           # password for read/write database user
+      readonly_user =    # the readonly database user -- it's pretty 
+                         # safe to use the read/write user here
+      readonly_passwd =  # password for the readonly user
+
+5) Two programs are provided for updating the checkin database, 
+   cvsdbadmin and loginfo-handler.  They serve two different purposes.
+   The cvsdbadmin program walks through your CVS repository and adds
+   every commit in every file.  This is commonly used for initalizing
+   the database from a repository which has been in use.  The 
+   loginfo-handler script is executed by the CVS server's CVSROOT/loginfo 
+   system upon each commit.  It makes real-time updates to the checkin
+   database as commits are made to the repository.
+
+   To build a database of all the commits in the CVS repository /home/cvs,
+   invoke: "./cvsdbadmin rebuild /home/cvs".  If you want to update
+   the checkin database, invoke: "./cvsdbadmin update /home/cvs".  The
+   update mode checks to see if a commit is already in the database,
+   and only adds it if it is abscent.
+
+   To get real-time updates, you'll want to checkout the CVSROOT module
+   from your CVS repository and edit CVSROOT/loginfo.  Add the line:
+
+       ALL (echo %{sVv}; cat) | <install-root>/loginfo-handler
+
+   If you have other scripts invoked by CVSROOT/loginfo, you will want
+   to make sure to change any running under the "DEFAULT" keyword to
+   "ALL" like the loginfo handler, and probably carefully read the
+   execution rules for CVSROOT/loginfo from the CVS manual.
+
+6) You may want to modify the HTML template files:
+
+      <install-root>/html-templates/queryformtemplate.html
+      <install-root>/html-templates/querytemplate.html
+
+   They're used by the queryform.cgi and query.cgi scripts generate
+   HTML output.  At some point, viewcvs.cgi, query.cgi, and queryform.cgi
+   will use the same mechanism for HTML generation, but not yet.
+
+7) You should be ready to go.  Load up the queryform.cgi script and give 
+   it a try.
 
 
 IF YOU HAVE PROBLEMS ...
@@ -75,7 +172,7 @@ If you've trouble to make viewcvs.cgi work:
 
  o check the ViewCVS home page:
 
-     http://www.lyra.org/greg/python/viewcvs/
+     http://www.lyra.org/viewcvs/
 
  o review the ViewCVS mailing list archive to see if somebody else had
    the same problem, and it was solved:

cgi/query.cgi

@@ -1,48 +1,50 @@
 #!/usr/bin/python
 # -*- Mode: python -*-
 #
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
 # CGI script to process and display queries to CVSdb
 #
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
-#
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# This script is part of the ViewCVS package. More information can be
+# found at http://www.lyra.org/viewcvs/.
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-## BOOTSTRAP
-import sys, os, string
-_viewcvs_root = string.strip(open("/etc/viewcvs/root", "r").read())
-sys.path.append(os.path.join(_viewcvs_root, "lib"))
-##
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+HTML_TEMPLATE_DIR = None
+
+# Adjust sys.path to include our library directory
+import sys
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path[:0] = ['../lib']	# any other places to look?
+
+#########################################################################
+
+import os, string, cgi, time, cvsdbapi
 
-import cgi, time, cvsdbapi
 
 ## tuple of alternating row colors
 Colors = ("#ccccee", "#ffffff")
@@ -182,8 +184,7 @@ class HTMLTemplate:
 def Main():
     HTMLHeader()
 
-    template_path = os.path.join(
-        _viewcvs_root, "html-templates", "querytemplate.html")
+    template_path = os.path.join(HTML_TEMPLATE_DIR, "querytemplate.html")
     template = HTMLTemplate(template_path)
     template.Print1()
     

cgi/queryform.cgi

@@ -1,46 +1,42 @@
 #!/usr/bin/python
 # -*- Mode: python -*-
 #
-# nothing here yet!
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
 #
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-## BOOTSTRAP
-import sys, os, string
-_viewcvs_root = string.strip(open("/etc/viewcvs/root", "r").read())
-sys.path.append(os.path.join(_viewcvs_root, "lib"))
-##
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+HTML_TEMPLATE_DIR = None
+
+# Adjust sys.path to include our library directory
+import sys
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path[:0] = ['../lib']	# any other places to look?
+
+#########################################################################
+
+import os, string
 
 
 def HTMLHeader():
@@ -50,8 +46,7 @@ def HTMLHeader():
 
 def Main():
     HTMLHeader()
-    template_path = os.path.join(
-        _viewcvs_root, "html-templates", "queryformtemplate.html")
+    template_path = os.path.join(HTML_TEMPLATE_DIR, "queryformtemplate.html")
     print open(template_path, "r").read()
 
 

cgi/viewcvs.cgi

@@ -1,40 +1,19 @@
 #!/usr/local/bin/python
 # -*-python-*-
 #
-# viewcvs: View CVS repositories via a web browser
+# Copyright (C) 1999-2000 The ViewCVS Group. All Rights Reserved.
 #
-# Copyright (C) 1999-2000 Greg Stein. All Rights Reserved.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# This module is maintained by Greg and is available at:
-#    http://www.lyra.org/viewcvs/
-#
-# For tracking purposes, this software is identified by:
-#   $Id$
+# viewcvs: View CVS repositories via a web browser
 #
 # -----------------------------------------------------------------------
 #
@@ -47,7 +26,7 @@
 # -----------------------------------------------------------------------
 #
 
-__version__ = '0.5-dev'
+__version__ = '0.5'
 
 #########################################################################
 #
@@ -85,6 +64,8 @@ else:
 # time for our imports now
 import compat
 import config
+import popen
+
 
 #########################################################################
 
@@ -117,6 +98,13 @@ header_comment = '''\
   -->
 '''
 
+# for reading/writing between a couple descriptors
+CHUNK_SIZE = 8192
+
+# if your rlog doesn't use 77 '=' characters, then this must change
+LOG_END_MARKER = '=' * 77 + '\n'
+ENTRY_END_MARKER = '-' * 28 + '\n'
+
 
 class Request:
   def __init__(self):
@@ -467,7 +455,7 @@ def markup_stream_default(fp):
   while 1:
     ### technically, the htmlify() could fail if something falls across
     ### the chunk boundary. TFB.
-    chunk = fp.read(8192)
+    chunk = fp.read(CHUNK_SIZE)
     if not chunk:
       break
     sys.stdout.write(htmlify(chunk))
@@ -494,8 +482,83 @@ def markup_stream_python(fp):
     html = re.sub(_re_rewrite_email, r'<a href="mailto:\1">\1</a>', html)
     sys.stdout.write(html)
 
+def markup_stream_enscript(lang, fp):
+  sys.stdout.flush()
+  cmd = "%senscript --color -W html -E%s -o - - 2> /dev/null " \
+        "| sed -n '/^<PRE>$/,/<\\/PRE>$/p'" % \
+        (cfg.options.enscript_path, lang,)
+  enscript = os.popen(cmd, "w")
+  while 1:
+    chunk = fp.read(CHUNK_SIZE)
+    if not chunk:
+      break
+    enscript.write(chunk)
+  enscript.close()
+
 markup_streamers = {
-  '.py' : markup_stream_python,
+#  '.py' : markup_stream_python,
+  }
+
+### this sucks... we have to duplicate the extensions defined by enscript
+enscript_extensions = {
+  '.c' : 'c',
+  '.h' : 'c',
+  '.c++' : 'cpp',
+  '.C' : 'cpp',
+  '.H' : 'cpp',
+  '.cpp' : 'cpp',
+  '.cc' : 'cpp',
+  '.cxx' : 'cpp',
+  '.m' : 'objc',
+  '.scm' : 'scheme',
+  '.scheme' : 'scheme',
+  '.el' : 'elisp',
+  '.ada' : 'ada',
+  '.adb' : 'ada',
+  '.ads' : 'ada',
+  '.s' : 'asm',
+  '.S' : 'asm',
+  '.st' : 'states',
+  '.tcl' : 'tcl',
+  '.v' : 'verilog',
+  '.vh' : 'verilog',
+  '.htm' : 'html',
+  '.html' : 'html',
+  '.shtml' : 'html',
+  '.vhd' : 'vhdl',
+  '.vhdl' : 'vhdl',
+  '.scr' : 'synopsys',
+  '.syn' : 'synopsys',
+  '.synth' : 'synopsys',
+  '.idl' : 'idl',
+  '.hs' : 'haskell',
+  '.lhs' : 'haskell',
+  '.gs' : 'haskell',
+  '.lgs' : 'haskell',
+  '.pm' : 'perl',
+  '.pl' : 'perl',
+  '.eps' : 'postscript',
+  '.EPS' : 'postscript',
+  '.ps' : 'postscript',
+  '.PS' : 'postscript',
+  '.js' : 'javascript',
+  '.java' : 'java',
+  '.pas' : 'pascal',
+  '.pp' : 'pascal',
+  '.p' : 'pascal',
+  '.f' : 'fortran',
+  '.F' : 'fortran',
+  '.awk' : 'awk',
+  '.sh' : 'sh',
+  '.vba' : 'vba',
+
+  ### use enscript or py2html?
+  '.py' : 'python',
+  }
+enscript_filenames = {
+  '.emacs' : 'elisp',
+  'Makefile' : 'makefile',
+  'makefile' : 'makefile',
   }
 
 def markup_stream(request, fp, revision, mime_type):
@@ -530,14 +593,26 @@ def markup_stream(request, fp, revision, mime_type):
       print 'Tag: <b>%s</b><br>' % tag
   print '</td></tr></table>'
 
-  url = download_url(request, file_url, revision, mime_type)
   print '<hr noshade>'
   if mime_type[:6] == 'image/':
+    url = download_url(request, file_url, revision, mime_type)
     print '<img src="%s%s"><br>' % (url, request.amp_query)
   else:
     basename, ext = os.path.splitext(filename)
-    streamer = markup_streamers.get(ext, markup_stream_default)
-    streamer(fp)
+    streamer = markup_streamers.get(ext)
+    if streamer:
+      streamer(fp)
+    elif not cfg.options.use_enscript:
+      markup_stream_default(fp)
+    else:
+      lang = enscript_extensions.get(ext)
+      if not lang:
+        lang = enscript_filenames.get(basename)
+      if lang and lang not in cfg.options.disable_enscript_lang:
+        markup_stream_enscript(lang, fp)
+      else:
+        markup_stream_default(fp)
+  html_footer()
 
 def get_file_data(full_name):
   """Return a sequence of tuples containing various data about the files.
@@ -636,10 +711,10 @@ def parse_log_header(fp):
       elif line[:14] == 'symbolic names':
         # start parsing the tag information
         parsing_tags = 1
-      elif line == '----------------------------\n':
+      elif line == ENTRY_END_MARKER:
         # end of the headers
         break
-      elif line[:10] == '==========':
+      elif line == LOG_END_MARKER:
         # end of this file's log information
         eof = _EOF_FILE
         break
@@ -699,9 +774,9 @@ def parse_log_entry(fp):
       break
     if line[:9] == 'branches:':
       continue
-    if line == '----------------------------\n':
+    if line == ENTRY_END_MARKER:
       break
-    if line[:10] == '==========':
+    if line == LOG_END_MARKER:
       # end of this file's log information
       eof = _EOF_FILE
       break
@@ -725,7 +800,7 @@ def skip_file(fp):
     line = fp.readline()
     if not line:
       break
-    if line[:10] == '==========':
+    if line == LOG_END_MARKER:
       break
 
 def process_rlog_output(rlog, full_name, view_tag, fileinfo, alltags):
@@ -862,18 +937,18 @@ def get_logs(full_name, files, view_tag):
     chunk = files[:chunk_size]
     del files[:chunk_size]
 
-    arglist = string.join(chunk, "' '" + full_name + '/')
+    # prepend the full pathname for each file
+    for i in range(len(chunk)):
+      chunk[i] = full_name + '/' + chunk[i]
+
     if view_tag:
       # NOTE: can't pass tag on command line since a tag may contain "-"
       #       we'll search the output for the appropriate revision
-      rlog = os.popen("%srlog '%s/%s' 2>&1" %
-                      (cfg.general.rcs_path, full_name, arglist),
-                      "r")
+      rlog = popen.popen(cfg.general.rcs_path + 'rlog', chunk, 'r')
     else:
       # fetch the latest revision on the default branch
-      rlog = os.popen("%srlog -r '%s/%s' 2>&1" %
-                      (cfg.general.rcs_path, full_name, arglist),
-                      "r")
+      chunk = ('-r',) + tuple(chunk)
+      rlog = popen.popen(cfg.general.rcs_path + 'rlog', chunk, 'r')
 
     process_rlog_output(rlog, full_name, view_tag, fileinfo, alltags)
 
@@ -886,6 +961,10 @@ def get_logs(full_name, files, view_tag):
     ###
     ### more work for later...
 
+    if rlog.close():
+      ### what to do?
+      pass
+
   return fileinfo, alltags.keys()
 
 def revcmp(rev1, rev2):
@@ -1077,7 +1156,7 @@ def view_directory(request):
     if isdir:
       if not hideattic and file == 'Attic':
         continue
-      if where == '' and (file == 'CVSROOT' or file in cfg.general.forbidden):
+      if where == '' and (file == 'CVSROOT' or cfg.is_forbidden(file)):
         continue
 
       print '<tr bgcolor="%s"><td>' % cfg.colors.even_odd[cur_row % 2]
@@ -1212,12 +1291,10 @@ def view_directory(request):
 
 def fetch_log(full_name, which_rev=None):
   if which_rev:
-    rev_flag = '-r' + which_rev
+    args = ('-r' + which_rev, full_name)
   else:
-    rev_flag = ''
-  rlog = os.popen("%srlog %s '%s' 2>&1" %
-                  (cfg.general.rcs_path, rev_flag, full_name),
-                  "r")
+    args = (full_name,)
+  rlog = popen.popen(cfg.general.rcs_path + 'rlog', args, 'r')
 
   header, eof = parse_log_header(rlog)
   filename = header.filename
@@ -1705,18 +1782,14 @@ def view_checkout(request):
     ### validate it?
     pass
   else:
-    mime_type, encoding = mimetypes.guess_type(where)
-    if not mime_type:
-      mime_type = 'text/plain'
+    mime_type = request.mime_type
 
   if rev:
     rev_flag = '-p' + rev
   else:
     rev_flag = '-p'
 
-  fp = os.popen("%sco '%s' '%s' 2>&1" %
-                (cfg.general.rcs_path, rev_flag, full_name),
-                'r')
+  fp = popen.popen(cfg.general.rcs_path + 'co', (rev_flag, full_name), 'r')
 
   # header from co:
 
@@ -1745,7 +1818,8 @@ def view_checkout(request):
           (header, filename, where))
 
   if mime_type == viewcvs_mime_type:
-    markup_stream(request, fp, revision, mime_type)
+    # use the "real" MIME type
+    markup_stream(request, fp, revision, request.mime_type)
   else:
     http_header(mime_type)
     while 1:
@@ -1755,14 +1829,22 @@ def view_checkout(request):
       sys.stdout.write(chunk)
 
 def view_annotate(request):
-  ### dunno what this is for... check against cvsweb
-  some_value = request.query_dict['annotate']
+  rev = request.query_dict['annotate']
+
+  pathname, filename = os.path.split(request.where)
+  if pathname[-6:] == '/Attic':
+    pathname = pathname[:-6]
+
+  http_header()
+  navigate_header(request, request.url, pathname, filename, rev, 'view')
+  print '<hr noshade>'
+
+  import blame
+  blame.make_html(request.cvsroot, request.where + ',v', rev)
 
-  ### testing
-  html_header('annotate')
-  print "annotate"
   html_footer()
 
+
 _re_extract_rev = re.compile(r'^[-+]+ [^\t]+\t([^\t]+)\t((\d+\.)+\d+)$')
 _re_extract_info = re.compile(r'@@ \-([0-9]+).*\+([0-9]+).*@@(.*)')
 _re_extract_diff = re.compile(r'^([-+ ])(.*)')
@@ -1826,11 +1908,17 @@ def human_readable_diff(request, fp, rev1, rev2, sym1, sym2):
        (cfg.options.diff_font_face, cfg.options.diff_font_size)
   left_row = right_row = 0
 
+  # this will be set to true if any changes are found
+  changes_seen = 0
+
   while 1:
     line = fp.readline()
     if not line:
       break
 
+    # we've seen some kind of change
+    changes_seen = 1
+
     if line[:2] == '@@':
       match = _re_extract_info.match(line)
       print '<tr bgcolor="%s"><td width="50&#37;">' % cfg.colors.diff_heading
@@ -1846,6 +1934,11 @@ def human_readable_diff(request, fp, rev1, rev2, sym1, sym2):
       state = 'dump'
       left_col = [ ]
       right_col = [ ]
+    elif line[0] == '\\':
+      # \ No newline at end of file
+      flush_diff_rows(state, left_col, right_col)
+      left_col = [ ]
+      right_col = [ ]
     else:
       match = _re_extract_diff.match(line)
       line = spaced_html_text(match.group(2))
@@ -1872,10 +1965,11 @@ def human_readable_diff(request, fp, rev1, rev2, sym1, sym2):
         left_col = [ ]
         right_col = [ ]
 
-  flush_diff_rows(state, left_col, right_col)
-  if not state:
+  if changes_seen:
+    flush_diff_rows(state, left_col, right_col)
+  else:
     print '<tr><td colspan=2>&nbsp;</td></tr>'
-    print '<tr bgcolor="%s"><td colspan=2 align=center><b>- No viewable change -</b></td></tr>' % (cfg.colors.diff_empty)
+    print '<tr bgcolor="%s"><td colspan=2 align=center><br><b>- No changes -</b><br>&nbsp;</td></tr>' % (cfg.colors.diff_empty)
 
   print '</table><br><hr noshade width="100&#37;">'
   print '<table border=0 cellpadding=10><tr><td>'
@@ -1968,45 +2062,51 @@ def view_diff(request, cvs_filename):
       rev2 = r2[:idx]
       sym2 = r2[idx+1:]
 
-  ### check rev1, rev2 for well-formed-ness (security reasons)
-
   if revcmp(rev1, rev2) > 0:
     rev1, rev2 = rev2, rev1
     sym1, sym2 = sym2, sym1
 
   human_readable = 0
+  unified = 0
+
+  args = [ ]
+
   format = query_dict['diff_format']
   if format == 'c':
-    diff_type = '-c'
+    args.append('-c')
     diff_name = 'Context diff'
   elif format == 's':
-    diff_type = '--side-by-side --width=164'
+    args.append('--side-by-side')
+    args.append('--width=164')
     diff_name = 'Side by Side'
   elif format == 'H':
-    diff_type = '--unified=15'
+    args.append('--unified=15')
     diff_name = 'Long Human readable'
     human_readable = 1
+    unified = 1
   elif format == 'h':
-    diff_type = '-u'
+    args.append('-u')
     diff_name = 'Human readable'
     human_readable = 1
+    unified = 1
   elif format == 'u':
-    diff_type = '-u'
+    args.append('-u')
     diff_name = 'Unidiff'
+    unified = 1
   else:
     error('Diff format %s not understood' % format, '400 Bad arguments')
 
   if human_readable:
     if cfg.options.hr_funout:
-      diff_type = diff_type + ' -p'
+      args.append('-p')
     if cfg.options.hr_ignore_white:
-      diff_type = diff_type + ' -w'
+      args.append('-w')
     if cfg.options.hr_ignore_keyword_subst:
-      diff_type = diff_type + ' -kk'
+      args.append('-kk')
+
+  args[len(args):] = ['-r' + rev1, '-r' + rev2, cvs_filename]
+  fp = popen.popen(cfg.general.rcs_path + 'rcsdiff', args, 'r')
 
-  fp = os.popen("%srcsdiff %s '-r%s' '-r%s' '%s' 2>&1" %
-                (cfg.general.rcs_path, diff_type, rev1, rev2, cvs_filename),
-                'r')
   if human_readable:
     http_header()
     human_readable_diff(request, fp, rev1, rev2, sym1, sym2)
@@ -2014,7 +2114,7 @@ def view_diff(request, cvs_filename):
 
   http_header('text/plain')
 
-  if diff_type == '-u':
+  if unified:
     f1 = '--- ' + cvsroot
     f2 = '+++ ' + cvsroot
   else:
@@ -2044,7 +2144,7 @@ def handle_config():
 
   # load in configuration information from the config file
   pathname = CONF_PATHNAME or 'viewcvs.conf'
-  cfg.load_config(pathname)
+  cfg.load_config(pathname, os.environ.get('HTTP_HOST'))
 
   global default_settings
   default_settings = {
@@ -2084,7 +2184,7 @@ def main():
     redirect(url + '/' + request.qmark_query)
 
   # check the forbidden list
-  if request.module in cfg.general.forbidden:
+  if cfg.is_forbidden(request.module):
     error('Access to "%s" is forbidden.' % request.module, '403 Forbidden')
 
   if isdir:

cgi/viewcvs.conf.dist

@@ -28,6 +28,8 @@
 #    long_intro
 #    repository_info
 #
+#    use_enscript
+#
 # For Python source colorization:
 #
 #    py2html_path
@@ -94,19 +96,55 @@ main_title = CVS Repository
 # This should contain a list of modules in the repository that should not be
 # displayed (by default or by explicit path specification).
 #
+# This configuration can be a simple list of modules, or it can get quite
+# complex:
+#
+#   *) The "!" can be used before a module to explicitly state that it
+#      is NOT forbidden. Whenever this form is seen, then all modules will
+#      be forbidden unless one of the "!" modules match.
+#
+#   *) Shell-style "glob" expressions may be used. "*" will match any
+#      sequence of zero or more characters, "?" will match any single
+#      character, "[seq]" will match any character in seq, and "[!seq]"
+#      will match any character not in seq.
+#
+#   *) Tests are performed in sequence. The first match will terminate the
+#      testing. This allows for more complex allow/deny patterns.
+#
+# Tests are case-sensitive.
+#
 forbidden =
-# forbidden = example
-# forbidden = example1, example2
+
+# Some examples:
+#
+# Disallow "example" but allow all others:
+#   forbidden = example
+#
+# Disallow "example1" and "example2" but allow all others:
+#   forbidden = example1, example2
+#
+# Allow *only* "example1" and "example2":
+#   forbidden = !example1, !example2
+#
+# Forbid modules starting with "x":
+#   forbidden = x*
+#
+# Allow modules starting with "x" but no others:
+#   forbidden = !x*
+#
+# Allow "xml", forbid other modules starting with "x", and allow the rest:
+#   forbidden = !xml, x*, !*
+#
 
 #---------------------------------------------------------------------------
 [cvsdb]
 
-host = master
-database_name = bonsai
-user = root
-passwd = ogieta50
-readonly_user = root
-readonly_passwd = ogieta50
+#host = localhost
+#database_name = ViewCVS
+#user = 
+#passwd = 
+#readonly_user = 
+#readonly_passwd = 
 
 #---------------------------------------------------------------------------
 [images]
@@ -307,7 +345,7 @@ hr_ignore_keyword_subst = 1
 # NOTE: this requires rw-access to the CVSROOT/history file, and rw-access to
 # the subdirectory to place the lock... so you maybe don't want it
 # WARNING: this is not yet implemented!!
-allow_annotate = 0
+allow_annotate = 1
 
 # allow pretty-printed version of files
 allow_markup = 1
@@ -378,4 +416,53 @@ diff_font_size = -1
 # the width of the textinput in the request-diff-form
 input_text_size = 12
 
+# should we use 'enscript' for syntax coloring?
+use_enscript = 0
+
+#
+# if the enscript program is not on the path, set this value
+# Note: there should be a trailing slash
+#
+enscript_path =
+# enscript_path = /usr/bin/
+
+#
+# ViewCVS has its own set of mappings from filename extensions and filenames
+# to languages. If the language is not supported by enscript, then it can
+# be listed here to disable the use of enscript.
+#
+disable_enscript_lang =
+# disable_enscript_lang = perl, cpp
+
+#---------------------------------------------------------------------------
+[vhosts]
+### DOC
+
+# vhost1 = glob1, glob2
+# vhost2 = glob3, glob4
+
+# [vhost1-section]
+# option = value
+# [vhost1-othersection]
+# option = value
+# [vhost2-section]
+# option = value
+
+#
+# Here is an example:
+#
+# [vhosts]
+# lyra = *lyra.org
+#
+# [lyra-general]
+# forbidden = hideme
+#
+# [lyra-options]
+# show_logs = 0
+#
+# Note that "lyra" is the "canonical" name for all hosts in the lyra.org
+# domain. This canonical name is then used within the additional, vhost-
+# specific sections to override specific values in the common sections.
+#
+
 #---------------------------------------------------------------------------

lib/blame.py

@@ -0,0 +1,733 @@
+#!/usr/local/bin/python
+# -*-python-*-
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2000 Curt Hagenlocher <curt@hagenlocher.org>
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+# blame.py: Annotate each line of a CVS file with its author,
+#           revision #, date, etc.
+#
+# -----------------------------------------------------------------------
+#
+# This software is being maintained as part of the ViewCVS project.
+# Information is available at:
+#    http://www.lyra.org/viewcvs/
+#
+# This file is based on the cvsblame.pl portion of the Bonsai CVS tool,
+# developed by Steve Lamm for Netscape Communications Corporation.  More
+# information about Bonsai can be found at
+#    http://www.mozilla.org/bonsai.html
+#
+# cvsblame.pl, in turn, was based on Scott Furman's cvsblame script
+#
+# -----------------------------------------------------------------------
+#
+
+import string
+import sys
+import os
+import re
+import time
+import math
+import cgi
+
+path_sep    = os.path.normpath('/')[-1]
+
+class CVSParser:
+  # Precompiled regular expressions
+  nonws_token = re.compile('^([^;@][^;\\s]*)\\s*')
+  semic_token = re.compile('^;\\s*')
+  rcsen_token = re.compile('^@([^@]*)')
+  undo_escape = re.compile('@@')
+  single_at   = re.compile('([^@]|^)@([^@]|$)')
+  rcs_tree    = re.compile('^\\d')
+  trunk_rev   = re.compile('^[0-9]+\\.[0-9]+$')
+  last_branch = re.compile('(.*)\\.[0-9]+')
+  is_branch   = re.compile('(.*)\\.0\\.([0-9]+)')
+  d_command   = re.compile('^d(\d+)\\s(\\d+)')
+  a_command   = re.compile('^a(\d+)\\s(\\d+)')
+
+  SECONDS_PER_DAY = 86400
+
+  def __init__(self):
+    self.Reset()
+
+  def Reset(self):
+    self.line_buffer = ''
+    self.rcsfile = None
+    self.debug = 0
+    self.last_revision = {}
+    self.prev_revision = {}
+    self.revision_date = {}
+    self.revision_author = {}
+    self.revision_branches = {}
+    self.next_delta = {}
+    self.prev_delta = {}
+    self.feof = 0
+    self.tag_revision = {}
+    self.revision_symbolic_name = {}
+    self.timestamp = {}
+    self.revision_ctime = {}
+    self.revision_age = {}
+    self.revision_log = {}
+    self.revision_deltatext = {}
+    self.revision_map = []
+    self.lines_added  = {}
+    self.lines_removed = {}
+
+  # Get the next token from the RCS file
+  def get_token(self):
+    # Erase all-whitespace lines
+    while len(self.line_buffer) == 0:
+      self.line_buffer = self.rcsfile.readline()
+      if self.line_buffer == '':
+        raise RuntimeError, 'EOF'
+      self.line_buffer = string.lstrip(self.line_buffer)
+
+    # A string of non-whitespace characters is a token
+    match = self.nonws_token.match(self.line_buffer)
+    if match:
+      self.line_buffer = self.nonws_token.sub('', self.line_buffer)
+      return match.group(1)
+
+    # ...and so is a single semicolon
+    if self.semic_token.match(self.line_buffer):
+      self.line_buffer = self.semic_token.sub('', self.line_buffer)
+      return ';'
+
+    # ...or an RCS-encoded string that starts with an @ character
+    match = self.rcsen_token.match(self.line_buffer)
+    self.line_buffer = self.rcsen_token.sub('', self.line_buffer)
+    token = match.group(1)
+
+    # Detect single @ character used to close RCS-encoded string
+    while string.find(self.line_buffer, '@') < 0 or not self.single_at.search(self.line_buffer):
+      token = token + self.line_buffer
+      self.line_buffer = self.rcsfile.readline()
+      if self.line_buffer == '':
+        raise RuntimeError, 'EOF'
+
+    # Retain the remainder of the line after the terminating @ character
+    i = string.rindex(self.line_buffer, '@')
+    token = token + self.line_buffer[:i]
+    self.line_buffer = self.line_buffer[i+1:]
+
+    # Undo escape-coding of @ characters.
+    token = self.undo_escape.sub('@', token)
+
+    # Digest any extra blank lines
+    while len(self.line_buffer) == 0 or self.line_buffer == '\n':
+      self.line_buffer = self.rcsfile.readline()
+      if self.line_buffer == '':
+        self.feof = 1
+        break
+
+    if token[-1:] == '\n':
+      token = token[:-1]
+
+    return token
+
+  # Try to match the next token from the input buffer
+  def match_token(self, match):
+    token = self.get_token()
+    if token != match:
+      raise RuntimeError, ('Unexpected parsing error in RCS file.\n' +
+                           'Expected token: %s, but saw: %s' % (match, token))
+
+  # Push RCS token back into the input buffer.
+  def unget_token(self, token):
+    self.line_buffer = token + " " + self.line_buffer
+
+  # Map a tag to a numerical revision number.  The tag can be a symbolic
+  # branch tag, a symbolic revision tag, or an ordinary numerical
+  # revision number.
+  def map_tag_to_revision(self, tag_or_revision):
+    try:
+      revision = self.tag_revision[tag_or_revision]
+      match = self.is_branch.match(revision)
+      if match:
+        branch = match.group(1) + '.' + match.group(2)
+        if self.last_revision.get(branch):
+          return self.last_revision[branch]
+        else:
+          return match.group(1)
+      else:
+        return revision
+    except:
+      return ''
+
+  # Construct an ordered list of ancestor revisions to the given
+  # revision, starting with the immediate ancestor and going back
+  # to the primordial revision (1.1).
+  #
+  # Note: The generated path does not traverse the tree the same way
+  #       that the individual revision deltas do.  In particular,
+  #       the path traverses the tree "backwards" on branches.
+  def ancestor_revisions(self, revision):
+    ancestors = []
+    revision = self.prev_revision.get(revision)
+    while revision:
+      ancestors.append(revision)
+      revision = self.prev_revision.get(revision)
+
+    return ancestors
+
+  # Extract the given revision from the digested RCS file.
+  # (Essentially the equivalent of cvs up -rXXX)
+  def extract_revision(self, revision):
+    path = []
+    add_lines_remaining = 0
+    start_line = 0
+    count = 0
+    while revision:
+      path.append(revision)
+      revision = self.prev_delta.get(revision)
+    path.reverse()
+    path = path[1:]  # Get rid of head revision
+
+    text = string.split(self.revision_deltatext[self.head_revision], '\n')
+
+    # Iterate, applying deltas to previous revision
+    for revision in path:
+      adjust = 0
+      diffs = string.split(self.revision_deltatext[revision], '\n')
+      self.lines_added[revision]   = 0
+      self.lines_removed[revision] = 0
+      lines_added_now = 0
+      lines_removed_now = 0
+
+      for command in diffs:
+        dmatch = self.d_command.match(command)
+        amatch = self.a_command.match(command)
+        if add_lines_remaining > 0:
+          # Insertion lines from a prior "a" command
+          text.insert(start_line + adjust, command)
+          add_lines_remaining = add_lines_remaining - 1
+          adjust = adjust + 1
+        elif dmatch:
+          # "d" - Delete command
+          start_line = string.atoi(dmatch.group(1))
+          count      = string.atoi(dmatch.group(2))
+          begin = start_line + adjust - 1
+          del text[begin:begin + count]
+          adjust = adjust - count
+          lines_removed_now = lines_removed_now + count
+        elif amatch:
+          # "a" - Add command
+          start_line = string.atoi(amatch.group(1))
+          count      = string.atoi(amatch.group(2))
+          add_lines_remaining = count
+          lines_added_now = lines_added_now + count
+        else:
+          raise RuntimeError, 'Error parsing diff commands'
+
+      self.lines_added[revision]   = self.lines_added[revision]   + lines_added_now
+      self.lines_removed[revision] = self.lines_removed[revision] + lines_removed_now
+    return text
+
+  def parse_rcs_admin(self):
+    while 1:
+      # Read initial token at beginning of line
+      token = self.get_token()
+
+      # We're done once we reach the description of the RCS tree
+      if self.rcs_tree.match(token):
+        self.unget_token(token)
+        return
+
+      # print "token:", token
+
+      if token == "head":
+        self.head_revision = self.get_token()
+        self.get_token()         # Eat semicolon
+      elif token == "branch":
+        self.principal_branch = self.get_token()
+        self.get_token()         # Eat semicolon
+      elif token == "symbols":
+        # Create an associate array that maps from tag name to
+        # revision number and vice-versa.
+        while 1:
+          tag = self.get_token()
+          if tag == ';':
+            break
+          (tag_name, tag_rev) = string.split(tag, ':')
+          self.tag_revision[tag_name] = tag_rev
+          self.revision_symbolic_name[tag_rev] = tag_name
+      elif token == "comment":
+        self.file_description = self.get_token()
+        self.get_token()         # Eat semicolon
+
+      # Ignore all these other fields - We don't care about them.         
+      elif token in ("locks", "strict", "expand", "access"):
+        while 1:
+          tag = self.get_token()
+          if tag == ';':
+            break
+      else:
+        pass
+        # warn("Unexpected RCS token: $token\n")
+
+    raise RuntimeError, "Unexpected EOF";
+
+  # Construct dicts that represent the topology of the RCS tree
+  # and other arrays that contain info about individual revisions.
+  #
+  # The following dicts are created, keyed by revision number:
+  #   self.revision_date     -- e.g. "96.02.23.00.21.52"
+  #   self.timestamp         -- seconds since 12:00 AM, Jan 1, 1970 GMT
+  #   self.revision_author   -- e.g. "tom"
+  #   self.revision_branches -- descendant branch revisions, separated by spaces,
+  #                             e.g. "1.21.4.1 1.21.2.6.1"
+  #   self.prev_revision     -- revision number of previous *ancestor* in RCS tree.
+  #                             Traversal of this array occurs in the direction
+  #                             of the primordial (1.1) revision.
+  #   self.prev_delta        -- revision number of previous revision which forms
+  #                             the basis for the edit commands in this revision.
+  #                             This causes the tree to be traversed towards the
+  #                             trunk when on a branch, and towards the latest trunk
+  #                             revision when on the trunk.
+  #   self.next_delta        -- revision number of next "delta".  Inverts prev_delta.
+  #
+  # Also creates self.last_revision, keyed by a branch revision number, which
+  # indicates the latest revision on a given branch,
+  #   e.g. self.last_revision{"1.2.8"} == 1.2.8.5
+
+  def parse_rcs_tree(self):
+    while 1:
+      revision = self.get_token()
+
+      # End of RCS tree description ?
+      if revision == 'desc':
+        self.unget_token(revision)
+        return
+
+      is_trunk_revision = self.trunk_rev.match(revision) is not None
+
+      self.tag_revision[revision] = revision
+      branch = self.last_branch.match(revision).group(1)
+      self.last_revision[branch] = revision
+
+      # Parse date
+      self.match_token('date')
+      date = self.get_token()
+      self.revision_date[revision] = date
+      self.match_token(';')
+
+      # Convert date into timestamp
+      date_fields = string.split(date, '.') + ['0', '0', '0']
+      date_fields = map(string.atoi, date_fields)
+      if date_fields[0] < 100:
+        date_fields[0] = date_fields[0] + 1900
+      self.timestamp[revision] = time.mktime(date_fields)
+
+      # Pretty print the date string
+      ltime = time.localtime(self.timestamp[revision])
+      formatted_date = time.strftime("%d %b %Y %H:%M", ltime)
+      self.revision_ctime[revision] = formatted_date
+
+      # Save age
+      self.revision_age[revision] = (
+              (time.time() - self.timestamp[revision]) / self.SECONDS_PER_DAY)
+
+      # Parse author
+      self.match_token('author')
+      author = self.get_token()
+      self.revision_author[revision] = author
+      self.match_token(';')
+
+      # Parse state
+      self.match_token('state')
+      while self.get_token() != ';':
+        pass
+
+      # Parse branches
+      self.match_token('branches')
+      branches = ''
+      while 1:
+        token = self.get_token()
+        if token == ';':
+          break
+        self.prev_revision[token] = revision
+        self.prev_delta[token] = revision
+        branches = branches + token + ' '
+      self.revision_branches[revision] = branches
+
+      # Parse revision of next delta in chain
+      self.match_token('next')
+      next = ''
+      token = self.get_token()
+      if token != ';':
+        next = token
+        self.get_token()         # Eat semicolon
+        self.next_delta[revision] = next
+        self.prev_delta[next] = revision
+        if is_trunk_revision:
+          self.prev_revision[revision] = next
+        else:
+          self.prev_revision[next] = revision
+
+      if self.debug >= 3:
+        print "<pre>revision =", revision
+        print "date     = ", date
+        print "author   = ", author
+        print "branches = ", branches
+        print "next     = ", next + "</pre>\n"
+
+  def parse_rcs_description(self):
+    self.match_token('desc')
+    self.rcs_file_description = self.get_token()
+
+  # Construct associative arrays containing info about individual revisions.
+  #
+  # The following associative arrays are created, keyed by revision number:
+  #   revision_log        -- log message
+  #   revision_deltatext  -- Either the complete text of the revision,
+  #                          in the case of the head revision, or the
+  #                          encoded delta between this revision and another.
+  #                          The delta is either with respect to the successor
+  #                          revision if this revision is on the trunk or
+  #                          relative to its immediate predecessor if this
+  #                          revision is on a branch.
+  def parse_rcs_deltatext(self):
+    while not self.feof:
+      revision = self.get_token()
+      if self.debug >= 3:
+        print "Reading delta for revision:", revision
+      self.match_token('log')
+      self.revision_log[revision] = self.get_token()
+      self.match_token('text')
+      self.revision_deltatext[revision] = self.get_token()
+
+  def parse_rcs_file(self):
+    if self.debug >= 2:
+      print "Reading RCS admin..."
+    self.parse_rcs_admin()
+    if self.debug >= 2:
+      print "Reading RCS revision tree topology..."
+    self.parse_rcs_tree()
+
+    if self.debug >= 3:
+      print "<pre>Keys:\n"
+      for i in self.tag_revision.keys():
+        print "yoyuo %s: %s" % (i, self.tag_revision[i])
+      print "</pre>"
+
+    self.parse_rcs_description()
+    if self.debug >= 2:
+      print "Reading RCS revision deltas..."
+    self.parse_rcs_deltatext()
+    if self.debug >= 2:
+      print "Done reading RCS file..."
+
+  def parse_cvs_file(self, rcs_pathname, opt_rev = None, opt_m_timestamp = None):
+    # Args in:  opt_rev - requested revision
+    #           opt_m - time since modified
+    # Args out: revision_map
+    #           timestamp
+    #           revision_deltatext
+
+    # CheckHidden(rcs_pathname);
+    try:
+      self.rcsfile = open(rcs_pathname, 'r')
+    except:
+      raise RuntimeError, ('error: %s appeared to be under CVS control, ' +
+              'but the RCS file is inaccessible.') % rcs_pathname
+
+    self.parse_rcs_file()
+    self.rcsfile.close()
+
+    if opt_rev in [None, '', 'HEAD']:
+      # Explicitly specified topmost revision in tree
+      revision = self.head_revision
+    else:
+      # Symbolic tag or specific revision number specified.
+      revision = self.map_tag_to_revision(opt_rev)
+      if revision == '':
+        raise RuntimeError, 'error: -r: No such revision: ' + opt_rev
+
+    # The primordial revision is not always 1.1!  Go find it.
+    primordial = revision
+    while self.prev_revision.get(primordial):
+      primordial = self.prev_revision[primordial]
+
+    # Don't display file at all, if -m option is specified and no
+    # changes have been made in the specified file.
+    if opt_m_timestamp and self.timestamp[revision] < opt_m_timestamp:
+      return ''
+
+    # Figure out how many lines were in the primordial, i.e. version 1.1,
+    # check-in by moving backward in time from the head revision to the
+    # first revision.
+    line_count = 0
+    if self.revision_deltatext.get(self.head_revision):
+      tmp_array = string.split(self.revision_deltatext[self.head_revision], '\n')
+      line_count = len(tmp_array)
+
+    skip = 0
+
+    rev = self.prev_revision.get(self.head_revision)
+    while rev:
+      diffs = string.split(self.revision_deltatext[rev], '\n')
+      for command in diffs:
+        dmatch = self.d_command.match(command)
+        amatch = self.a_command.match(command)
+        if skip > 0:
+          # Skip insertion lines from a prior "a" command
+          skip = skip - 1
+        elif dmatch:
+          # "d" - Delete command
+          start_line = string.atoi(dmatch.group(1))
+          count      = string.atoi(dmatch.group(2))
+          line_count = line_count - count
+        elif amatch:
+          # "a" - Add command
+          start_line = string.atoi(amatch.group(1))
+          count      = string.atoi(amatch.group(2))
+          skip       = count;
+          line_count = line_count + count
+        else:
+          raise RuntimeError, 'error: illegal RCS file'
+
+      rev = self.prev_revision.get(rev)
+
+    # Now, play the delta edit commands *backwards* from the primordial
+    # revision forward, but rather than applying the deltas to the text of
+    # each revision, apply the changes to an array of revision numbers.
+    # This creates a "revision map" -- an array where each element
+    # represents a line of text in the given revision but contains only
+    # the revision number in which the line was introduced rather than
+    # the line text itself.
+    #
+    # Note: These are backward deltas for revisions on the trunk and
+    # forward deltas for branch revisions.
+
+    # Create initial revision map for primordial version.
+    self.revision_map = [primordial] * line_count
+
+    ancestors = [revision, ] + self.ancestor_revisions(revision)
+    ancestors = ancestors[:-1]  # Remove "1.1"
+    last_revision = primordial
+    ancestors.reverse()
+    for revision in ancestors:
+      is_trunk_revision = self.trunk_rev.match(revision) is not None
+
+      if is_trunk_revision:
+        diffs = string.split(self.revision_deltatext[last_revision], '\n')
+
+        # Revisions on the trunk specify deltas that transform a
+        # revision into an earlier revision, so invert the translation
+        # of the 'diff' commands.
+        for command in diffs:
+          if skip > 0:
+            skip = skip - 1
+          else:
+            dmatch = self.d_command.match(command)
+            amatch = self.a_command.match(command)
+            if dmatch:
+              start_line = string.atoi(dmatch.group(1))
+              count      = string.atoi(dmatch.group(2))
+              temp = []
+              while count > 0:
+                temp.append(revision)
+                count = count - 1
+              self.revision_map = (self.revision_map[:start_line - 1] +
+                      temp + self.revision_map[start_line - 1:])
+            elif amatch:
+              start_line = string.atoi(amatch.group(1))
+              count      = string.atoi(amatch.group(2))
+              del self.revision_map[start_line:start_line + count]
+              skip = count
+            else:
+              raise RuntimeError, 'Error parsing diff commands'
+
+      else:
+        # Revisions on a branch are arranged backwards from those on
+        # the trunk.  They specify deltas that transform a revision
+        # into a later revision.
+        adjust = 0
+        diffs = string.split(self.revision_deltatext[revision], '\n')
+        for command in diffs:
+          if skip > 0:
+            skip = skip - 1
+          else:
+            dmatch = self.d_command.match(command)
+            amatch = self.a_command.match(command)
+            if dmatch:
+              start_line = string.atoi(dmatch.group(1))
+              count      = string.atoi(dmatch.group(2))
+              del self.revision_map[start_line + adjust - 1:start_line + adjust - 1 + count]
+              adjust = adjust - count
+            elif amatch:
+              start_line = string.atoi(amatch.group(1))
+              count      = string.atoi(amatch.group(2))
+              skip = count
+              temp = []
+              while count > 0:
+                temp.append(revision)
+                count = count - 1
+              self.revision_map = (self.revision_map[:start_line + adjust] +
+                      temp + self.revision_map[start_line + adjust:])
+              adjust = adjust + skip
+            else:
+              raise RuntimeError, 'Error parsing diff commands'
+
+      last_revision = revision
+
+    return revision
+
+
+re_includes = re.compile('\\#(\\s*)include(\\s*)"(.*?)"')
+re_filename = re.compile('(.*[\\\\/])?(.+)')
+
+def link_includes(text, root, rcs_path):
+  match = re_includes.match(text)
+  if match:
+    incfile = match.group(3)
+    for rel_path in ('', 'Attic', '..'):
+      trial_root = os.path.join(rcs_path, rel_path)
+      file = os.path.normpath('%s%s%s%s%s,v' % (root, path_sep, trial_root, path_sep, incfile))
+      if os.access(file, os.F_OK):
+        return '#%sinclude%s"<a href="%s">%s</a>"' % \
+               (match.group(1), match.group(2),
+                os.path.join(rel_path, incfile), incfile)
+  return text
+
+def make_html(root, rcs_path, opt_rev = None):
+  filename = root + path_sep + rcs_path
+  parser = CVSParser()
+  revision = parser.parse_cvs_file(filename, opt_rev)
+  count = len(parser.revision_map)
+  text = parser.extract_revision(revision)
+  if len(text) != count:
+    raise RuntimeError, 'Internal consistency error'
+
+  match = re_filename.match(rcs_path)
+  if not match:
+    raise RuntimeError, 'Unable to parse filename'
+  file_head = match.group(1)
+  file_tail = match.group(2)
+
+  open_table_tag = '<table border=0 cellpadding=0 cellspacing=0 width="100%">'
+  startOfRow = '<tr><td colspan=3%s><pre>'
+  endOfRow = '</td></tr>'
+
+  print open_table_tag + (startOfRow % '')
+
+  if count == 0:
+    count = 1
+
+  line_num_width = int(math.log10(count)) + 1
+  revision_width = 3
+  author_width = 5
+  line = 0
+  usedlog = {}
+  usedlog[revision] = 1
+  old_revision = 0
+  row_color = ''
+  lines_in_table = 0
+  inMark = 0
+  rev_count = 0
+
+  for revision in parser.revision_map:
+    thisline = text[line]
+    line = line + 1
+    usedlog[revision] = 1
+    line_in_table = lines_in_table + 1
+
+    # Escape HTML meta-characters
+    thisline = cgi.escape(thisline)
+
+    # Add a link to traverse to included files
+    if 1:   # opt_includes
+      thisline = link_includes(thisline, root, file_head)
+
+    output = ''
+
+    # Highlight lines
+    #mark_cmd;
+    #if (defined($mark_cmd = $mark_line{$line}) and mark_cmd != 'end':
+    #	output = output + endOfRow + '<tr><td bgcolor=LIGHTGREEN width="100%"><pre>'
+    #	inMark = 1
+
+    if old_revision != revision and line != 1:
+      if row_color == '':
+        row_color = ' bgcolor="#e7e7e7"'
+      else:
+        row_color = ''
+
+      if not inMark:
+        if lines_in_table > 100:
+          output = output + endOfRow + '</table>' + open_table_tag + (startOfRow % row_color)
+          lines_in_table = 0
+        else:
+          output = output + endOfRow + (startOfRow % row_color)
+
+    elif lines_in_table > 200 and not inMark:
+      output = output + endOfRow + '</table>' + open_table_tag + (startOfRow % row_color)
+      lines_in_table = 0
+
+    output = output + "<a name=%d></a>" % (line, )
+    if 1:  # opt_line_nums
+      output = output + ('%%%dd' % (line_num_width, )) % (line, )
+
+    if old_revision != revision or rev_count > 20:
+      revision_width = max(revision_width, len(revision))
+
+      if parser.prev_revision.get(revision):
+        fname = file_tail[:-2]	# strip the ",v"
+        ### need the sticky options! need cvsroot if not-default
+        output = output + ' <a href="%s.diff?r1=%s&amp;r2=%s"' % \
+                 (fname, parser.prev_revision[revision], revision)
+        if 0: # use_layers
+          output = output + " onmouseover='return log(event,\"%s\",\"%s\");'" % (
+                  parser.prev_revision[revision], revision)
+        output = output + ">"
+      else:
+        output = output + " "
+        parser.prev_revision[revision] = ''
+
+      author = parser.revision_author[revision]
+      # $author =~ s/%.*$//;
+      author_width = max(author_width, len(author))
+      output = output + ('%%-%ds ' % (author_width, )) % (author, )
+      output = output + revision
+      if parser.prev_revision.get(revision):
+        output = output + '</a>'
+      output = output + (' ' * (revision_width - len(revision) + 1))
+
+      old_revision = revision
+      rev_count = 0
+    else:
+      output = output + '   ' + (' ' * (author_width + revision_width))
+    rev_count = rev_count + 1
+
+    output = output + thisline
+
+    # Close the highlighted section
+    #if (defined $mark_cmd and mark_cmd != 'begin'):
+    #	chop($output)
+    #	output = output + endOfRow + (startOfRow % row_color)
+    #	inMark = 0
+
+    print output
+  print endOfRow + '</table>'
+
+
+def main():
+  if len(sys.argv) != 3:
+    print 'USAGE: %s cvsroot rcs-file' % sys.argv[0]
+    sys.exit(1)
+  make_html(sys.argv[1], sys.argv[2])
+
+if __name__ == '__main__':
+  main()

lib/cfg.py

@@ -1,48 +0,0 @@
-# -*- Mode: python -*-
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
-#
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# -----------------------------------------------------------------------
-#
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
-
-class EmptyNameSpace:
-    "Placehoder empty class for nesting namespaces."
-    pass
-
-
-
-## [cvsdb]
-cvsdb = EmptyNameSpace()
-cvsdb.host = 'master'
-cvsdb.database_name = 'bonsai'
-cvsdb.user = 'root'
-cvsdb.passwd = 'ogieta50'
-cvsdb.readonly_user = 'root'
-cvsdb.readonly_passwd = 'ogieta50' 

lib/commit.py

@@ -1,36 +1,17 @@
 # -*- Mode: python -*-
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
 import os
 

lib/compat.py

@@ -1,13 +1,28 @@
+# -*- Mode: python -*-
 #
-# ### add license stuff
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
 #
 # compat.py: compatibility functions for operation across Python 1.5.x
 #
+# -----------------------------------------------------------------------
+#
 
 import urllib
 import string
 import time
 import re
+import os
+
 
 #
 # urllib.urlencode() is new to Python 1.5.2
@@ -38,3 +53,15 @@ else:
     matches = _re_rev_date.match(timestr).groups()
     return tuple(map(int, matches)) + (0, 1, -1)
 cvs_strptime.__doc__ = 'Parse a CVS-style date/time value.'
+
+#
+# os.makedirs() is new to Python 1.5.2
+#
+try:
+  makedirs = os.makedirs
+except AttributeError:
+  def makedirs(path, mode=0777):
+    head, tail = os.path.split(path)
+    if head and tail and not os.path.exists(head):
+      makedirs(head, mode)
+    os.mkdir(path, mode)

lib/config.py

@@ -1,13 +1,27 @@
+# -*- Mode: python -*-
 #
-# ### add license stuff
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
 #
 # config.py: configuration utilities
 #
+# -----------------------------------------------------------------------
+#
 
 import sys
 import os
 import string
 import ConfigParser
+import fnmatch
 
 
 #########################################################################
@@ -28,41 +42,71 @@ import ConfigParser
 
 class Config:
   _sections = ('general', 'images', 'options', 'colors', 'text', 'cvsdb')
-  _force_multi_value = ('cvs_roots', 'forbidden', 'even_odd')
+  _force_multi_value = ('cvs_roots', 'forbidden', 'even_odd',
+                        'disable_enscript_lang')
 
   def __init__(self):
     for section in self._sections:
       setattr(self, section, _sub_config())
 
-  def load_config(self, fname):
+  def load_config(self, fname, vhost=None):
     this_dir = os.path.dirname(sys.argv[0])
     pathname = os.path.join(this_dir, fname)
     parser = ConfigParser.ConfigParser()
     parser.read(pathname)
 
     for section in self._sections:
-      if not parser.has_section(section):
-        continue
+      if parser.has_section(section):
+        self._process_section(parser, section, section)
 
-      sc = getattr(self, section)
+    if vhost:
+      self._process_vhost(parser, vhost)
 
-      for opt in parser.options(section):
-        value = parser.get(section, opt)
-        if opt in self._force_multi_value or section == 'images':
-          value = map(string.strip, string.split(value, ','))
-        else:
-          try:
-            value = int(value)
-          except ValueError:
-            pass
+  def _process_section(self, parser, section, subcfg_name):
+    sc = getattr(self, subcfg_name)
 
-        if opt == 'cvs_roots':
-          roots = { }
-          for root in value:
-            name, path = map(string.strip, string.split(root, ':'))
-            roots[name] = path
-          value = roots
-        setattr(sc, opt, value)
+    for opt in parser.options(section):
+      value = parser.get(section, opt)
+      if opt in self._force_multi_value or subcfg_name == 'images':
+        value = map(string.strip, filter(None, string.split(value, ',')))
+      else:
+        try:
+          value = int(value)
+        except ValueError:
+          pass
+
+      if opt == 'cvs_roots':
+        roots = { }
+        for root in value:
+          name, path = map(string.strip, string.split(root, ':'))
+          roots[name] = path
+        value = roots
+      setattr(sc, opt, value)
+
+  def _process_vhost(self, parser, vhost):
+    canon_vhost = self._find_canon_vhost(parser, vhost)
+    if not canon_vhost:
+      # none of the vhost sections matched
+      return
+
+    cv = canon_vhost + '-'
+    lcv = len(cv)
+    for section in parser.sections():
+      if section[:lcv] == cv:
+        self._process_section(parser, section, section[lcv:])
+
+  def _find_canon_vhost(self, parser, vhost):
+    vhost = string.lower(vhost)
+
+    for canon_vhost in parser.options('vhosts'):
+      value = parser.get('vhosts', canon_vhost)
+      patterns = map(string.lower, map(string.strip,
+                                       filter(None, string.split(value, ','))))
+      for pat in patterns:
+        if fnmatch.fnmatchcase(vhost, pat):
+          return canon_vhost
+
+    return None
 
   def set_defaults(self):
     "Set some default values in the configuration."
@@ -142,6 +186,9 @@ class Config:
     self.options.diff_font_face = 'Helvetica,Arial'
     self.options.diff_font_size = -1
     self.options.input_text_size = 12
+    self.options.use_enscript = 0
+    self.options.enscript_path = ''
+    self.options.disable_enscript_lang = ()
 
     self.text.long_intro = """\
     <p>
@@ -204,6 +251,19 @@ class Config:
     </p>
     """
 
+  def is_forbidden(self, module):
+    if not module:
+      return 0
+    default = 0
+    for pat in self.general.forbidden:
+      if pat[0] == '!':
+        default = 1
+        if fnmatch.fnmatchcase(module, pat[1:]):
+          return 0
+      elif fnmatch.fnmatchcase(module, pat):
+        return 1
+    return default
+
 class _sub_config:
   def get_image(self, which):
     text = '[%s]' % string.upper(which)

lib/cvsdbapi.py

@@ -1,38 +1,31 @@
 # -*- Mode: python -*-
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-import os, cfg, database, rlog, commit
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+CONF_PATHNAME = None
+
+#########################################################################
+
+import os, database, rlog, commit, config
 
 ## error
 error = 'cvsdbapi error'
@@ -52,6 +45,11 @@ PrintCommit = commit.PrintCommit
 gCheckinDatabase = None
 gCheckinDatabaseReadOnly = None
 
+## load configuration file, the data is used globally here
+cfg = config.Config()
+cfg.set_defaults()
+cfg.load_config(CONF_PATHNAME)
+
 
 def ConnectDatabaseReadOnly():
     global gCheckinDatabaseReadOnly

lib/database.py

@@ -1,36 +1,17 @@
 # -*- Mode: python -*-
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
 import os, sys, string, time
 

lib/dbi.py

@@ -0,0 +1,71 @@
+# -*- Mode: python -*-
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+
+import sys
+import MySQLdb
+
+
+dbi_error = "dbi error"
+
+
+## make some checks in MySQLdb
+_no_datetime = """\
+ERROR: Your version of MySQLdb requires the mxDateTime module
+       for the Timestamp() and TimestampFromTicks() methods.
+       You will need to install mxDateTime to use the ViewCVS
+       database.
+"""
+
+if not hasattr(MySQLdb, "Timestamp") or \
+   not hasattr(MySQLdb, "TimestampFromTicks"):
+    sys.stderr.write(_no_datetime)
+    sys.exit(1)
+
+
+class Cursor:
+    def __init__(self, mysql_cursor):
+        self.__cursor = mysql_cursor
+
+    def execute(self, *args):
+        apply(self.__cursor.execute, args)
+
+    def fetchone(self):
+        try:
+            row = self.__cursor.fetchone()
+        except IndexError:
+            row = None
+        
+        return row
+    
+
+class Connection:
+    def __init__(self, host, user, passwd, db):
+        self.__mysql = MySQLdb.connect(
+            host=host, user=user, passwd=passwd, db=db)
+
+    def cursor(self):
+        return Cursor(self.__mysql.cursor())
+
+
+def Timestamp(year, month, date, hour, minute, second):
+    return MySQLdb.Timestamp(year, month, date, hour, minute, second)
+
+
+def TimestampFromTicks(ticks):
+    return MySQLdb.TimestampFromTicks(ticks)
+
+
+def connect(host, user, passwd, db):
+    return Connection(host, user, passwd, db)

lib/popen.py

@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+# popen.py: a replacement for os.popen()
+#
+# This implementation of popen() provides a cmd + args calling sequence,
+# rather than a system() type of convention. The shell facilities are not
+# available, but that implies we can avoid worrying about shell hacks in
+# the arguments.
+#
+# -----------------------------------------------------------------------
+#
+
+import os
+
+def popen(cmd, args, mode, capture_err=1):
+  r, w = os.pipe()
+  pid = os.fork()
+  if pid:
+    # in the parent
+
+    # close the descriptor that we don't need and return the other one.
+    if mode == 'r':
+      os.close(w)
+      return _pipe(os.fdopen(r, 'r'), pid)
+    os.close(r)
+    return _pipe(os.fdopen(w, 'w'), pid)
+
+  # in the child
+
+  # we'll need /dev/null for the discarded I/O
+  null = os.open('/dev/null', os.O_RDWR)
+
+  if mode == 'r':
+    # hook stdout/stderr to the "write" channel
+    os.dup2(w, 1)
+    # "close" stdin; the child shouldn't use it
+    os.dup2(null, 0)
+    # what to do with errors?
+    if capture_err:
+      os.dup2(w, 2)
+    else:
+      os.dup2(null, 2)
+  else:
+    # hook stdin to the "read" channel
+    os.dup2(r, 0)
+    # "close" stdout/stderr; the child shouldn't use them
+    os.dup2(null, 1)
+    os.dup2(null, 2)
+
+  # don't need these FDs any more
+  os.close(null)
+  os.close(r)
+  os.close(w)
+
+  # the stdin/stdout/stderr are all set up. exec the target
+  os.execvp(cmd, (cmd,) + tuple(args))
+
+  # crap. shouldn't be here.
+  sys.exit(127)
+
+
+class _pipe:
+  "Wrapper for a file which can wait() on a child process at close time."
+
+  def __init__(self, file, child_pid):
+    self.file = file
+    self.child_pid = child_pid
+
+  def close(self):
+    self.file.close()
+    self.file = None
+    return os.waitpid(self.child_pid, 0)[1] or None
+
+  def __getattr__(self, name):
+    return getattr(self.file, name)
+
+  def __del__(self):
+    if self.file:
+      self.close()

lib/query.py

@@ -0,0 +1,102 @@
+# -*- Mode: python -*-
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+
+import time
+import dbi
+
+
+## QueryEntry holds data on one match-type in the SQL database
+## match is: "exact", "like", or "regex"
+
+class QueryEntry:
+    def __init__(self, data, match):
+        self.data = data
+        self.match = match
+
+
+## CheckinDatabaseQueryData is a object which contains the search parameters
+## for a query to the CheckinDatabase
+        
+class CheckinDatabaseQuery:
+    def __init__(self):
+        ## sorting
+        self.sort = "date"
+        
+        ## repository to query
+        self.repository_list = []
+        self.branch_list = []
+        self.directory_list = []
+        self.file_list = []
+        self.author_list = []
+
+        ## date range in DBI 2.0 timedate objects
+        self.from_date = None
+        self.to_date = None
+
+        ## list of commits -- filled in by CVS query
+        self.commit_list = []
+
+        ## commit_cb provides a callback for commits as they
+        ## are added
+        self.commit_cb = None
+
+    def SetRepository(self, repository, match = "exact"):
+        self.repository_list.append(QueryEntry(repository, match))
+
+    def SetBranch(self, branch, match = "exact"):
+        self.branch_list.append(QueryEntry(branch, match))
+
+    def SetDirectory(self, directory, match = "exact"):
+        self.directory_list.append(QueryEntry(directory, match))
+
+    def SetFile(self, file, match = "exact"):
+        self.file_list.append(QueryEntry(file, match))
+
+    def SetAuthor(self, author, match = "exact"):
+        self.author_list.append(QueryEntry(author, match))
+
+    def SetSortMethod(self, sort):
+        self.sort = sort
+
+    def SetFromDateObject(self, ticks):
+        self.from_date = dbi.TimestampFromTicks(ticks)
+
+    def SetToDateObject(self, ticks):
+        self.to_date = dbi.TimestampFromTicks(ticks)
+
+    def SetFromDateHoursAgo(self, hours_ago):
+        ticks = time.time() - (3600 * hours_ago)
+        self.from_date = dbi.TimestampFromTicks(ticks)
+        
+    def SetFromDateDaysAgo(self, days_ago):
+        ticks = time.time() - (86400 * days_ago)
+        self.from_date = dbi.TimestampFromTicks(ticks)
+
+    def SetToDateDaysAgo(self, days_ago):
+        ticks = time.time() - (86400 * days_ago)
+        self.to_date = dbi.TimestampFromTicks(ticks)
+
+    def AddCommit(self, commit):
+        self.commit_list.append(commit)
+        if self.commit_cb:
+            self.commit_cb(commit)
+        
+    def SetCommitCB(self, callback):
+        self.commit_cb = callback
+       
+
+## entrypoints
+def CreateCheckinQuery():
+    return CheckinDatabaseQuery()

lib/rlog.py

@@ -1,38 +1,37 @@
 # -*- Mode: python -*-
-# -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
 #
 # -----------------------------------------------------------------------
 #
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-import os, sys, string, time, re
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+CONF_PATHNAME = None
+
+#########################################################################
+
+import os, sys, string, re, time, config
+
+## load configuration file, the data is used globally here
+cfg = config.Config()
+cfg.set_defaults()
+cfg.load_config(CONF_PATHNAME)
+
 
 ## RLogOutputParser uses the output of rlog to build a list of Commit
 ## objects describing all the checkins from a given RCS file; this
@@ -107,7 +106,8 @@ class RLog:
         if self.date:
             arg_list.append('-d%s' % (self.date))
 
-        self.cmd = 'rlog %s "%s"' % (string.join(arg_list), self.filename)
+        temp = os.path.join(cfg.general.rcs_path, "rlog")
+        self.cmd = '%s %s "%s"' % (temp, string.join(arg_list), self.filename)
         self.rlog = os.popen(self.cmd, 'r')
 
     def fix_filename(self, filename):

tools/cvsdbadmin

@@ -1,49 +1,46 @@
 #!/usr/bin/env python
 # -*- Mode: python -*-
 #
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
 # administrative program for CVSdb; this is primarily
 # used to add/rebuild CVS repositories to the database
 #
 # -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# -----------------------------------------------------------------------
-#
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-## BOOTSTRAP
-import sys, os, string
-_viewcvs_root = string.strip(open("/etc/viewcvs/root", "r").read())
-sys.path.append(os.path.join(_viewcvs_root, "lib"))
-##
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
 
-import cvsdbapi
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+# Adjust sys.path to include our library directory
+import sys
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path[:0] = ['../lib']	# any other places to look?
+
+#########################################################################
+  
+import os, string, cvsdbapi
 
 
 def UpdateFile(db, repository, path):

tools/loginfo-handler

@@ -1,48 +1,45 @@
 #!/usr/bin/python
 # -*- Mode: python -*-
 #
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
 # updates SQL database with new commit records
 #
 # -----------------------------------------------------------------------
-# Copyright (C) 2000 Jay Painter. All Rights Reserved.
 #
-# By using this file, you agree to the terms and conditions set forth below:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# -----------------------------------------------------------------------
-#
-# For tracking purposes, this software is identified by:
-#   $Id$
-#
-# -----------------------------------------------------------------------
 
-## BOOTSTRAP
-import sys, os, string
-_viewcvs_root = string.strip(open("/etc/viewcvs/root", "r").read())
-sys.path.append(os.path.join(_viewcvs_root, "lib"))
-##
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
 
-import getopt, re, cvsdbapi
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+# Adjust sys.path to include our library directory
+import sys
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path[:0] = ['../lib']	# any other places to look?
+
+#########################################################################
+
+import os, string, getopt, re, cvsdbapi
 
 DEBUG_FLAG = 0
 
@@ -132,7 +129,7 @@ def ProcessLoginfo(repository, stdin_list):
     if len(list) == 4:
         if list[1] == '-' and list[2] == 'New' and list[3] == 'directory':
             debug('new directory')
-            exit(0, file_hash, 1)
+            return
 
     ## each file in the file list _should_ be of the form:
     ## file-name,<old-ver>,<new-ver>

tools/make-database

@@ -0,0 +1,146 @@
+#!/usr/bin/env python
+# -*- Mode: python -*-
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+# administrative program for CVSdb; creates a clean database in
+# MySQL 3.22 or later
+#
+# -----------------------------------------------------------------------
+#
+import os, sys, string
+
+INTRO_TEXT = """\
+This script creates the database and tables in MySQL used by the ViewCVS
+checkin database.  You will be prompted for: database user, database user
+password, and database name.  This script will use mysql to create the
+database for you.  You will then need to set the appropriate parameters
+in your viewcvs.conf file under the [cvsdb] section.
+"""
+
+DATABASE_SCRIPT="""\
+DROP DATABASE IF EXISTS <dbname>;
+CREATE DATABASE <dbname>;
+
+USE <dbname>;
+
+DROP TABLE IF EXISTS branches;
+CREATE TABLE branches (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  branch varchar(64) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE branch (branch)
+);
+
+DROP TABLE IF EXISTS checkins;
+CREATE TABLE checkins (
+  type enum('Change','Add','Remove'),
+  ci_when datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
+  whoid mediumint(9) DEFAULT '0' NOT NULL,
+  repositoryid mediumint(9) DEFAULT '0' NOT NULL,
+  dirid mediumint(9) DEFAULT '0' NOT NULL,
+  fileid mediumint(9) DEFAULT '0' NOT NULL,
+  revision varchar(32) binary DEFAULT '' NOT NULL,
+  stickytag varchar(255) binary DEFAULT '' NOT NULL,
+  branchid mediumint(9) DEFAULT '0' NOT NULL,
+  addedlines int(11) DEFAULT '0' NOT NULL,
+  removedlines int(11) DEFAULT '0' NOT NULL,
+  descid mediumint(9),
+  UNIQUE repositoryid (repositoryid,dirid,fileid,revision),
+  KEY ci_when (ci_when),
+  KEY whoid (whoid),
+  KEY repositoryid_2 (repositoryid),
+  KEY dirid (dirid),
+  KEY fileid (fileid),
+  KEY branchid (branchid)
+);
+
+DROP TABLE IF EXISTS descs;
+CREATE TABLE descs (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  description text,
+  hash bigint(20) DEFAULT '0' NOT NULL,
+  PRIMARY KEY (id),
+  KEY hash (hash)
+);
+
+DROP TABLE IF EXISTS dirs;
+CREATE TABLE dirs (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  dir varchar(128) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE dir (dir)
+);
+
+DROP TABLE IF EXISTS files;
+CREATE TABLE files (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  file varchar(128) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE file (file)
+);
+
+DROP TABLE IF EXISTS people;
+CREATE TABLE people (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  who varchar(32) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE who (who)
+);
+
+DROP TABLE IF EXISTS repositories;
+CREATE TABLE repositories (
+  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  repository varchar(64) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE repository (repository)
+);
+
+DROP TABLE IF EXISTS tags;
+CREATE TABLE tags (
+  repositoryid mediumint(9) DEFAULT '0' NOT NULL,
+  branchid mediumint(9) DEFAULT '0' NOT NULL,
+  dirid mediumint(9) DEFAULT '0' NOT NULL,
+  fileid mediumint(9) DEFAULT '0' NOT NULL,
+  revision varchar(32) binary DEFAULT '' NOT NULL,
+  UNIQUE repositoryid (repositoryid,dirid,fileid,branchid,revision),
+  KEY repositoryid_2 (repositoryid),
+  KEY dirid (dirid),
+  KEY fileid (fileid),
+  KEY branchid (branchid)
+);
+"""
+
+if __name__ == "__main__":
+    print INTRO_TEXT
+    
+    user = raw_input("MySQL User: ")
+    passwd = raw_input("MySQL Password: ")
+    dbase = raw_input("ViewCVS Database Name [default: ViewCVS]: ")
+    if not dbase:
+        dbase = "ViewCVS"
+
+    cmd = "{ mysql --user=%s --password=%s ; } 2>&1" % (user, passwd)
+    dscript = string.replace(DATABASE_SCRIPT, "<dbname>", dbase)
+    
+    mysql = os.popen(cmd, "w")
+    mysql.write(dscript)
+    status = mysql.close()
+
+    if status:
+        print "[ERROR] the database did not create sucessfully."
+        sys.exit(1)
+
+    print "Database created successfully."
+    sys.exit(0)
+    

tools/make-release

@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+# make-release: internal tool for creating ViewCVS releases
+#
+# -----------------------------------------------------------------------
+#
+
+if [ "x$1" = "x" ]; then
+  echo "USAGE: $0 target-directory"
+  exit 1
+fi
+
+# grab a copy of the CVS repository  (export requires a tag, so just use 'co')
+rm -r $1
+echo 'Checking out into:' $1
+cvs -d /home/cvsroot co -d $1 -kv -P -R viewcvs
+
+echo 'Cleaning up...'
+# clean out the CVS crap
+find $1 -name CVS | xargs rm -r
+
+# various shifting, cleanup
+mv $1/website/license-1.html $1/LICENSE.html
+rm -r $1/website
+rm $1/tools/make-release
+
+echo 'Done.'

viewcvs-install

@@ -0,0 +1,176 @@
+#!/usr/bin/env python
+# -*- Mode: python -*-
+#
+# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+#
+# By using this file, you agree to the terms and conditions set forth in
+# the LICENSE.html file which can be found at the top level of the ViewCVS
+# distribution or at http://www.lyra.org/viewcvs/license-1.html.
+#
+# Contact information:
+#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
+#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+#
+# -----------------------------------------------------------------------
+#
+# install script for viewcvs -- temporary?
+#
+# ### this will eventually be replaced by autoconf plus tools. an
+# ### interactive front-end to ./configure may be provided.
+#
+# -----------------------------------------------------------------------
+#
+
+import os
+import sys
+import string
+import re
+import traceback
+import py_compile
+
+# get access to our library modules
+sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'lib'))
+
+import compat
+
+
+## installer text
+INFO_TEXT = """\
+
+This is the ViewCVS installer.  It will allow you to choose the install
+path for ViewCVS.  You will now be asked some installation questions.
+Defaults are given in square brackets.  Just hit [Enter] if a default
+is okay.
+"""
+
+## installer defaults
+ROOT_DIR = "/usr/local/viewcvs"
+
+
+## list of files for installation
+## tuple (source path, destination path, install mode, true/false flag for
+##        search-and-replace, flag for prompt before replace, compile_it)
+##       
+
+FILE_INFO_LIST = [
+    ("cgi/viewcvs.cgi", "cgi/viewcvs.cgi", 0755, 1, 0, 0),
+    ("cgi/queryform.cgi", "cgi/queryform.cgi", 0755, 1, 0, 0),
+    ("cgi/query.cgi", "cgi/query.cgi", 0755, 1, 0, 0),
+
+    ("cgi/viewcvs.conf.dist", "viewcvs.conf", 0644, 0, 1, 0),
+
+    ("lib/PyFontify.py", "lib/PyFontify.py", 0644, 0, 0, 1),
+    ("lib/blame.py", "lib/blame.py", 0644, 0, 0, 1),
+    ("lib/commit.py", "lib/commit.py", 0644, 0, 0, 1),
+    ("lib/compat.py", "lib/compat.py", 0644, 0, 0, 1),
+    ("lib/config.py", "lib/config.py", 0644, 0, 0, 1),
+    ("lib/cvsdbapi.py", "lib/cvsdbapi.py", 0644, 1, 0, 1),
+    ("lib/database.py", "lib/database.py", 0644, 0, 0, 1),
+    ("lib/popen.py", "lib/popen.py", 0644, 0, 0, 1),
+    ("lib/py2html.py", "lib/py2html.py", 0644, 0, 0, 1),
+    ("lib/rlog.py", "lib/rlog.py", 0644, 1, 0, 1),
+    
+    ("tools/loginfo-handler", "loginfo-handler", 0755, 1, 0, 0),
+    ("tools/cvsdbadmin", "cvsdbadmin", 0755, 1, 0, 0),
+    ("tools/make-database", "make-database", 0755, 1, 0, 0),
+
+    ("html-templates/queryformtemplate.html",
+     "html-templates/queryformtemplate.html", 0644, 0, 1, 0),
+    ("html-templates/querytemplate.html",
+     "html-templates/querytemplate.html", 0644, 0, 1, 0),
+    ]
+
+
+def Error(text, etype=None, evalue=None):
+    print
+    print "[ERROR] %s" % text
+    if etype:
+        print '[ERROR] ',
+        traceback.print_exception(etype, evalue, None, file=sys.stdout)
+    sys.exit(1)
+    
+
+def MkDir(path):
+    try:
+        compat.makedirs(path)
+    except OSError, e:
+        if e.errno == 17:
+            # EEXIST: file exists
+            return
+        if e.errno == 13:
+            # EACCES: permission denied
+            Error("You do not have permission to create directory %s" % path)
+        Error("Unknown error creating directory %s" % path, OSError, e)
+
+
+
+def SetOnePath(contents, var, value):
+    pattern = re.compile('^' + var + r'\s*=\s*.*$', re.MULTILINE)
+    repl = '%s = "%s"' % (var, os.path.join(ROOT_DIR, value))
+    return re.sub(pattern, repl, contents)
+
+def SetPythonPaths(contents):
+    if contents[:2] == '#!':
+        shbang = '#!' + sys.executable
+        contents = re.sub('^#![^\n]*', shbang, contents)
+    contents = SetOnePath(contents, 'LIBRARY_DIR', 'lib')
+    contents = SetOnePath(contents, 'CONF_PATHNAME', 'viewcvs.conf')
+    contents = SetOnePath(contents, 'HTML_TEMPLATE_DIR', 'html-templates')
+    return contents
+
+
+def InstallFile(src_path, dest_path, mode, set_python_paths, prompt_replace,
+                compile_it):
+    dest_path = os.path.join(ROOT_DIR, dest_path)
+    
+    if prompt_replace and os.path.exists(dest_path):
+        temp = raw_input("File %s exists, overwright? [y/N]: " % (dest_path))
+        if not temp or string.lower(temp[0]) != "y":
+            return
+    
+    try:
+        contents = open(src_path, "r").read()
+    except IOError, e:
+        Error(str(e))
+
+    if set_python_paths:
+        contents = SetPythonPaths(contents)
+
+    ## write the file to the destination location
+    path, basename = os.path.split(dest_path)
+    MkDir(path)
+
+    try:
+        open(dest_path, "w").write(contents)
+    except IOError, e:
+        if e.errno == 13:
+            # EACCES: permission denied
+            Error("You do not have permission to write file %s" % dest_path)
+        Error("Unknown error writing file %s" % dest_path, IOError, e)
+        
+    os.chmod(dest_path, mode)
+
+    if compile_it:
+      py_compile.compile(dest_path)
+
+
+## MAIN
+if __name__ == "__main__":
+    print INFO_TEXT
+    
+    ## get the install path
+    temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
+    temp = string.strip(temp)
+    if len(temp):
+        ROOT_DIR = temp
+        
+    ## install the files
+    print
+    print "Installing ViewCVS to:", ROOT_DIR
+
+    for args in FILE_INFO_LIST:
+        print "        ", args[0]
+        apply(InstallFile, args)
+
+    print
+    print "Installation Complete"

website/index.html

@@ -19,31 +19,29 @@
     <p>
       ViewCVS can browse directories, change logs, and specific
       revisions of files. It can display diffs between versions and
-      show selections of files based on tags or branches.
+      show selections of files based on tags or branches. In addition, 
+      ViewCVS has "annotation" or "blame" support, and the beginnings
+      of Bonsai-like query facilities.
     </p>
     <p>
-      ViewCVS is currently at version 0.4. It was a
-      port of the cvsweb script, but has had numerous cleanups and other
-      modifications, based on some of Python's strengths. There is
-      still some "badness" in there, but I've been working on flushing 
-      that out, along with a few new features. The
-      functionality of ViewCVS is equal to that of cvsweb, minus the
-      "annotation" support. Annotation requires read/write access to
-      the CVS repository (at this time), and I believe that is a 
-      Bad Thing to do. One of my tasks will be eliminating the
-      read/write requirement.
+      ViewCVS is currently at version 0.5. It was a port of the cvsweb
+      script, but has had numerous cleanups and other modifications,
+      based on some of Python's strengths. There is still some minor
+      "badness" in there, but I've been working on flushing that out,
+      while adding new features. Currently, the functionality of ViewCVS
+      surpasses that of cvsweb.
     </p>
     <p>
       The software is available for download:
     </p>
     <blockquote>
-      <a href="viewcvs-0.4.tar.gz">Version 0.4 of ViewCVS</a>
+      <a href="viewcvs-0.5.tar.gz">Version 0.5 of ViewCVS</a>
     </blockquote>
     <p>
       Of course, it is also available through ViewCVS itself:
     </p>
     <blockquote>
-      <a href="/cgi-bin/viewcvs.cgi/gjspy/viewcvs/">http://www.lyra.org/cgi-bin/viewcvs.cgi/gjspy/viewcvs/</a>
+      <a href="/cgi-bin/viewcvs.cgi/viewcvs/">http://www.lyra.org/cgi-bin/viewcvs.cgi/viewcvs/</a>
     </blockquote>
 
     <p>
@@ -53,8 +51,8 @@
     </p>
 
     <p>
-      [ <a href="../">up to Python software</a> ]
-      [ <a href="../../">up to Greg's page</a> ]
+      [ <a href="/greg/">Greg's page</a> ]
+      [ <a href="/greg/python/">other Python software</a> ]
     </p>
 
     <hr width="75&#37;">
@@ -66,16 +64,22 @@
       <a href="http://mailman.lyra.org/mailman/listinfo/viewcvs">ViewCVS
 	mailing list</a>.
     </p>
+    <p>
+      A <a href="http://mailman.lyra.org/mailman/listinfo/viewcvs-dev">mailing
+	list for ViewCVS developers</a> is also available. 
+    </p>
 
     <hr width="75&#37;">
     <h2>Additional features over cvsweb</h2>
 
     <ul>
-      <li>Colorization for Python files</li>
-      <li>Better reporting for unreadable files</li>
-      <li>More robust when given varying <code>rcsdiff</code> or
-	<code>rlog</code> outputs</li>
-      <li>Hard breaks in human-readable diffs</li>
+      <li>Colorization for many file types via <code>enscript</code>.</li>
+      <li>Better reporting for unreadable files.</li>
+      <li>
+	More robust when given varying <code>rcsdiff</code> or
+	<code>rlog</code> outputs.
+      </li>
+      <li>Hard breaks in human-readable diffs.</li>
       <li>
 	The configuration file is optional (you can change the values
 	right in the CGI script and avoid the config file, if you so
@@ -85,6 +89,17 @@
       <li>
 	Directories with a large number of files can be viewed.
       </li>
+      <li>Bonsai-like query features.</li>
+      <li>
+	Annotation/blame support against a <strong>read-only</strong>
+	repository.
+      </li>
+      <li>
+	Configuration on a per-virtual-host basis. This allows you
+	to share the configuration file and ViewCVS installation
+	across virtual hosts, yet still be able to fine-tune the
+	options when necessary.
+      </li>
     </ul>
 
     <p>
@@ -93,6 +108,7 @@
     <ul>
       <li>UI streamlining/simplification</li>
       <li>Integration with CVS checkin auto-mail scripts</li>
+      <li>Tighter integration the query features</li>
       <li>
 	<i>Suggestions? Send mail to the
 	  <a href="mailto:viewcvs@lyra.org">viewcvs@lyra.org</a>
@@ -105,14 +121,29 @@
       Longer term:
     </p>
     <ul>
-      <li>Annotation ("blame") support (similar to cvsweb)</li>
       <li>Integration with an indexer such as LXR</li>
-      <li>Additional colorizers</li>
     </ul>
 
     <hr width="75&#37;">
-    <h2>Colorization of Python files</h2>
+    <h2>Colorization of files</h2>
+    <p>
+      ViewCVS can make use of the <code>enscript</code> program to
+      colorize files in the CVS repository. If <code>enscript</code>
+      is present on your system, then set the
+      <code>use_enscript</code> option in the
+      <code>viewcvs.conf</code> configuration file. If necessary,
+      update the <code>enscript_path</code> option to point to your
+      installation directory. ... That's it! Now, as you view files
+      through ViewCVS, they will be colored.
+    </p>
 
+    <h3>Colorization of Python files</h3>
+
+    <p>
+      ViewCVS currently comes with a builtin colorizer for Python
+      source files. This may go away, given the new
+      <code>enscript</code> support...
+    </p>
     <p>
       Christophe Pelte suggested this feature: colorize Python source
       files using
@@ -130,7 +161,7 @@
     <address><a href="mailto:gstein@lyra.org">Greg Stein</a></address>
 <!-- Created: Fri Dec  3 02:51:37 PST 1999 -->
 <!-- hhmts start -->
-Last modified: Fri Mar 24 03:12:34 PST 2000
+Last modified: Fri May 12 03:53:51 PDT 2000
 <!-- hhmts end -->
   </body>
 </html>

website/license-1.html

@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+  <head>
+    <title>ViewCVS License Agreement (v1)</title>
+  </head>
+
+  <body>
+    <h1>ViewCVS License Agreement (v1)</h1>
+
+    <p>
+      The following text constitutes the license agreement for the
+      <a href="./">ViewCVS</a> software. It
+      is an agreement between
+      <a href="who.html">The ViewCVS
+	Group</a> and the users of ViewCVS.
+    </p>
+
+    <hr>
+
+    <p>
+      <b>
+	Copyright &copy; 1999-2000 The ViewCVS Group.  All rights reserved.
+      </b>
+    </p>
+    <p>
+      By using ViewCVS, you agree to the terms and conditions set
+      forth below:
+    </p>
+    <p>
+      Redistribution and use in source and binary forms, with or
+      without modification, are permitted provided that the following
+      conditions are met:
+    </p>
+    <ol>
+      <li>
+	<p>
+	  Redistributions of source code must retain the above
+	  copyright notice, this list of conditions and the following
+	  disclaimer.
+	</p>
+      </li>
+      <li>
+	<p>
+	  Redistributions in binary form must reproduce the above
+	  copyright notice, this list of conditions and the following
+	  disclaimer in the documentation and/or other materials
+	  provided with the distribution.
+	</p>
+      </li>
+    </ol>
+
+    <p>
+      THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS
+      IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+      FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+      SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+      BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+      LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+      THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+      SUCH DAMAGE.
+    </p>
+
+    <hr>
+    <address><a href="mailto:gstein@lyra.org">Greg Stein</a></address>
+<!-- Created: Mon May  8 19:01:27 PDT 2000 -->
+<!-- hhmts start -->
+Last modified: Mon May  8 19:28:37 PDT 2000
+<!-- hhmts end -->
+  </body>
+</html>

website/who.html

@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+  <head>
+    <title>The ViewCVS Group</title>
+  </head>
+
+  <body background="/images/chalk.jpg">
+    <h1>The ViewCVS Group</h1>
+
+    <p>
+      The ViewCVS Group is an informal group of people working on and
+      developing the ViewCVS package. The current set of members are:
+    </p>
+    <ul>
+      <li><a href="/greg/"><b>Greg Stein</b></a></li>
+      <li>Jay Painter</li>
+    </ul>
+
+    <p>
+      Please note that the <a href="./">ViewCVS</a> package is offered 
+      under a BSD-type license, which is detailed on the
+      <a href="license-1.html">ViewCVS License</a> page.
+    </p>
+
+    <hr>
+    <address><a href="mailto:gstein@lyra.org">Greg Stein</a></address>
+<!-- Created: Mon May  8 19:08:58 PDT 2000 -->
+<!-- hhmts start -->
+Last modified: Mon May  8 19:14:45 PDT 2000
+<!-- hhmts end -->
+  </body>
+</html>