Retroactively "peg" the svn:externals property on these tags which

pulls in the 'templates-contrib' area.

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

CHANGES

@@ -1,3 +1,179 @@
+Version 1.0.6 (released 16-Sep-2008)
+
+  * security fix: ignore arbitrary user-provided MIME types (issue #354)
+  * fix bug in regexp search filter when used with sticky tag (issue #346)
+  * fix bug in handling of certain 'co' output (issue #348)
+  * fix regexp search filter template bug
+  * fix annotate code syntax error
+  * fix mod_python import cycle (issue #369)
+
+Version 1.0.5 (released 28-Feb-2008)
+
+  * security fix: omit commits of all-forbidden files from query results
+  * security fix: disallow direct URL navigation to hidden CVSROOT folder
+  * security fix: strip forbidden paths from revision view
+  * security fix: don't traverse log history thru forbidden locations
+  * security fix: honor forbiddenness via diff view path parameters
+  * new 'forbiddenre' regexp-based path authorization feature
+  * fix root name conflict resolution inconsistencies (issue #287)
+  * fix an oversight in the CVS 1.12.9 loginfo-handler support
+  * fix RSS feed content type to be more specific (issue #306)
+  * fix entity escaping problems in RSS feed data (issue #238)
+  * fix bug in tarball generation for remote Subversion repositories
+  * fix query interface file-count-limiting logic
+  * fix query results plus/minus count to ignore forbidden files
+  * fix blame error caused by 'svn' unable to create runtime config dir
+
+Version 1.0.4 (released 10-Apr-2007)
+
+  * fix some markup bugs in query views (issue #266)
+  * fix loginfo-handler's support for CVS 1.12.9 (issues #151, #257)
+  * make viewvc-install able to run from an arbitrary location
+  * update viewvc-install's output for readability
+  * fix bug writing commits to non-MyISAM databases (issue #262)
+  * allow long paths in generated tarballs (issue #12)
+  * fix bug interpreting EZT substitute patterns
+  * fix broken markup view disablement
+  * fix broken directory view link generation in directory log view
+  * fix Windows-specific viewvc-install bugs
+  * fix broke query result links for Subversion deleted items (issue #296)
+  * fix some output XHTML validation buglets
+  * fix database query cache staleness problems (issue #180)
+
+Version 1.0.3 (released 13-Oct-2006)
+
+  * fix bug in path shown for Subversion deleted-under-copy items (issue #265)
+  * security fix: declare charset for views to avoid IE UTF7 XSS attack
+
+Version 1.0.2 (released 29-Sep-2006)
+
+  * minor documentation fixes
+  * fix Subversion annotate functionality on Windows (issue #18)
+  * fix annotate assertions on uncanonicalized #include paths (issue #208)
+  * make RSS URL method match the method used to generate it (issue #245)
+  * fix Subversion annotation to run non-interactively, preventing hangs
+  * fix bug in custom syntax highlighter fallback logic
+  * fix bug in PHP CGI hack to avoid force-cgi-redirect errors
+
+Version 1.0.1 (released 20-Jul-2006)
+
+  * fix exception on log page when use_pagesize is enabled
+  * fix an XHTML validation bug in the footer template (issue #239)
+  * fix handling of single-component CVS revision numbers (issue #237)
+  * fix bug in download-as-text URL link generation (issue #241)
+  * fix query.cgi bug, missing 'rss_href' template data item (issue #249)
+  * no longer omit empty Subversion directories from tarballs (issue #250)
+  * use actual modification time for Subversion directories in tarballs
+
+Version 1.0 (released 01-May-2006)
+
+  * add support for viewing Subversion repositories
+  * add support for running on MS Windows
+  * generate strict XHTML output
+  * add support for caching by sending "Last-Modified", "Expires", 
+    "ETag", and "Cache-Control" headers
+  * add support for Mod_Python on Apache 2.x and ASP on IIS
+  * Several changes to standalone.py:
+    - -h commandline option to specify hostname for non local use.
+    - -r commandline option may be repeated to use more than repository
+      before actually installing ViewCVS.
+    - New GUI field to test paging.
+  * add new, better-integrated query interface
+  * add integrated RSS feeds
+  * add new "root_as_url_component" option to embed root names as
+    path components in ViewCVS URLs for a more natural URL scheme
+    in ViewCVS configurations with multiple repositories.
+  * add new "use_localtime" option to display local times instead of UTC times
+  * add new "root_parents" option to make it possible to add and
+    remove repositories without modifying the ViewCVS configuration
+  * add new "template_dir" option to facilitate switching between sets of 
+    templates
+  * add new "sort_group_dirs" option to disable grouping of
+    directories in directory listings
+  * add new "port" option to connect to a MySQL database on a nonstandard port
+  * make "default_root" option optional. When no root is specified,
+    show a page listing all available repositories
+  * add "default_file_view" option to make it possible for relative
+    links and image paths in checked out HTML files to work without
+    the need for special /*checkout*/ prefixes in URLs. Deprecate
+    "checkout_magic" option and disable by default
+  * add "limit_changes" option to limit number of changed files shown per
+    commit by default in query results and in the Subversion revision view
+  * hide CVS "Attic" directories and add simple toggle for showing
+    dead files in directory listings
+  * show Unified, Context and Side-by-side diffs in HTML instead of
+    in bare text pages
+  * make View/Download links work the same for all file types
+  * add links to tip of selected branch on log page
+  * allow use of "Highlight" program for colorizing
+  * enable enscript colorizing for more file types
+  * add sorting arrows for directory views
+  * get rid of popup windows for checkout links
+  * obfuscate email addresses in html output by encoding @ symbol
+    with an HTML character reference
+  * add paging capability
+  * Improvements to templates
+    - add new template authoring guide
+    - increase coverage, use templates to produce HTML for diff pages,
+      markup pages, annotate pages, and error pages
+    - move more common page elements into includes
+    - add new template variables providing ViewCVS URLs for more 
+      links between related pages and less URL generation inside
+      templates
+  * add new [define] EZT directive for assigning variables within templates
+  * add command line argument parsing to install script to allow 
+    non-interactive installs
+  * add stricter parameter validation to lower likelihood of cross-site
+    scripting vulnerabilities
+  * add support for cvsweb's "mime_type=text/x-cvsweb-markup" URLs
+  * fix incompatibility with enscript 1.6.3
+  * fix bug in parsing FreeBSD rlog output
+  * work around rlog assumption all two digit years in RCS files are
+    relative to the year 1900.
+  * change loginfo-handler to cope with spaces in filenames and
+    support a simpler command line invocation from CVS
+  * make cvsdbadmin work properly when invoked on CVS subdirectory
+    paths instead of top-level CVS root paths
+  * show diff error when comparing two binary files
+  * make regular expression search skip binary files
+  * make regular expression search skip nonversioned files in CVS
+    directories instead of choking on them
+  * fix tarball generator so it doesn't include forbidden modules
+  * output "404 Not Found" errors instead of "403 Forbidden" errors
+    to not reveal whether forbidden paths exist
+  * fix sorting bug in directory view
+  * reset log and directory page numbers when leaving those pages
+  * reset sort direction in directory listing when clicking new columns
+  * fix "Accept-Language" handling for Netscape 4.x browsers   
+  * fix file descriptor leak in standalone server
+  * clean up zombie processes from running enscript
+  * fix mysql "Too many connections" error in cvsdbadmin
+  * get rid of mxDateTime dependency for query database
+  * store query database times in UTC instead of local time
+  * fix daylight saving time bugs in various parts of the code
+
+Version 0.9.4 (released 17-Aug-2005)
+
+  * security fix: omit forbidden/hidden modules from query results.
+
+Version 0.9.3 (released 17-May-2005)
+
+  * security fix: disallow bad "content-type" input [CAN-2004-1062]
+  * security fix: disallow bad "sortby" and "cvsroot" input [CAN-2002-0771]
+  * security fix: omit forbidden/hidden modules from tarballs [CAN-2004-0915]
+
+Version 0.9.2 (released 15-Jan-2002)
+
+  * fix redirects to Attic for diffs
+  * fix diffs that have no changes (causing an infinite loop)
+
+Version 0.9.1 (released 26-Dec-2001)
+
+  * fix a problem with some syntax in ndiff.py which isn't compatible
+    with Python 1.5.2 (causing problems at install time)
+  * remove a debug statement left in the code which continues to
+    append lines to /tmp/log
+
 Version 0.9 (released 23-Dec-2001)
 
   * create templates for the rest of the pages: markup pages, graphs,

COMMITTERS

@@ -0,0 +1,27 @@
+The following people have commit access to the ViewVC sources.
+Note that this is not a full list of ViewVC's authors, however --
+for that, you'd need to look over the log messages to see all the
+patch contributors.
+
+If you have a question or comment, it's probably best to mail
+dev@viewvc.tigris.org, rather than mailing any of these people
+directly.
+
+        gstein   Greg Stein <gstein@lyra.org>
+        jpaint   Jay Painter <???>
+           akr   Tanaka Akira <???>
+       timcera   Tim Cera <???>
+          pefu   Peter Funk <???>
+       lbruand   Lucas Bruand <???>
+      cmpilato   C. Michael Pilato <cmpilato@collab.net>
+          rey4   Russell Yanofsky <rey4@columbia.edu>
+        mharig   Mark Harig <???>
+      northeye   Takuo Kitame <???>
+        jamesh   James Henstridge <???>
+          maxb   Max Bowsher <maxb1@ukf.net>
+            eh   Erik Hülsmann <e.huelsmann@gmx.net>
+
+## Local Variables:
+## coding:utf-8
+## End:
+## vim:encoding=utf8

INSTALL

@@ -1,10 +1,12 @@
 CONTENTS
 --------
   TO THE IMPATIENT
-  INSTALLING VIEWCVS
-  UPGRADING VIEWCVS
+  SECURITY INFORMATION
+  INSTALLING VIEWVC
+  APACHE CONFIGURATION
+  UPGRADING VIEWVC
   SQL CHECKIN DATABASE
-  ENSCRIPT CONFIGURATION
+  ENABLING SYNTAX COLORATION
   CVSGRAPH CONFIGURATION
   IF YOU HAVE PROBLEMS...
 
@@ -13,227 +15,395 @@ TO THE IMPATIENT
 ----------------
 Congratulations on getting this far. :-)
 
-Prerequisites: Python 1.5 or later
-                 (http://www.python.org/)
-               RCS, Revision Control System
-                 (http://www.cs.purdue.edu/homes/trinkle/RCS/)
-               read-only, physical access to a CVS repository
-                 (See http://www.cvshome.org/ for more information)
+  Required Software And Configuration Needed To Run ViewVC:
 
-Optional:      a web server capable of running CGI programs
-                 (for example, Apache at http://httpd.apache.org/)
-               GNU-diff to replace broken diff implementations
-                 (http://www.gnu.org/software/diffutils/diffutils.html)
-               MySQL to create and query a commit database
-                 (http://www.mysql.com/)
-                 (http://sourceforge.net/projects/mysql-python)
-		 (and Python 1.5.2 or later)
-               Enscript to colorize code displayed from the CVS repository
-                 (http://people.ssh.com/mtr/genscript/)
-               CvsGraph for a graphical representation of the CVS revisions
-                 (http://www.akhphd.au.dk/~bertho/cvsgraph/)
+    For CVS Support: 
 
-  GUI Operation:
+      * Python 1.5.2 or later
+          (http://www.python.org/)
+      * RCS, Revision Control System
+          (http://www.cs.purdue.edu/homes/trinkle/RCS/)
+      * GNU-diff to replace diff implementations without the -u option
+          (http://www.gnu.org/software/diffutils/diffutils.html)
+      * read-only, physical access to a CVS repository
+          (See http://www.cvshome.org/ for more information)
 
-    If you just want to see what your CVS repository looks like with
-    ViewCVS, type "./standalone.py -g -r /PATH/TO/CVS/ROOT".  This
-    will start a tiny webserver serving at http://localhost:7467/.
+    For Subversion Support:
+
+      * Python 2.0 or later
+          (http://www.python.org/)
+      * Subversion, Version Control System, 1.2.0 or later
+          (binary installation and Python bindings)
+          (http://subversion.tigris.org/)
+
+    Optional:
+
+      * a web server capable of running CGI programs
+          (for example, Apache at http://httpd.apache.org/)
+      * MySQL 3.22 and MySQLdb 0.9.0 or later to create a commit database
+          (http://www.mysql.com/)
+          (http://sourceforge.net/projects/mysql-python)
+      * Enscript, code colorizer
+          (http://www.codento.com/people/mtr/genscript/)
+      * Highlight, code colorizer, 2.2.10 or later required, 2.4.5 or
+        later recommended for reliable line numbering
+          (http://www.andre-simon.de/)
+      * CvsGraph 1.5.0 or later, graphical CVS revision tree generator
+          (http://www.akhphd.au.dk/~bertho/cvsgraph/)
+
+  Quick sanity check:
+
+    If you just want to see what your repository looks like when seen
+    through ViewVC, type:
+
+       $ bin/standalone.py -r /PATH/TO/REPOSITORY
+
+    This will start a tiny ViewVC server at http://localhost:7467/viewvc/,
+    to which you can connect with your browser.
 
   Standard operation:
 
-    To start installing right away (on UNIX): type "./viewcvs-install"
+    To start installing right away (on UNIX): type "./viewvc-install"
     in the current directory and answer the prompts.  When it
-    finishes, edit the file viewcvs.conf in the installation directory
-    to tell viewcvs the paths to your CVS repositories. Next,
-    configure your web server to run <INSTALL>/cgi/viewcvs.cgi, as
-    appropriate for your web server.  The section `INSTALLING VIEWCVS'
-    below is still recommended reading.
+    finishes, edit the file viewvc.conf in the installation directory
+    to tell ViewVC the paths to your CVS and Subversion repositories. 
+    Next, configure your web server (in the way appropriate to that browser)
+    to run <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/viewvc.cgi.  The section
+    `INSTALLING VIEWVC' below is still recommended reading.
 
 
-INSTALLING VIEWCVS
+SECURITY INFORMATION
+--------------------
+
+ViewVC provides a feature which allows version controlled content to
+be served to web browsers just like static web server content.  So, if
+you have a directory full of interrelated HTML files that is housed in
+your version control repository, ViewVC can serve those files as HTML.
+You'll see in your web browser what you'd see if the files were part
+of your website, with working references to stylesheets and images and
+links to other pages.
+
+It is important to realize, however, that as useful as that feature
+is, there is some risk security-wise in its use.  Essentially, anyone
+with commit access to the CVS or Subversion repositories served by
+ViewVC has the ability to affect site content.  If a discontented or
+ignorant user commits malicious HTML to a version controlled file
+(perhaps just by way of documenting examples of such), that malicious
+HTML is effectively published and live on your ViewVC instance.
+Visitors viewing those versioned controlled documents get the
+malicious code, too, which might not be what the original author
+intended.
+
+If you wish to disable ViewVC's "checkout" view which implements this
+feature, you can do so by editing lib/viewvc.py, and modifying the
+function view_checkout() like so, adding the lines indicated:
+
+      def view_checkout(request):
+>>      raise debug.ViewVCException('Checkout view is disabled',
+>>                                  '403 Forbidden')
+        path, rev = _orig_path(request)
+        fp, revision = request.repos.openfile(path, rev)
+
+
+INSTALLING VIEWVC
 ------------------
 
-1) To get viewcvs.cgi to work, make sure that you have Python 1.5 or
-   greater installed and a webserver which is capable of executing
-   CGI scripts (either based on the .cgi extension, or by placing the
-   script within a specific directory).
+NOTE: Windows users can refer to windows/README for Windows-specific
+installation instructions.
 
-   You need to have RCS installed. Specifically, "rlog", "rcsdiff",
-   and "co". This script was tested against RedHat's rcs-5.7-10.rpm
+1) To get viewvc.cgi to work, make sure that you have Python installed
+   and a webserver which is capable of executing CGI scripts (either
+   based on the .cgi extension, or by placing the script within a specific
+   directory).
 
-   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 to the repository will not work.
+   Note that to browse CVS repositories, the viewvc.cgi script needs to
+   have READ-ONLY, physical access to the repository (or a copy of it).
+   Therefore, rsh/ssh or pserver access to the repository will not work.
+   And you need to have the RCS utilities installed, specifically "rlog",
+   "rcsdiff", and "co".
 
-   For the more human readable diff formats you need a modern diff utility.
-   If you are using Linux, this is no problem.  But on commercial unices
-   you might want to install GNU-diff to be able to use unified or 
-   side-by-side diffs.
-
-   If you want to use cvsgraph, you have to obtain and install this
-   separately.  See below.  This was tested with cvsgraph-1.1.2.
-
-   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 0.9.1.
-
-2) Installation is handled by the ./viewcvs-install script.  Run this
+2) Installation is handled by the ./viewvc-install script.  Run this
    script and you will be prompted for a installation root path.
-   The default is /usr/local/viewcvs-VERSION, where VERSION is
-   the version of this ViewCVS release.  The installer sets the install 
-   path in some of the files, and ViewCVS cannot be moved to a 
+   The default is /usr/local/viewvc-VERSION, where VERSION is
+   the version of this ViewVC release.  The installer sets the install 
+   path in some of the files, and ViewVC cannot be moved to a 
    different path after the install.
 
-   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.
+   Note: while 'root' is usually required to create /usr/local/viewvc,
+   ViewVC does not have to be installed as root, nor does it run as root.
+   It is just as valid to place ViewVC in a home directory, too.
 
-   Note: viewcvs-install will create directories if needed. It will
+   Note: viewvc-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
+   as viewvc.conf), thus making it safe to install over the top of
    a previous installation. It will always overwrite program files,
    however.
 
-3) Edit <VIEWCVS_INSTALLATION_DIRECTORY>/viewcvs.conf for your specific 
+3) Edit <VIEWVC_INSTALLATION_DIRECTORY>/viewvc.conf for your specific 
    configuration.  In particular, examine the following configuration options:
 
-      cvs_roots
+      cvs_roots (for CVS)
+      svn_roots (for Subversion)
+      root_parents (for CVS or Subversion)
       default_root
+      root_as_url_component
       rcs_path
       mime_types_file
 
    There are some other options that are usually nice to change. See
-   viewcvs.conf for more information.  ViewCVS provides a working,
-   default look. However, if you want to customize the look of ViewCVS
-   then edit the files in <VIEWCVS_INSTALLATION_DIRECTORY>/templates.
+   viewvc.conf for more information.  ViewVC provides a working,
+   default look. However, if you want to customize the look of ViewVC
+   then edit the files in <VIEWVC_INSTALLATION_DIRECTORY>/templates.
    You need knowledge about HTML to edit the templates.
 
-4) The CGI programs are in <VIEWCVS_INSTALLATION_DIRECTORY>/cgi/.  You can 
+4) The CGI programs are in <VIEWVC_INSTALLATION_DIRECTORY>/bin/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 <VIEWCVS_INSTALLATION_DIRECTORY>/cgi/*.cgi scripts 
-   after the install (unlike the other files in ViewCVS, the CGI scripts can 
-   be moved).
+   also copy the installed <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi 
+   scripts after the install (unlike the other files in ViewVC, the scripts 
+   under bin/ can be moved).
 
-   If you are using Apache, then the ScriptAlias directive is very
-   useful for pointing directly to the viwecvs.cgi script.
+   If you are using Apache, then see below at the section titled
+   APACHE CONFIGURATION.
 
-   NOTE: for security reasons, it is not advisable to install ViewCVS
+   NOTE: for security reasons, it is not advisable to install ViewVC
    directly into your published HTTP directory tree (due to the MySQL
-   passwords in viewcvs.conf).
+   passwords in viewvc.conf).
 
-5) That's it for repository browsing.  Instructions for getting the
-   SQL checkin database working are below.
+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.
+APACHE CONFIGURATION
+--------------------
+
+1) Find out where the web server configuration file is kept. Typical
+   locations are /etc/httpd/httpd.conf, /etc/httpd/conf/httpd.conf,
+   and /etc/apache/httpd.conf. Depending on how apache was installed,
+   you may also look under /usr/local/etc or /etc/local. Use the vendor
+   documentation or the find utility if in doubt.
+
+Either METHOD A: 
+2) The ScriptAlias directive is very useful for pointing 
+   directly to the viewvc.cgi script.  Simply insert a line containing
+
+     ScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/viewvc.cgi
+
+   into your httpd.conf file.  Choose the location in httpd.conf where 
+   also the other ScriptAlias lines reside.  Some examples:
+
+     ScriptAlias /viewvc /usr/local/viewvc-1.0/bin/cgi/viewvc.cgi
+     ScriptAlias /query /usr/local/viewvc-1.0/bin/cgi/query.cgi
+
+   continue with step 3).
+
+or alternatively METHOD B: 
+2) Copy the CGI scripts from 
+   <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
+   to the /cgi-bin/ directory configured in your httpd.conf file.
+
+   continue with step 3).
+   
+and then there's METHOD C:
+2) Copy the CGI scripts from 
+   <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
+   to the directory of your choosing in the Document Root adding the following
+   apache directives for the directory in httpd.conf or an .htaccess file:
+
+     Options +ExecCGI
+     AddHandler cgi-script .cgi
+     
+   (Note: For this to work mod_cgi has to be loaded. And for the .htaccess file
+   to be effective, "AllowOverride All" or "AllowOverride Options FileInfo"
+   need to have been specified for the directory.)
+   
+   continue with step 3).
+
+or if you've got Mod_Python installed you can use METHOD D:
+2) Copy the Python scripts and .htaccess file from 
+   <VIEWVC_INSTALLATION_DIRECTORY>/bin/mod_python/
+   to a directory being served by apache.
+   
+   In httpd.conf, make sure that "AllowOverride All" or at least 
+   "AllowOverride FileInfo Options" are enabled for the directory
+   you copied the files to.
+   
+   Note: If you are using Mod_Python under Apache 1.3 the tarball generation
+   and enscript colorizing features may not work because they use
+   multithreading. They do work fine with Apache 2.
+   
+   continue with step 3).
+
+3) Restart apache.  The commands to do this vary.  "httpd -k restart" and 
+   "apache -k restart" are two common variants.  On RedHat Linux it is
+   done using the command "/sbin/service httpd restart" and on SuSE Linux
+   it is done with "rcapache restart" 
+
+4) Optional: Add access control.
+
+   In your httpd.conf you can control access to certain modules by adding 
+   directives like this:
+
+      <Location "<url to viewvc.cgi>/<modname_you_wish_to_access_ctl>">
+        AllowOverride None
+        AuthUserFile /path/to/passwd/file
+        AuthName "Client Access"
+        AuthType Basic
+        require valid-user
+      </Location>
+
+   WARNING: If you enable the "checkout_magic" or "allow_tar" options, you
+   will need to add additional location directives to prevent people
+   from sneaking in with URLs like:
+
+      http://<server_name>/viewvc/*checkout*/<module_name>
+      http://<server_name>/viewvc/~checkout~/<module_name>
+      http://<server_name>/viewvc/<module_name>.tar.gz?view=tar
+
+5) Optional: Protect your ViewVC instance from server-whacking webcrawlers.
+
+   As ViewVC is a web-based application which each page containing various
+   links to other pages and views, you can expect your server's performance
+   to suffer if a webcrawler finds your ViewVC instance and begins
+   traversing those links.  We highly recommend that you add your ViewVC
+   location to a site-wide robots.txt file.  Visit the Wikipedia page
+   for Robots.txt (http://en.wikipedia.org/wiki/Robots.txt) for more
+   information.
 
 
-UPGRADING VIEWCVS
+UPGRADING VIEWVC
 -----------------
 
-Please read the file upgrading.html in the website subdirectory or
-at <http://viewcvs.sourceforge.net/upgrading.html>.
+Please read the file upgrading-howto.html in the docs/ subdirectory.
 
 
 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.
+catalogs every commit in the CVS or Subversion repository into a SQL
+database.  In fact, the databases are 100% compatible.
 
-Various queries can be performed on the database.  After installing ViewCVS,
+Various queries can be performed on the database.  After installing ViewVC,
 there are some additional steps required to get the database working.
 
-1) You need MySQL >= 3.22, and the Python module MySQLdb 0.9.0 installed.
-   Python 1.5.2 is REQUIRED by MySQLdb, therefore to use this part of
-   ViewCVS you must be using Python 1.5.2.  Additionally you will need the
-   mxDateTime extension.  I've tested with version 1.3.0
+1) You need MySQL and MySQLdb (a Python DBAPI 2.0 module) 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 <VIEWCVS_INSTALLATION_DIRECTORY>/make-database script.  It will 
+3) Run the <VIEWVC_INSTALLATION_DIRECTORY>/bin/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 
+   want to create.  The database name defaults to "ViewVC".  This script 
    creates the database and sets up the empty tables.  If you run this on a 
-   existing ViewCVS database, you will lose all your data!
+   existing ViewVC database, you will lose all your data!
 
-4) Edit your <VIEWCVS_INSTALLATION_DIRECTORY>/viewcvs.conf file.  
+4) Edit your <VIEWVC_INSTALLATION_DIRECTORY>/viewvc.conf file.  
    There is a [cvsdb] section.  You will need to set:
      
-      
+      enabled = 1        # Whether to enable query support in viewvc.cgi
       host =             # MySQL database server host
-      database_name =    # the name of the database you created with
-                         # make-database
-      user =             # the read/write database user
+      port =             # MySQL database server port (default is 3306)
+      database_name =    # name of database you created with make-database
+      user =             # 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
+      readonly_user =    # read-only database user
+      readonly_passwd =  # password for the read-only 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 initializing
-   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.
+   Note that it's pretty safe in this instance for your read-only user
+   and your read-write user to be the same.
 
-   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 absent.
+5) At this point, you need to tell your version control system(s) to 
+   publish their commit information to the database.  This is done
+   using utilities that ViewVC provides.
 
-   To get real-time updates, you'll want to checkout the CVSROOT module
-   from your CVS repository and edit CVSROOT/loginfo.  Add the line:
+   To publish CVS commits into the database:
 
-     ALL (echo %{sVv}; cat) | <VIEWCVS_INSTALLATION_DIRECTORY>/loginfo-handler
+      Two programs are provided for updating the checkin database from
+      a CVS repository, 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 initializing 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.
 
-   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.
+      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 absent.
 
-6) You may want to modify the HTML template file:
+      To get real-time updates, you'll want to checkout the CVSROOT
+      module from your CVS repository and edit CVSROOT/loginfo.  For
+      folks running CVS 1.12 or better, add this line:
 
-      <VIEWCVS_INSTALLATION_DIRECTORY>/templates/query.ezt
+         ALL <VIEWVC_INSTALLATION_DIRECTORY>/bin/loginfo-handler %p %{sVv}
 
-   This is used by the query.cgi script to generate part of its HTML output.  
-   At some point the currently hardcoded table output will also vanish.
+      If you are running CVS 1.11 or earlier, you'll want a slightly
+      different command line in CVSROOT/loginfo:
 
-7) You should be ready to go.  Load up the query.cgi script and give 
-   it a try.
+        ALL <VIEWVC_INSTALLATION_DIRECTORY>/bin/loginfo-handler %{sVv}
+   
+      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.
+   
+      If you are running the Unix port of CVS-NT, the handler script
+      need to know about it.  CVS-NT delivers commit information to
+      loginfo scripts differently than the way mainstream CVS does.
+      Your command line should look like this:
+      
+        ALL <VIEWVC_INSTALLATION_DIRECTORY>/bin/loginfo-handler %{sVv} cvsnt
+
+   To publish Subversion commits into the database:
+
+      To build a database of all the commits in the Subversion
+      repository /home/svn, invoke: "./svndbadmin rebuild /home/svn".
+      If you want to update the checkin database, invoke:
+      "./svndbadmin update /home/svn".
+
+      To get real time updates, you will need to add a post-commit
+      hook (for the repository example above, the script should go in
+      /home/svn/hooks/post-commit).  The script should look something
+      like this:
+
+         #!/bin/sh
+         REPOS="$1"
+         REV="$2"
+         <VIEWVC_INSTALLATION_DIRECTORY>/bin/svndbadmin rebuild "$REPOS" "$REV"
+
+      If you allow revision property changes in your repository,
+      create a post-revprop-change hook script containing the same
+      commands as the post-commit one.  This will make sure that the
+      checkin database stays consistent when you change the svn:log,
+      svn:author or svn:date revision properties.
+
+You should be ready to go.  Click one of the "Query revision history"
+links in ViewVC directory listings and give it a try.
 
 
-ENSCRIPT CONFIGURATION
-----------------------
+ENABLING SYNTAX COLORATION
+--------------------------
 
-Enscript is program that can colorize sourcecode of a lot of languages.
-Linux distributions like for example SuSE Linux from at least 7.0
-up to the recently released 7.3 already contain a precompiled and
-configured enscript 1.6.2 package.
+Enscript and Highlight are two programs that can colorize source code
+for a lot of languages.  ViewVC can be configured to use either one.
 
-1) Download genscript from http://people.ssh.com/mtr/genscript/
+1) Install Enscript or Highlight using your system's package manager
+   or downloading from the project home pages.
 
-2) Configure and compile per instructions with enscript.
-   (I 've not done this, since I'm using the precompiled package
-   delivered with SuSE Linux)
+2) Set either the 'use_enscript' or 'use_highlight' options in
+   viewvc.conf to 1.
 
-3) Set the 'use_enscript' option in viewcvs.conf to 1.
+3) You may also need to set 'enscript_path' or 'highlight_path' option
+   if the executables are not located on the system PATH.
 
-4) That's it!
-
-5) If you want to colorize exotic languages, you might have to 
-   patch 'lib/viewcvs.py' and add a new highlighting file to enscript.
-   I've done this for Modula-2 and submitted the file to the 
-   enscript maintainer long ago.  If interested in this patch for
-   enscript mailto:pefu@sourceforge.net
+That's it!  Now when you view the contents of recognized filetypes in
+ViewVC, you should see colorized syntax.
 
 
 CVSGRAPH CONFIGURATION
@@ -243,88 +413,113 @@ CvsGraph is a program that can display a clickable, graphical tree
 of files in a CVS repository.
 
 WARNING: Under certain circumstances (many revisions of a file
-or many branches or both) cvsgraph can generate very huge images.
+or many branches or both) CvsGraph can generate very huge images.
 Especially on thin clients these images may crash the Web-Browser.
-Currently there is no known way to avoid this behavior of cvsgraph.
+Currently there is no known way to avoid this behavior of CvsGraph.
 So you have been warned!  
 
-Nevertheless cvsgraph can be quite helpful on repositories with 
+Nevertheless, CvsGraph can be quite helpful on repositories with 
 a reasonable number of revisions and branches.
 
-1) Install viewcvs according to instructions in 'INSTALLING
-   VIEWCVS' section above.  The installation directory is where
-   the 'viewcvs-install' script copied and configured the viewcvs
-   programs.
+1) Install CvsGraph using your system's package manager or downloading
+   from the project home page.
 
-2) Download CvsGraph from http://www.akhphd.au.dk/~bertho/cvsgraph/
+2) Set the 'use_cvsgraph' options in viewvc.conf to 1.
 
-3) Configure and compile per instructions with CvsGraph.  I had
-   problems with 'configure' finding the gd library.  Had to create
-   a link from libgd.so to libgd.do.4.0.0.   On Solaris you might
-   want to edit the link command line and add the option -R if 
-   you have you libraries at non-standard location.
+3) You may also need to set the 'cvsgraph_path' option if the 
+   CvsGraph executable is not located on the system PATH.
 
-4) Place the 'cvsgraph' executable into a directory readable by the
-   userid running the web server. (default is '/usr/local/bin' if
-   you simply type 'make install' in the cvsgraph directory).
-
-5) Check the setting of the 'cvsgraph_path' option in viewcvs.conf:
-   /usr/local/bin/ is most often NOT contained in $PATH of the
-   webserver process (e.g. Apache), so you will have to edit this.  
-   Set the 'use_cvsgraph' option in viewcvs.conf to 1.
-
-6) That's it!
-
-7) There is a file <VIEWCVS_INSTALLATION_DIRECTORY>/cvsgraph.conf that
+4) There is a file <VIEWVC_INSTALLATION_DIRECTORY>/cvsgraph.conf that
    you may want to edit if desired to set color and font characteristics.
    See the cvsgraph.conf documentation.  No edits are required in
-   cvsgraph.conf for operation with viewcvs.
+   cvsgraph.conf for operation with ViewVC.
+
+
+SUBVERSION INTEGRATION
+----------------------
+
+Unlike the CVS integration, which simply wraps the RCS and CVS utility
+programs, the Subversion integration requires additional Python
+libraries.  To use ViewVC with Subversion, make sure you have both
+Subversion itself and the Subversion Python bindings installed.  See
+Subversion's installation notes for more details on how to build and
+install these items.
+
+Generally speaking, you'll know when your installation of Subversion's
+bindings has been successful if you can import the 'svn.core' module
+from within your Python interpreter.  Here's an example of doing so
+which doubles as a quick way to check what version of the Subversion
+Python binding you have:
+
+   % python
+   Python 2.2.2 (#1, Oct 29 2002, 02:47:30) 
+   [GCC 2.96 20000731 (Red Hat Linux 7.2 2.96-108.7.2)] on linux2
+   Type "help", "copyright", "credits" or "license" for more information.
+   >>> from svn.core import *
+   >>> "%s.%s.%s" % (SVN_VER_MAJOR, SVN_VER_MINOR, SVN_VER_PATCH)
+   '1.2.0'
+   >>>
+
+Note that by default, Subversion installs its bindings in a location
+that is not in Python's default module search path (for example, on
+Linux systems the default is usually /usr/local/lib/svn-python).  You
+need to remedy this, either by adding this path to Python's module
+search path, or by relocating the bindings to some place in that
+search path.
+
+For example, you might want to create .pth file in your Python
+installation directory's site-packages area which tells Python where
+to find additional modules (in this case, you Subversion Python
+bindings).  You would do this as follows (and as root):
+
+   $ echo "/path/to/svn/bindings" > /path/to/python/site-packages/svn.pth
+
+(Though, obviously, with the correct paths specified.)
+
+Configuration of the Subversion repositories happens in much the same
+way as with CVS repositories, only with the 'svn_roots' configuration
+variable instead of the 'cvs_roots' one.
 
 
 IF YOU HAVE PROBLEMS ...
 ------------------------
 
-If you've trouble to make viewcvs.cgi work:
+If nothing seems to work:
 
-=== If nothing seems to work:
+  * Check if you can execute CGI-scripts (Apache needs to have an
+    ScriptAlias /cgi-bin or cgi-script Handler defined). Try to
+    execute a simple CGI-script that often comes with the distribution
+    of the webserver; locate the logfiles and try to find hints which
+    explain the malfunction
 
- o check if you can execute CGI-scripts (Apache needs to have an
-   ScriptAlias /cgi-bin or cgi-script Handler defined). Try to 
-   execute a simple CGI-script that often comes with the distribution
-   of the webserver; locate the logfiles and try to find hints
-   which explain the malfunction
-
- o view the entries in the webserver's error.log
+  * View the entries in the webserver's error.log
  
- o make sure there is a trailing slash on the URL. for example:
+If ViewVC seems to work but doesn't show the expected result (Typical
+error: you can't see any files)
+
+  * Check whether the CGI-script has read-permissions to your
+    CVS-Repository. The CGI-script generally runs as the same user
+    that the web server does, often user 'nobody' or 'httpd'.
+
+  * Does ViewVC find your RCS utilities? (edit rcs_path)
+
+If something else happens or you can't get it to work:
+
+  * Check the ViewVC home page:
+
+       http://viewvc.org/
+
+  * Review the ViewVC mailing list archive to see if somebody else had
+    the same problem, and it was solved:
+
+       http://viewvc.tigris.org/servlets/SummarizeList?listName=users
+
+  * Check the ViewVC issue database to see if the problem you are
+    seeing is the result of a known bug:
+
+       http://viewvc.tigris.org/issues/query.cgi
  
-     http://www.example.com/cgi-bin/viewcvs.cgi/
-     
-   (ViewCVS should perform a redirection to ensure this, but a report
-    has indicated that it doesn't always do this... please send more
-    of these bug reports if you run into this)
-
-=== If viewcvs seems to work but doesn't show the expected result
-    (Typical error: you can't see any files)
-
- o check whether the CGI-script has read-permissions to your
-   CVS-Repository. The CGI-script often runs as the user 'nobody' 
-   or 'httpd' ..
-
- o does viewcvs find your RCS utilities? (edit rcs_path)
-
-=== If something else happens or you can't get it to work:
-
- o check the ViewCVS home page:
-
-     http://viewcvs.sourceforge.net/
-
- o review the ViewCVS mailing list archive to see if somebody else had
-   the same problem, and it was solved:
-
-     http://mailman.lyra.org/pipermail/viewcvs/
-
- o send mail to the ViewCVS mailing list: viewcvs@lyra.org
-
-   NOTE: make sure you provide an accurate description of the problem
-         and any relevant tracebacks or error logs.
+  * Send mail to the ViewVC mailing list, users@viewvc.tigris.org.
+    NOTE: make sure you provide an accurate description of the problem
+    -- including the version of ViewVC you are using -- and any
+    relevant tracebacks or error logs.

LICENSE.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<title>ViewVC: License v1</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+
+<p>The following text constitutes the license agreement for the <a
+   href="http://www.viewvc.org/">ViewVC</a> software (formerly known
+   as ViewCVS). It is an agreement between <a
+   href="http://www.viewvc.org/who.html#sec-viewcvs-group">The ViewCVS
+   Group</a> and the users of ViewVC.</p>
+
+<blockquote>
+
+<p><strong>Copyright &copy; 1999-2008 The ViewCVS Group.  All rights
+   reserved.</strong></p>
+
+<p>By using ViewVC, 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>Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following
+      disclaimer.</li>
+  <li>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.</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>
+
+</blockquote>
+
+<hr />
+
+<p>The following changes have occured to this license over time:</p>
+<ul>
+  <li>May 12, 2001 &mdash; copyright years updated</li>
+  <li>September 5, 2002 &mdash; copyright years updated</li>
+  <li>March 17, 2006 &mdash; software renamed from "ViewCVS"</li>
+  <li>April 10, 2007 &mdash; copyright years updated</li>
+  <li>February 22, 2008 &mdash; copyright years updated</li>
+</ul>
+
+</body>
+</html>

README

@@ -1,3 +1,6 @@
-ViewCVS -- Viewing the content of CVS repositories with a Webbrowser.
+ViewVC -- Viewing the content of CVS/SVN repositories with a Webbrowser.
 
 Please read the file INSTALL for more information.
+
+And see windows/README for more information on running ViewVC on
+Microsoft Windows.

TODO

@@ -32,7 +32,7 @@ TODO ITEMS
 
 *) include a ConfigParser.py to help older Python installations
 
-*) add a check for the rcs programs/paths to viewcvs-install. clarify the
+*) add a check for the rcs programs/paths to viewvc-install. clarify the
    dependency on RCS in the docs.
 
 *) have a "check" mode that verifies binaries are available on rcs_path
@@ -46,8 +46,8 @@ KNOWN BUGS
    is non existant.
 
 *) With old repositories containing many branches, tags or thousands
-   or revisions, the cvsgraph feature becomes unusable (see INSTALL).  
-   ViewCVS can't do much about this, but it might be possible to 
+   or revisions, the cvsgraph feature becomes unusable (see INSTALL).
+   ViewVC can't do much about this, but it might be possible to
    investigate the number of branches, tags and revision in advance
    and disable the cvsgraph links, if the numbers exceed a certain
    treshold.

bin/asp/query.asp

@@ -0,0 +1,61 @@
+<%@ LANGUAGE = Python %>
+<%
+
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# query.asp: View CVS/SVN commit database by web browser
+#
+# -----------------------------------------------------------------------
+#
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) query.py file and runs it.
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+#########################################################################
+#
+# Adjust sys.path to include our library directory
+#
+
+import sys
+
+if LIBRARY_DIR:
+  if not LIBRARY_DIR in sys.path:
+    sys.path.insert(0, LIBRARY_DIR)
+
+#########################################################################
+
+import sapi
+import viewvc
+import query
+
+server = sapi.AspServer(Server, Request, Response, Application)
+try:
+  cfg = viewvc.load_config(CONF_PATHNAME, server)
+  query.main(server, cfg, "viewvc.asp")
+finally:
+  s.close()
+
+%>

bin/asp/viewvc.asp

@@ -0,0 +1,65 @@
+<%@ LANGUAGE = Python %>
+<%
+
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# viewvc: View CVS/SVN repositories via a web browser
+#
+# -----------------------------------------------------------------------
+#
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) viewvc.py file and runs it.
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+#########################################################################
+#
+# Adjust sys.path to include our library directory
+#
+
+import sys
+
+if LIBRARY_DIR:
+  if not LIBRARY_DIR in sys.path:
+    sys.path.insert(0, LIBRARY_DIR)
+
+#########################################################################
+
+### add code for checking the load average
+
+#########################################################################
+
+# go do the work
+import sapi
+import viewvc
+
+server = sapi.AspServer(Server, Request, Response, Application)
+try:
+  cfg = viewvc.load_config(CONF_PATHNAME, server)
+  viewvc.main(server, cfg)
+finally:
+  s.close()
+
+%>

bin/cgi/query.cgi

@@ -1,24 +1,22 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
-# query.cgi: View CVS commit database by web browser
+# query.cgi: View CVS/SVN commit database by web browser
 #
 # -----------------------------------------------------------------------
 #
-# This is a teeny stub to launch the main ViewCVS app. It checks the load
-# average, then loads the (precompiled) viewcvs.py file and runs it.
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) viewvc.py file and runs it.
 #
 # -----------------------------------------------------------------------
 #
@@ -32,6 +30,7 @@
 #
 
 LIBRARY_DIR = None
+CONF_PATHNAME = None
 
 #########################################################################
 #
@@ -39,13 +38,20 @@ LIBRARY_DIR = None
 #
 
 import sys
+import os
 
 if LIBRARY_DIR:
   sys.path.insert(0, LIBRARY_DIR)
 else:
-  sys.path[:0] = ['../lib']	# any other places to look?
+  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
+                                                  "../../../lib")))
 
 #########################################################################
 
-import query 
-query.run_cgi()
+import sapi
+import viewvc
+import query
+
+server = sapi.CgiServer()
+cfg = viewvc.load_config(CONF_PATHNAME, server)
+query.main(server, cfg, "viewvc.cgi")

bin/cgi/viewvc-strace.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Set this script up with something like:
+#
+#   ScriptAlias /viewvc-strace /home/gstein/src/viewvc/cgi/viewvc-strace.sh
+#
+thisdir="`dirname $0`"
+exec strace -q -r -o /tmp/v-strace.log "${thisdir}/viewvc.cgi"

bin/cgi/viewvc.cgi

@@ -1,24 +1,22 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
-# viewcvs: View CVS repositories via a web browser
+# viewvc: View CVS/SVN repositories via a web browser
 #
 # -----------------------------------------------------------------------
 #
-# This is a teeny stub to launch the main ViewCVS app. It checks the load
-# average, then loads the (precompiled) viewcvs.py file and runs it.
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) viewvc.py file and runs it.
 #
 # -----------------------------------------------------------------------
 #
@@ -32,6 +30,7 @@
 #
 
 LIBRARY_DIR = None
+CONF_PATHNAME = None
 
 #########################################################################
 #
@@ -39,11 +38,13 @@ LIBRARY_DIR = None
 #
 
 import sys
+import os
 
 if LIBRARY_DIR:
   sys.path.insert(0, LIBRARY_DIR)
 else:
-  sys.path[:0] = ['../lib']	# any other places to look?
+  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
+                                                  "../../../lib")))
 
 #########################################################################
 
@@ -52,5 +53,9 @@ else:
 #########################################################################
 
 # go do the work
-import viewcvs
-viewcvs.run_cgi()
+import sapi
+import viewvc
+
+server = sapi.CgiServer()
+cfg = viewvc.load_config(CONF_PATHNAME, server)
+viewvc.main(server, cfg)

bin/cvsdbadmin

@@ -0,0 +1,157 @@
+#!/usr/bin/env python
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# administrative program for CVSdb; this is primarily
+# used to add/rebuild CVS repositories to the database
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+# Adjust sys.path to include our library directory
+import sys
+import os
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0], "../../lib")))
+
+#########################################################################
+  
+import os
+import string
+import cvsdb
+import viewvc
+import vclib.bincvs
+
+
+def UpdateFile(db, repository, path, update):
+    try:
+        if update:
+            commit_list = cvsdb.GetUnrecordedCommitList(repository, path, db)
+        else:
+            commit_list = cvsdb.GetCommitListFromRCSFile(repository, path)
+    except cvsdb.error, e:
+        print '[ERROR] %s' % (e)
+        return
+
+    file = string.join(path, "/")
+    if update:
+       print '[%s [%d new commits]]' % (file, len(commit_list)),
+    else:
+       print '[%s [%d commits]]' % (file, len(commit_list)),
+
+    ## add the commits into the database
+    for commit in commit_list:
+        db.AddCommit(commit)
+        sys.stdout.write('.')
+        sys.stdout.flush()
+    print
+
+
+def RecurseUpdate(db, repository, directory, update):
+    for entry in repository.listdir(directory, None, {}):
+        path = directory + [entry.name]
+
+        if entry.errors:
+            continue
+
+        if entry.kind is vclib.DIR:
+            RecurseUpdate(db, repository, path, update)
+            continue
+
+        if entry.kind is vclib.FILE:
+            UpdateFile(db, repository, path, update)
+
+def RootPath(path):
+    """Break os path into cvs root path and other parts"""
+    root = os.path.abspath(path)
+    path_parts = []
+
+    p = root
+    while 1:
+        if os.path.exists(os.path.join(p, 'CVSROOT')):
+            root = p
+            print "Using repository root `%s'" % root
+            break
+
+        p, pdir = os.path.split(p)
+        if not pdir:
+            del path_parts[:]
+            print "Using repository root `%s'" % root
+            print "Warning: CVSROOT directory not found."
+            break
+
+        path_parts.append(pdir)
+
+    root = cvsdb.CleanRepository(root)
+    path_parts.reverse()
+    return root, path_parts
+
+def usage():
+    print 'Usage: %s <command> [arguments]' % (sys.argv[0])
+    print 'Performs administrative functions for the CVSdb database'
+    print 'Commands:'
+    print '  rebuild <repository>            rebuilds the CVSdb database'
+    print '                                  for all files in the repository'
+    print '  update <repository>             updates the CVSdb database for'
+    print '                                  all unrecorded commits'
+    print
+    sys.exit(1)
+
+
+## main
+if __name__ == '__main__':
+    ## check that a command was given
+    if len(sys.argv) <= 2:
+        usage()
+
+    ## set the handler function for the command
+    command = sys.argv[1]
+    if string.lower(command) == 'rebuild':
+        update = 0
+    elif string.lower(command) == 'update':
+        update = 1
+    else:
+        print 'ERROR: unknown command %s' % (command)
+        usage()
+
+    # get repository path
+    root, path_parts = RootPath(sys.argv[2])
+
+    ## run command
+    try:
+      ## connect to the database we are updating
+      cfg = viewvc.load_config(CONF_PATHNAME)
+      db = cvsdb.ConnectDatabase(cfg)
+
+      repository = vclib.bincvs.BinCVSRepository(None, root, cfg.general)
+
+      RecurseUpdate(db, repository, path_parts, update)
+
+    except KeyboardInterrupt:
+        print
+        print '** break **'
+        
+    sys.exit(0)

bin/loginfo-handler

@@ -0,0 +1,317 @@
+#!/usr/bin/env python
+# -*-python-*-
+#
+# Copyright (C) 1999-2007 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# updates SQL database with new commit records
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+# Adjust sys.path to include our library directory
+import sys
+import os
+
+if LIBRARY_DIR:
+    sys.path.insert(0, LIBRARY_DIR)
+else:
+    sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0], "../../lib")))
+
+#########################################################################
+
+import os
+import string
+import getopt
+import re
+import cvsdb
+import viewvc
+import vclib.bincvs
+
+DEBUG_FLAG = 0
+
+## output functions
+def debug(text):        
+    if DEBUG_FLAG:
+        if type(text) != (type([])):
+            text = [text]
+        for line in text:
+            line = line.rstrip('\n\r')
+            print 'DEBUG(viewvc-loginfo):', line
+
+def warning(text):
+    print 'WARNING(viewvc-loginfo):', text
+
+def error(text):
+    print 'ERROR(viewvc-loginfo):', text
+    sys.exit(1)
+
+_re_revisions = re.compile(                            
+    r",(?P<old>(?:\d+\.\d+)(?:\.\d+\.\d+)*|NONE)"  # comma and first revision
+    r",(?P<new>(?:\d+\.\d+)(?:\.\d+\.\d+)*|NONE)"  # comma and second revision
+    r"(?:$| )"                                     # space or end of string
+)    
+
+def Cvs1Dot12ArgParse(args):
+    """CVS 1.12 introduced a new loginfo format while provides the various
+    pieces of interesting version information to the handler script as
+    individual arguments instead of as a single string."""
+
+    if args[1] == '- New directory':
+        return None, None
+    elif args[1] == '- Imported sources':
+        return None, None
+    else:
+        directory = args.pop(0)
+        files = []
+        while len(args) >= 3:
+            files.append(args[0:3])
+            args = args[3:]
+        return directory, files
+  
+def HeuristicArgParse(s, repository):
+    """Older versions of CVS (except for CVSNT) do not escape spaces in file
+    and directory names that are passed to the loginfo handler. Since the input
+    to loginfo is a space separated string, this can lead to ambiguities. This
+    function attempts to guess intelligently which spaces are separators and
+    which are part of file or directory names. It disambiguates spaces in
+    filenames from the separator spaces between files by assuming that every
+    space which is preceded by two well-formed revision numbers is in fact a 
+    separator. It disambiguates the first separator space from spaces in the 
+    directory name by choosing the longest possible directory name that
+    actually exists in the repository"""
+
+    if (s[-16:] == ' - New directory'
+            or s[:26] == ' - New directory,NONE,NONE'):
+        return None, None
+
+    if (s[-19:] == ' - Imported sources'
+            or s[-29:] == ' - Imported sources,NONE,NONE'):
+        return None, None
+
+    file_data_list = []
+    start = 0
+
+    while 1:
+        m = _re_revisions.search(s, start)
+
+        if start == 0:
+            if m is None: 
+                error('Argument "%s" does not contain any revision numbers' \
+                      % s)
+        
+            directory, filename = FindLongestDirectory(s[:m.start()],
+                                                       repository)
+            if directory is None:
+                error('Argument "%s" does not start with a valid directory' \
+                      % s)
+
+            debug('Directory name is "%s"' % directory)
+
+        else:
+            if m is None:
+                warning('Failed to interpret past position %i in the loginfo '
+                        'argument, leftover string is "%s"' \
+                        % start, pos[start:])
+            
+            filename = s[start:m.start()]
+            
+        old_version, new_version = m.group('old', 'new')
+
+        file_data_list.append((filename, old_version, new_version))
+
+        debug('File "%s", old revision %s, new revision %s' 
+            % (filename, old_version, new_version))
+
+        start = m.end()
+        
+        if start == len(s): break
+
+    return directory, file_data_list
+
+def FindLongestDirectory(s, repository):
+    """Splits the first part of the argument string into a directory name
+    and a file name, either of which may contain spaces. Returns the longest
+    possible directory name that actually exists"""
+
+    parts = string.split(s, " ")
+    
+    for i in range(len(parts)-1, 0, -1):
+        directory = string.join(parts[:i])
+        filename = string.join(parts[i:])
+        if os.path.isdir(os.path.join(repository, directory)):
+            return directory, filename
+    
+    return None, None
+
+_re_cvsnt_revisions = re.compile(                            
+    r"(?P<filename>.*)"                            # comma and first revision
+    r",(?P<old>(?:\d+\.\d+)(?:\.\d+\.\d+)*|NONE)"  # comma and first revision
+    r",(?P<new>(?:\d+\.\d+)(?:\.\d+\.\d+)*|NONE)"  # comma and second revision
+    r"$"                                           # end of string
+)
+
+def CvsNtArgParse(s, repository):
+    """CVSNT escapes all spaces in filenames and directory names with 
+    backslashes"""
+
+    if s[-18:] == r' -\ New\ directory':
+        return None, None
+
+    if s[-21:] == r' -\ Imported\ sources':
+        return None, None
+
+    file_data_list = []
+    directory, pos = NextFile(s)
+    
+    debug('Directory name is "%s"' % directory)
+
+    while 1:
+        fileinfo, pos = NextFile(s, pos)
+        if fileinfo is None:
+            break
+
+        m = _re_cvsnt_revisions.match(fileinfo)
+        if m is None:
+            warning('Can\'t parse file information in "%s"' % fileinfo)
+            continue
+
+        file_data = m.group('filename', 'old', 'new')
+        file_data_list.append(file_data)
+
+        debug('File "%s", old revision %s, new revision %s' % file_data)
+
+    return directory, file_data_list
+
+def NextFile(s, pos = 0):
+    escaped = 0
+    ret = ''
+    i = pos
+    while i < len(s):
+        c = s[i]
+        if escaped:
+            ret += c
+            escaped = 0
+        elif c == '\\':
+            escaped = 1
+        elif c == ' ':
+            return ret, i + 1
+        else:
+            ret += c
+        i += 1
+
+    return ret or None, i
+
+def ProcessLoginfo(rootpath, directory, files):
+    cfg = viewvc.load_config(CONF_PATHNAME)
+    db = cvsdb.ConnectDatabase(cfg)
+    repository = vclib.bincvs.BinCVSRepository(None, rootpath, cfg.general)
+
+    # split up the directory components
+    dirpath = filter(None, string.split(os.path.normpath(directory), os.sep))
+
+    ## build a list of Commit objects
+    commit_list = []
+    for filename, old_version, new_version in files:
+        filepath = dirpath + [filename]
+
+        ## XXX: this is nasty: in the case of a removed file, we are not
+        ##      given enough information to find it in the rlog output!
+        ##      So instead, we rlog everything in the removed file, and
+        ##      add any commits not already in the database
+        if new_version == 'NONE':
+            commits = cvsdb.GetUnrecordedCommitList(repository, filepath, db)
+        else:
+            commits = cvsdb.GetCommitListFromRCSFile(repository, filepath,
+                                                     new_version)
+
+        commit_list.extend(commits)
+
+    ## add to the database
+    db.AddCommitList(commit_list)
+
+
+## MAIN
+if __name__ == '__main__':
+    ## get the repository from the environment
+    try:
+        repository = os.environ['CVSROOT']
+    except KeyError:
+        error('CVSROOT not in environment')
+
+    debug('Repository name is "%s"' % repository)
+
+    ## parse arguments
+
+    argc = len(sys.argv)
+    debug('Got %d arguments:' % (argc))
+    debug(map(lambda x: '   ' + x, sys.argv))
+    
+    # if we have more than 3 arguments, we are likely using the
+    # newer loginfo format introduced in CVS 1.12:
+    # 
+    #    ALL <path>/bin/loginfo-handler %p %{sVv}
+    if argc > 3:
+        directory, files = Cvs1Dot12ArgParse(sys.argv[1:])
+    else:
+        if len(sys.argv) > 1:
+            # the first argument should contain file version information
+            arg = sys.argv[1]
+        else:
+            # if there are no arguments, read version information from
+            # first line of input like old versions of ViewCVS did
+            arg = string.rstrip(sys.stdin.readline())
+    
+        if len(sys.argv) > 2:
+            # if there is a second argument it indicates which parser
+            # should be used to interpret the version information
+            if sys.argv[2] == 'cvs':
+                fun = HeuristicArgParse
+            elif sys.argv[2] == 'cvsnt':
+                fun = CvsNtArgParse
+            else:
+                error('Bad arguments')
+        else:
+            # if there is no second argument, guess which parser to use based
+            # on the operating system. Since CVSNT now runs on Windows and
+            # Linux, the guess isn't necessarily correct
+            if sys.platform == "win32":
+                fun = CvsNtArgParse
+            else:
+                fun = HeuristicArgParse
+        
+        directory, files = fun(arg, repository)
+    
+    debug('Discarded from stdin:')
+    debug(map(lambda x: '   ' + x, sys.stdin.readlines())) # consume stdin
+
+    repository = cvsdb.CleanRepository(repository)
+
+    debug('Repository: %s' % (repository))
+    debug('Directory: %s' % (directory))
+    debug('Files: %s' % (str(files)))
+
+    if files is None:
+        debug('Not a checkin, nothing to do')
+    else:
+        ProcessLoginfo(repository, directory, files)
+
+    sys.exit(0)

bin/make-database

@@ -1,15 +1,13 @@
 #!/usr/bin/env python
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2007 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
@@ -17,17 +15,16 @@
 # MySQL 3.22 or later
 #
 # -----------------------------------------------------------------------
-#
 
 import os, sys, string
 import popen2
 
 INTRO_TEXT = """\
-This script creates the database and tables in MySQL used by the ViewCVS
+This script creates the database and tables in MySQL used by the ViewVC
 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.
+in your viewvc.conf file under the [cvsdb] section.
 """
 
 DATABASE_SCRIPT="""\
@@ -38,11 +35,11 @@ USE <dbname>;
 
 DROP TABLE IF EXISTS branches;
 CREATE TABLE branches (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  id mediumint(9) NOT NULL auto_increment,
   branch varchar(64) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (id),
   UNIQUE branch (branch)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS checkins;
 CREATE TABLE checkins (
@@ -65,48 +62,48 @@ CREATE TABLE checkins (
   KEY dirid (dirid),
   KEY fileid (fileid),
   KEY branchid (branchid)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS descs;
 CREATE TABLE descs (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  id mediumint(9) NOT NULL auto_increment,
   description text,
   hash bigint(20) DEFAULT '0' NOT NULL,
   PRIMARY KEY (id),
   KEY hash (hash)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS dirs;
 CREATE TABLE dirs (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
-  dir varchar(128) binary DEFAULT '' NOT NULL,
+  id mediumint(9) NOT NULL auto_increment,
+  dir varchar(255) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (id),
   UNIQUE dir (dir)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS files;
 CREATE TABLE files (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
-  file varchar(128) binary DEFAULT '' NOT NULL,
+  id mediumint(9) NOT NULL auto_increment,
+  file varchar(255) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (id),
   UNIQUE file (file)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS people;
 CREATE TABLE people (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  id mediumint(9) NOT NULL auto_increment,
   who varchar(32) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (id),
   UNIQUE who (who)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS repositories;
 CREATE TABLE repositories (
-  id mediumint(9) DEFAULT '0' NOT NULL auto_increment,
+  id mediumint(9) NOT NULL auto_increment,
   repository varchar(64) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (id),
   UNIQUE repository (repository)
-);
+) TYPE=MyISAM;
 
 DROP TABLE IF EXISTS tags;
 CREATE TABLE tags (
@@ -120,7 +117,7 @@ CREATE TABLE tags (
   KEY dirid (dirid),
   KEY fileid (fileid),
   KEY branchid (branchid)
-);
+) TYPE=MyISAM;
 """
 
 if __name__ == "__main__":
@@ -128,18 +125,25 @@ if __name__ == "__main__":
     
     user = raw_input("MySQL User: ")
     passwd = raw_input("MySQL Password: ")
-    dbase = raw_input("ViewCVS Database Name [default: ViewCVS]: ")
+    dbase = raw_input("ViewVC Database Name [default: ViewVC]: ")
     if not dbase:
-        dbase = "ViewCVS"
+        dbase = "ViewVC"
 
-    cmd = "{ mysql --user=%s --password=%s ; } 2>&1" % (user, passwd)
     dscript = string.replace(DATABASE_SCRIPT, "<dbname>", dbase)
 
-    pipes = popen2.Popen3(cmd)
-    pipes.tochild.write(dscript)
-    pipes.tochild.close()
-    print pipes.fromchild.read()
-    status = pipes.wait()
+    if sys.platform == "win32":
+      # popen2.Popen3 is not provided on windows
+      cmd = "mysql --user=%s --password=%s" % (user, passwd)
+      mysql = os.popen(cmd, "w")
+      mysql.write(dscript)
+      status = mysql.close()
+    else:
+      cmd = "{ mysql --user=%s --password=%s ; } 2>&1" % (user, passwd)
+      pipes = popen2.Popen3(cmd)
+      pipes.tochild.write(dscript)
+      pipes.tochild.close()
+      print pipes.fromchild.read()
+      status = pipes.wait()
 
     if status:
         print "[ERROR] the database did not create sucessfully."

bin/mod_python/.htaccess

@@ -0,0 +1,3 @@
+AddHandler python-program .py
+PythonHandler handler
+PythonDebug On

bin/mod_python/handler.py

@@ -0,0 +1,31 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# Mod_Python handler based on mod_python.publisher
+#
+# -----------------------------------------------------------------------
+
+from mod_python import apache
+import os.path
+
+def handler(req):
+  path, module_name = os.path.split(req.filename)
+  module_name, module_ext = os.path.splitext(module_name)
+  try:
+    module = apache.import_module(module_name, path=[path])
+  except ImportError:
+    raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
+
+  req.add_common_vars()
+  module.index(req)
+
+  return apache.OK

bin/mod_python/query.py

@@ -0,0 +1,71 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# ViewVC: View CVS/SVN repositories via a web browser
+#
+# -----------------------------------------------------------------------
+#
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) viewvc.py file and runs it.
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+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)
+
+import sapi
+import imp
+
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
+# Import real ViewVC Query modules
+fp, pathname, description = imp.find_module('query', [LIBRARY_DIR])
+try:
+  query = imp.load_module('query', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
+cfg = viewvc.load_config(CONF_PATHNAME)
+
+def index(req):
+  server = sapi.ModPythonServer(req)
+  try:
+    query.main(server, cfg, "viewvc.py")
+  finally:
+    server.close()
+

bin/mod_python/viewvc.py

@@ -0,0 +1,61 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# viewvc: View CVS/SVN repositories via a web browser
+#
+# -----------------------------------------------------------------------
+#
+# This is a teeny stub to launch the main ViewVC app. It checks the load
+# average, then loads the (precompiled) viewvc.py file and runs it.
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+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)
+
+import sapi
+import imp
+
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
+def index(req):
+  server = sapi.ModPythonServer(req)
+  cfg = viewvc.load_config(CONF_PATHNAME, server)
+  try:
+    viewvc.main(server, cfg)
+  finally:
+    server.close()

bin/standalone.py

@@ -1,27 +1,18 @@
 #!/usr/bin/env python
-# $Id$
-# vim:sw=4:ts=4:et:nowrap
-# [Emacs: -*- python -*-]
+# -*-python-*-
 #
-# Copyright (C) 1999-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   This file: Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Germany
-#   ViewCVS project: Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
-# Note: this module is designed to deploy instantly and run under any
-# version of Python from 1.5 and up.  That's why some 2.0 features 
-# (like string methods) are conspicuously avoided.
-
-# XXX Security issues?
+# -----------------------------------------------------------------------
 
 """Run "standalone.py -p <port>" to start an HTTP server on a given port 
-on the local machine to generate ViewCVS web pages.
+on the local machine to generate ViewVC web pages.
 """
 
 __author__ = "Peter Funk <pf@artcom-gmbh.de>"
@@ -34,100 +25,149 @@ Ka-Ping Yee, for the GUI code and the framework stolen from pydoc.py.
 
 # INSTALL-TIME CONFIGURATION
 #
-# This value will be set during the installation process. During
-# development, it will remain None.
+# These values will be set during the installation process. During
+# development, they will remain None.
 #
 
 LIBRARY_DIR = None
+CONF_PATHNAME = None
 
 import sys
 import os
+import os.path
+import stat
 import string
 import urllib
+import rfc822
 import socket
 import select
 import BaseHTTPServer
 
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0], "../../lib")))
+
+import sapi
+import viewvc
+import compat; compat.for_standalone()
+
+
 class Options:
     port = 7467 # default TCP/IP port used for the server
     start_gui = 0 # No GUI unless requested.
-    repository = None # use default repository specified in config
+    repositories = {} # use default repositories specified in config
+    if sys.platform == 'mac':
+        host = '127.0.0.1' 
+    else:
+        host = 'localhost'
+    script_alias = 'viewvc'
 
 # --- web browser interface: ----------------------------------------------
 
-def serve(port, callback=None):
+class StandaloneServer(sapi.CgiServer):
+    def __init__(self, handler):
+        sapi.CgiServer.__init__(self, inheritableOut = sys.platform != "win32")
+        self.handler = handler
+
+    def header(self, content_type='text/html', status=None):
+        if not self.headerSent:
+            self.headerSent = 1
+            if status is None:
+              statusCode = 200
+              statusText = 'OK'           
+            else:              
+              p = string.find(status, ' ')
+              if p < 0:
+                statusCode = int(status)
+                statusText = ''
+              else:
+                statusCode = int(status[:p])
+                statusText = status[p+1:]
+            self.handler.send_response(statusCode, statusText)
+            self.handler.send_header("Content-type", content_type)
+            for (name, value) in self.headers:
+                self.handler.send_header(name, value)
+            self.handler.end_headers()
+            
+
+def serve(host, port, callback=None):
     """start a HTTP server on the given port.  call 'callback' when the
     server is ready to serve"""
 
-    class ViewCVS_Handler(BaseHTTPServer.BaseHTTPRequestHandler):
+    class ViewVC_Handler(BaseHTTPServer.BaseHTTPRequestHandler):
          
         def do_GET(self):
             """Serve a GET request."""
             if not self.path or self.path == "/":
                 self.redirect()
-            elif self.is_viewcvs():
-                self.run_viewcvs()
-            elif self.path[:7] == "/icons/":
-                # XXX icon type should not be hardcoded to GIF:
-                self.send_response(200)
-                self.send_header("Content-type", "image/gif") 
-                self.end_headers()
-                apache_icons.serve_icon(self.path, self.wfile)
+            elif self.is_viewvc():
+                try:
+                    self.run_viewvc()
+                except IOError:
+                    # ignore IOError: [Errno 32] Broken pipe
+                    pass
             else:
                 self.send_error(404)
 
         def do_POST(self):
             """Serve a POST request."""
-            if self.is_viewcvs():
-                self.run_viewcvs()
+            if self.is_viewvc():
+                self.run_viewvc()
             else:
-                self.send_error(501, "Can only POST to viewcvs")
+                self.send_error(501, "Can only POST to %s"
+                                % (options.script_alias))
 
-        def is_viewcvs(self):
-            """Check whether self.path matches the hardcoded ScriptAlias
-            /viewcvs"""
-            if self.path[:8] == "/viewcvs":
+        def is_viewvc(self):
+            """Check whether self.path is, or is a child of, the ScriptAlias"""
+            if self.path == '/' + options.script_alias:
+                return 1
+            if self.path[:len(options.script_alias)+2] == \
+                   '/' + options.script_alias + '/':
+                return 1
+            if self.path[:len(options.script_alias)+2] == \
+                   '/' + options.script_alias + '?':
                 return 1
             return 0
 
         def redirect(self):
-            """redirect the browser to the viewcvs URL"""
-            self.send_response(301, "moved (redirection follows)")
+            """redirect the browser to the viewvc URL"""
+            new_url = self.server.url + options.script_alias + '/'
+            self.send_response(301, "Moved (redirection follows)")
             self.send_header("Content-type", "text/html")
-            self.send_header("Location", self.server.url + 'viewcvs/')
+            self.send_header("Location", new_url)
             self.end_headers()
             self.wfile.write("""<html>
 <head>
 <meta http-equiv="refresh" content="1; URL=%s">
 </head>
 <body>
-<h1>Redirection to <a href="%s">ViewCVS</a></h1>
-Wait a second.   You will be automatically redirected to <b>ViewCVS</b>.
+<h1>Redirection to <a href="%s">ViewVC</a></h1>
+Wait a second.   You will be automatically redirected to <b>ViewVC</b>.
 If this doesn't work, please click on the link above.
 </body>
 </html>
-""" % tuple([self.server.url + "viewcvs/"]*2))
+""" % tuple([new_url]*2))
 
-        def run_viewcvs(self):
-            """This is a quick and dirty cut'n'rape from Pythons 
+        def run_viewvc(self):
+            """This is a quick and dirty cut'n'rape from Python's 
             standard library module CGIHTTPServer."""
-            assert self.path[:8] == "/viewcvs"
-            viewcvs_url, rest = self.server.url[:-1]+"/viewcvs", self.path[8:]
+            scriptname = '/' + options.script_alias
+            assert string.find(self.path, scriptname) == 0
+            viewvc_url = self.server.url[:-1] + scriptname
+            rest = self.path[len(scriptname):]
             i = string.rfind(rest, '?')
             if i >= 0:
                 rest, query = rest[:i], rest[i+1:]
             else:
                 query = ''
-            i = string.find(rest, '/')
-            if i >= 0:
-                script, rest = rest[:i], rest[i:]
-            else:
-                script, rest = rest, ''
-            scriptname = viewcvs_url + script
             # sys.stderr.write("Debug: '"+scriptname+"' '"+rest+"' '"+query+"'\n")
             env = os.environ
             # Since we're going to modify the env in the parent, provide empty
             # values to override previously set values
+            for k in env.keys():
+                if k[:5] == 'HTTP_':
+                    del env[k]
             for k in ('QUERY_STRING', 'REMOTE_HOST', 'CONTENT_LENGTH',
                       'HTTP_USER_AGENT', 'HTTP_COOKIE'):
                 if env.has_key(k): 
@@ -144,6 +184,7 @@ If this doesn't work, please click on the link above.
             env['SCRIPT_NAME'] = scriptname
             if query:
                 env['QUERY_STRING'] = query
+            env['HTTP_HOST'] = self.server.address[0]
             host = self.address_string()
             if host != self.client_address[0]:
                 env['REMOTE_HOST'] = host
@@ -168,48 +209,49 @@ If this doesn't work, please click on the link above.
             ua = self.headers.getheader('user-agent')
             if ua:
                 env['HTTP_USER_AGENT'] = ua
+            modified = self.headers.getheader('if-modified-since')
+            if modified:
+                env['HTTP_IF_MODIFIED_SINCE'] = modified
+            etag = self.headers.getheader('if-none-match')
+            if etag:
+                env['HTTP_IF_NONE_MATCH'] = etag
             # XXX Other HTTP_* headers
             decoded_query = string.replace(query, '+', ' ')
 
-            self.send_response(200)
-            # FIXME: I'm not sure about this:  Sometimes it hurts, sometimes 
-            #        it is required.  Please enlight me
-            if 1:
-                self.send_header("Content-type", "text/html")
-                self.end_headers()
-
             # Preserve state, because we execute script in current process:
             save_argv = sys.argv
             save_stdin = sys.stdin
             save_stdout = sys.stdout
             save_stderr = sys.stderr
             # For external tools like enscript we also need to redirect
-            # the real stdout file descriptor:
-            save_realstdout = os.dup(1) 
+            # the real stdout file descriptor. (On windows, reassigning the
+            # sys.stdout variable is sufficient because pipe_cmds makes it
+            # the standard output for child processes.)
+            if sys.platform != "win32": save_realstdout = os.dup(1) 
             try:
                 try:
                     sys.stdout = self.wfile
-                    os.close(1) 
-                    assert os.dup(self.wfile.fileno()) == 1
+                    if sys.platform != "win32":
+                      os.dup2(self.wfile.fileno(), 1)
                     sys.stdin = self.rfile
-                    viewcvs.run_cgi()
+                    viewvc.main(StandaloneServer(self), cfg)
                 finally:
                     sys.argv = save_argv
                     sys.stdin = save_stdin
                     sys.stdout.flush()
-                    os.close(1)
-                    assert os.dup(save_realstdout) == 1
+                    if sys.platform != "win32":
+                      os.dup2(save_realstdout, 1)
+                      os.close(save_realstdout)
                     sys.stdout = save_stdout
                     sys.stderr = save_stderr
             except SystemExit, status:
-                self.log_error("ViewCVS exit status %s", str(status))
+                self.log_error("ViewVC exit status %s", str(status))
             else:
-                self.log_error("ViewCVS exited ok")
+                self.log_error("ViewVC exited ok")
 
-    class ViewCVS_Server(BaseHTTPServer.HTTPServer):
-        def __init__(self, port, callback):
-            host = (sys.platform == 'mac') and '127.0.0.1' or 'localhost'
-            self.address = ('', port)
+    class ViewVC_Server(BaseHTTPServer.HTTPServer):
+        def __init__(self, host, port, callback):
+            self.address = (host, port)
             self.url = 'http://%s:%d/' % (host, port)
             self.callback = callback
             BaseHTTPServer.HTTPServer.__init__(self, self.address,
@@ -235,41 +277,80 @@ If this doesn't work, please click on the link above.
                                        socket.SO_REUSEADDR, 1)
             BaseHTTPServer.HTTPServer.server_bind(self)
 
-    ViewCVS_Server.handler = ViewCVS_Handler
+    ViewVC_Server.handler = ViewVC_Handler
 
     try:
         # XXX Move this code out of this function.
         # Early loading of configuration here.  Used to
         # allow tinkering with some configuration settings:
-        viewcvs.handle_config()
-        if options.repository:
-            if viewcvs.cfg.general.cvs_roots.has_key("Development"):
-                viewcvs.cfg.general.cvs_roots["Development"] = options.repository
-            else:
-                sys.stderr.write("*** No default ViewCVS configuration. Edit viewcvs.conf\n")
-                raise KeyboardInterrupt # Hack!
-        elif viewcvs.cfg.general.cvs_roots.has_key("Development") and \
-             not os.path.isdir(viewcvs.cfg.general.cvs_roots["Development"]):
+        handle_config()
+        if options.repositories:
+            cfg.general.default_root = "Development"
+            cfg.general.cvs_roots.update(options.repositories)
+        elif cfg.general.cvs_roots.has_key("Development") and \
+             not os.path.isdir(cfg.general.cvs_roots["Development"]):
             sys.stderr.write("*** No repository found. Please use the -r option.\n")
             sys.stderr.write("   Use --help for more info.\n")
             raise KeyboardInterrupt # Hack!
         os.close(0) # To avoid problems with shell job control
-        ViewCVS_Server(port, callback).serve_until_quit()
+
+        # always use default docroot location
+        cfg.options.docroot = None
+
+        # if cvsnt isn't found, fall back to rcs
+        if (cfg.conf_path is None
+            and cfg.general.cvsnt_exe_path):
+          import popen
+          cvsnt_works = 0
+          try:
+            fp = popen.popen(cfg.general.cvsnt_exe_path, ['--version'], 'rt')
+            try:
+              while 1:
+                line = fp.readline()
+                if not line: break
+                if string.find(line, "Concurrent Versions System (CVSNT)")>=0:
+                  cvsnt_works = 1
+                  while fp.read(4096):
+                    pass
+                  break
+            finally:
+              fp.close()
+          except:
+            pass
+          if not cvsnt_works:
+            cfg.cvsnt_exe_path = None
+
+        ViewVC_Server(host, port, callback).serve_until_quit()
     except (KeyboardInterrupt, select.error):
         pass
     print 'server stopped'
 
+def handle_config():
+  global cfg
+  cfg = viewvc.load_config(CONF_PATHNAME)
+
 # --- graphical interface: --------------------------------------------------
 
-def gui(port):
+def nogui(missing_module):
+    sys.stderr.write(
+        "Sorry! Your Python was compiled without the %s module"%missing_module+
+        " enabled.\nI'm unable to run the GUI part.  Please omit the '-g'\n"+
+        "and '--gui' options or install another Python interpreter.\n")
+    raise SystemExit, 1
+
+def gui(host, port):
     """Graphical interface (starts web server and pops up a control window)."""
     class GUI:
-        def __init__(self, window, port):
+        def __init__(self, window, host, port):
             self.window = window
             self.server = None
             self.scanner = None
 
-            import Tkinter
+            try:
+                import Tkinter
+            except ImportError:
+                nogui("Tkinter")
+
             self.server_frm = Tkinter.Frame(window)
             self.title_lbl = Tkinter.Label(self.server_frm,
                 text='Starting server...\n ')
@@ -279,7 +360,7 @@ def gui(port):
                 text='quit serving', command=self.quit, state='disabled')
 
 
-            self.window.title('ViewCVS standalone')
+            self.window.title('ViewVC standalone')
             self.window.protocol('WM_DELETE_WINDOW', self.quit)
             self.title_lbl.pack(side='top', fill='x')
             self.open_btn.pack(side='left', fill='x', expand=1)
@@ -287,15 +368,15 @@ def gui(port):
 
             # Early loading of configuration here.  Used to
             # allow tinkering with configuration settings through the gui:
-            viewcvs.handle_config()
+            handle_config()
             if not LIBRARY_DIR:
-                viewcvs.cfg.options.cvsgraph_conf = "../cgi/cvsgraph.conf.dist"
+                cfg.options.cvsgraph_conf = "../cgi/cvsgraph.conf.dist"
 
             self.options_frm = Tkinter.Frame(window)
 
             # cvsgraph toggle:
             self.cvsgraph_ivar = Tkinter.IntVar()
-            self.cvsgraph_ivar.set(viewcvs.cfg.options.use_cvsgraph)
+            self.cvsgraph_ivar.set(cfg.options.use_cvsgraph)
             self.cvsgraph_toggle = Tkinter.Checkbutton(self.options_frm,
                 text="enable cvsgraph (needs binary)", var=self.cvsgraph_ivar,
                 command=self.toggle_use_cvsgraph)
@@ -303,7 +384,7 @@ def gui(port):
 
             # enscript toggle:
             self.enscript_ivar = Tkinter.IntVar()
-            self.enscript_ivar.set(viewcvs.cfg.options.use_enscript)
+            self.enscript_ivar.set(cfg.options.use_enscript)
             self.enscript_toggle = Tkinter.Checkbutton(self.options_frm,
                 text="enable enscript (needs binary)", var=self.enscript_ivar,
                 command=self.toggle_use_enscript)
@@ -311,7 +392,7 @@ def gui(port):
 
             # show_subdir_lastmod toggle:
             self.subdirmod_ivar = Tkinter.IntVar()
-            self.subdirmod_ivar.set(viewcvs.cfg.options.show_subdir_lastmod)
+            self.subdirmod_ivar.set(cfg.options.show_subdir_lastmod)
             self.subdirmod_toggle = Tkinter.Checkbutton(self.options_frm,
                 text="show subdir last mod (dir view)", var=self.subdirmod_ivar,
                 command=self.toggle_subdirmod)
@@ -319,18 +400,38 @@ def gui(port):
 
             # use_re_search toggle:
             self.useresearch_ivar = Tkinter.IntVar()
-            self.useresearch_ivar.set(viewcvs.cfg.options.use_re_search)
+            self.useresearch_ivar.set(cfg.options.use_re_search)
             self.useresearch_toggle = Tkinter.Checkbutton(self.options_frm,
                 text="allow regular expr search", var=self.useresearch_ivar,
                 command=self.toggle_useresearch)
             self.useresearch_toggle.pack(side='top', anchor='w')
 
+            # use_localtime toggle:
+            self.use_localtime_ivar = Tkinter.IntVar()
+            self.use_localtime_ivar.set(cfg.options.use_localtime)
+            self.use_localtime_toggle = Tkinter.Checkbutton(self.options_frm,
+                text="use localtime (instead of UTC)", 
+                var=self.use_localtime_ivar,
+                command=self.toggle_use_localtime)
+            self.use_localtime_toggle.pack(side='top', anchor='w')
+
+            # use_pagesize integer var:
+            self.usepagesize_lbl = Tkinter.Label(self.options_frm,
+                text='Paging (number of items per page, 0 disables):')
+            self.usepagesize_lbl.pack(side='top', anchor='w')
+            self.use_pagesize_ivar = Tkinter.IntVar()
+            self.use_pagesize_ivar.set(cfg.options.use_pagesize)
+            self.use_pagesize_entry = Tkinter.Entry(self.options_frm,
+                width=10, textvariable=self.use_pagesize_ivar)
+            self.use_pagesize_entry.bind('<Return>', self.set_use_pagesize)
+            self.use_pagesize_entry.pack(side='top', anchor='w')
+
             # directory view template:
             self.dirtemplate_lbl = Tkinter.Label(self.options_frm,
                 text='Chooose HTML Template for the Directory pages:')
             self.dirtemplate_lbl.pack(side='top', anchor='w')
             self.dirtemplate_svar = Tkinter.StringVar()
-            self.dirtemplate_svar.set(viewcvs.cfg.templates.directory)
+            self.dirtemplate_svar.set(cfg.templates.directory)
             self.dirtemplate_entry = Tkinter.Entry(self.options_frm,
                 width = 40, textvariable=self.dirtemplate_svar)
             self.dirtemplate_entry.bind('<Return>', self.set_templates_directory)
@@ -349,7 +450,7 @@ def gui(port):
                 text='Chooose HTML Template for the Log pages:')
             self.logtemplate_lbl.pack(side='top', anchor='w')
             self.logtemplate_svar = Tkinter.StringVar()
-            self.logtemplate_svar.set(viewcvs.cfg.templates.log)
+            self.logtemplate_svar.set(cfg.templates.log)
             self.logtemplate_entry = Tkinter.Entry(self.options_frm,
                 width = 40, textvariable=self.logtemplate_svar)
             self.logtemplate_entry.bind('<Return>', self.set_templates_log)
@@ -368,7 +469,7 @@ def gui(port):
                 text='Template for the database query page:')
             self.querytemplate_lbl.pack(side='top', anchor='w')
             self.querytemplate_svar = Tkinter.StringVar()
-            self.querytemplate_svar.set(viewcvs.cfg.templates.query)
+            self.querytemplate_svar.set(cfg.templates.query)
             self.querytemplate_entry = Tkinter.Entry(self.options_frm,
                 width = 40, textvariable=self.querytemplate_svar)
             self.querytemplate_entry.bind('<Return>', self.set_templates_query)
@@ -389,35 +490,45 @@ def gui(port):
             self.window.wm_geometry('%dx%d' % (self.minwidth, self.minheight))
             self.window.wm_minsize(self.minwidth, self.minheight)
 
-            import threading
-            threading.Thread(target=serve, args=(port, self.ready)).start()
+            try:
+                import threading
+            except ImportError:
+                nogui("thread")
+            threading.Thread(target=serve, 
+                             args=(host, port, self.ready)).start()
 
         def toggle_use_cvsgraph(self, event=None):
-            viewcvs.cfg.options.use_cvsgraph = self.cvsgraph_ivar.get()
+            cfg.options.use_cvsgraph = self.cvsgraph_ivar.get()
 
         def toggle_use_enscript(self, event=None):
-            viewcvs.cfg.options.use_enscript = self.enscript_ivar.get()
+            cfg.options.use_enscript = self.enscript_ivar.get()
+
+        def toggle_use_localtime(self, event=None):
+            cfg.options.use_localtime = self.use_localtime_ivar.get()
 
         def toggle_subdirmod(self, event=None):
-            viewcvs.cfg.options.show_subdir_lastmod = self.subdirmod_ivar.get()
+            cfg.options.show_subdir_lastmod = self.subdirmod_ivar.get()
 
         def toggle_useresearch(self, event=None):
-            viewcvs.cfg.options.use_re_search = self.useresearch_ivar.get()
+            cfg.options.use_re_search = self.useresearch_ivar.get()
+
+        def set_use_pagesize(self, event=None):
+            cfg.options.use_pagesize = self.use_pagesize_ivar.get()
 
         def set_templates_log(self, event=None):
-            viewcvs.cfg.templates.log = self.logtemplate_svar.get()
+            cfg.templates.log = self.logtemplate_svar.get()
 
         def set_templates_directory(self, event=None):
-            viewcvs.cfg.templates.directory = self.dirtemplate_svar.get()
+            cfg.templates.directory = self.dirtemplate_svar.get()
 
         def set_templates_query(self, event=None):
-            viewcvs.cfg.templates.query = self.querytemplate_svar.get()
+            cfg.templates.query = self.querytemplate_svar.get()
 
         def ready(self, server):
             """used as callback parameter to the serve() function"""
             self.server = server
             self.title_lbl.config(
-                text='ViewCVS standalone server at\n' + server.url)
+                text='ViewVC standalone server at\n' + server.url)
             self.open_btn.config(state='normal')
             self.quit_btn.config(state='normal')
 
@@ -446,7 +557,7 @@ def gui(port):
 
     import Tkinter
     try:
-        gui = GUI(Tkinter.Tk(), port)
+        gui = GUI(Tkinter.Tk(), host, port)
         Tkinter.mainloop()
     except KeyboardInterrupt:
         pass
@@ -459,56 +570,74 @@ def cli(argv):
     class BadUsage(Exception): pass
 
     try:
-        opts, args = getopt.getopt(argv[1:], 'gp:r:', 
-            ['gui', 'port=', 'repository='])
+        opts, args = getopt.getopt(argv[1:], 'gp:r:h:s:', 
+            ['gui', 'port=', 'repository=', 'script-alias='])
         for opt, val in opts:
             if opt in ('-g', '--gui'):
                 options.start_gui = 1
             elif opt in ('-r', '--repository'):
-                options.repository = val
+                if options.repositories: # option may be used more than once:
+                    num = len(options.repositories.keys())+1
+                    symbolic_name = "Repository"+str(num)
+                    options.repositories[symbolic_name] = val
+                else:
+                    options.repositories["Development"] = val
             elif opt in ('-p', '--port'):
                 try:
                     options.port = int(val)
                 except ValueError:
                     raise BadUsage
+            elif opt in ('-h', '--host'):
+                options.host = val
+            elif opt in ('-s', '--script-alias'):
+                options.script_alias = \
+                    string.join(filter(None, string.split(val, '/')), '/')
         if options.start_gui:
-            gui(options.port)
+            gui(options.host, options.port)
             return
         elif options.port:
             def ready(server):
-                print 'server ready at %s' % server.url
-            serve(options.port, ready)
+                print 'server ready at %s%s' % (server.url,
+                                                options.script_alias)
+            serve(options.host, options.port, ready)
             return
         raise BadUsage
     except (getopt.error, BadUsage):
-        cmd = sys.argv[0]
+        cmd = os.path.basename(sys.argv[0])
         port = options.port
-        print """ViewCVS standalone - a simple standalone HTTP-Server
+        host = options.host
+        script_alias = options.script_alias
+        print """ViewVC standalone - a simple standalone HTTP-Server
 
-Usage: %(cmd)s [ <options> ]
+Usage: %(cmd)s [OPTIONS]
 
 Available Options:
--p <port> or --port=<port>
-    Start an HTTP server on the given port on the local machine.
-    Default port is %(port)d.
 
--r <path> or --repository=<path>
-    Specify another path for the default CVS repository "Development".
-    If you don't have your repository at /home/cvsroot you will need to
-    use this option or you have to install first and edit viewcvs.conf.
+-h <host>, --host=<host>:
+    Start the HTTP server listening on <host>.  You need to provide
+    the hostname if you want to access the standalone server from a
+    remote machine.  [default: %(host)s]
 
--g or --gui
-    Pop up a graphical interface for serving and testing ViewCVS.
+-p <port>, --port=<port>:
+    Start an HTTP server on the given port.  [default: %(port)d]
 
+-r <path>, --repository=<path>:
+    Specify a path for a CVS repository.  Repository definitions are
+    typically read from the viewvc.conf file, if available.  This
+    option may be used more than once.
+
+-s <path>, --script-alias=<path>:
+    Specify the ScriptAlias, the artificial path location that at
+    which ViewVC appears to be located.  For example, if your
+    ScriptAlias is "cgi-bin/viewvc", then ViewVC will appear to be
+    accessible at the URL "http://%(host)s:%(port)s/cgi-bin/viewvc".
+    [default: %(script_alias)s]
+    
+-g, --gui:
+    Pop up a graphical interface for serving and testing ViewVC.
+    NOTE: this requires a valid X11 display connection.
 """ % locals()
 
-if __name__ == '__main__': 
-    if LIBRARY_DIR:
-        sys.path.insert(0, LIBRARY_DIR)
-    else:
-        sys.path[:0] = ['lib']
-        os.chdir('lib')
-    import viewcvs
-    import apache_icons
+if __name__ == '__main__':
     options = Options()
     cli(sys.argv)

bin/svndbadmin

@@ -0,0 +1,311 @@
+#!/usr/bin/env python
+# -*-python-*-
+#
+# Copyright (C) 2004 James Henstridge
+#
+# 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# administrative program for loading Subversion revision information
+# into the checkin database.  It can be used to add a single revision
+# to the database, or rebuild/update all revisions.
+#
+# To add all the checkins from a Subversion repository to the checkin
+# database, run the following:
+#    /path/to/svndbadmin rebuild /path/to/repo
+#
+# This script can also be called from the Subversion post-commit hook,
+# something like this:
+#    REPOS="$1"
+#    REV="$2"
+#    /path/to/svndbadmin update "$REPOS" "$REV"
+#
+# If you allow changes to revision properties in your repository, you
+# might also want to set up something similar in the
+# post-revprop-change hook using "rebuild" instead of "update" to keep
+# the checkin database consistent with the repository.
+#
+# -----------------------------------------------------------------------
+#
+
+#########################################################################
+#
+# INSTALL-TIME CONFIGURATION
+#
+# These values will be set during the installation process. During
+# development, they will remain None.
+#
+
+LIBRARY_DIR = None
+CONF_PATHNAME = None
+
+# Adjust sys.path to include our library directory
+import sys
+import os
+
+if LIBRARY_DIR:
+  sys.path.insert(0, LIBRARY_DIR)
+else:
+  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0], "../../lib")))
+
+#########################################################################
+
+import os
+import string
+import re
+
+import svn.core
+import svn.repos
+import svn.fs
+import svn.delta
+
+import cvsdb
+import viewvc
+
+class SvnRepo:
+    """Class used to manage a connection to a SVN repository."""
+    def __init__(self, path, pool):
+        self.scratch_pool = svn.core.svn_pool_create(pool)
+        self.path = path
+        self.repo = svn.repos.svn_repos_open(path, pool)
+        self.fs = svn.repos.svn_repos_fs(self.repo)
+        # youngest revision of base of file system is highest revision number
+        self.rev_max = svn.fs.youngest_rev(self.fs, pool)
+    def __getitem__(self, rev):
+        if rev is None:
+            rev = self.rev_max
+        elif rev < 0:
+            rev = rev + self.rev_max + 1
+        assert 0 <= rev <= self.rev_max
+        rev = SvnRev(self, rev, self.scratch_pool)
+        svn.core.svn_pool_clear(self.scratch_pool)
+        return rev
+
+_re_diff_change_command = re.compile('(\d+)(?:,(\d+))?([acd])(\d+)(?:,(\d+))?')
+
+def _get_diff_counts(diff_fp):
+    """Calculate the plus/minus counts by parsing the output of a
+    normal diff.  The reasons for choosing Normal diff format are:
+      - the output is short, so should be quicker to parse.
+      - only the change commands need be parsed to calculate the counts.
+      - All file data is prefixed, so won't be mistaken for a change
+        command.
+    This code is based on the description of the format found in the
+    GNU diff manual."""
+
+    plus, minus = 0, 0
+    line = diff_fp.readline()
+    while line:
+        match = re.match(_re_diff_change_command, line)
+        if match:
+            # size of first range
+            if match.group(2):
+                count1 = int(match.group(2)) - int(match.group(1)) + 1
+            else:
+                count1 = 1
+            cmd = match.group(3)
+            # size of second range
+            if match.group(5):
+                count2 = int(match.group(5)) - int(match.group(4)) + 1
+            else:
+                count2 = 1
+
+            if cmd == 'a':
+                # LaR - insert after line L of file1 range R of file2
+                plus = plus + count2
+            elif cmd == 'c':
+                # FcT - replace range F of file1 with range T of file2
+                minus = minus + count1
+                plus = plus + count2
+            elif cmd == 'd':
+                # RdL - remove range R of file1, which would have been
+                #       at line L of file2
+                minus = minus + count1
+        line = diff_fp.readline()
+    return plus, minus
+
+
+class SvnRev:
+    """Class used to hold information about a particular revision of
+    the repository."""
+    def __init__(self, repo, rev, pool):
+        self.repo = repo
+        self.rev = rev
+        self.pool = pool
+        self.rev_roots = {} # cache of revision roots
+
+        subpool = svn.core.svn_pool_create(pool)
+
+        # revision properties ...
+        properties = svn.fs.revision_proplist(repo.fs, rev, pool)
+        self.author = str(properties.get(svn.core.SVN_PROP_REVISION_AUTHOR,''))
+        self.date = str(properties.get(svn.core.SVN_PROP_REVISION_DATE, ''))
+        self.log = str(properties.get(svn.core.SVN_PROP_REVISION_LOG, ''))
+
+        # convert the date string to seconds since epoch ...
+        self.date = svn.core.secs_from_timestr(self.date, pool)
+
+        # get a root for the current revisions
+        fsroot = self._get_root_for_rev(rev)
+        
+        # find changes in the revision
+        editor = svn.repos.RevisionChangeCollector(repo.fs, rev, pool)
+        e_ptr, e_baton = svn.delta.make_editor(editor, pool)
+        svn.repos.svn_repos_replay(fsroot, e_ptr, e_baton, pool)
+
+        self.changes = []
+        for path, change in editor.changes.items():
+
+            # clear the iteration subpool
+            svn.core.svn_pool_clear(subpool)
+
+            # skip non-file changes
+            if change.item_kind != svn.core.svn_node_file: continue
+
+            # deal with the change types we handle
+            base_root = None
+            if change.base_path:
+                base_root = self._get_root_for_rev(change.base_rev)
+                
+            if not change.path:
+                action = 'remove'
+            elif change.added:
+                action = 'add'
+            else:
+                action = 'change'
+
+            diffobj = svn.fs.FileDiff(base_root and base_root or None,
+                                      base_root and change.base_path or None,
+                                      change.path and fsroot or None,
+                                      change.path and change.path or None,
+                                      subpool, [])
+            diff_fp = diffobj.get_pipe()
+            plus, minus = _get_diff_counts(diff_fp)
+            self.changes.append((path, action, plus, minus))
+
+    def _get_root_for_rev(self, rev):
+        """Fetch a revision root from a cache of such, or a fresh root
+        (which is then cached for later use."""
+        if not self.rev_roots.has_key(rev):
+            self.rev_roots[rev] = svn.fs.revision_root(self.repo.fs, rev,
+                                                       self.pool)
+        return self.rev_roots[rev]
+
+
+def handle_revision(db, command, repo, rev, verbose):
+    """Adds a particular revision of the repository to the checkin database."""
+    revision = repo[rev]
+    committed = 0
+
+    if verbose: print "Building commit info for revision %d..." % (rev),
+
+    if not revision.changes:
+        if verbose: print "skipped (no changes)."
+        return
+
+    for (path, action, plus, minus) in revision.changes:
+        directory, file = os.path.split(path)
+        commit = cvsdb.CreateCommit()
+        commit.SetRepository(repo.path)
+        commit.SetDirectory(directory)
+        commit.SetFile(file)
+        commit.SetRevision(str(rev))
+        commit.SetAuthor(revision.author)
+        commit.SetDescription(revision.log)
+        commit.SetTime(revision.date)
+        commit.SetPlusCount(plus)
+        commit.SetMinusCount(minus)
+        commit.SetBranch(None)
+
+        if action == 'add':
+            commit.SetTypeAdd()
+        elif action == 'remove':
+            commit.SetTypeRemove()
+        elif action == 'change':
+            commit.SetTypeChange()
+
+        if command == 'update':
+            result = db.CheckCommit(commit)
+            if result:
+                continue # already recorded
+
+        # commit to database
+        db.AddCommit(commit)
+        committed = 1
+
+    if verbose:
+        if committed:
+            print "done."
+        else:
+            print "skipped (already recorded)."
+
+def main(pool, command, repository, rev=None, verbose=0):
+    cfg = viewvc.load_config(CONF_PATHNAME)
+    db = cvsdb.ConnectDatabase(cfg)
+
+    repo = SvnRepo(repository, pool)
+    if rev:
+        handle_revision(db, command, repo, rev, verbose)
+    else:
+        for rev in range(repo.rev_max+1):
+            handle_revision(db, command, repo, rev, verbose)
+
+def usage():
+    cmd = os.path.basename(sys.argv[0])
+    sys.stderr.write("""
+Usage: 1. %s [-v] rebuild REPOSITORY [REVISION]
+       2. %s [-v] update REPOSITORY [REVISION]
+
+1.  Rebuild the commit database information for REPOSITORY across all revisions
+    or, optionally, only for the specified REVISION.
+
+2.  Update the commit database information for REPOSITORY across all revisions
+    or, optionally, only for the specified REVISION.  This is just like
+    rebuilding, except that no commit information will be stored for
+    commits already present in the database.
+
+Use the -v flag to cause this script to give progress information as it works.
+""" % (cmd, cmd))
+    sys.exit(1)
+
+if __name__ == '__main__':
+    verbose = 0
+    
+    args = sys.argv
+    try:
+        index = args.index('-v')
+        verbose = 1
+        del args[index]
+    except ValueError:
+        pass
+        
+    if len(args) < 3:
+        usage()
+
+    command = string.lower(args[1])
+    if command not in ('rebuild', 'update'):
+        sys.stderr.write('ERROR: unknown command %s\n' % command)
+        usage()
+
+    repository = args[2]
+    if not os.path.exists(repository):
+        sys.stderr.write('ERROR: could not find repository %s\n' % repository)
+        usage()
+
+    if len(sys.argv) > 3:
+        rev = sys.argv[3]
+        try:
+            rev = int(rev)
+        except ValueError:
+            sys.stderr.write('ERROR: revision "%s" is not numeric\n' % rev)
+            usage()
+    else:
+        rev = None
+
+    repository = cvsdb.CleanRepository(os.path.abspath(repository))
+    svn.core.run_app(main, command, repository, rev, verbose)

cgi/cvsgraph.conf.dist

@@ -1,192 +0,0 @@
-# CvsGraph configuration
-#
-# - Empty lines and whitespace are ignored.
-#
-# - Comments start with '#' and everything until
-#   end of line is ignored.
-#
-# - Strings are C-style strings in which characters
-#   may be escaped with '\' and written in octal
-#   and hex escapes. Note that '\' must be escaped
-#   if it is to be entered as a character.
-#
-# - Some strings are expanded with printf like
-#   conversions which start with '%'. Not all
-#   are applicable at all times, in which case they
-#   will expand to noting.
-#	%c = cvsroot (with trailing '/')
-#	%C = cvsroot (*without* trailing '/')
-#	%m = module (with trailing '/')
-#	%M = module (*without* trailing '/')
-#	%f = filename without path
-#	%F = filename without path and with ",v" stripped
-#	%p = path part of filename (with trailing '/')
-#	%r = number of revisions
-#	%b = number of branches
-#	%% = '%'
-#	%R = the revision number (e.g. '1.2.4.4')
-#	%P = previous revision number
-#	%B = the branch number (e.g. '1.2.4')
-#	%d = date of revision
-#	%a = author of revision
-#	%s = state of revision
-#	%t = current tag of branch or revision
-#	%0..%9 = command-line argument -0 .. -9
-#   ViewCVS currently uses the following two command-line arguments to
-#   pass URL information to cvsgraph:
-#       -6 request.amp_query (the query preceeded with '&')
-#       -7 request.qmark_query (the query preceed with '?')
-#
-# - Numbers may be entered as octal, decimal or
-#   hex as in 0117, 79 and 0x4f respectively.
-#
-# - Fonts are numbered 0..4 (defined as in libgd)
-#	0 = tiny
-#	1 = small
-#	2 = medium (bold)
-#	3 = large
-#	4 = giant
-#
-# - Colors are a string like html-type colors in
-#   the form "#rrggbb" with parts written in hex
-#	rr = red (00..ff)
-#	gg = green (00-ff)
-#	bb = blue (00-ff)
-#
-# - There are several reserved words besides of the
-#   feature-keywords. These additional reserved words
-#   expand to numerical values:
-#	* false	 = 0
-#	* true	 = 1
-#	* left	 = 0
-#	* center = 1
-#	* right	 = 2
-#	* gif	 = 0
-#	* png	 = 1
-#	* jpeg	 = 2
-#	* tiny	 = 0
-#	* small	 = 1
-#	* medium = 2
-#	* large	 = 3
-#	* giant	 = 4
-
-# cvsroot <string>
-#	The *absolute* base directory where the
-#	CSV/RCS repository can be found
-# cvsmodule <string>
-#
-cvsroot		= "--unused--"; # unused with ViewCVS, will be overridden
-cvsmodule	= "";  # unused with ViewCVS -- please leave it blank
-
-# color_bg <color>
-#	The background color of the image
-color_bg	= "#ffffff";
-
-# date_format <string>
-#	The strftime(3) format string for date and time
-date_format	= "%d-%b-%Y %H:%M:%S";
-
-box_shadow	= true;
-
-tag_font	= medium;
-tag_color	= "#007000";
-
-rev_font	= giant;
-rev_color	= "#000000";
-rev_bgcolor	= "#f0f0f0";
-rev_separator	= 1;
-rev_minline	= 15;
-rev_maxline	= 30;
-rev_lspace	= 5;
-rev_rspace	= 5;
-rev_tspace	= 3;
-rev_bspace	= 3;
-rev_text	= "%d";	# or "%d\n%a, %s" for author and state too
-rev_text_font	= tiny;
-rev_text_color	= "#500020";
-
-# branch_font <number>
-#	The font of the number and tags
-# branch_color <color>
-#	All branch element's color
-# branch_[lrtb]space <number>
-#	Interior spacing (margin)
-# branch_margin <number>
-#	Exterior spacing
-# branch_connect <number>
-#	Length of the vertical connector
-branch_font	= medium;
-branch_color	= "#0000c0";
-branch_bgcolor	= "#ffffc0";
-branch_lspace	= 5;
-branch_rspace	= 5;
-branch_tspace	= 3;
-branch_bspace	= 3;
-branch_margin	= 15;
-branch_connect	= 8;
-
-# title <string>
-#	The title string is expanded (see above for details)
-# title_[xy] <number>
-#	Postion of title
-# title_font <number>
-#	The font
-# title_align <number>
-#	0 = left
-#	1 = center
-#	2 = right
-# title_color <color>
-title		= "%C: %p%F\nRevisions: %r, Branches: %b";
-title_x		= 10;
-title_y		= 5;
-title_font	= small;
-title_align	= left;
-title_color	= "#800000";
-
-# Margins of the image
-# Note: the title is outside the margin
-margin_top	= 35;
-margin_bottom	= 10;
-margin_left	= 10;
-margin_right	= 10;
-
-# Image format(s)
-# image_type <number|{gif,jpeg,png}>
-#	gif  (0) = Create gif image
-#	png  (1) = Create png image
-#	jpeg (2) = Create jpeg image
-#	Image types are available if they can be found in
-#	the gd library. Newer versions of gd do not have
-#	gif anymore. CvsGraph will automatically generate
-#	png images instead.
-# image_quality <number>
-#	The quality of a jpeg image (1..100)
-image_type	= png;
-image_quality	= 75;
-
-# HTML ImageMap generation
-# map_name <string>
-#	The name= attribute in <map name="mapname">...</map>
-# map_branch_href <string>
-# map_branch_alt <string>
-# map_rev_href <string>
-# map_rev_alt <string>
-# map_diff_href <string>
-# map_diff_alt <string>
-#	These are the href= and alt= attributes in the <area>
-#	tags of html. The strings are expanded (see above).
-map_name	= "MyMapName";
-map_branch_href	= "href=\"%m%F?only_with_tag=%t%8%6\"";
-map_branch_alt	= "alt=\"%0 %t (%B)\"";
-# You might want to experiment with the following setting:
-# 1. The default setting will take you to a ViewCVS generated page displaying 
-#    that revision of the file, if you click into a revision box:
-map_rev_href	= "href=\"%m%F?rev=%R&content-type=text/vnd.viewcvs-markup%6\"";
-# 2. This alternative setting will take you to the anchor representing this
-#    revision on a ViewCVS generated Log page for that file:
-# map_rev_href   = "href=\"%m%F%7#rev%R\"";
-#
-map_rev_alt	= "alt=\"%1 %t (%R)\"";
-map_diff_href	= "href=\"%m%F.diff?r1=%P&r2=%R%8%6\"";
-map_diff_alt	= "alt=\"%2 %P &lt;-&gt; %R\"";
-

cgi/granny.cgi

@@ -1,529 +0,0 @@
-#!/usr/bin/python
-# -*- Mode: python -*-
-
-"""
-Granny.py - display CVS annotations in HTML
-with lines colored by code age in days.
-
-Original Perl version by J. Gabriel Foster (gabe@sgrail.com)
-   Posted to info-cvs on 02/27/1997
-   You can still get the original shell archive here:
-     http://www.geocrawler.com/archives/3/382/1997/2/0/2103824/
-
-Perl modifications for NT by Marc Paquette (marcpa@cam.org)
-
-Python port and CGI modifications by Brian Lenihan (brianl@real.com)
-
- From the original granny.pl README:
-
---
-What is Granny?  Why do I care?
-
-   Granny is a tool for viewing cvs annotation information graphically.  Using
-   Netscape, granny indicates the age of lines by color.  Red lines are new,
-   blue lines are old.  This information can be very useful in determining
-   what lines are 'hot'.  New lines are more likely to contain bugs, and this
-   is an easy way to visualize that information.
-
-     Requirements:
-         Netscape (version 2.0 or better)
-         Perl5
-         CVS 1.9 (1.8 should work, but I have not tried it.)
-
-     Installation:
-         Put granny somewhere in your path.  You may need to edit the
-         first line to point to your perl5 binary and libraries.
-
-     What to do:
-         Run granny just like you would 'cvs annotate' for a single file.
-             granny thefile.C
-
-         To find out who is to blame for that new 'feature'.
-             granny -U thefile.C
-
-         For all your options:
-             granny -h
-
-   Questions, Comments, Assertions?
-     send e-mail to the author: Gabe Foster (gabe@sgrail.com)
-
-   Notes:
-   I'm not the first person to try this sort of display, I just read about it
-   in a magazine somewhere and decided that cvs had all the information
-   I needed.  To whomever first had this idea, it's a great one.
-
-   Granny is free, please use it as you see fit.  I give no warranties.
-   As a courtesy, I ask that you tell me about any modifications you have made,
-   and also ask that you acknowledge my work if you use Granny in your own
-   software.
---
-
-
-Granny.py:
-
-granny.py [-h][-d days][-i input][-o output][-DUV] file
-
-
--h:      Get this help display.
--i:      Specify the input file. (Use - for stdin.)
--o:      Specify the output file. (Use - for stdout.)
--d:      Specify the day range for the coloring.\n
--r:      Specify the cvs revision of the file.
--D:      Display the date the line was last edited.
--U       Display the user that last edited the line.
--V:      Display the version the line was last edited.
-
-By default, granny.py executes cvs annotate on a FILE and
-runs netscape to display the graphic.
-
-It is assumed that cvs and Netscape (for command line version) are
-in your path.
-
-If granny.py is placed in the cgi-bin directory of your Web
-server, it will act as a CGI script. The working directory
-defaults to /usr/tmp, but it can be overridden in the class
-constructor:
-
-     A = CGIAnnotate(tempdir='/tmp')
-
-Required fields:
-
-root        The full path to the cvs root directory.
-Name        The module/filename of the annotated file.
-
-Optional fields:
-
-rev         The cvs revision number to use. (default HEAD).
-
-Set the following fields to display extra info:
-
-showUser    Display the user that last edited the line.
-showVersion Display version that the line was last edited in.
-showDate    Display the date the line was last edited.
-
-http://yourserver.yourdomain.com/cgi-bin/granny.py?root=/cvsroot&Name=module/file
-
-
-TODO:
-
-Add support for determining the MIME type of files and/or a binary check.
-   - easily done by parsing Apache (mime.conf) or Roxen (extensions) MIME 
-files.
-Consider adding buttons to HTML for optional display fields.
-Add support for launching other browsers.
-
-"""
-
-import os
-import sys
-import string
-import re
-import time
-import getopt
-import cStringIO
-import tempfile
-import traceback
-
-
-month_num = {
-     'Jan' : 1, 'Feb' : 2, 'Mar' : 3, 'Apr' : 4, 'May' : 5, 'Jun' : 6,
-      'Jul' : 7, 'Aug' : 8, 'Sep' : 9, 'Oct' : 10, 'Nov' : 11, 'Dec' : 12
-}
-
-class Annotate:
-     def __init__(self):
-         self.day_range = 365
-         self.counter = 0
-         self.color_table = {}
-         self.user = {}
-         self.version = {}
-         self.rtime = {}
-         self.source = {}
-         self.tmp = None
-         self.tmpfile = None
-         self.revision = ''
-         self.showUser = 0
-         self.showDate = 0
-         self.showVersion = 0
-         self.set_today()
-
-
-     def run(self):
-         try:
-             self.process_args()
-             self.parse_raw_annotated_file()
-             self.write_annotated_html_file()
-             if self.tmp:
-                 self.display_annotated_html_file()
-         finally:
-             if sys.exc_info()[0] is not None:
-                 traceback.print_exc()
-             self.cleanup()
-
-
-     def cleanup(self):
-         if self.tmp:
-             self.tmp.close()
-             os.unlink(self.tmpfile)
-         sys.exit(0)
-
-
-     def getoutput(self, cmd):
-         """
-         Get stdin and stderr from cmd and
-         return exit status and captured output
-         """
-
-         if os.name == 'nt':
-             # os.popen is broken on win32, but seems to work so far...
-             pipe = os.popen('%s 2>&1' % cmd, 'r')
-         else:
-             pipe = os.popen('{ %s ; } 2>&1' % cmd, 'r')
-         text = pipe.read()
-         sts = pipe.close()
-         if sts == None:
-             sts = 0
-         if text[:-1] == '\n':
-             text = text[-1:]
-         return sts, text
-
-
-     def set_today(self):
-         """
-         compute the start of this day
-         """
-         (year,mon,day,hour,min,sec,dow,doy,dst) = time.gmtime(time.time())
-         self.today = time.mktime((year,mon,day,0,0,0,0,0,0))
-
-
-     def get_today(self):
-         return self.today
-
-
-     # entify stuff which breaks HTML display
-     # this was lifted from some Zope Code in
-     # StructuredText.py
-     #
-     # XXX try it with string.replace and run it in the profiler
-
-     def html_quote(self,v,
-          character_entities=((re.compile('&'), '&'),
-                              (re.compile("<"), '&lt;' ),
-                              (re.compile(">"), '&gt;' ),
-                              (re.compile('"'), '&quot;'))):
-         gsub = re.sub
-
-         text=str(v)
-         for regexp,name in character_entities:
-             text=gsub(regexp,name,text)
-         return text
-
-
-     def display_annotated_html_file(self):
-         if os.name == 'nt':
-             path = '"C:\\Program Files\\Netscape\\Communicator'\
-                    '\\Program\\Netscape"'
-
-             if os.system('%s %s' % (path, self.tmpfile)) != 0:
-                 sys.stderr.write('%s: Unable to start Netscape' % sys.argv[0])
-                 sys.exit(1)
-         else:
-             if os.system('netscape -remote openFile\(%s\)' %
-                                                          self.tmpfile) != 0:
-                 sys.stderr.write('%s: Trying to run netscape, please wait\n' %
-                                                          sys.argv[0])
-                 if os.system('netscape &') == 0:
-                     for i in range(10):
-                         time.sleep(1)
-                         if os.system('netscape -remote openFile\(%s\)' %
-                                                          self.tmpfile) == 0:
-                             break
-                     if i == 10:
-                         sys.stderr.write('%s:Unable to start netscape\n' %
-                                                          sys.argv[0])
-                 else:
-                     sys.stderr.write('%s:Unable to start netscape\n' %
-                                                          sys.argv[0])
-
-         # give Netscape time to read the file
-         # XXX big files may raise an OSError exception on NT
-         # if the sleep is too short.
-         time.sleep(5)
-
-
-     def get_opts(self):
-         opt_dict = {}
-         if not len(sys.argv[1:]) > 0:
-             self.usage()
-
-         opts, args = getopt.getopt(sys.argv[1:], 'DUVhi:o:d:r:')
-         for k,v in opts:
-             opt_dict[k] = v
-         return opt_dict
-
-
-     def process_args(self):
-         opts = self.get_opts()
-
-         if opts.has_key('-r'):
-             self.revision = '-r%s' % opts['-r']
-
-         if opts.has_key('-h'):
-             self.usage(help=1)
-
-         if opts.has_key('-i'):
-             if opts['-i'] != '-':
-                 self.filename = v
-                 infile = open(filename, 'r')
-                 sys.stdin = infile
-             else:
-                 self.file = sys.stdin
-         else:
-             self.filename = sys.argv[len(sys.argv) - 1]
-
-             cmd = 'cvs annotate %s %s' % (self.revision, self.filename)
-
-             status, text = self.getoutput(cmd)
-
-             if status != 0 or text == '':
-                 sys.stderr.write("Can't run cvs annotate on %s\n" %
-                                                                 self.filename)
-                 sys.stderr.write('%s\n' % text)
-                 sys.exit(1)
-             self.file = cStringIO.StringIO(text)
-
-
-         if opts.has_key('-o'):
-             if opts['-o'] != '-':
-                 outfile = open(v, 'w')
-                 sys.stdout = outfile
-         else:
-             # this could be done without a temp file
-             target = sys.argv[len(sys.argv) -1]
-             self.tmpfile = tempfile.mktemp()
-             self.tmp = open(self.tmpfile, 'w')
-             sys.stdout = self.tmp
-
-
-         if opts.has_key('-d'):
-             if opts['-d'] > 0:
-                 self.day_range = opts['-d']
-
-         if opts.has_key('-D'):
-             self.showDate = 1
-
-         if opts.has_key('-U'):
-             self.showUser = 1
-
-         if opts.has_key('-V'):
-             self.showVersion = 1
-
-
-     def parse_raw_annotated_file(self):
-         ann = re.compile('((\d+\.?)+)\s+\((\w+)\s+(\d\d)-'\
-                          '(\w{3})-(\d\d)\): (.*)')
-
-         text = self.file.read()
-         lines = string.split(text, '\n')
-         for line in lines:
-             # Parse an annotate string
-             m = ann.search(line)
-             if m:
-                 self.version[self.counter] = m.group(1)
-                 self.user[self.counter] = m.group(3)
-                 oldtime = self.today - time.mktime((
-                                                 int(m.group(6)),
-                                                 int(month_num[m.group(5)]),
-                                                 int(m.group(4)),0,0,0,0,0,0))
-
-                 self.rtime[self.counter] = oldtime / 86400
-                 self.source[self.counter] = self.html_quote(m.group(7))
-             else:
-                 self.source[self.counter] = self.html_quote(line)
-                 pass
-             self.counter = self.counter + 1
-
-
-     def write_annotated_html_file(self):
-         if os.environ.has_key('SCRIPT_NAME'):
-             print 'Status: 200 OK\r\n'
-             print 'Content-type: text/html\r\n\r\n'
-
-         print ('<html><head><title>%s</title></head>\n' \
-                '<body bgcolor="#000000">\n' \
-                '<font color="#FFFFFF"><H1>File %s</H1>\n' \
-                '<H3>Code age in days</H2>' % (self.filename, self.filename))
-
-         for i in range(self.day_range + 1):
-             self.color_table[i] = \
-                 self.hsvtorgb(240.0 * i / self.day_range, 1.0, 1.0)
-
-         step = self.day_range / 40
-         if step < 5:
-             step = 1
-             while self.day_range/step > 40:
-                 step = step + 1
-         if step >= 5:
-             if step != 5:
-                 step = step + 5 - (step % 5)
-             while self.day_range / step > 20:
-                 step = step + 5
-
-         for i in range(self.day_range + 1, step):
-             print '<font color=%s>%s ' % (self.color_table[i], i),
-         print '<pre><code>'
-
-         for i in range(self.counter):
-             if self.showUser and self.user.has_key(i):
-                 print '%s%s ' % ('<font color=#FFFFFF>',
-                                  string.ljust(self.user[i],10)),
-
-             if self.showVersion and self.version.has_key(i):
-                 print '%s%s ' % ('<font color=#FFFFFF>',
-                                  string.ljust(self.version[i],6)),
-
-             if self.showDate and self.rtime.has_key(i):
-                 (year,mon,day,hour,min,sec,dow,doy,dst) = time.gmtime(
-                                            self.today - self.rtime[i] * 86400)
-
-                 print '<font color=#FFFFFF>%02d/%02d/%4d ' % (mon, day, year),
-
-
-             if self.rtime.get(i, self.day_range) < self.day_range:
-                 fcolor = self.color_table.get(
-                                         self.rtime[i],
-                                         self.color_table[self.day_range])
-             else:
-                 fcolor = self.color_table[self.day_range]
-
-             print '<font color=%s> %s' % (fcolor, self.source[i])
-
-         print ('</code></pre>\n' \
-                '<font color=#FFFFFF>\n' \
-                '<H5>Granny original Perl version by' \
-                '<I>J. Gabriel Foster</I>\n' \
-                '<ADDRESS><A HREF=\"mailto:gabe@sgrail.com\">'\
-                'gabe@sgrail.com</A></ADDRESS>\n' \
-                'Python version by <I>Brian Lenihan</I>\n' \
-                '<ADDRESS><A HREF=\"mailto:brianl@real.com\">' \
-                'brianl@real.com</A></ADDRESS>\n' \
-                '</body></html>')
-
-         sys.stdout.flush()
-
-
-     def hsvtorgb(self,h,s,v):
-         """
-         a veritable technicolor spew
-         """
-         if s == 0.0:
-             r = v; g = v; b = v
-         else:
-             if h < 0:
-                 h = h + 360.0
-             elif h >= 360.0:
-                 h = h - 360.0
-             h = h / 60.0
-             i = int(h)
-             f = h - i
-
-             if s > 1.0:
-                 s = 1.0
-             p = v * (1.0 - s)
-             q = v * (1.0 - (s * f))
-             t = v * (1.0 - (s * (1.0 - f)))
-
-             if   i == 0: r = v; g = t; b = p
-             elif i == 1: r = q; g = v; b = p
-             elif i == 2: r = p; g = v; b = t
-             elif i == 3: r = p; g = q; b = v
-             elif i == 4: r = t; g = p; b = v
-             elif i == 5: r = v; g = p; b = q
-
-         return '#%02X%02X%02X' % (r * 255 + 0.5, g * 255 + 0.5, b * 255 + 0.5)
-
-
-
-     def usage(self, help=None):
-         sys.stderr.write('\nusage: %s %s\n\n' % (
-                         sys.argv[0],
-                         '[-hDUV][-d days][-i input][-o output][-r rev] FILE')
-         )
-
-         if help is not None:
-             sys.stderr.write(
-                 '-h:      Get this help display.\n' \
-                 '-i:      Specify the input file. (Use - for stdin.)\n' \
-                 '-o:      Specify the output file. (Use - for stdout.)\n' \
-                 '-d:      Specify the day range for the coloring.\n' \
-                 '-r:      Specify the cvs revision of the file.\n' \
-                 '-D:      Display the date the line was last edited.\n' \
-                 '-U       Display the user that last edited the line.\n' \
-                 '-V:      Display the version the line was last edited.\n\n' \
-                 'By default, %s executes a cvs annotate on a FILE and\n' \
-                 'runs netscape to display the graphical ' \
-                 'annotation\n' % sys.argv[0]
-             )
-
-         sys.exit(0)
-
-
-
-class CGIAnnotate(Annotate):
-     def __init__(self,tempdir='/usr/tmp'):
-         Annotate.__init__(self)
-         if os.name == 'nt':
-             self.tempdir = os.environ.get('TEMP') or os.environ.get('TMP')
-         else:
-             # XXX need a sanity check here
-             self.tempdir = tempdir
-         os.chdir(self.tempdir)
-
-     def process_args(self):
-         f = cgi.FieldStorage()
-         cvsroot = f['root'].value
-         if f.has_key('showUser'):
-             self.showUser = 1
-         if f.has_key('showDate'):
-             self.showDate = 1
-         if f.has_key('showVersion'):
-             self.showVersion = 1
-         if f.has_key('rev'):
-             self.revision = '-r%s' % f['rev'].value
-         path = f['Name'].value
-         module = os.path.dirname(path)
-         self.workingdir = 'ann.%s' % os.getpid()
-         self.filename = os.path.basename(path)
-
-         os.mkdir(self.workingdir)
-         os.chdir(os.path.join(self.tempdir, self.workingdir))
-         os.system('cvs -d %s co %s' % (cvsroot, path))
-         os.chdir(module)
-
-         cmd = 'cvs annotate %s %s' % (self.revision, self.filename)
-         status, text = self.getoutput(cmd)
-
-         if status != 0 or text == '':
-             text = "Can't run cvs annotate on %s\n" % path
-         self.file = cStringIO.StringIO(text)
-
-
-     def cleanup(self):
-         os.chdir(self.tempdir)
-         os.system('rm -rf %s' % self.workingdir)
-
-
-     def display_annotated_html_file(self):
-         pass
-
-     def usage(self):
-         pass
-
-if __name__ == '__main__':
-     if os.environ.has_key('SCRIPT_NAME'):
-         import cgi
-         A = CGIAnnotate()
-     else:
-         A = Annotate()
-     A.run()
-

cvsgraph.conf.dist

@@ -0,0 +1,394 @@
+# CvsGraph configuration
+#
+# - Empty lines and whitespace are ignored.
+#
+# - Comments start with '#' and everything until
+#   end of line is ignored.
+#
+# - Strings are C-style strings in which characters
+#   may be escaped with '\' and written in octal
+#   and hex escapes. Note that '\' must be escaped
+#   if it is to be entered as a character.
+#
+# - Some strings are expanded with printf like
+#   conversions which start with '%'. Not all
+#   are applicable at all times, in which case they
+#   will expand to nothing.
+#	%c = cvsroot (with trailing '/')
+#	%C = cvsroot (*without* trailing '/')
+#	%m = module (with trailing '/')
+#	%M = module (*without* trailing '/')
+#	%f = filename without path
+#	%F = filename without path and with ",v" stripped
+#	%p = path part of filename (with trailing '/')
+#	%r = number of revisions
+#	%b = number of branches
+#	%% = '%'
+#	%R = the revision number (e.g. '1.2.4.4')
+#	%P = previous revision number
+#	%B = the branch number (e.g. '1.2.4')
+#	%d = date of revision
+#	%a = author of revision
+#	%s = state of revision
+#	%t = current tag of branch or revision
+#	%0..%9 = command-line argument -0 .. -9
+#	%l = HTMLized log entry of the revision
+#		NOTE: %l is obsolete. See %(%) and cvsgraph.conf(5) for
+#		more details.
+#	%L = log entry of revision
+#		The log entry expansion takes an optional argument to
+#		specify maximum length of the expansion like %L[25].
+#	%(...%) = HTMLize the string within the parenthesis.
+#   ViewVC currently uses the following four command-line arguments to
+#   pass URL information to cvsgraph:
+#       -3 link to current file's log page
+#       -4 link to current file's checkout page minus "rev" parameter
+#       -5 link to current file's diff page minus "r1" and "r2" parameters
+#       -6 link to current directory page minus "pathrev" parameter
+#
+# - Numbers may be entered as octal, decimal or
+#   hex as in 0117, 79 and 0x4f respectively.
+#
+# - Fonts are numbered 0..4 (defined as in libgd)
+#	0 = tiny
+#	1 = small
+#	2 = medium (bold)
+#	3 = large
+#	4 = giant
+#
+# - Colors are a string like HTML type colors in
+#   the form "#rrggbb" with parts written in hex
+#	rr = red (00..ff)
+#	gg = green (00-ff)
+#	bb = blue (00-ff)
+#
+# - There are several reserved words besides of the
+#   feature-keywords. These additional reserved words
+#   expand to numerical values:
+#	* false	 = 0
+#	* true	 = 1
+#	* not	 = -1
+#	* left	 = 0
+#	* center = 1
+#	* right	 = 2
+#	* gif	 = 0
+#	* png	 = 1
+#	* jpeg	 = 2
+#	* tiny	 = 0
+#	* small	 = 1
+#	* medium = 2
+#	* large	 = 3
+#	* giant	 = 4
+#
+# - Booleans have three possible arguments: true, false
+#   and not. `Not' means inverse of what it was (logical
+#   negation) and is represented by the value -1.
+#   For the configuration file that means that the default
+#   value is negated.
+#
+
+# cvsroot <string>
+#	The *absolute* base directory where the
+#	CVS/RCS repository can be found
+# cvsmodule <string>
+#
+cvsroot		= "--unused--"; # unused with ViewVC, will be overridden
+cvsmodule	= "";  # unused with ViewVC -- please leave it blank
+
+# color_bg <color>
+#	The background color of the image
+# transparent_bg <boolean>
+#	Make color_bg the transparent color (only useful with PNG)
+color_bg	= "#ffffff";
+transparent_bg	= false;
+
+# date_format <string>
+#	The strftime(3) format string for date and time
+date_format	= "%d-%b-%Y %H:%M:%S";
+
+# box_shadow <boolean>
+#	Add a shadow around the boxes
+# upside_down <boolean>
+#	Reverse the order of the revisions
+# left_right <boolean>
+#	Draw the image left to right instead of top down,
+#	or right to left is upside_down is set simultaneously.
+# strip_untagged <boolean>
+#	Remove all untagged revisions except the first, last and tagged ones
+# strip_first_rev <boolean>
+#	Also remove the first revision if untagged
+# auto_stretch <boolean>
+#	Try to reformat the tree to minimize image size
+# use_ttf <boolean>
+#	Use TrueType fonts for text
+# anti_alias <boolean>
+#	Enable pretty TrueType anti-alias drawing
+# thick_lines <number>
+#	Draw all connector lines thicker (range: 1..11)
+box_shadow	= true;
+upside_down	= false;
+left_right	= false;
+strip_untagged	= false;
+strip_first_rev	= false;
+#auto_stretch	= true;		# not yet stable.
+use_ttf		= false;
+anti_alias	= true;
+thick_lines	= 1;
+
+# msg_color <color>
+#	Sets the error/warning message color
+# msg_font <number>
+# msg_ttfont <string>
+# msg_ttsize <float>
+#	Sets the error/warning message font
+msg_color	= "#800000";
+msg_font	= medium;
+msg_ttfont	= "/dos/windows/fonts/ariali.ttf";
+msg_ttsize	= 11.0;
+
+# parse_logs <boolean>
+#	Enable the parsing of the *entire* ,v file to read the
+#	log-entries between revisions. This is necessary for
+#	the %L expansion to work, but slows down parsing by
+#	a very large factor. You're warned.
+parse_logs	= false;
+
+# tag_font <number>
+#	The font of the tag text
+# tag_color <color>
+#	The color of the tag text
+# tag_ignore <string>
+#	A extended regular expression to exclude certain tags from view.
+#	See regex(7) for details on the format.
+#	Note 1: tags matched in merge_from/merge_to are always displayed unless
+#		tag_ignore_merge is set to true.
+#	Note 2: normal string rules apply and special characters must be
+#		escaped.
+# tag_ignore_merge <boolean>
+#	If set to true, allows tag_ignore to also hide merge_from and merge_to
+#	tags.
+# tag_nocase <boolean>
+#	Ignore the case is tag_ignore expressions
+# tag_negate <boolean>
+#	Negate the matching criteria of tag_ignore. When true, only matching
+#	tags will be shown.
+#	Note: tags matched with merge_from/merge_to will still be displayed.
+tag_font	= medium;
+#tag_ttfont	= "/dos/windows/fonts/ariali.ttf";
+#tag_ttsize	= 11.0;
+tag_color	= "#007000";
+#tag_ignore	= "(test|alpha)_release";
+#tag_ignore_merge = false;
+#tag_nocase	= false;
+#tag_negate	= false;
+
+# rev_hidenumber <boolean>
+#	If set to true no revision numbers will be printed in the graph.
+#rev_hidenumber = false;
+rev_font	= giant;
+#rev_ttfont	= "/dos/windows/fonts/arial.ttf";
+#rev_ttsize	= 12.0;
+rev_color	= "#000000";
+rev_bgcolor	= "#f0f0f0";
+rev_separator	= 1;
+rev_minline	= 15;
+rev_maxline	= 75;
+rev_lspace	= 5;
+rev_rspace	= 5;
+rev_tspace	= 3;
+rev_bspace	= 3;
+rev_text	= "%d";	# or "%d\n%a, %s" for author and state too
+rev_text_font	= tiny;
+#rev_text_ttfont	= "/dos/windows/fonts/times.ttf";
+#rev_text_ttsize	= 9.0;
+rev_text_color	= "#500020";
+rev_maxtags	= 25;
+
+# merge_color <color>
+#	The color of the line connecting merges
+# merge_front <boolean>
+#	If true, draw the merge-lines on top if the image
+# merge_nocase <boolean>
+#	Ignore case in regular expressions
+# merge_from <string>
+#	A regex describing a tag that is used as the merge source
+# merge_to <string>
+#	A regex describing a tag that is the target of the merge
+# merge_findall <boolean>
+#	Try to match all merge_to targets possible. This can result in
+#	multiple lines originating from one tag.
+# merge_arrows <boolean>
+#	Use arrows to point to the merge destination. Default is true.
+# merge_cvsnt <boolean>
+#	Use CVSNT's mergepoint registration for merges
+# merge_cvsnt_color <color>
+#	The color of the line connecting merges from/to registered
+#	mergepoints.
+# arrow_width <number>
+# arrow_length <number>
+#	Specify the size of the arrows. Default is 3 wide and 12 long.
+#
+# NOTE:
+# - The merge_from is an extended regular expression as described in
+#   regex(7) and POSIX 1003.2 (see also Single Unix Specification at
+#   http://www.opengroup.com).
+# - The merge_to is an extended regular expression with a twist. All
+#   subexpressions from the merge_from are expanded into merge_to
+#   using %[1-9] (in contrast to \[1-9] for backreferences). Care is
+#   taken to escape the constructed expression.
+# - A '$' at the end of the merge_to expression can be important to
+#   prevent 'near match' references. Normally, you want the destination
+#   to be a good representation of the source. However, this depends
+#   on how well you defined the tags in the first place.
+#
+# Example:
+#	merge_from = "^f_(.*)";
+#	merge_to = "^t_%1$";
+#	tags: f_foo, f_bar, f_foobar, t_foo, t_bar
+#	result:
+#		f_foo	-> "^t_foo$"	-> t_foo
+#		f_bar	-> "^t_bar$"	-> t_bar
+#		f_foobar-> "^t_foobar$"	-> <no match>
+#
+merge_color	= "#a000a0";
+merge_front	= false;
+merge_nocase	= false;
+merge_from	= "^f_(.*)";
+merge_to	= "^t_%1$";
+merge_findall	= false;
+
+#merge_arrows	= true;
+#arrow_width	= 3;
+#arrow_length	= 12;
+
+merge_cvsnt	= true;
+merge_cvsnt_color = "#606000";
+
+# branch_font <number>
+#	The font of the number and tags
+# branch_color <color>
+#	All branch element's color
+# branch_[lrtb]space <number>
+#	Interior spacing (margin)
+# branch_margin <number>
+#	Exterior spacing
+# branch_connect <number>
+#	Length of the vertical connector
+# branch_dupbox <boolean>
+#	Add the branch-tag also at the bottom/top of the trunk
+# branch_fold <boolean>
+#	Fold empty branches in one box to save space
+# branch_foldall <boolean>
+#	Put all empty branches in one box, even if they
+#	were interspaced with branches with revisions.
+# branch_resort <boolean>
+#	Resort the branches by the number of revisions to save space
+# branch_subtree <string>
+#	Only show the branch denoted or all branches that sprout
+#	from the denoted revision. The argument may be a symbolic
+#	tag. This option you would normally want to set from the
+#	command line with the -O option.
+branch_font	= medium;
+#branch_ttfont	= "/dos/windows/fonts/arialbd.ttf";
+#branch_ttsize	= 18.0;
+branch_tag_color= "#000080";
+branch_tag_font	= medium;
+#branch_tag_ttfont = "/dos/windows/fonts/arialbi.ttf";
+#branch_tag_ttsize = 14.0;
+branch_color	= "#0000c0";
+branch_bgcolor	= "#ffffc0";
+branch_lspace	= 5;
+branch_rspace	= 5;
+branch_tspace	= 3;
+branch_bspace	= 3;
+branch_margin	= 15;
+branch_connect	= 8;
+branch_dupbox	= false;
+branch_fold	= true;
+branch_foldall	= false;
+branch_resort	= false;
+#branch_subtree	= "1.2.4";
+
+# title <string>
+#	The title string is expanded (see above for details)
+# title_[xy] <number>
+#	Position of title
+# title_font <number>
+#	The font
+# title_align <number>
+#	0 = left
+#	1 = center
+#	2 = right
+# title_color <color>
+title		= "%c%p%f\nRevisions: %r, Branches: %b";
+title_x		= 10;
+title_y		= 5;
+title_font	= small;
+#title_ttfont	= "/dos/windows/fonts/times.ttf";
+#title_ttsize	= 10.0;
+title_align	= left;
+title_color	= "#800000";
+
+# Margins of the image
+# Note: the title is outside the margin
+margin_top	= 35;
+margin_bottom	= 10;
+margin_left	= 10;
+margin_right	= 10;
+
+# Image format(s)
+# image_type <number|{gif,jpeg,png}>
+#	gif  (0) = Create gif image
+#	png  (1) = Create png image
+#	jpeg (2) = Create jpeg image
+#	Image types are available if they can be found in
+#	the gd library. Newer versions of gd do not have
+#	gif anymore. CvsGraph will automatically generate
+#	png images instead.
+# image_quality <number>
+#	The quality of a jpeg image (1..100)
+# image_compress <number>
+#	Set the compression of a PNG image (gd version >= 2.0.12).
+#	Values range from -1 to 9 where:
+#	- -1	default compression (usually 3)
+#	-  0	no compression
+#	-  1	lowest level compression
+#	- ...	...
+#	-  9	highest level of compression
+# image_interlace <boolean>
+#	Write interlaces PNG/JPEG images for progressive loading.
+image_type	= png;
+image_quality	= 75;
+image_compress	= 3;
+image_interlace	= true;
+
+# HTML image map generation
+# map_name <string>
+#	The name= attribute in <map name="mapname">...</map>
+# map_branch_href <string>
+# map_branch_alt <string>
+# map_rev_href <string>
+# map_rev_alt <string>
+# map_diff_href <string>
+# map_diff_alt <string>
+# map_merge_href <string>
+# map_merge_alt <string>
+#	These are the href= and alt= attributes in the <area>
+#	tags of HTML. The strings are expanded (see above).
+map_name	= "MyMapName\" name=\"MyMapName";
+map_branch_href	= "href=\"%6pathrev=%(%t%)\"";
+map_branch_alt	= "alt=\"%0 %(%t%) (%B)\"";
+# You might want to experiment with the following setting:
+# 1. The default setting will take you to a ViewVC generated page displaying 
+#    that revision of the file, if you click into a revision box:
+map_rev_href	= "href=\"%4rev=%R\"";
+# 2. This alternative setting will take you to the anchor representing this
+#    revision on a ViewVC generated Log page for that file:
+# map_rev_href   = "href=\"%3#rev%R\"";
+#
+map_rev_alt	= "alt=\"%1 %(%t%) (%R)\"";
+map_diff_href	= "href=\"%5r1=%P&amp;r2=%R\"";
+map_diff_alt	= "alt=\"%2 %P &lt;-&gt; %R\"";
+map_merge_href	= "href=\"%5r1=%P&amp;r2=%R\"";
+map_merge_alt	= "alt=\"%2 %P &lt;-&gt; %R\"";
+

elemx/Makefile

@@ -0,0 +1,54 @@
+TARGETS = python/elx-python java/elx-java
+
+all : $(TARGETS)
+
+CFLAGS = -g -Wpointer-arith -Wwrite-strings -Wshadow -Wall
+CPPFLAGS = -Ipython -Ijava -I.
+
+# the scanner depends on tokens generated from python.y
+python/scanner.c : python/python.c
+
+# the keywords also need the tokens in python.h
+python/py_keywords.c : python/python.c
+
+# we need the scanner tokens in py_scan.h and keywords in py_keywords.h
+python/elx-python.o : python/elx-python.c python/py_keywords.c
+
+# we need java.[ch] generated first to get the tokens in java.h
+java/j_scan.c : java/java.c java/j_keywords.c
+
+# the keywords also need the tokens in java.h
+java/j_keywords.c : java/java.c
+
+# we need the scanner tokens in j_scan.h and keywords in j_keywords.h
+java/elx-java.o : java/elx-java.c java/j_keywords.c java/java.c
+
+
+python/elx-python : python/elx-python.o python/scanner.o python/python.o \
+			python/py_keywords.o elx-common.o
+	$(CC) -o $@ $^
+
+java/elx-java : java/elx-java.o java/j_scan.o java/java.o java/j_keywords.o \
+			elx-common.o
+	$(CC) -o $@ $^
+
+clean :
+	rm -f *.o
+	rm -f python/*.o python/python.[ch] python/py_keywords.[ch]
+	rm -f java/*.o java/java.[ch] java/j_keywords.[ch] java/j_scan.[ch]
+	rm -f python/*.output java/*.output
+	rm -f $(TARGETS)
+
+.SUFFIXES:
+.SUFFIXES: .c .y .shilka .o
+
+%.c : %.y
+	@d="`echo $@ | sed 's/\.c//'`" ; \
+	echo msta -d -enum -v -o $$d $< ; \
+	msta -d -enum -v -o $$d $<
+
+%.c : %.shilka
+	@d="`echo $@ | sed 's,/[^/]*$$,,'`" ; \
+	f="`echo $< | sed 's,.*/,,'`" ; \
+	echo shilka -length -no-definitions -interface $$f ; \
+	(cd $$d && shilka -length -no-definitions -interface $$f)

elemx/elx-common.c

@@ -0,0 +1,110 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "elx.h"
+
+#define ELX_ELEMS_EXT   ".elx"
+#define ELX_SYMBOLS_EXT ".els"
+
+
+static void usage(const char *progname)
+{
+    fprintf(stderr, "USAGE: %s FILENAME\n", progname);
+    exit(1);
+}
+
+static const char * build_one(const char *base, int len, const char *suffix)
+{
+    int slen = strlen(suffix);
+    char *fn;
+
+    fn = malloc(len + slen + 1);
+    memcpy(fn, base, len);
+    memcpy(fn + len, suffix, slen);
+    fn[len + slen] = '\0';
+
+    return fn;
+}
+
+elx_context_t *elx_process_args(int argc, const char **argv)
+{
+    elx_context_t *ec;
+    const char *input_fn;
+    const char *p;
+    int len;
+
+    /* ### in the future, we can expand this for more options */
+
+    if (argc != 2)
+    {
+        usage(argv[0]);
+        /* NOTREACHED */
+    }
+
+    input_fn = argv[1];
+
+    p = strrchr(input_fn, '.');
+    if (p == NULL)
+        len = strlen(input_fn);
+    else
+        len = p - argv[1];
+
+    ec = malloc(sizeof(*ec));
+    ec->input_fn = input_fn;
+    ec->elx_fn = build_one(input_fn, len, ELX_ELEMS_EXT);
+    ec->sym_fn = build_one(input_fn, len, ELX_SYMBOLS_EXT);
+
+    return ec;
+}
+
+void elx_open_files(elx_context_t *ec)
+{
+    const char *fn;
+    const char *op;
+
+    if ((ec->input_fp = fopen(ec->input_fn, "r")) == NULL)
+    {
+        fn = ec->input_fn;
+        op = "reading";
+        goto error;
+    }
+    if ((ec->elx_fp = fopen(ec->elx_fn, "w")) == NULL)
+    {
+        fn = ec->elx_fn;
+        op = "writing";
+        goto error;
+    }
+    if ((ec->sym_fp = fopen(ec->sym_fn, "w")) == NULL)
+    {
+        fn = ec->sym_fn;
+        op = "writing";
+        goto error;
+    }
+    return;
+
+  error:
+    fprintf(stderr, "ERROR: file \"%s\" could not be opened for %s.\n       %s\n",
+            fn, op, strerror(errno));
+    exit(2);
+}
+
+void elx_close_files(elx_context_t *ec)
+{
+    fclose(ec->input_fp);
+    fclose(ec->elx_fp);
+    fclose(ec->sym_fp);
+}
+
+void elx_issue_token(elx_context_t *ec,
+                     char which, int start, int len,
+                     const char *symbol)
+{
+    fprintf(ec->elx_fp, "%c %d %d\n", which, start, len);
+
+    if (ELX_DEFINES_SYM(which))
+    {
+        fprintf(ec->sym_fp, "%s %d %s\n", symbol, start, ec->input_fn);
+    }
+}

elemx/elx.h

@@ -0,0 +1,54 @@
+#ifndef ELX_H
+#define ELX_H
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+#define ELX_COMMENT     'C'     /* a comment */
+#define ELX_STRING      'S'     /* a string constant */
+#define ELX_KEYWORD     'K'     /* a language keyword */
+#define ELX_GLOBAL_FDEF 'F'     /* function defn in global (visible) scope */
+#define ELX_LOCAL_FDEF  'L'     /* function defn in local (hidden) scope */
+#define ELX_METHOD_DEF  'M'     /* method definition */
+#define ELX_FUNC_REF    'R'     /* function reference / call */
+
+#define ELX_DEFINES_SYM(c) ((c) == ELX_GLOBAL_FDEF || (c) == ELX_LOCAL_FDEF \
+                            || (c) == ELX_METHOD_DEF)
+
+
+typedef struct
+{
+    /* input filename */
+    const char *input_fn;
+
+    /* output filenames: element extractions, and symbols */
+    const char *elx_fn;
+    const char *sym_fn;
+
+    /* file pointers for each of the input/output files */
+    FILE *input_fp;
+    FILE *elx_fp;
+    FILE *sym_fp;
+
+} elx_context_t;
+
+elx_context_t *elx_process_args(int argc, const char **argv);
+
+void elx_open_files(elx_context_t *ec);
+void elx_close_files(elx_context_t *ec);
+
+
+void elx_issue_token(elx_context_t *ec,
+                     char which, int start, int len,
+                     const char *symbol);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* ELX_H */

elemx/elx_html.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+#
+# generate HTML given an input file and an element file
+#
+
+import re
+import string
+import cgi
+import struct
+
+_re_elem = re.compile('([a-zA-Z]) ([0-9]+) ([0-9]+)\n')
+
+CHUNK_SIZE = 98304 # 4096*24
+
+
+class ElemParser:
+  "Parse an elements file, extracting the token type, start, and length."
+
+  def __init__(self, efile):
+    self.efile = efile
+
+  def get(self):
+    line = self.efile.readline()
+    if not line:
+      return None, None, None
+    t, s, e = string.split(line)
+    return t, int(s)-1, int(e)
+
+  def unused_get(self):
+    record = self.efile.read(9)
+    if not record:
+      return None, None, None
+    return struct.unpack('>cii', record)
+
+
+class Writer:
+  "Generate output, including copying from another input."
+
+  def __init__(self, ifile, ofile):
+    self.ifile = ifile
+    self.ofile = ofile
+
+    self.buf = ifile.read(CHUNK_SIZE)
+    self.offset = 0
+
+  def write(self, data):
+    self.ofile.write(data)
+
+  def copy(self, pos, amt):
+    "Copy 'amt' bytes from position 'pos' of input to output."
+    idx = pos - self.offset
+    self.ofile.write(cgi.escape(buffer(self.buf, idx, amt)))
+    amt = amt - (len(self.buf) - idx)
+    while amt > 0:
+      self._more()
+      self.ofile.write(cgi.escape(buffer(self.buf, 0, amt)))
+      amt = amt - len(self.buf)
+
+  def flush(self, pos):
+    "Flush the rest of the input to the output."
+    idx = pos - self.offset
+    self.ofile.write(cgi.escape(buffer(self.buf, idx)))
+    while 1:
+      buf = self.ifile.read(CHUNK_SIZE)
+      if not buf:
+        break
+      self.ofile.write(cgi.escape(buf))
+
+  def _more(self):
+    self.offset = self.offset + len(self.buf)
+    self.buf = self.ifile.read(CHUNK_SIZE)
+
+
+def generate(input, elems, output, genpage=0):
+  ep = ElemParser(elems)
+  w = Writer(input, output)
+  cur = 0
+  if genpage:
+    w.write('''\
+<html><head><title>ELX Output Page</title>
+<style type="text/css">
+  .elx_C { color: firebrick; font-style: italic; }
+  .elx_S { color: #bc8f8f; font-weight: bold; }
+  .elx_K { color: purple; font-weight: bold }
+  .elx_F { color: blue; font-weight: bold; }
+  .elx_L { color: blue; font-weight: bold; }
+  .elx_M { color: blue; font-weight: bold; }
+  .elx_R { color: blue; font-weight: bold; }
+</style>
+</head>
+<body>
+''')
+  w.write('<pre>')
+  while 1:
+    type, start, length = ep.get()
+    if type is None:
+      break
+    if cur < start:
+      # print out some plain text up to 'cur'
+      w.copy(cur, start - cur)
+
+    # wrap a bit o' formatting here
+    w.write('<span class="elx_%s">' % type)
+
+    # copy over the token
+    w.copy(start, length)
+
+    # and close up the formatting
+    w.write('</span>')
+
+    cur = start + length
+
+  # all done.
+  w.flush(cur)
+  w.write('</pre>')
+  if genpage:
+    w.write('</body></html>\n')
+
+if __name__ == '__main__':
+  import sys
+  generate(open(sys.argv[1]), open(sys.argv[2]), sys.stdout, 1)

elemx/elx_page.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if test "$#" != 2; then
+  echo "USAGE: $0 SOURCE-FILE ELX-FILE"
+  exit 1
+fi
+
+cat <<EOF
+<html><head><title>ELX Output Page</title>
+<style type="text/css">
+  .elx_C { color: firebrick; font-style: italic; }
+  .elx_S { color: #bc8f8f; font-weight: bold; }
+  .elx_K { color: purple; font-weight: bold }
+  .elx_F { color: blue; font-weight: bold; }
+  .elx_L { color: blue; font-weight: bold; }
+  .elx_M { color: blue; font-weight: bold; }
+  .elx_R { color: blue; font-weight: bold; }
+</style>
+</head>
+<body>
+EOF
+
+dirname="`dirname $0`"
+python2 $dirname/elx_html.py $1 $2
+
+echo "</body></html>"

elemx/java/.cvsignore

@@ -0,0 +1,8 @@
+elx-java
+j_keywords.c
+j_keywords.h
+j_scan.c
+j_scan.h
+java.c
+java.h
+*.output

elemx/java/elx-java.c

@@ -0,0 +1,148 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "java.h"
+#include "j_keywords.h"
+#include "elx.h"
+
+/* from j_scan.c */
+extern int yylex(void);
+extern void yylex_start(int *error_flag);
+extern void yylex_finish(void);
+extern const char *get_identifier(void);
+
+static const char *fname;
+static int saw_error = 0;
+
+static int lineno = 1;
+static int hpos = 1;
+static int fpos = 0;
+
+static int token_start = 0;
+static int start_lineno;
+static int start_hpos;
+
+static elx_context_t *ectx;
+
+
+//#define DEBUG_SCANNER
+
+/* if we're debugging, then the scanner looks for this var */
+int yysdebug = 0;
+
+/* and the parser looks for this */
+int yydebug = 1;
+
+
+void yyserror(const char *msg)
+{
+    fprintf(stderr, "%s:%d:%d: lex error: %s\n",
+            fname, start_lineno, start_hpos, msg);
+    saw_error = 1;
+}
+
+void yyerror(const char *msg)
+{
+    fprintf(stderr, "%s:%d:%d: parse error: %s\n",
+            fname, start_lineno, start_hpos, msg);
+    saw_error = 1;
+}
+
+int yyslex(void)
+{
+    int c = fgetc(ectx->input_fp);
+
+    if (c == EOF)
+        return -1;      /* tell lexer we're done */
+
+    ++fpos;
+    if (c == '\n')
+    {
+        hpos = 1;
+        ++lineno;
+    }
+    else
+        ++hpos;
+
+//    printf("char: '%c'\n", c);
+
+    return c;
+}
+
+void issue_token(char which)
+{
+    const char *ident = NULL;
+
+    if (ELX_DEFINES_SYM(which))
+        ident = get_identifier();
+    else
+        ident = NULL;
+
+    elx_issue_token(ectx, which, token_start, fpos - token_start + 1, ident);
+}
+
+void mark_token_start(void)
+{
+    token_start = fpos;
+    start_lineno = lineno;
+    start_hpos = hpos;
+}
+
+#ifdef DEBUG_SCANNER
+
+void gen_scan_tokens(void)
+{
+    while (1)
+    {
+        int v = yylex();
+
+        if (v == TK_IDENTIFIER)
+            printf("%d-%d: %d '%s'\n",
+                   token_start, fpos-1, v, get_identifier());
+        else
+            printf("%d-%d: %d\n", token_start, fpos-1, v);
+
+        /* end of parse? */
+        if (v <= 0)
+            break;
+    }
+}
+
+#else /* DEBUG_SCANNER */
+
+static void gen_elx_tokens(void)
+{
+    /* ### what to do with the result? should have seen/set saw_error */
+    (void) yyparse();
+}
+
+#endif /* DEBUG_SCANNER */
+
+int main(int argc, const char **argv)
+{
+    int errcode;
+
+    ectx = elx_process_args(argc, argv);
+
+    yylex_start(&errcode);
+    if (errcode)
+    {
+        fprintf(stderr, "error: yylex_start: %d\n", errcode);
+        return EXIT_FAILURE;
+    }
+
+    elx_open_files(ectx);
+
+#ifdef DEBUG_SCANNER
+    gen_scan_tokens();
+#else
+    gen_elx_tokens();
+#endif
+
+    yylex_finish();
+    elx_close_files(ectx);
+
+    if (saw_error)
+        return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}

elemx/java/j_keywords.shilka

@@ -0,0 +1,65 @@
+%local {
+/* get the KR_* values */
+#include "java.h"
+}
+
+%%
+abstract
+boolean
+break
+byte
+/* byvalue */
+case
+/* cast */
+catch
+char
+class
+/* const */
+continue
+default
+do
+double
+else
+extends
+false
+final
+finally
+float
+for
+/* future */
+/* generic */
+/* goto */
+if
+implements
+import
+/* inner */
+instanceof
+int
+interface
+long
+native
+new
+null
+/* operator */
+/* outer */
+package
+private
+protected
+public
+/* rest */
+return
+short
+static
+super
+switch
+synchronized
+this
+throw
+throws
+transient
+true
+try
+/* var */
+void
+volatile
+while

elemx/java/j_scan.y

@@ -0,0 +1,135 @@
+%start token
+%scanner
+
+%local {
+#include "elx.h"
+
+/* from elx-java.c */
+void yyserror(const char *msg);
+int yyslex(void);
+
+/* for the TK_ symbols, generated from java.y */
+#include "java.h"
+
+/* for keyword recognition */
+#include "j_keywords.h"
+
+extern void issue_token(char which);
+extern void mark_token_start(void);
+
+#define MAX_IDENT 200
+static int idlen;
+static char identifier[MAX_IDENT+1];
+#define INIT_IDENT(c) (identifier[0] = (c), idlen = 1)
+#define ADD_IDENT(c) if (idlen == MAX_IDENT) return E_IDENT_TOO_LONG; \
+                     else identifier[idlen++] = (c)
+
+/* ### is there a better place? */
+#define E_IDENT_TOO_LONG  (-100)
+
+static int lookup(void);
+}
+
+
+%%
+
+token : pure_ws* { mark_token_start(); } slash_op
+
+slash_op : "/=" { return TK_OPERATOR; }
+	 | comment token
+	 | '/' { return TK_OPERATOR; }
+	 | one_token
+	 |
+	 ;
+
+one_token : t_identifier { return lookup(); }
+	  | t_literal { return TK_LITERAL; }
+	  | t_operator { return TK_OPERATOR; }
+	  | t_chars { return yysprev_char; }
+	  | t_inc_dec { return TK_INC_DEC; }
+	  | t_bracket
+          ;
+
+t_identifier : alpha { INIT_IDENT(yysprev_char); }
+	       ( alphanum { ADD_IDENT(yysprev_char); } )*
+
+alpha : 'a' - 'z' | 'A' - 'Z' | '_' | '$'
+alphanum : alpha | digit
+
+digit : '0' - '9'
+hexdigit : digit | 'a' - 'f' | 'A' - 'F'
+octal : '0' - '7'
+
+t_literal : number | string | char_constant
+
+number : ('1' - '9') digit* decimal_suffix
+       | '.' digit+ [exponent] [float_suffix]
+       | '0' (('x' | 'X') hexdigit+ | octal+) decimal_suffix
+       ;
+decimal_suffix : ('.' digit* [exponent] [float_suffix])
+	       | 'l' | 'L'
+	       | /* nothing */
+	       ;
+exponent : ('e' | 'E') ['+' | '-'] digit+
+float_suffix : 'f' | 'F' | 'd' | 'D'
+
+string : '"' string_char* '"' { issue_token(ELX_STRING); }
+string_char : '\1' -> '"' | '"' <-> '\\' | '\\' <- '\377' | '\\' '\1' - '\377'
+
+char_constant : '\'' one_char '\''
+one_char : '\1' -> '\'' | '\'' <-> '\\' | '\\' <- '\377' | '\\' '\1' - '\377'
+
+comment : ( "//" line_comment_char* '\n'
+	  | "/*" (block_comment_char | '*' block_non_term_char)* "*/"
+	  ) { issue_token(ELX_COMMENT); }
+	;
+line_comment_char : '\1' -> '\n' | '\n' <- '\377'
+block_comment_char : '\1' -> '*' | '*' <- '\377'
+block_non_term_char : '\1' -> '/' | '/' <- '\377'
+
+t_operator : "<<" | ">>" | ">>>"
+           | ">=" | "<=" | "==" | "!=" | "&&" | "||"
+	   | "*=" | "%=" | "+=" | "-=" | "<<=" | ">>="
+	   | ">>>=" | "&=" | "^=" | "|="
+	   | '<' | '>' | '%' | '^' | '&' | '|'
+	   ;
+t_inc_dec : "++" | "--"
+
+/* note: could not use ws* ; the '[' form would only reduce on $end
+   rather than "any" character. that meant we could not recognize '['
+   within the program text. separating out the cases Does The Right
+   Thing */
+t_bracket : '[' { return '['; }
+	  | '[' ']' { return TK_DIM; }
+	  | '[' ws+ ']' { return TK_DIM; }
+	  ;
+
+t_chars : ',' | ';' | '.' | '{' | '}' | '=' | '(' | ')' | ':'
+        | ']' | '!' | '~' | '+' | '-' | '*' | '?'
+	;
+
+ws : pure_ws | comment
+
+pure_ws : ' ' | '\t' | '\n' | '\f'
+
+%%
+
+static int lookup(void)
+{
+    int kw = KR_find_keyword(identifier, idlen);
+
+    if (kw == KR__not_found)
+    {
+        /* terminate so user can grab an identifier string */
+        identifier[idlen] = '\0';
+        return TK_IDENTIFIER;
+    }
+    
+    issue_token(ELX_KEYWORD);
+    return kw;
+}
+
+const char *get_identifier(void)
+{
+    return identifier;
+}

elemx/java/java.y

@@ -0,0 +1,458 @@
+%token KR_abstract
+%token KR_boolean KR_break KR_byte /* KR_byvalue */
+%token KR_case /* KR_cast */ KR_catch KR_char KR_class /* KR_const */ KR_continue
+%token KR_default KR_do KR_double
+%token KR_else KR_extends
+%token KR_false KR_final KR_finally KR_float KR_for /* KR_future */
+/* %token KR_generic KR_goto */
+%token KR_if KR_implements KR_import /* KR_inner */ KR_instanceof KR_int KR_interface
+%token KR_long
+%token KR_native KR_new KR_null
+/* %token KR_operator KR_outer */
+%token KR_package KR_private KR_protected KR_public
+%token /* KR_rest */ KR_return
+%token KR_short KR_static KR_super KR_switch KR_synchronized
+%token KR_this KR_throw KR_throws KR_transient KR_true KR_try
+%token /* KR_var */ KR_void KR_volatile
+%token KR_while
+
+%token TK_OP_ASSIGN TK_OPERATOR TK_IDENTIFIER TK_LITERAL
+%token TK_DIM TK_INC_DEC
+
+%start CompilationUnit
+
+/* the standard if/then/else conflict */
+/* %expect 1 */
+
+%{
+#include "elx.h"
+
+void yyerror(const char *msg);
+int yylex(void);
+
+/* ### should come from an elx-python.h or something */
+void issue_token(char which);
+%}
+
+%export {
+/* the main parsing function */
+int yyparse(void);
+
+/* need to define the 'not found' in addition to the regular keywords */
+#define KR__not_found 0
+}
+
+%%
+
+TypeSpecifier
+	: TypeName
+	| TypeNameDims
+	;
+
+TypeNameDims
+	: TypeName TK_DIM+
+	;
+
+TypeNameDot
+	: NamePeriod
+	| PrimitiveType '.'
+	;
+
+TypeName
+	: PrimitiveType
+	| NamePeriod TK_IDENTIFIER
+	| TK_IDENTIFIER
+	;
+
+NamePeriod
+	: TK_IDENTIFIER '.'
+	| NamePeriod TK_IDENTIFIER '.'
+	;
+
+TypeNameList
+	: TypeName / ','
+	;
+
+PrimitiveType
+	: KR_boolean
+	| KR_byte
+	| KR_char
+	| KR_double
+	| KR_float
+	| KR_int
+	| KR_long
+	| KR_short
+	| KR_void
+	;
+
+CompilationUnit
+	: PackageStatement [ImportStatements] [TypeDeclarations]
+	|                   ImportStatements  [TypeDeclarations]
+	|                                      TypeDeclarations
+	;
+
+PackageStatement
+	: KR_package (TK_IDENTIFIER / '.') ';'
+	;
+
+TypeDeclarations
+	: TypeDeclaration+
+	;
+
+TypeDeclaration
+	: ClassDeclaration
+	| InterfaceDeclaration
+	;
+
+ImportStatements
+	: ImportStatement+
+	;
+
+ImportStatement
+	: KR_import TK_IDENTIFIER ('.' TK_IDENTIFIER)* [".*"] ';'
+	;
+/*
+QualifiedName
+	: TK_IDENTIFIER / '.'
+	;
+*/
+ClassDeclaration
+        : [Modifiers] KR_class TK_IDENTIFIER [Super] [Interfaces] ClassBody
+	;
+
+Modifiers
+	: Modifier+
+	;
+
+Modifier
+	: KR_abstract
+	| KR_final
+	| KR_public
+	| KR_protected
+	| KR_private
+	| KR_static
+	| KR_transient
+	| KR_volatile
+	| KR_native
+	| KR_synchronized
+	;
+
+Super
+	: KR_extends TypeNameList
+	;
+
+Interfaces
+	: KR_implements TypeNameList
+	;
+
+ClassBody
+	: '{' FieldDeclaration* '}'
+	;
+
+FieldDeclaration
+	: FieldVariableDeclaration
+	| MethodDeclaration
+	| ConstructorDeclaration
+	| StaticInitializer
+	;
+
+FieldVariableDeclaration
+	: [Modifiers] TypeSpecifier VariableDeclarators ';'
+	;
+
+VariableDeclarators
+	: VariableDeclarator / ','
+	;
+
+VariableDeclarator
+	: DeclaratorName ['=' VariableInitializer]
+	;
+
+VariableInitializer
+	: Expression
+        | '{' [ArrayInitializers] '}'
+        ;
+
+ArrayInitializers
+	: VariableInitializer ( ',' [VariableInitializer] )*
+	;
+
+MethodDeclaration
+	: [Modifiers] TypeSpecifier MethodDeclarator [Throws] MethodBody
+	;
+
+MethodDeclarator
+	: DeclaratorName '(' [ParameterList] ')' TK_DIM*
+	;
+
+ParameterList
+	: Parameter / ','
+	;
+
+Parameter
+	: TypeSpecifier DeclaratorName
+	;
+
+DeclaratorName
+	: TK_IDENTIFIER TK_DIM*
+        ;
+
+Throws
+	: KR_throws TypeNameList
+	;
+
+MethodBody
+	: Block
+	| ';'
+	;
+
+ConstructorDeclaration
+	: [Modifiers] ConstructorDeclarator [Throws] Block
+	;
+
+ConstructorDeclarator
+	: TypeName '(' [ParameterList] ')'
+	;
+
+StaticInitializer
+	: KR_static Block
+	;
+
+InterfaceDeclaration
+	: [Modifiers] KR_interface TK_IDENTIFIER [ExtendsInterfaces] InterfaceBody
+	;
+
+ExtendsInterfaces
+	: KR_extends TypeNameList
+        ;
+
+InterfaceBody
+	: '{' FieldDeclaration+ '}'
+	;
+
+Block
+	: '{' LocalVariableDeclarationOrStatement* '}'
+        ;
+
+LocalVariableDeclarationOrStatement
+	: LocalVariableDeclarationStatement
+	| Statement
+	;
+
+LocalVariableDeclarationStatement
+	: TypeSpecifier VariableDeclarators ';'
+	;
+
+Statement
+	: EmptyStatement
+	| LabeledStatement
+	| ExpressionStatement ';'
+        | SelectionStatement
+        | IterationStatement
+	| JumpStatement
+	| GuardingStatement
+	| Block
+	;
+
+EmptyStatement
+	: ';'
+        ;
+
+LabeledStatement
+	: TK_IDENTIFIER ':' LocalVariableDeclarationOrStatement
+        | KR_case ConstantExpression ':' LocalVariableDeclarationOrStatement
+	| KR_default ':' LocalVariableDeclarationOrStatement
+        ;
+
+ExpressionStatement
+	: Expression
+	;
+
+SelectionStatement
+	: KR_if '(' Expression ')' Statement [KR_else Statement]
+        | KR_switch '(' Expression ')' Block
+        ;
+
+IterationStatement
+	: KR_while '(' Expression ')' Statement
+	| KR_do Statement KR_while '(' Expression ')' ';'
+	| KR_for '(' ForInit ForExpr [ForIncr] ')' Statement
+	;
+
+ForInit
+	: ExpressionStatements ';'
+	| LocalVariableDeclarationStatement
+	| ';'
+	;
+
+ForExpr
+	: [Expression] ';'
+	;
+
+ForIncr
+	: ExpressionStatements
+	;
+
+ExpressionStatements
+	: ExpressionStatement / ','
+	;
+
+JumpStatement
+	: KR_break [TK_IDENTIFIER] ';'
+        | KR_continue [TK_IDENTIFIER] ';'
+	| KR_return [Expression] ';'
+	| KR_throw Expression ';'
+	;
+
+GuardingStatement
+	: KR_synchronized '(' Expression ')' Statement
+	| KR_try Block Finally
+	| KR_try Block Catches
+	| KR_try Block Catches Finally
+	;
+
+Catches
+	: Catch+
+	;
+
+Catch
+	: KR_catch '(' TypeSpecifier [TK_IDENTIFIER] ')' Block
+	;
+
+Finally
+	: KR_finally Block
+	;
+
+ArgumentList
+	: Expression / ','
+	;
+
+PrimaryExpression
+	: TK_LITERAL
+	| KR_true | KR_false
+	| KR_this
+	| KR_null
+	| KR_super
+	| '(' Expression ')'
+	;
+
+PostfixExpression
+	: PrimaryExpression Trailers
+
+	| TypeName AltTrailers
+	| TypeNameDot FollowsPeriod Trailers
+	| TypeNameDot DimAllocation TypeTrailers
+	| TypeNameDims TypeTrailers
+
+	| KR_new TypeName AltTrailers
+	| KR_new TypeNameDims TypeTrailers
+        ;
+
+DimAllocation
+	: KR_new TypeNameDims
+	;
+
+PostfixDims
+	: TK_DIM+ '.' KR_class
+	;
+
+FollowsPeriod
+	: KR_this
+	| KR_class
+	| KR_super
+	| KR_new TypeName NoPeriodsTrailer
+	;
+
+NoPeriodsTrailer
+	: '[' Expression ']'
+	| '(' [ArgumentList] ')'
+	;
+
+NoDimTrailer
+	: NoPeriodsTrailer
+	| '.' (FollowsPeriod | TK_IDENTIFIER)
+	;
+
+AnyTrailer
+	: NoDimTrailer
+	| PostfixDims
+	;
+
+Trailers
+	: (AnyTrailer | DimAllocation NoDimTrailer)* [DimAllocation]
+	;
+
+AltTrailers
+	: NoPeriodsTrailer Trailers
+	|
+	;
+
+TypeTrailers
+	: NoDimTrailer Trailers
+	|
+	;
+
+CastablePrefixExpression
+	: PostfixExpression [TK_INC_DEC]
+	| LogicalUnaryOperator CastExpression
+	;
+
+LogicalUnaryOperator
+	: '~'
+	| '!'
+	;
+
+UnaryOperator
+	: '+'
+	| '-'
+	| TK_INC_DEC
+	;
+
+/* note: we don't actually have grammar for a cast. we just rely on:
+   (expr) (argument)
+   as our parse match */
+CastExpression
+	: /* '(' PrimitiveType ')' CastExpression
+	| '(' NamePeriod TK_IDENTIFIER TK_DIM TK_DIM* ')' CastablePrefixExpression
+	| '(' NamePeriod TK_IDENTIFIER ')' CastablePrefixExpression
+	| '(' TK_IDENTIFIER TK_DIM TK_DIM* ')' CastablePrefixExpression
+	| '(' TK_IDENTIFIER ')' CastablePrefixExpression
+	| */ UnaryOperator CastExpression
+	| CastablePrefixExpression
+	;
+
+BinaryExpression
+	: CastExpression
+	| BinaryExpression TK_BINARY CastExpression
+	| BinaryExpression KR_instanceof TypeSpecifier
+	;
+
+ConditionalExpression
+	: BinaryExpression
+	| BinaryExpression '?' Expression ':' ConditionalExpression
+	;
+
+AssignmentExpression
+	: ConditionalExpression [AssignmentOperator AssignmentExpression]
+	;
+
+AssignmentOperator
+	: '='
+	| TK_OP_ASSIGN
+	;
+
+Expression
+	: AssignmentExpression
+        ;
+
+ConstantExpression
+	: ConditionalExpression
+	;
+
+/*
+TK_OPERATOR : OP_LOR | OP_LAND
+	    | OP_EQ | OP_NE | OP_LE | OP_GE
+	    | OP_SHL | OP_SHR | OP_SHRR
+	    ;
+*/
+TK_BINARY : TK_OPERATOR | '+' | '-' | '*'

elemx/python/.cvsignore

@@ -0,0 +1,6 @@
+elx-python
+py_keywords.c
+py_keywords.h
+python.c
+python.h
+*.output

elemx/python/elx-python.c

@@ -0,0 +1,150 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "scanner.h"
+#include "python.h"
+#include "py_keywords.h"
+#include "elx.h"
+
+extern int yylex(void);
+
+static const char *fname;
+static int saw_error = 0;
+static void *scan_ctx;
+static elx_context_t *ectx;
+
+void yyerror(const char *msg)
+{
+    int sl, sc, el, ec;
+
+    scanner_token_linecol(scan_ctx, &sl, &sc, &el, &ec);
+    fprintf(stderr, "%s:%d:%d: parse error: %s\n", fname, sl, sc, msg);
+    saw_error = 1;
+}
+
+int reader(void *user_ctx)
+{
+    FILE *inf = user_ctx;
+    int c = fgetc(inf);
+
+    if (c == EOF)
+        return SCANNER_EOF;
+
+//    printf("char: '%c'\n", c);
+
+    return c;
+}
+
+void issue_token(char which)
+{
+    int start;
+    int end;
+    const char *ident = NULL;
+
+    scanner_token_range(scan_ctx, &start, &end);
+
+    if (ELX_DEFINES_SYM(which))
+    {
+        int length;
+
+        scanner_identifier(scan_ctx, &ident, &length);
+    }
+
+    elx_issue_token(ectx, which, start, end - start + 1, ident);
+}
+
+int yylex(void)
+{
+    int v;
+
+    do {
+        v = scanner_get_token(scan_ctx);
+
+        if (v == TK_COMMENT)
+        {
+            issue_token(ELX_COMMENT);
+        }
+    } while (v == TK_COMMENT);
+
+    /* is this identifier a keyword? */
+    if (v == TK_IDENTIFIER)
+    {
+        const char *ident;
+        int length;
+        int kw;
+
+        scanner_identifier(scan_ctx, &ident, &length);
+#if 0
+        printf("id=%s\n", ident);
+#endif
+
+        kw = KR_find_keyword(ident, length);
+        if (kw != KR__not_found)
+        {
+            v = kw;
+            issue_token(ELX_KEYWORD);
+        }
+    }
+    else if (v == TK_STRING)
+    {
+        issue_token(ELX_STRING);
+    }
+
+//    printf("token=%d\n", v);
+
+    return v;
+}
+
+#ifdef DEBUG_SCANNER
+
+void gen_scan_tokens(void)
+{
+    while (1)
+    {
+        int v = scanner_get_token(scan_ctx);
+        int sl, sc, el, ec;
+
+        scanner_token_linecol(scan_ctx, &sl, &sc, &el, &ec);
+        if (v == TK_NEWLINE)
+            printf("%d,%d: NEWLINE\n", sl, sc);
+        else if (v == TK_INDENT)
+            printf("%d,%d: INDENT\n", el, ec);
+        else if (v == TK_DEDENT)
+            printf("%d,%d: DEDENT\n", el, ec);
+        else
+            printf("%d,%d-%d,%d: %d\n", sl, sc, el, ec, v);
+
+        /* end of parse? */
+        if (v <= 0)
+            break;
+    }
+}
+
+#endif /* DEBUG_SCANNER */
+
+static void gen_elx_tokens(void)
+{
+    /* ### what to do with the result? should have seen/set saw_error */
+    (void) yyparse();
+}
+
+int main(int argc, const char **argv)
+{
+    ectx = elx_process_args(argc, argv);
+    elx_open_files(ectx);
+
+    scan_ctx = scanner_begin(reader, ectx->input_fp);
+
+#ifdef DEBUG_SCANNER
+    gen_scan_tokens();
+#else
+    gen_elx_tokens();
+#endif
+
+    scanner_end(scan_ctx);
+    elx_close_files(ectx);
+
+    if (saw_error)
+        return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}

elemx/python/py_keywords.shilka

@@ -0,0 +1,36 @@
+%local {
+/* get the KR_* values */
+#include "python.h"
+}
+
+%%
+and
+/* as */
+assert
+break
+class
+continue
+def
+del
+elif
+else
+except
+exec
+finally
+for
+from
+global
+if
+import
+in
+is
+lambda
+not
+or
+pass
+print
+raise
+return
+try
+while
+yield

elemx/python/python.y

@@ -0,0 +1,135 @@
+
+%token TK_COMMENT TK_IDENTIFIER TK_NUMBER
+%token TK_OPERATOR TK_STRING
+%token TK_INDENT TK_DEDENT TK_NEWLINE
+
+%token KR_and KR_assert KR_break KR_class KR_continue KR_def
+%token KR_del KR_elif KR_else KR_except KR_exec KR_finally
+%token KR_for KR_from KR_global KR_if KR_import KR_in KR_is
+%token KR_lambda KR_not KR_or KR_pass KR_print KR_raise
+%token KR_return KR_try KR_while KR_yield
+
+%start file_input
+
+%{
+#include "elx.h"
+
+void yyerror(const char *msg);
+int yylex(void);
+
+/* ### should come from an elx-python.h or something */
+void issue_token(char which);
+%}
+
+%export {
+/* the main parsing function */
+int yyparse(void);
+
+/* need to define the 'not found' in addition to the regular keywords */
+#define KR__not_found 0
+}
+
+%%
+
+file_input: (TK_NEWLINE | stmt)*
+
+NAME: TK_IDENTIFIER
+
+funcdef: KR_def NAME { issue_token(ELX_LOCAL_FDEF); } parameters ':' suite
+parameters: '(' [varargslist] ')'
+varargslist: paramdef (',' paramdef)* [',' [varargsdef]]
+           | varargsdef
+	   ;
+/* the TK_OPERATOR represents '*' or '**' */
+varargsdef: TK_OPERATOR NAME [',' TK_OPERATOR NAME]
+paramdef: fpdef [TK_OPERATOR test]
+fpdef: NAME | '(' fplist ')'
+fplist: fpdef (',' fpdef)* [',']
+
+stmt: simple_stmt | compound_stmt
+simple_stmt: small_stmt (';' small_stmt)* [';'] TK_NEWLINE
+small_stmt: expr_stmt | print_stmt | raise_stmt
+	  | import_stmt | global_stmt | exec_stmt | assert_stmt
+          | KR_del exprlist
+	  | KR_pass
+	  | KR_break
+	  | KR_continue
+	  | KR_return [testlist]
+	  | KR_yield testlist
+	  ;
+
+/* expr_stmt is normally assignment, which we get thru TK_OPERATOR in 'expr' */
+expr_stmt: testlist
+
+/* a print normally allows '>> test'; since that is a TK_OPERATOR, we
+   get it as part of 'factor'. this rule also allows for a trailing
+   comma in '>> test,' which the normal print doesn't */
+print_stmt: KR_print [test (',' test)* [',']]
+
+raise_stmt: KR_raise [test [',' test [',' test]]]
+
+/* the TK_OPERATOR represents '*' */
+import_stmt: KR_import dotted_as_name (',' dotted_as_name)*
+           | KR_from dotted_name KR_import (TK_OPERATOR | import_as_name (',' import_as_name)*)
+import_as_name: NAME [NAME NAME]
+dotted_as_name: dotted_name [NAME NAME]
+dotted_name: NAME ('.' NAME)*
+global_stmt: KR_global NAME (',' NAME)*
+exec_stmt: KR_exec expr [KR_in test [',' test]]
+assert_stmt: KR_assert test [',' test]
+
+compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
+if_stmt: KR_if test ':' suite (KR_elif test ':' suite)* [KR_else ':' suite]
+while_stmt: KR_while test ':' suite [KR_else ':' suite]
+for_stmt: KR_for exprlist KR_in testlist ':' suite [KR_else ':' suite]
+try_stmt: KR_try ':' suite (except_clause ':' suite)+
+           [KR_else ':' suite] | KR_try ':' suite KR_finally ':' suite
+/* NB compile.c makes sure that the default except clause is last */
+except_clause: KR_except [test [',' test]]
+suite: simple_stmt | TK_NEWLINE TK_INDENT stmt+ TK_DEDENT
+
+test: test_factor (test_op test_factor | KR_is [KR_not] factor)*
+      [TK_OPERATOR lambdef] | lambdef
+test_op: bin_op | KR_in
+test_factor: KR_not* factor
+
+expr: factor (expr_op factor)*
+expr_op: bin_op | KR_is [KR_not]
+
+factor: TK_OPERATOR* atom trailer*
+
+bin_op: TK_OPERATOR | KR_or | KR_and | KR_not KR_in
+
+atom: '(' [testlist] ')' | '[' [listmaker] ']' | '{' [dictmaker] '}'
+    | '`' testlist_no_trailing '`' | TK_IDENTIFIER | TK_NUMBER | TK_STRING+
+listmaker: test ( list_for | (',' test)* [','] )
+lambdef: KR_lambda [varargslist] ':' test
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: expr (',' expr)* [',']
+testlist: test (',' test)* [',']
+testlist_no_trailing: test (',' test)*
+testlist_safe: test [(',' test)+ [',']] /* doesn't match: test, */
+dictmaker: test ':' test (',' test ':' test)* [',']
+
+classdef: KR_class NAME ['(' testlist ')'] ':' suite
+
+/* arguments are normally 'keyword = test; since '=' is TK_OPERATOR, we
+   match keyword arguments as part of 'test' (in 'expr').
+   
+   the vararg portion is normally '* test' or '** test'; since '*' and
+   '**' are TK_OPERATOR, we match varargs as part of 'test' (in
+   'factor')
+   
+   thus, all argument forms are simply 'test'
+   
+   varargs does not normally allow a trailing comma, but we can
+   simplify things and allow a match
+*/
+arglist: test (',' test)* [',']
+
+list_iter: list_for | list_if
+list_for: KR_for exprlist KR_in testlist_safe [list_iter]
+list_if: KR_if test [list_iter]

elemx/python/scanner.c

@@ -0,0 +1,523 @@
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <assert.h>
+#include <string.h>
+
+#include "python.h"     /* get the TK_ values */
+#include "scanner.h"
+
+#define SCANNER_EMPTY (SCANNER_EOF - 1) /* -2 */
+#define SCANNER_TABSIZE 8
+#define SCANNER_MAXINDENT 100
+#define SCANNER_MAXIDLEN  200
+
+typedef struct
+{
+    get_char_t getfunc;
+    void *user_ctx;
+
+    char saved;
+    int was_newline;    /* was previous character a newline? */
+
+    int start;          /* start position of last token returned */
+    int start_col;
+    int start_line;
+
+    int fpos;           /* file position */
+    int lineno;         /* file line number */
+    int line_pos;       /* file position of current line's first char */
+
+    int nesting_level;
+
+    int indent;                         /* which indent */
+    int indents[SCANNER_MAXINDENT];     /* the set of indents */
+
+    int dedent_count;                   /* how many DEDENTs to issue */
+
+    int skip_newline;   /* skip the newline after a blank_line + comment */
+
+    int idlen;
+    char identifier[SCANNER_MAXIDLEN];  /* accumulated identifier */
+
+} scanner_ctx;
+
+
+static int next_char(scanner_ctx *ctx)
+{
+    int c;
+
+    ++ctx->fpos;
+
+    if (ctx->saved == SCANNER_EMPTY)
+    {
+        return (*ctx->getfunc)(ctx->user_ctx);
+    }
+
+    c = ctx->saved;
+    ctx->saved = SCANNER_EMPTY;
+    return c;
+}
+
+static void backup_char(scanner_ctx *ctx, int c)
+{
+    assert(ctx->saved == SCANNER_EMPTY);
+    ctx->saved = c;
+    ctx->was_newline = 0;       /* we may have put it back */
+    --ctx->fpos;
+}
+
+/* called to note that we've moved on to another line */
+static void on_next_line(scanner_ctx *ctx)
+{
+    ctx->line_pos = ctx->fpos;
+    ++ctx->lineno;
+}
+
+void *scanner_begin(get_char_t getfunc, void *user_ctx)
+{
+    scanner_ctx *ctx = malloc(sizeof(*ctx));
+
+    memset(ctx, 0, sizeof(*ctx));
+    ctx->getfunc = getfunc;
+    ctx->user_ctx = user_ctx;
+    ctx->saved = SCANNER_EMPTY;
+    ctx->lineno = 1;
+
+    return ctx;
+}
+
+int scanner_get_token(void *opaque_ctx)
+{
+    scanner_ctx *ctx = opaque_ctx;
+    int c;
+    int c2;
+    int blank_line;
+
+    if (ctx->dedent_count)
+    {
+        --ctx->dedent_count;
+        return TK_DEDENT;
+    }
+
+  nextline:
+    blank_line = 0;
+    /* if we're at the start of the line, then get the indentation level */
+    if (ctx->fpos == ctx->line_pos)
+    {
+        int col = 0;
+
+        while (1)
+        {
+            c = next_char(ctx);
+            if (c == ' ')
+                ++col;
+            else if (c == '\t')
+                col = (col / SCANNER_TABSIZE + 1) * SCANNER_TABSIZE;
+            else if (c == '\f')         /* ^L / formfeed */
+                col = 0;
+            else
+                break;
+        }
+        backup_char(ctx, c);
+
+        if (c == '#' || c == '\n')
+        {
+            /* this is a "blank" line and doesn't count towards indentation,
+               and it doesn't produce NEWLINE tokens */
+            blank_line = 1;
+        }
+
+        /* if it isn't blank, and we aren't inside nesting expressions, then
+           we need to handle INDENT/DEDENT */
+        if (!blank_line && ctx->nesting_level == 0)
+        {
+            int last_indent = ctx->indents[ctx->indent];
+
+            if (col == last_indent)
+            {
+                /* no change */
+            }
+            else if (col > last_indent)
+            {
+                if (ctx->indent == SCANNER_MAXINDENT - 1)
+                {
+                    /* oops. too deep. */
+                    return E_TOO_MANY_INDENTS;
+                }
+                ctx->indents[++ctx->indent] = col;
+                return TK_INDENT;
+            }
+            else /* col < last_indent */
+            {
+                /* find the previous indentation that matches this one */
+                while (ctx->indent > 0
+                       && col < ctx->indents[ctx->indent])
+                {
+                    ++ctx->dedent_count;
+                    --ctx->indent;
+                }
+                if (col != ctx->indents[ctx->indent])
+                {
+                    /* oops. dedent doesn't match any indent. */
+                    return E_DEDENT_MISMATCH;
+                }
+
+                /* deliver one dedent now */
+                --ctx->dedent_count;
+                return TK_DEDENT;
+            }
+        } /* !blank_line ... */
+    } /* start of line */
+
+    /* start here if we see a line continuation */
+ read_more:
+
+    do {
+        c = next_char(ctx);
+    } while (c == ' ' || c == '\t' || c == '\f');
+
+    /* here is where the token starts */
+    ctx->start = ctx->fpos;
+    ctx->start_line = ctx->lineno;
+    ctx->start_col = ctx->fpos - ctx->line_pos;
+
+    /* comment? */
+    if (c == '#')
+    {
+        do {
+            c = next_char(ctx);
+        } while (c != SCANNER_EOF && c != '\n');
+
+        /* if we are suppressing newlines because this is a blank line, then
+           leave a marker to skip the newline, next time through. */
+        if (blank_line && c == '\n')
+            ctx->skip_newline = 1;
+
+        /* put back whatever we sucked up */
+        backup_char(ctx, c);
+
+        return TK_COMMENT;
+    }
+
+    /* Look for an identifier */
+    if (isalpha(c) || c == '_')
+    {
+        ctx->idlen = 0;
+
+        /* is this actually a string? */
+        if (c == 'r' || c == 'R')
+        {
+            ctx->identifier[ctx->idlen++] = c;
+            c = next_char(ctx);
+            if (c == '"' || c == '\'')
+                goto parse_string;
+        }
+        else if (c == 'u' || c == 'U')
+        {
+            ctx->identifier[ctx->idlen++] = c;
+            c = next_char(ctx);
+            if (c == 'r' || c == 'R')
+            {
+                ctx->identifier[ctx->idlen++] = c;
+                c = next_char(ctx);
+            }
+            if (c == '"' || c == '\'')
+                goto parse_string;
+        }
+
+        while (isalnum(c) || c == '_') {
+            /* store the character if there is room for it, and room left
+               for a null-terminator. */
+            if (ctx->idlen < SCANNER_MAXIDLEN-1)
+                ctx->identifier[ctx->idlen++] = c;
+            c = next_char(ctx);
+        }
+        backup_char(ctx, c);
+
+        /* ### check for a keyword */
+        return TK_IDENTIFIER;
+    }
+
+    if (c == '\n')
+    {
+        on_next_line(ctx);
+
+        /* don't report NEWLINE tokens for blank lines or nested exprs */
+        if (blank_line || ctx->nesting_level > 0 || ctx->skip_newline)
+        {
+            ctx->skip_newline = 0;
+            goto nextline;
+        }
+
+        return TK_NEWLINE;
+    }
+
+    if (c == '.')
+    {
+        c = next_char(ctx);
+        if (isdigit(c))
+            goto parse_fraction;
+        backup_char(ctx, c);
+        return '.';
+    }
+
+    if (isdigit(c))
+    {
+        if (c == '0')
+        {
+            c = next_char(ctx);
+            if (c == 'x' || c == 'X')
+            {
+                do {
+                    c = next_char(ctx);
+                } while (isxdigit(c));
+                goto skip_fp;
+            }
+            else if (isdigit(c))
+            {
+                do {
+                    c = next_char(ctx);
+                } while (isdigit(c));
+            }
+            if (c == '.')
+                goto parse_fraction;
+            if (c == 'e' || c == 'E')
+                goto parse_exponent;
+            if (c == 'j' || c == 'J')
+                goto parse_imaginary;
+        skip_fp:
+            /* this point: parsed an octal, decimal, or hexadecimal */
+
+            if (c == 'l' || c == 'L')
+            {
+                /* we consumed just enough. stop and return a NUMBER */
+                return TK_NUMBER;
+            }
+
+            /* consumed too much. backup and return a NUMBER */
+            backup_char(ctx, c);
+            return TK_NUMBER;
+        }
+
+        /* decimal number */
+        do {
+            c = next_char(ctx);
+        } while (isdigit(c));
+
+        if (c == 'l' || c == 'L')
+        {
+            /* we consumed just enogh. stop and return a NUMBER */
+            return TK_NUMBER;
+        }
+
+        if (c == '.')
+        {
+        parse_fraction:
+            do {
+                c = next_char(ctx);
+            } while (isdigit(c));
+        }
+
+        if (c == 'e' || c == 'E')
+        {
+        parse_exponent:
+            c = next_char(ctx);
+            if (c == '+' || c == '-')
+                c = next_char(ctx);
+            if (!isdigit(c))
+            {
+                backup_char(ctx, c);
+                return E_BAD_NUMBER;
+            }
+            do {
+                c = next_char(ctx);
+            } while (isdigit(c));
+        }
+
+        if (c == 'j' || c == 'J')
+        {
+        parse_imaginary:
+            c = next_char(ctx);
+        }
+
+        /* one too far. backup and return a NUMBER */
+        backup_char(ctx, c);
+        return TK_NUMBER;
+
+    } /* isdigit */
+
+parse_string:
+    if (c == '\'' || c == '"')
+    {
+        int second_quote_pos = ctx->fpos + 1;
+        int which_quote = c;
+        int is_triple = 0;
+        int quote_count = 0;
+
+        while (1)
+        {
+            c = next_char(ctx);
+            if (c == '\n')
+            {
+                on_next_line(ctx);
+
+                if (!is_triple)
+                    return E_UNTERM_STRING;
+                quote_count = 0;
+            }
+            else if (c == SCANNER_EOF)
+            {
+                return E_UNTERM_STRING;
+            }
+            else if (c == which_quote)
+            {
+                ++quote_count;
+                if (ctx->fpos == second_quote_pos)
+                {
+                    c = next_char(ctx);
+                    if (c == which_quote)
+                    {
+                        is_triple = 1;
+                        quote_count = 0;
+                        continue;
+                    }
+                    /* we just read one past the empty string. back up. */
+                    backup_char(ctx, c);
+                }
+
+                /* this quote may have terminated the string */
+                if (!is_triple || quote_count == 3)
+                    return TK_STRING;
+            }
+            else if (c == '\\')
+            {
+                c = next_char(ctx);
+                if (c == SCANNER_EOF)
+                    return E_UNTERM_STRING;
+                if (c == '\n')
+                    on_next_line(ctx);
+                quote_count = 0;
+            }
+            else
+            {
+                quote_count = 0;
+            }
+        }
+
+        /* NOTREACHED */
+    }
+
+    /* line continuation */
+    if (c == '\\')
+    {
+        c = next_char(ctx);
+        if (c != '\n')
+            return E_BAD_CONTINUATION;
+
+        on_next_line(ctx);
+        goto read_more;
+    }
+
+    /* look for operators */
+
+    /* the nesting operators */
+    if (c == '(' || c == '[' || c == '{')
+    {
+        ++ctx->nesting_level;
+        return c;
+    }
+    if (c == ')' || c == ']' || c == '}')
+    {
+        --ctx->nesting_level;
+        return c;
+    }
+
+    /* look for up-to-3-char ops */
+    if (c == '<' || c == '>' || c == '*' || c == '/')
+    {
+        c2 = next_char(ctx);
+        if (c == c2)
+        {
+            c2 = next_char(ctx);
+            if (c2 != '=')
+            {
+                /* oops. one too far. */
+                backup_char(ctx, c2);
+            }
+            return TK_OPERATOR;
+        }
+
+        if (c == '<' && c2 == '>')
+            return TK_OPERATOR;
+
+        if (c2 != '=')
+        {
+            /* one char too far. */
+            backup_char(ctx, c2);
+        }
+        return TK_OPERATOR;
+    }
+
+    /* look for 2-char ops */
+    if (c == '=' || c == '!' || c == '+' || c == '-'
+        || c == '|' || c == '%' || c == '&' || c == '^')
+    {
+        c2 = next_char(ctx);
+        if (c2 == '=')
+            return TK_OPERATOR;
+
+        /* oops. too far. */
+        backup_char(ctx, c2);
+        return TK_OPERATOR;
+    }
+
+    /* ### should all of these return 'c' ? */
+    if (c == ':' || c == ',' || c == ';' || c == '`')
+        return c;
+
+    /* as a unary operator, this must be a TK_OPERATOR */
+    if (c == '~')
+        return TK_OPERATOR;
+
+    /* if we have an EOF, then just return it */
+    if (c == SCANNER_EOF)
+        return SCANNER_EOF;
+
+    /* unknown input */
+    return E_UNKNOWN_TOKEN;
+}
+
+void scanner_identifier(void *opaque_ctx, const char **ident, int *len)
+{
+    scanner_ctx *ctx = opaque_ctx;
+
+    ctx->identifier[ctx->idlen] = '\0';
+    *ident = ctx->identifier;
+    *len = ctx->idlen;
+}
+
+void scanner_token_range(void *opaque_ctx, int *start, int *end)
+{
+    scanner_ctx *ctx = opaque_ctx;
+
+    *start = ctx->start;
+    *end = ctx->fpos;
+}
+
+void scanner_token_linecol(void *opaque_ctx,
+                           int *sline, int *scol, int *eline, int *ecol)
+{
+    scanner_ctx *ctx = opaque_ctx;
+
+    *sline = ctx->start_line;
+    *scol = ctx->start_col;
+
+    *eline = ctx->lineno;
+    *ecol = ctx->fpos - ctx->line_pos;
+}
+
+void scanner_end(void *ctx)
+{
+    free(ctx);
+}

elemx/python/scanner.h

@@ -0,0 +1,42 @@
+#ifndef SCANNER_H
+#define SCANNER_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* constants and errors returned by the scanner */
+enum
+{
+    SCANNER_EOF = -1,           /* returned by get_char_t and
+                                   scanner_get_token to symbolize EOF */
+
+    E_TOO_MANY_INDENTS = -100,  /* too many indents */
+    E_DEDENT_MISMATCH,          /* no matching indent */
+    E_BAD_CONTINUATION,         /* character occurred after \ */
+    E_BAD_NUMBER,               /* parse error in a number */
+    E_UNKNOWN_TOKEN,            /* dunno what we found */
+    E_UNTERM_STRING             /* unterminated string constant */
+};
+
+typedef int (*get_char_t)(void *user_ctx);
+
+void *scanner_begin(get_char_t getfunc, void *user_ctx);
+
+int scanner_get_token(void *ctx);
+
+void scanner_identifier(void *ctx, const char **ident, int *len);
+void scanner_token_range(void *ctx, int *start, int *end);
+void scanner_token_linecol(void *ctx,
+                           int *sline, int *scol, int *eline, int *ecol);
+
+void scanner_end(void *ctx);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SCANNER_H */

lib/PyFontify.py

@@ -1,153 +1,170 @@
 """Module to analyze Python source code; for syntax coloring tools.
 
 Interface:
-	tags = fontify(pytext, searchfrom, searchto)
 
-The 'pytext' argument is a string containing Python source code.
-The (optional) arguments 'searchfrom' and 'searchto' may contain a slice in pytext. 
+    tags = fontify(pytext, searchfrom, searchto)
+
+The PYTEXT argument is a string containing Python source code.  The
+(optional) arguments SEARCHFROM and SEARCHTO may contain a slice in
+PYTEXT.
+
 The returned value is a list of tuples, formatted like this:
-	[('keyword', 0, 6, None), ('keyword', 11, 17, None), ('comment', 23, 53, None), etc. ]
+
+    [('keyword', 0, 6, None),
+     ('keyword', 11, 17, None),
+     ('comment', 23, 53, None),
+     ...
+    ]
+    
 The tuple contents are always like this:
-	(tag, startindex, endindex, sublist)
-tag is one of 'keyword', 'string', 'comment' or 'identifier'
-sublist is not used, hence always None. 
+
+    (tag, startindex, endindex, sublist)
+    
+TAG is one of 'keyword', 'string', 'comment' or 'identifier'
+SUBLIST is not used, hence always None.
 """
 
 # Based on FontText.py by Mitchell S. Chapman,
 # which was modified by Zachary Roadhouse,
 # then un-Tk'd by Just van Rossum.
 # Many thanks for regular expression debugging & authoring are due to:
-#	Tim (the-incredib-ly y'rs) Peters and Cristian Tismer
+#    Tim (the-incredib-ly y'rs) Peters and Cristian Tismer
 # So, who owns the copyright? ;-) How about this:
 # Copyright 1996-1997: 
-#	Mitchell S. Chapman,
-#	Zachary Roadhouse,
-#	Tim Peters,
-#	Just van Rossum
+#    Mitchell S. Chapman,
+#    Zachary Roadhouse,
+#    Tim Peters,
+#    Just van Rossum
 
 __version__ = "0.3.1"
 
-import string, regex
+import string, re
 
-# First a little helper, since I don't like to repeat things. (Tismer speaking)
-import string
-def replace(where, what, with):
-	return string.join(string.split(where, what), with)
 
 # This list of keywords is taken from ref/node13.html of the
 # Python 1.3 HTML documentation. ("access" is intentionally omitted.)
-keywordsList = [
-	"del", "from", "lambda", "return",
-	"and", "elif", "global", "not", "try",
-	"break", "else", "if", "or", "while",
-	"class", "except", "import", "pass",
-	"continue", "finally", "in", "print",
-	"def", "for", "is", "raise"]
 
-# Build up a regular expression which will match anything
-# interesting, including multi-line triple-quoted strings.
+keywordsList = ["and", "assert", "break", "class", "continue", "def",
+                "del", "elif", "else", "except", "exec", "finally",
+                "for", "from", "global", "if", "import", "in", "is",
+                "lambda", "not", "or", "pass", "print", "raise",
+                "return", "try", "while",
+                ]
+
+# A regexp for matching Python comments.
 commentPat = "#.*"
 
-pat = "q[^\q\n]*\(\\\\[\000-\377][^\q\n]*\)*q"
-quotePat = replace(pat, "q", "'") + "\|" + replace(pat, 'q', '"')
+# A regexp for matching simple quoted strings.
+pat = "q[^q\\n]*(\\[\000-\377][^q\\n]*)*q"
+quotePat = string.replace(pat, "q", "'") + "|" + string.replace(pat, 'q', '"')
 
-# Way to go, Tim!
+# A regexp for matching multi-line tripled-quoted strings.  (Way to go, Tim!)
 pat = """
-	qqq
-	[^\\q]*
-	\(
-		\(	\\\\[\000-\377]
-		\|	q
-			\(	\\\\[\000-\377]
-			\|	[^\\q]
-			\|	q
-				\(	\\\\[\000-\377]
-				\|	[^\\q]
-				\)
-			\)
-		\)
-		[^\\q]*
-	\)*
-	qqq
+    qqq
+    [^q]*
+    (
+        (    \\[\000-\377]
+        |    q
+            (    \\[\000-\377]
+            |    [^q]
+            |    q
+                (    \\[\000-\377]
+                |    [^q]
+                )
+            )
+        )
+        [^q]*
+    )*
+    qqq
 """
-pat = string.join(string.split(pat), '')	# get rid of whitespace
-tripleQuotePat = replace(pat, "q", "'") + "\|" + replace(pat, 'q', '"')
+pat = string.join(string.split(pat), '')   # get rid of whitespace
+tripleQuotePat = string.replace(pat, "q", "'") + "|" \
+                 + string.replace(pat, 'q', '"')
 
-# Build up a regular expression which matches all and only
-# Python keywords. This will let us skip the uninteresting
-# identifier references.
-# nonKeyPat identifies characters which may legally precede
-# a keyword pattern.
-nonKeyPat = "\(^\|[^a-zA-Z0-9_.\"']\)"
+# A regexp which matches all and only Python keywords. This will let
+# us skip the uninteresting identifier references.
+nonKeyPat = "(^|[^a-zA-Z0-9_.\"'])"   # legal keyword-preceding characters
+keyPat = nonKeyPat + "(" + string.join(keywordsList, "|") + ")" + nonKeyPat
 
-keyPat = nonKeyPat + "\("
-for keyword in keywordsList:
-	keyPat = keyPat + keyword + "\|"
-keyPat = keyPat[:-2] + "\)" + nonKeyPat
+# Our final syntax-matching regexp is the concatation of the regexp's we
+# constructed above.
+syntaxPat = keyPat + \
+            "|" + commentPat + \
+            "|" + tripleQuotePat + \
+            "|" + quotePat
+syntaxRE = re.compile(syntaxPat)
 
-matchPat = keyPat + "\|" + commentPat + "\|" + tripleQuotePat + "\|" + quotePat
-matchRE = regex.compile(matchPat)
-
-idKeyPat = "[ \t]*[A-Za-z_][A-Za-z_0-9.]*"	# Ident w. leading whitespace.
-idRE = regex.compile(idKeyPat)
+# Finally, we construct a regexp for matching indentifiers (with
+# optional leading whitespace).
+idKeyPat = "[ \t]*[A-Za-z_][A-Za-z_0-9.]*"
+idRE = re.compile(idKeyPat)
 
 
-def fontify(pytext, searchfrom = 0, searchto = None):
-	if searchto is None:
-		searchto = len(pytext)
-	# Cache a few attributes for quicker reference.
-	search = matchRE.search
-	group = matchRE.group
-	idSearch = idRE.search
-	idGroup = idRE.group
-	
-	tags = []
-	tags_append = tags.append
-	commentTag = 'comment'
-	stringTag = 'string'
-	keywordTag = 'keyword'
-	identifierTag = 'identifier'
-	
-	start = 0
-	end = searchfrom
-	while 1:
-		start = search(pytext, end)
-		if start < 0 or start >= searchto:
-			break	# EXIT LOOP
-		match = group(0)
-		end = start + len(match)
-		c = match[0]
-		if c not in "#'\"":
-			# Must have matched a keyword.
-			if start <> searchfrom:
-				# there's still a redundant char before and after it, strip!
-				match = match[1:-1]
-				start = start + 1
-			else:
-				# this is the first keyword in the text.
-				# Only a space at the end.
-				match = match[:-1]
-			end = end - 1
-			tags_append((keywordTag, start, end, None))
-			# If this was a defining keyword, look ahead to the
-			# following identifier.
-			if match in ["def", "class"]:
-				start = idSearch(pytext, end)
-				if start == end:
-					match = idGroup(0)
-					end = start + len(match)
-					tags_append((identifierTag, start, end, None))
-		elif c == "#":
-			tags_append((commentTag, start, end, None))
-		else:
-			tags_append((stringTag, start, end, None))
-	return tags
+def fontify(pytext, searchfrom=0, searchto=None):
+    if searchto is None:
+        searchto = len(pytext)
+    tags = []
+    commentTag = 'comment'
+    stringTag = 'string'
+    keywordTag = 'keyword'
+    identifierTag = 'identifier'
+    
+    start = 0
+    end = searchfrom
+    while 1:
+        # Look for some syntax token we're interested in.  If find
+        # nothing, we're done.
+        matchobj = syntaxRE.search(pytext, end)
+        if not matchobj:
+            break
+
+        # If we found something outside our search area, it doesn't
+        # count (and we're done).
+        start = matchobj.start()
+        if start >= searchto:
+            break
+
+        match = matchobj.group(0)
+        end = start + len(match)
+        c = match[0]
+        if c == '#':
+            # We matched a comment.
+            tags.append((commentTag, start, end, None))
+        elif c == '"' or c == '\'':
+            # We matched a string.
+            tags.append((stringTag, start, end, None))
+        else:
+            # We matched a keyword.
+            if start != searchfrom:
+                # there's still a redundant char before and after it, strip!
+                match = match[1:-1]
+                start = start + 1
+            else:
+                # This is the first keyword in the text.
+                # Only a space at the end.
+                match = match[:-1]
+            end = end - 1
+            tags.append((keywordTag, start, end, None))
+            # If this was a defining keyword, look ahead to the
+            # following identifier.
+            if match in ["def", "class"]:
+                matchobj = idRE.search(pytext, end)
+                if matchobj:
+                    start = matchobj.start()
+                    if start == end and start < searchto:
+                        end = start + len(matchobj.group(0))
+                        tags.append((identifierTag, start, end, None))
+    return tags
 
 
 def test(path):
-	f = open(path)
-	text = f.read()
-	f.close()
-	tags = fontify(text)
-	for tag, start, end, sublist in tags:
-		print tag, `text[start:end]`
+    f = open(path)
+    text = f.read()
+    f.close()
+    tags = fontify(text)
+    for tag, start, end, sublist in tags:
+        print tag, `text[start:end]`
+
+if __name__ == "__main__":
+    import sys
+    test(sys.argv[0])

lib/accept.py

@@ -1,21 +1,18 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
 # accept.py: parse/handle the various Accept headers from the client
 #
 # -----------------------------------------------------------------------
-#
 
 import re
 import string
@@ -111,6 +108,23 @@ class _LanguageRange(_AcceptItem):
     return None
 
 class _LanguageSelector:
+  """Instances select an available language based on the user's request.
+
+  Languages found in the user's request are added to this object with the
+  append() method (they should be instances of _LanguageRange). After the
+  languages have been added, then the caller can use select_from() to
+  determine which user-request language(s) best matches the set of
+  available languages.
+
+  Strictly speaking, this class is pretty close for more than just
+  language matching. It has been implemented to enable q-value based
+  matching between requests and availability. Some minor tweaks may be
+  necessary, but simply using a new 'item_class' should be sufficient
+  to allow the _parse() function to construct a selector which holds
+  the appropriate item implementations (e.g. _LanguageRange is the
+  concrete _AcceptItem class that handles matching of language tags).
+  """
+
   item_class = _LanguageRange
 
   def __init__(self):
@@ -120,7 +134,8 @@ class _LanguageSelector:
     """Select one of the available choices based on the request.
 
     Note: if there isn't a match, then the first available choice is
-    considered the default.
+    considered the default. Also, if a number of matches are equally
+    relevant, then the first-requested will be used.
 
     avail is a list of language-tag strings of available languages
     """
@@ -140,7 +155,8 @@ class _LanguageSelector:
         qvalue = want.matches(tag)
         #print 'have %s. want %s. qvalue=%s' % (tag, want.name, qvalue)
         if qvalue is not None and len(want.name) > longest:
-          # we have a match and it is longer than any we may have had
+          # we have a match and it is longer than any we may have had.
+          # the final qvalue should be from this tag.
           final = qvalue
           longest = len(want.name)
 
@@ -148,22 +164,48 @@ class _LanguageSelector:
       if final:
         matches.append((final, tag))
 
-    # if we have any matches, then look at the highest qvalue
-    if matches:
-      matches.sort()
-      qvalue, tag = matches[-1]
+    # if there are no matches, then return the default language tag
+    if not matches:
+      return avail[0]
 
-      if len(matches) >= 2 and matches[-2][0] == qvalue:
-        #print "non-deterministic choice", avail
-        pass
+    # get the highest qvalue and its corresponding tag
+    matches.sort()
+    qvalue, tag = matches[-1]
 
-      # if the qvalue is non-zero, then we have a valid match
-      if qvalue:
-        return tag
-      # the qvalue is zero (non-match). drop thru to return the default
+    # if the qvalue is zero, then we have no valid matches. return the
+    # default language tag.
+    if not qvalue:
+      return avail[0]
 
-    # return the default language tag
-    return avail[0]
+    # if there are two or more matches, and the second-highest has a
+    # qvalue equal to the best, then we have multiple "best" options.
+    # select the one that occurs first in self.requested
+    if len(matches) >= 2 and matches[-2][0] == qvalue:
+      # remove non-best matches
+      while matches[0][0] != qvalue:
+        del matches[0]
+      #print "non-deterministic choice", matches
+
+      # sequence through self.requested, in order
+      for want in self.requested:
+        # try to find this one in our best matches
+        for qvalue, tag in matches:
+          if want.matches(tag):
+            # this requested item is one of the "best" options
+            ### note: this request item could match *other* "best" options,
+            ### so returning *this* one is rather non-deterministic.
+            ### theoretically, we could go further here, and do another
+            ### search based on the ordering in 'avail'. however, note
+            ### that this generally means that we are picking from multiple
+            ### *SUB* languages, so I'm all right with the non-determinism
+            ### at this point. stupid client should send a qvalue if they
+            ### want to refine.
+            return tag
+
+      # NOTREACHED
+
+    # return the best match
+    return tag
 
   def append(self, item):
     self.requested.append(item)
@@ -177,6 +219,10 @@ def _test():
   assert s.select_from(['en', 'de']) == 'en'
   assert s.select_from(['de', 'en']) == 'en'
 
+  # Netscape 4.x and early version of Mozilla may not send a q value
+  s = language('en, ja')
+  assert s.select_from(['en', 'ja']) == 'en'
+
   s = language('fr, de;q=0.9, en-gb;q=0.7, en;q=0.6, en-gb-foo;q=0.8')
   assert s.select_from(['en']) == 'en'
   assert s.select_from(['en-gb-foo']) == 'en-gb-foo'

lib/apache_icons.py

@@ -1,199 +0,0 @@
-#! /usr/bin/env python
-# This file was automatically generated!  DO NOT EDIT!
-# Howto regenerate: see ../tools/bin2inline.py
-# $Id$
-# You have been warned.  But if you want to edit, go ahead using your
-# favorite editor :-)
-## vim:ts=4:et:nowrap
-# [Emacs: -*- python -*-]
-
-_ap_icons = {
-  "/icons/apache_pb.gif" :
-    'GIF89a\003\001 \000\367\000\000\377\377\377'
-    '\316\316\316\245\245\245\204\204\204ssskkkZ'
-    'ZZ!\030\030\377B\030\3771\000\275R\020\336\255'
-    '\204\357\234B\377\204\000\377\316\030\377\316\000\316\316\306'
-    '\275\275\3061\000\377c\000\377\234\000\377\357\000\377\347'
-    'J\357\336{\336\326\245\316\377\000\234\357J\214\377\000'
-    'c\347\204\234\357Rc\377\000\030\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000'
-    '\000\000\000\000\000\000\000\000\000\000\000\000\000!\371\004'
-    '\001\000\000\001\000,\000\000\000\000\003\001 \000G\010'
-    '\377\000\003\010\034H\260\240\301\203\010\023*\\\310\260'
-    '\241\303\207\020#J\234H\261\242E\206\021\016\034\030'
-    '0\260\300\200\001\002\002l0\260!\303\006\017(Q'
-    '&X\331\300A\204\201\007\376\3753\020\363_\004\231'
-    '\007h\376;\020 \246\001\0032\011\370\024\2603\302'
-    '\200\231=e\006%03\002P\002\001p\352\374W'
-    '\020\350L\253\004\254\336\264y\261\253\327\257`\303\026'
-    '|Iv\203\331\012\033*P\2400a\302?\011J'
-    '\343\276\225@w\002\333\265\0252P\3100!\203I'
-    '\277\005P\376;\231\022\001\002\001._\212]\314\270'
-    '\261\343\307b#Dh0\000A\203\225\011R\012N'
-    '\371\317\203\001\017f\375\206\366+\332d^\275\245\323'
-    "f\030\360\240u\353\006\017\032\314\374'\200\243\300\013"
-    "u'Hh\333\226\356\356\335\272%\\0xa\355"
-    '\332\341\022/\220^\316\274y\006\015\0065{X\330'
-    'A3\206\202\0300\257d\270@{\202\203\014\032\210'
-    '\377o\000\371\253\200\363\347\313/\214\220\236 \373\220'
-    '\352\343\313\237\357\360\345y\271o\347\266]\233!o'
-    '\337\275\031L\225\222\001\010(PSQ\002\035\305S'
-    'T\264\011$\300\201P\305\264\240@L)\025\222S'
-    'rU\025\327F\016\312\244\030} \2068_\004\010'
-    '\030\260Rg\240\225d\332r\024T`\327ZnY'
-    '\205\237\\p\375\366\033[\025\2505\300^\033\000\230'
-    '\300\000-\271\324P\004\272\265\025\200\005\277M\360\341'
-    'A\305\031G\301BN"\207\335r\303Y\260\334u'
-    '\011I\267\220\006\326a\347\035w_\032\024\336x"'
-    '\226i\346\231h\246\251\346\232l\266\351\246A\017.'
-    '9\320y\005(\346\200\000\015\340\331PM\002X\305'
-    '\221Q\006\014`\337O/\031\000\225S\006\220E\200'
-    '\240\024\032 \200S\360\011@\000|\002E@@V'
-    '2i\370\317\000\216\006\320g\242\236\032\372\346\250e'
-    '\032U\023P \355\367_\217*J\247RM\037n'
-    '\377\005U\205\222)\365\023N\001\034E\033zIM'
-    '\010\324\001\350=*S\242Vi\352\351\260\001\310('
-    "'\251\314\252\367\350O\004\024\020\000_\301\3218\227"
-    '\001\022\030p\227\213\250M0\022a\011\240\310\222x'
-    '\206!\260\254|[Q\332\354\272"\032\225\222Y\241'
-    '\251\325\237\213l\3015c~\276\365\266\037\275x\241'
-    '6\322_&\201\326\300\271\023\345;\201\005\0155\351'
-    '\344\302\014\033\207%B\0324\367pB\030\270j\261'
-    '\253\034\030\224\035f\035\200\251\035x\343\205,\362\310'
-    '\013<\206\247\211\232\015\206\222\212\244\261\314\234qj'
-    '\3355\301On\331;#P\015\030\020\333k\2559'
-    " \244\306ENP\020\222ENL\220\302\015'\275"
-    '\226\321\312\221&\345m\313e|\220\226\025m\354\335'
-    '\325Xc\006\362\310"\227<\252d\001HfT\003'
-    '\033!p\000\002)\036\340\301\000\033\014\000\332\333\360'
-    '\232\205\322\001q\033\345\300\000w\252{d\276F\037'
-    '\377\204Ap\022 <\020\322O7\304\\\337~\037'
-    '>\020\007\0277\216R\307^~\274Pw\222\0274'
-    '&\327\230\213\007\001\273\234w\356\371\347\240\207.\372'
-    '\350\244\227\3169\301a\203M\321\201\310\212X,A'
-    '\257\233.;D\246\352-)\243hk\226\200e\003'
-    '#T\323\261\377L*\227\260\233\022e\323\257\311*'
-    '\005lRV\361t\340\001/U\030\227\246\312oe'
-    '\000\363\263go\320\000\032\011\012@\001\005@\205Z'
-    '\005\004\2304RJ,\355~\030\353\300\032?\253L'
-    '\222\342$!\374\025j\224)\237\317\356d?\2602'
-    'q\024\273@\257\363\311V|\242\275\002\036DF\267'
-    '\252\213\223\374\223\232\317x@)\0360\314\300jB'
-    'A\000\302OW\327\263\236\244\234\267\2239\015\353S'
-    'I\311\020\354\360\023\022\343]\317\200(\014[\001\200'
-    'b\000\217\330L)\276\221\000\214\214\343\257\275\020\000'
-    '\\\036X\211\002,\203\030\325%\204=\014yTW'
-    '\377X\230B\024\212\215=/\351Vo^\010\303|'
-    '\311\320.}\351V\3344\343\300\0346\240\\z\203'
-    '\314\005rR\304.V*l\271\353\221_\3622\303'
-    '\266\334k.7z"\031\333\242\032\322\334\020\\\231'
-    ')\014\352(R\227\302%Dix\274\000\342\012r'
-    '\001\013\370Qp\015\201\000\007\030\347\270\224p\000q'
-    '\030\350\200";\3405\205Pn%\215$\010\003&'
-    'I\311JZ\262\222\221\264\310d\334\366.\227\235\246'
-    'E0b"~jd\243\375\340H-1\243@\001'
-    '\344V\030\004\260\315\\\022\311\315o\000\231\020\244Q'
-    '\340\002\270\314\245.\011\227\020\347\370e\217\003\221\316'
-    ' \207IL\016h\240:)\331\034A\254\346\001\310'
-    '92L\226\013\331\002\246I\315jZ\2231w\273'
-    'L\034W\026\232\264\250\34649B\245]\012\000\027'
-    '\031\235Q&\300\341\015o\332&\236\330\300\346g\010'
-    '!\022p\006B\264\335\240\316\226\273\314g\2244F'
-    '\363\245\301])K\232Y\010\006\016\211\310\254\031\364'
-    "j[\023\317%'\231I\365\214\315D+\331\014J"
-    'H\302\315n.\3474\375\361\313^\310\330\242\276\304'
-    '\314\0003\273U\\~b\000\361\300S \177K\222'
-    ':y\223$\304\331\022\217\306\321#\037}IS\251'
-    '\025\204j\011\341\200"\017\2511\357\024\223\003\326|'
-    '\244\326\304$\315\240.@\231i\222Lm\\\351\235'
-    '\034\272\252G\025e\245\001\376B\030\222\250\250\000\355'
-    '\204\215k|\366!\334\000G\217\030\010k\000\302J'
-    '\326\013,\261p\274\214H\323\374\002V\262\2725\254'
-    '\034X\016t\010"\314\237\016\363\230\232A*J\241'
-    '\231\020\241~\207\250\343\241\244Q\257\351E\332\351r'
-    '\216\3569\354@0\240K`\372M\227\020\031\3500'
-    "'&Y\273ZV\257\003\201@5\035+\020\315V"
-    '\363 \203\015-5\013K\332\322\232\366\264\250=\010'
-    '@\002\004\004\000;',
-
-  "/icons/small/back.gif" :
-    'GIF89a\020\000\020\000\242\377\000!!!'
-    '111ZZZ\204\204\204\214\214\214\300\300\300\000'
-    '\000\000\000\000\000!\371\004\001\000\000\005\000,\000\000'
-    '\000\000\020\000\020\000\000\003FX\272\334\015\300I`'
-    'L\224\213V\213\213\320\025 t\304f\020]Qn'
-    '(i\266\303\240\310\312Z\215D,\010\255\022\230\236'
-    '\20000Z\010L\203\241\320a"*\035 \321\260'
-    '\267\260\235\204E\307q3\310J\010`p#\001\000'
-    ';',
-
-  "/icons/small/dir.gif" :
-    'GIF89a\020\000\020\000\242\377\000\377\336\255'
-    '\377\334\256\300\300\300\270\240}WK;+%\035\000'
-    '\000\000\000\000\000!\371\004\001\000\000\002\000,\000\000'
-    '\000\000\020\000\020\000\000\003I(b\246\376\316\2241'
-    '\230\262\320\2002\253\031\001v\001$GQA\025\221'
-    '\254y6#\333v\360"\337_\255\335dE\350\274'
-    '\236\341\267\012\372t\204\001\357\370`$e\314\314P'
-    '\0118\026 \227\251\365\212]\014\277\234n\204\021\026'
-    '$\000\000;',
-
-  "/icons/small/text.gif" :
-    'GIF89a\020\000\020\000\242\377\000\377\377\377'
-    '999kkk\214\214\214\300\300\300\316\316\316\347'
-    '\347\347\000\000\000!\371\004\001\000\000\004\000,\000\000'
-    '\000\000\020\000\020\000\000\003EH\272\334\276\343\025@'
-    "k1\261\315J'\326\\W\024D\246LA\232\002"
-    'j\300xFlP\212\360\262me\330\013,\307\024'
-    '\336\011\327Z\011\011\276\337\354\210*\032oJ\031\200'
-    'I,No!\316\261$\350z\275\256E\002\000;',
-
-}
-
-
-def serve_icon(pathname, fp):
-    if _ap_icons.has_key(pathname):
-        fp.write(_ap_icons[pathname])
-    else:
-        raise OSError # icon not found
-

lib/blame.py

@@ -1,16 +1,14 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
@@ -19,10 +17,6 @@
 #
 # -----------------------------------------------------------------------
 #
-# This software is being maintained as part of the ViewCVS project.
-# Information is available at:
-#    http://viewcvs.sourceforge.net/
-#
 # 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
@@ -31,439 +25,84 @@
 # 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
-import rcsparse
-
-class CVSParser(rcsparse.Sink):
-  # Precompiled regular expressions
-  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.last_revision = {}
-    self.prev_revision = {}
-    self.revision_date = {}
-    self.revision_author = {}
-    self.revision_branches = {}
-    self.next_delta = {}
-    self.prev_delta = {}
-    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 = {}
-
-  # 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
-
-  # Split deltatext specified by rev to each line.
-  def deltatext_split(self, rev):
-    lines = string.split(self.revision_deltatext[rev], '\n')
-    if lines[-1] == '':
-      del lines[-1]
-    return lines
-
-  # 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 = self.deltatext_split(self.head_revision)
-
-    # Iterate, applying deltas to previous revision
-    for revision in path:
-      adjust = 0
-      diffs = self.deltatext_split(revision)
-      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 set_head_revision(self, revision):
-    self.head_revision = revision
-
-  def set_principal_branch(self, branch_name):
-    self.principal_branch = branch_name
-
-  def define_tag(self, name, revision):
-    # Create an associate array that maps from tag name to
-    # revision number and vice-versa.
-    self.tag_revision[name] = revision
-
-    ### actually, this is a bit bogus... a rev can have multiple names
-    self.revision_symbolic_name[revision] = name
-
-  def set_comment(self, comment):
-    self.file_description = comment
-
-  def set_description(self, description):
-    self.rcs_file_description = description
-
-  # 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 define_revision(self, revision, timestamp, author, state,
-                      branches, next):
-    self.tag_revision[revision] = revision
-    branch = self.last_branch.match(revision).group(1)
-    self.last_revision[branch] = revision
-
-    #self.revision_date[revision] = date
-    self.timestamp[revision] = timestamp
-
-    # 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)
-
-    # save author
-    self.revision_author[revision] = author
-
-    # ignore the state
-
-    # process the branch information
-    branch_text = ''
-    for branch in branches:
-      self.prev_revision[branch] = revision
-      self.next_delta[revision] = branch
-      self.prev_delta[branch] = revision
-      branch_text = branch_text + branch + ''
-    self.revision_branches[revision] = branch_text
-
-    # process the "next revision" information
-    if next:
-      self.next_delta[revision] = next
-      self.prev_delta[next] = revision
-      is_trunk_revision = self.trunk_rev.match(revision) is not None
-      if is_trunk_revision:
-        self.prev_revision[revision] = next
-      else:
-        self.prev_revision[next] = revision
-
-  # 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 set_revision_info(self, revision, log, text):
-    self.revision_log[revision] = log
-    self.revision_deltatext[revision] = text
-
-  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:
-      rcsfile = open(rcs_pathname, 'r')
-    except:
-      raise RuntimeError, ('error: %s appeared to be under CVS control, ' +
-              'but the RCS file is inaccessible.') % rcs_pathname
-
-    rcsparse.Parser().parse(rcsfile, 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 = self.deltatext_split(self.head_revision)
-      line_count = len(tmp_array)
-
-    skip = 0
-
-    rev = self.prev_revision.get(self.head_revision)
-    while rev:
-      diffs = self.deltatext_split(rev)
-      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 = self.deltatext_split(last_revision)
-
-        # 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 = self.deltatext_split(revision)
-        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
+import vclib
 
 
 re_includes = re.compile('\\#(\\s*)include(\\s*)"(.*?)"')
-re_filename = re.compile('(.*[\\\\/])?(.+)')
 
-def link_includes(text, root, rcs_path, sticky = None):
+def link_includes(text, repos, path_parts, include_url):
   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.join(root, trial_root)
-      file = os.path.normpath(os.path.join(file, incfile + ',v'))
-      if os.access(file, os.F_OK):
-	url = os.path.join(rel_path, incfile)
-	if sticky:
-	  url = url + '?' + sticky
-        return '#%sinclude%s"<a href="%s">%s</a>"' % \
-               (match.group(1), match.group(2), url, incfile)
+    include_path_parts = path_parts[:-1]
+    for part in filter(None, string.split(incfile, '/')):
+      if part == "..":
+        if not include_path_parts:
+          # nothing left to pop; don't bother marking up this include.
+          return text
+        include_path_parts.pop()
+      elif part and part != ".":
+        include_path_parts.append(part)
+
+    include_path = None
+    try:
+      if repos.itemtype(include_path_parts, None) == vclib.FILE:
+        include_path = string.join(include_path_parts, '/')
+    except vclib.ItemNotFound:
+      pass
+
+    if include_path:
+      return '#%sinclude%s<a href="%s">"%s"</a>' % \
+             (match.group(1), match.group(2),
+              string.replace(include_url, '/WHERE/', include_path), incfile)
+    
   return text
 
-def make_html(root, rcs_path, opt_rev = None, sticky = None):
-  filename = os.path.join(root, 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)
+class HTMLBlameSource:
+  """Wrapper around a the object by the vclib.annotate() which does
+  HTML escaping, diff URL generation, and #include linking."""
+  def __init__(self, repos, path_parts, diff_url, include_url, opt_rev=None):
+    self.repos = repos
+    self.path_parts = path_parts
+    self.diff_url = diff_url
+    self.include_url = include_url
+    self.annotation, self.revision = self.repos.annotate(path_parts, opt_rev)
 
-  open_table_tag = '<table border=0 cellpadding=0 cellspacing=0 width="100%">'
-  startOfRow = '<tr><td colspan=3%s><pre>'
-  endOfRow = '</td></tr>'
+  def __getitem__(self, idx):
+    item = self.annotation.__getitem__(idx)
+    diff_url = None
+    if item.prev_rev:
+      diff_url = '%sr1=%s&amp;r2=%s' % (self.diff_url, item.prev_rev, item.rev)
+    thisline = link_includes(cgi.escape(item.text), self.repos,
+                             self.path_parts, self.include_url)
+    return _item(text=thisline, line_number=item.line_number,
+                 rev=item.rev, prev_rev=item.prev_rev,
+                 diff_url=diff_url, date=item.date, author=item.author)
 
-  print open_table_tag + (startOfRow % '')
 
+def blame(repos, path_parts, diff_url, include_url, opt_rev=None):
+  source = HTMLBlameSource(repos, path_parts, diff_url, include_url, opt_rev)
+  return source, source.revision
+
+
+class _item:
+  def __init__(self, **kw):
+    vars(self).update(kw)
+
+
+def make_html(root, rcs_path):
+  import vclib.ccvs.blame
+  bs = vclib.ccvs.blame.BlameSource(os.path.join(root, rcs_path))
+
+  count = bs.num_lines
   if count == 0:
     count = 1
 
@@ -471,80 +110,44 @@ def make_html(root, rcs_path, opt_rev = None, sticky = None):
   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
+  open_table_tag = '<table cellpadding="0" cellspacing="0">'
+  startOfRow = '<tr><td colspan="3"%s><pre>'
+  endOfRow = '</td></tr>'
 
-    # 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, sticky)
+  print open_table_tag + (startOfRow % '')
 
+  for line_data in bs:
+    revision = line_data.rev
+    thisline = line_data.text
+    line = line_data.line_number
+    author = line_data.author
+    prev_rev = line_data.prev_rev
+    
     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"'
+        row_color = ' style="background-color:#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)
+        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, )
+    output = output + '<a name="%d">%*d</a>' % (line, 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"
-	url = '%s.diff?r1=%s&amp;r2=%s' % \
-	      (fname, parser.prev_revision[revision], revision)
-	if sticky:
-	  url = url + '&' + sticky
-	output = output + ' <a href="%s"' % (url, )
-        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/%.*$//;
+      output = output + ' '
       author_width = max(author_width, len(author))
-      output = output + ('%%-%ds ' % (author_width, )) % (author, )
+      output = output + ('%-*s ' % (author_width, author))
       output = output + revision
-      if parser.prev_revision.get(revision):
+      if prev_rev:
         output = output + '</a>'
       output = output + (' ' * (revision_width - len(revision) + 1))
 
@@ -558,15 +161,16 @@ def make_html(root, rcs_path, opt_rev = None, sticky = None):
 
     # Close the highlighted section
     #if (defined $mark_cmd and mark_cmd != 'begin'):
-    #	chop($output)
-    #	output = output + endOfRow + (startOfRow % row_color)
-    #	inMark = 0
+    #  chop($output)
+    #  output = output + endOfRow + (startOfRow % row_color)
+    #  inMark = 0
 
     print output
   print endOfRow + '</table>'
 
 
 def main():
+  import sys
   if len(sys.argv) != 3:
     print 'USAGE: %s cvsroot rcs-file' % sys.argv[0]
     sys.exit(1)

lib/compat.py

@@ -1,28 +1,28 @@
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
-# compat.py: compatibility functions for operation across Python 1.5.x
+# compat.py: compatibility functions for operation across Python 1.5.x to 2.2.x
 #
 # -----------------------------------------------------------------------
-#
 
 import urllib
 import string
 import time
+import calendar
 import re
 import os
-
+import rfc822
+import tempfile
+import errno
 
 #
 # urllib.urlencode() is new to Python 1.5.2
@@ -46,14 +46,17 @@ except AttributeError:
 if hasattr(time, 'strptime'):
   def cvs_strptime(timestr):
     'Parse a CVS-style date/time value.'
-    return time.strptime(timestr, '%Y/%m/%d %H:%M:%S')
+    return time.strptime(timestr, '%Y/%m/%d %H:%M:%S')[:-1] + (0,)
 else:
   _re_rev_date = re.compile('([0-9]{4})/([0-9][0-9])/([0-9][0-9]) '
                             '([0-9][0-9]):([0-9][0-9]):([0-9][0-9])')
   def cvs_strptime(timestr):
     'Parse a CVS-style date/time value.'
-    matches = _re_rev_date.match(timestr).groups()
-    return tuple(map(int, matches)) + (0, 1, 0)
+    match = _re_rev_date.match(timestr)
+    if match:
+      return tuple(map(int, match.groups())) + (0, 1, 0)
+    else:
+      raise ValueError('date is not in cvs format')
 
 #
 # os.makedirs() is new to Python 1.5.2
@@ -66,3 +69,98 @@ except AttributeError:
     if head and tail and not os.path.exists(head):
       makedirs(head, mode)
     os.mkdir(path, mode)
+
+#
+# rfc822.formatdate() is new to Python 1.6
+#
+try:
+  formatdate = rfc822.formatdate
+except AttributeError:
+  def formatdate(timeval):
+    if timeval is None:
+      timeval = time.time()
+    timeval = time.gmtime(timeval)
+    return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
+            ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][timeval[6]],
+            timeval[2],
+            ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
+             "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][timeval[1]-1],
+                                timeval[0], timeval[3], timeval[4], timeval[5])
+
+# 
+# calendar.timegm() is new to Python 2.x and 
+# calendar.leapdays() was wrong in Python 1.5.2
+#
+try:
+  timegm = calendar.timegm 
+except AttributeError:
+  def leapdays(year1, year2):
+    """Return number of leap years in range [year1, year2).
+       Assume year1 <= year2."""
+    year1 = year1 - 1
+    year2 = year2 - 1
+    return (year2/4 - year1/4) - (year2/100 - 
+                                  year1/100) + (year2/400 - year1/400)
+
+  EPOCH = 1970
+  def timegm(tuple):
+    """Unrelated but handy function to calculate Unix timestamp from GMT."""
+    year, month, day, hour, minute, second = tuple[:6]
+    # assert year >= EPOCH
+    # assert 1 <= month <= 12
+    days = 365*(year-EPOCH) + leapdays(EPOCH, year)
+    for i in range(1, month):
+      days = days + calendar.mdays[i]
+    if month > 2 and calendar.isleap(year):
+      days = days + 1
+    days = days + day - 1
+    hours = days*24 + hour
+    minutes = hours*60 + minute
+    seconds = minutes*60 + second
+    return seconds
+
+#
+# tempfile.mkdtemp() is new to Python 2.3
+#
+try:
+  mkdtemp = tempfile.mkdtemp
+except AttributeError:
+  def mkdtemp():
+    for i in range(10):
+      dir = tempfile.mktemp()
+      try:
+        os.mkdir(dir, 0700)
+        return dir
+      except OSError, e:
+        if e.errno == errno.EEXIST:
+          continue # try again
+        raise
+
+    raise IOError, (errno.EEXIST, "No usable temporary directory name found")
+
+# 
+# the following stuff is *ONLY* needed for standalone.py.
+# For that reason I've encapsulated it into a function.
+#
+
+def for_standalone():
+  import SocketServer
+  if not hasattr(SocketServer.TCPServer, "close_request"):
+    #
+    # method close_request() was missing until Python 2.1
+    #
+    class TCPServer(SocketServer.TCPServer):
+      def process_request(self, request, client_address):
+        """Call finish_request.
+
+        Overridden by ForkingMixIn and ThreadingMixIn.
+
+        """
+        self.finish_request(request, client_address)
+        self.close_request(request)
+
+      def close_request(self, request):
+        """Called to clean up an individual request."""
+        request.close()
+
+    SocketServer.TCPServer = TCPServer

lib/compat_difflib.py

@@ -0,0 +1,786 @@
+#! /usr/bin/env python
+# Backported to Python 1.5.2 for the ViewCVS project by pf@artcom-gmbh.de
+# 24-Dec-2001, original version "stolen" from Python-2.1.1
+"""
+Module difflib -- helpers for computing deltas between objects.
+
+Function get_close_matches(word, possibilities, n=3, cutoff=0.6):
+
+    Use SequenceMatcher to return list of the best "good enough" matches.
+
+    word is a sequence for which close matches are desired (typically a
+    string).
+
+    possibilities is a list of sequences against which to match word
+    (typically a list of strings).
+
+    Optional arg n (default 3) is the maximum number of close matches to
+    return.  n must be > 0.
+
+    Optional arg cutoff (default 0.6) is a float in [0, 1].  Possibilities
+    that don't score at least that similar to word are ignored.
+
+    The best (no more than n) matches among the possibilities are returned
+    in a list, sorted by similarity score, most similar first.
+
+    >>> get_close_matches("appel", ["ape", "apple", "peach", "puppy"])
+    ['apple', 'ape']
+    >>> import keyword
+    >>> get_close_matches("wheel", keyword.kwlist)
+    ['while']
+    >>> get_close_matches("apple", keyword.kwlist)
+    []
+    >>> get_close_matches("accept", keyword.kwlist)
+    ['except']
+
+Class SequenceMatcher
+
+SequenceMatcher is a flexible class for comparing pairs of sequences of any
+type, so long as the sequence elements are hashable.  The basic algorithm
+predates, and is a little fancier than, an algorithm published in the late
+1980's by Ratcliff and Obershelp under the hyperbolic name "gestalt pattern
+matching".  The basic idea is to find the longest contiguous matching
+subsequence that contains no "junk" elements (R-O doesn't address junk).
+The same idea is then applied recursively to the pieces of the sequences to
+the left and to the right of the matching subsequence.  This does not yield
+minimal edit sequences, but does tend to yield matches that "look right"
+to people.
+
+Example, comparing two strings, and considering blanks to be "junk":
+
+>>> s = SequenceMatcher(lambda x: x == " ",
+...                     "private Thread currentThread;",
+...                     "private volatile Thread currentThread;")
+>>>
+
+.ratio() returns a float in [0, 1], measuring the "similarity" of the
+sequences.  As a rule of thumb, a .ratio() value over 0.6 means the
+sequences are close matches:
+
+>>> print round(s.ratio(), 3)
+0.866
+>>>
+
+If you're only interested in where the sequences match,
+.get_matching_blocks() is handy:
+
+>>> for block in s.get_matching_blocks():
+...     print "a[%d] and b[%d] match for %d elements" % block
+a[0] and b[0] match for 8 elements
+a[8] and b[17] match for 6 elements
+a[14] and b[23] match for 15 elements
+a[29] and b[38] match for 0 elements
+
+Note that the last tuple returned by .get_matching_blocks() is always a
+dummy, (len(a), len(b), 0), and this is the only case in which the last
+tuple element (number of elements matched) is 0.
+
+If you want to know how to change the first sequence into the second, use
+.get_opcodes():
+
+>>> for opcode in s.get_opcodes():
+...     print "%6s a[%d:%d] b[%d:%d]" % opcode
+ equal a[0:8] b[0:8]
+insert a[8:8] b[8:17]
+ equal a[8:14] b[17:23]
+ equal a[14:29] b[23:38]
+
+See Tools/scripts/ndiff.py for a fancy human-friendly file differencer,
+which uses SequenceMatcher both to view files as sequences of lines, and
+lines as sequences of characters.
+
+See also function get_close_matches() in this module, which shows how
+simple code building on SequenceMatcher can be used to do useful work.
+
+Timing:  Basic R-O is cubic time worst case and quadratic time expected
+case.  SequenceMatcher is quadratic time for the worst case and has
+expected-case behavior dependent in a complicated way on how many
+elements the sequences have in common; best case time is linear.
+
+SequenceMatcher methods:
+
+__init__(isjunk=None, a='', b='')
+    Construct a SequenceMatcher.
+
+    Optional arg isjunk is None (the default), or a one-argument function
+    that takes a sequence element and returns true iff the element is junk.
+    None is equivalent to passing "lambda x: 0", i.e. no elements are
+    considered to be junk.  For example, pass
+        lambda x: x in " \\t"
+    if you're comparing lines as sequences of characters, and don't want to
+    synch up on blanks or hard tabs.
+
+    Optional arg a is the first of two sequences to be compared.  By
+    default, an empty string.  The elements of a must be hashable.
+
+    Optional arg b is the second of two sequences to be compared.  By
+    default, an empty string.  The elements of b must be hashable.
+
+set_seqs(a, b)
+    Set the two sequences to be compared.
+
+    >>> s = SequenceMatcher()
+    >>> s.set_seqs("abcd", "bcde")
+    >>> s.ratio()
+    0.75
+
+set_seq1(a)
+    Set the first sequence to be compared.
+
+    The second sequence to be compared is not changed.
+
+    >>> s = SequenceMatcher(None, "abcd", "bcde")
+    >>> s.ratio()
+    0.75
+    >>> s.set_seq1("bcde")
+    >>> s.ratio()
+    1.0
+    >>>
+
+    SequenceMatcher computes and caches detailed information about the
+    second sequence, so if you want to compare one sequence S against many
+    sequences, use .set_seq2(S) once and call .set_seq1(x) repeatedly for
+    each of the other sequences.
+
+    See also set_seqs() and set_seq2().
+
+set_seq2(b)
+    Set the second sequence to be compared.
+
+    The first sequence to be compared is not changed.
+
+    >>> s = SequenceMatcher(None, "abcd", "bcde")
+    >>> s.ratio()
+    0.75
+    >>> s.set_seq2("abcd")
+    >>> s.ratio()
+    1.0
+    >>>
+
+    SequenceMatcher computes and caches detailed information about the
+    second sequence, so if you want to compare one sequence S against many
+    sequences, use .set_seq2(S) once and call .set_seq1(x) repeatedly for
+    each of the other sequences.
+
+    See also set_seqs() and set_seq1().
+
+find_longest_match(alo, ahi, blo, bhi)
+    Find longest matching block in a[alo:ahi] and b[blo:bhi].
+
+    If isjunk is not defined:
+
+    Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
+        alo <= i <= i+k <= ahi
+        blo <= j <= j+k <= bhi
+    and for all (i',j',k') meeting those conditions,
+        k >= k'
+        i <= i'
+        and if i == i', j <= j'
+
+    In other words, of all maximal matching blocks, return one that starts
+    earliest in a, and of all those maximal matching blocks that start
+    earliest in a, return the one that starts earliest in b.
+
+    >>> s = SequenceMatcher(None, " abcd", "abcd abcd")
+    >>> s.find_longest_match(0, 5, 0, 9)
+    (0, 4, 5)
+
+    If isjunk is defined, first the longest matching block is determined as
+    above, but with the additional restriction that no junk element appears
+    in the block.  Then that block is extended as far as possible by
+    matching (only) junk elements on both sides.  So the resulting block
+    never matches on junk except as identical junk happens to be adjacent
+    to an "interesting" match.
+
+    Here's the same example as before, but considering blanks to be junk.
+    That prevents " abcd" from matching the " abcd" at the tail end of the
+    second sequence directly.  Instead only the "abcd" can match, and
+    matches the leftmost "abcd" in the second sequence:
+
+    >>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
+    >>> s.find_longest_match(0, 5, 0, 9)
+    (1, 0, 4)
+
+    If no blocks match, return (alo, blo, 0).
+
+    >>> s = SequenceMatcher(None, "ab", "c")
+    >>> s.find_longest_match(0, 2, 0, 1)
+    (0, 0, 0)
+
+get_matching_blocks()
+    Return list of triples describing matching subsequences.
+
+    Each triple is of the form (i, j, n), and means that
+    a[i:i+n] == b[j:j+n].  The triples are monotonically increasing in i
+    and in j.
+
+    The last triple is a dummy, (len(a), len(b), 0), and is the only triple
+    with n==0.
+
+    >>> s = SequenceMatcher(None, "abxcd", "abcd")
+    >>> s.get_matching_blocks()
+    [(0, 0, 2), (3, 2, 2), (5, 4, 0)]
+
+get_opcodes()
+    Return list of 5-tuples describing how to turn a into b.
+
+    Each tuple is of the form (tag, i1, i2, j1, j2).  The first tuple has
+    i1 == j1 == 0, and remaining tuples have i1 == the i2 from the tuple
+    preceding it, and likewise for j1 == the previous j2.
+
+    The tags are strings, with these meanings:
+
+    'replace':  a[i1:i2] should be replaced by b[j1:j2]
+    'delete':   a[i1:i2] should be deleted.
+                Note that j1==j2 in this case.
+    'insert':   b[j1:j2] should be inserted at a[i1:i1].
+                Note that i1==i2 in this case.
+    'equal':    a[i1:i2] == b[j1:j2]
+
+    >>> a = "qabxcd"
+    >>> b = "abycdf"
+    >>> s = SequenceMatcher(None, a, b)
+    >>> for tag, i1, i2, j1, j2 in s.get_opcodes():
+    ...    print ("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
+    ...           (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2]))
+     delete a[0:1] (q) b[0:0] ()
+      equal a[1:3] (ab) b[0:2] (ab)
+    replace a[3:4] (x) b[2:3] (y)
+      equal a[4:6] (cd) b[3:5] (cd)
+     insert a[6:6] () b[5:6] (f)
+
+ratio()
+    Return a measure of the sequences' similarity (float in [0,1]).
+
+    Where T is the total number of elements in both sequences, and M is the
+    number of matches, this is 2,0*M / T. Note that this is 1 if the
+    sequences are identical, and 0 if they have nothing in common.
+
+    .ratio() is expensive to compute if you haven't already computed
+    .get_matching_blocks() or .get_opcodes(), in which case you may want to
+    try .quick_ratio() or .real_quick_ratio() first to get an upper bound.
+
+    >>> s = SequenceMatcher(None, "abcd", "bcde")
+    >>> s.ratio()
+    0.75
+    >>> s.quick_ratio()
+    0.75
+    >>> s.real_quick_ratio()
+    1.0
+
+quick_ratio()
+    Return an upper bound on .ratio() relatively quickly.
+
+    This isn't defined beyond that it is an upper bound on .ratio(), and
+    is faster to compute.
+
+real_quick_ratio():
+    Return an upper bound on ratio() very quickly.
+
+    This isn't defined beyond that it is an upper bound on .ratio(), and
+    is faster to compute than either .ratio() or .quick_ratio().
+"""
+
+TRACE = 0
+
+class SequenceMatcher:
+    def __init__(self, isjunk=None, a='', b=''):
+        """Construct a SequenceMatcher.
+
+        Optional arg isjunk is None (the default), or a one-argument
+        function that takes a sequence element and returns true iff the
+        element is junk. None is equivalent to passing "lambda x: 0", i.e.
+        no elements are considered to be junk.  For example, pass
+            lambda x: x in " \\t"
+        if you're comparing lines as sequences of characters, and don't
+        want to synch up on blanks or hard tabs.
+
+        Optional arg a is the first of two sequences to be compared.  By
+        default, an empty string.  The elements of a must be hashable.  See
+        also .set_seqs() and .set_seq1().
+
+        Optional arg b is the second of two sequences to be compared.  By
+        default, an empty string.  The elements of b must be hashable. See
+        also .set_seqs() and .set_seq2().
+        """
+
+        # Members:
+        # a
+        #      first sequence
+        # b
+        #      second sequence; differences are computed as "what do
+        #      we need to do to 'a' to change it into 'b'?"
+        # b2j
+        #      for x in b, b2j[x] is a list of the indices (into b)
+        #      at which x appears; junk elements do not appear
+        # b2jhas
+        #      b2j.has_key
+        # fullbcount
+        #      for x in b, fullbcount[x] == the number of times x
+        #      appears in b; only materialized if really needed (used
+        #      only for computing quick_ratio())
+        # matching_blocks
+        #      a list of (i, j, k) triples, where a[i:i+k] == b[j:j+k];
+        #      ascending & non-overlapping in i and in j; terminated by
+        #      a dummy (len(a), len(b), 0) sentinel
+        # opcodes
+        #      a list of (tag, i1, i2, j1, j2) tuples, where tag is
+        #      one of
+        #          'replace'   a[i1:i2] should be replaced by b[j1:j2]
+        #          'delete'    a[i1:i2] should be deleted
+        #          'insert'    b[j1:j2] should be inserted
+        #          'equal'     a[i1:i2] == b[j1:j2]
+        # isjunk
+        #      a user-supplied function taking a sequence element and
+        #      returning true iff the element is "junk" -- this has
+        #      subtle but helpful effects on the algorithm, which I'll
+        #      get around to writing up someday <0.9 wink>.
+        #      DON'T USE!  Only __chain_b uses this.  Use isbjunk.
+        # isbjunk
+        #      for x in b, isbjunk(x) == isjunk(x) but much faster;
+        #      it's really the has_key method of a hidden dict.
+        #      DOES NOT WORK for x in a!
+
+        self.isjunk = isjunk
+        self.a = self.b = None
+        self.set_seqs(a, b)
+
+    def set_seqs(self, a, b):
+        """Set the two sequences to be compared.
+
+        >>> s = SequenceMatcher()
+        >>> s.set_seqs("abcd", "bcde")
+        >>> s.ratio()
+        0.75
+        """
+
+        self.set_seq1(a)
+        self.set_seq2(b)
+
+    def set_seq1(self, a):
+        """Set the first sequence to be compared.
+
+        The second sequence to be compared is not changed.
+
+        >>> s = SequenceMatcher(None, "abcd", "bcde")
+        >>> s.ratio()
+        0.75
+        >>> s.set_seq1("bcde")
+        >>> s.ratio()
+        1.0
+        >>>
+
+        SequenceMatcher computes and caches detailed information about the
+        second sequence, so if you want to compare one sequence S against
+        many sequences, use .set_seq2(S) once and call .set_seq1(x)
+        repeatedly for each of the other sequences.
+
+        See also set_seqs() and set_seq2().
+        """
+
+        if a is self.a:
+            return
+        self.a = a
+        self.matching_blocks = self.opcodes = None
+
+    def set_seq2(self, b):
+        """Set the second sequence to be compared.
+
+        The first sequence to be compared is not changed.
+
+        >>> s = SequenceMatcher(None, "abcd", "bcde")
+        >>> s.ratio()
+        0.75
+        >>> s.set_seq2("abcd")
+        >>> s.ratio()
+        1.0
+        >>>
+
+        SequenceMatcher computes and caches detailed information about the
+        second sequence, so if you want to compare one sequence S against
+        many sequences, use .set_seq2(S) once and call .set_seq1(x)
+        repeatedly for each of the other sequences.
+
+        See also set_seqs() and set_seq1().
+        """
+
+        if b is self.b:
+            return
+        self.b = b
+        self.matching_blocks = self.opcodes = None
+        self.fullbcount = None
+        self.__chain_b()
+
+    # For each element x in b, set b2j[x] to a list of the indices in
+    # b where x appears; the indices are in increasing order; note that
+    # the number of times x appears in b is len(b2j[x]) ...
+    # when self.isjunk is defined, junk elements don't show up in this
+    # map at all, which stops the central find_longest_match method
+    # from starting any matching block at a junk element ...
+    # also creates the fast isbjunk function ...
+    # note that this is only called when b changes; so for cross-product
+    # kinds of matches, it's best to call set_seq2 once, then set_seq1
+    # repeatedly
+
+    def __chain_b(self):
+        # Because isjunk is a user-defined (not C) function, and we test
+        # for junk a LOT, it's important to minimize the number of calls.
+        # Before the tricks described here, __chain_b was by far the most
+        # time-consuming routine in the whole module!  If anyone sees
+        # Jim Roskind, thank him again for profile.py -- I never would
+        # have guessed that.
+        # The first trick is to build b2j ignoring the possibility
+        # of junk.  I.e., we don't call isjunk at all yet.  Throwing
+        # out the junk later is much cheaper than building b2j "right"
+        # from the start.
+        b = self.b
+        self.b2j = b2j = {}
+        self.b2jhas = b2jhas = b2j.has_key
+        for i in xrange(len(b)):
+            elt = b[i]
+            if b2jhas(elt):
+                b2j[elt].append(i)
+            else:
+                b2j[elt] = [i]
+
+        # Now b2j.keys() contains elements uniquely, and especially when
+        # the sequence is a string, that's usually a good deal smaller
+        # than len(string).  The difference is the number of isjunk calls
+        # saved.
+        isjunk, junkdict = self.isjunk, {}
+        if isjunk:
+            for elt in b2j.keys():
+                if isjunk(elt):
+                    junkdict[elt] = 1   # value irrelevant; it's a set
+                    del b2j[elt]
+
+        # Now for x in b, isjunk(x) == junkdict.has_key(x), but the
+        # latter is much faster.  Note too that while there may be a
+        # lot of junk in the sequence, the number of *unique* junk
+        # elements is probably small.  So the memory burden of keeping
+        # this dict alive is likely trivial compared to the size of b2j.
+        self.isbjunk = junkdict.has_key
+
+    def find_longest_match(self, alo, ahi, blo, bhi):
+        """Find longest matching block in a[alo:ahi] and b[blo:bhi].
+
+        If isjunk is not defined:
+
+        Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
+            alo <= i <= i+k <= ahi
+            blo <= j <= j+k <= bhi
+        and for all (i',j',k') meeting those conditions,
+            k >= k'
+            i <= i'
+            and if i == i', j <= j'
+
+        In other words, of all maximal matching blocks, return one that
+        starts earliest in a, and of all those maximal matching blocks that
+        start earliest in a, return the one that starts earliest in b.
+
+        >>> s = SequenceMatcher(None, " abcd", "abcd abcd")
+        >>> s.find_longest_match(0, 5, 0, 9)
+        (0, 4, 5)
+
+        If isjunk is defined, first the longest matching block is
+        determined as above, but with the additional restriction that no
+        junk element appears in the block.  Then that block is extended as
+        far as possible by matching (only) junk elements on both sides.  So
+        the resulting block never matches on junk except as identical junk
+        happens to be adjacent to an "interesting" match.
+
+        Here's the same example as before, but considering blanks to be
+        junk.  That prevents " abcd" from matching the " abcd" at the tail
+        end of the second sequence directly.  Instead only the "abcd" can
+        match, and matches the leftmost "abcd" in the second sequence:
+
+        >>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
+        >>> s.find_longest_match(0, 5, 0, 9)
+        (1, 0, 4)
+
+        If no blocks match, return (alo, blo, 0).
+
+        >>> s = SequenceMatcher(None, "ab", "c")
+        >>> s.find_longest_match(0, 2, 0, 1)
+        (0, 0, 0)
+        """
+
+        # CAUTION:  stripping common prefix or suffix would be incorrect.
+        # E.g.,
+        #    ab
+        #    acab
+        # Longest matching block is "ab", but if common prefix is
+        # stripped, it's "a" (tied with "b").  UNIX(tm) diff does so
+        # strip, so ends up claiming that ab is changed to acab by
+        # inserting "ca" in the middle.  That's minimal but unintuitive:
+        # "it's obvious" that someone inserted "ac" at the front.
+        # Windiff ends up at the same place as diff, but by pairing up
+        # the unique 'b's and then matching the first two 'a's.
+
+        a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk
+        besti, bestj, bestsize = alo, blo, 0
+        # find longest junk-free match
+        # during an iteration of the loop, j2len[j] = length of longest
+        # junk-free match ending with a[i-1] and b[j]
+        j2len = {}
+        nothing = []
+        for i in xrange(alo, ahi):
+            # look at all instances of a[i] in b; note that because
+            # b2j has no junk keys, the loop is skipped if a[i] is junk
+            j2lenget = j2len.get
+            newj2len = {}
+            for j in b2j.get(a[i], nothing):
+                # a[i] matches b[j]
+                if j < blo:
+                    continue
+                if j >= bhi:
+                    break
+                k = newj2len[j] = j2lenget(j-1, 0) + 1
+                if k > bestsize:
+                    besti, bestj, bestsize = i-k+1, j-k+1, k
+            j2len = newj2len
+
+        # Now that we have a wholly interesting match (albeit possibly
+        # empty!), we may as well suck up the matching junk on each
+        # side of it too.  Can't think of a good reason not to, and it
+        # saves post-processing the (possibly considerable) expense of
+        # figuring out what to do with it.  In the case of an empty
+        # interesting match, this is clearly the right thing to do,
+        # because no other kind of match is possible in the regions.
+        while besti > alo and bestj > blo and \
+              isbjunk(b[bestj-1]) and \
+              a[besti-1] == b[bestj-1]:
+            besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
+        while besti+bestsize < ahi and bestj+bestsize < bhi and \
+              isbjunk(b[bestj+bestsize]) and \
+              a[besti+bestsize] == b[bestj+bestsize]:
+            bestsize = bestsize + 1
+
+        if TRACE:
+            print "get_matching_blocks", alo, ahi, blo, bhi
+            print "    returns", besti, bestj, bestsize
+        return besti, bestj, bestsize
+
+    def get_matching_blocks(self):
+        """Return list of triples describing matching subsequences.
+
+        Each triple is of the form (i, j, n), and means that
+        a[i:i+n] == b[j:j+n].  The triples are monotonically increasing in
+        i and in j.
+
+        The last triple is a dummy, (len(a), len(b), 0), and is the only
+        triple with n==0.
+
+        >>> s = SequenceMatcher(None, "abxcd", "abcd")
+        >>> s.get_matching_blocks()
+        [(0, 0, 2), (3, 2, 2), (5, 4, 0)]
+        """
+
+        if self.matching_blocks is not None:
+            return self.matching_blocks
+        self.matching_blocks = []
+        la, lb = len(self.a), len(self.b)
+        self.__helper(0, la, 0, lb, self.matching_blocks)
+        self.matching_blocks.append( (la, lb, 0) )
+        if TRACE:
+            print '*** matching blocks', self.matching_blocks
+        return self.matching_blocks
+
+    # builds list of matching blocks covering a[alo:ahi] and
+    # b[blo:bhi], appending them in increasing order to answer
+
+    def __helper(self, alo, ahi, blo, bhi, answer):
+        i, j, k = x = self.find_longest_match(alo, ahi, blo, bhi)
+        # a[alo:i] vs b[blo:j] unknown
+        # a[i:i+k] same as b[j:j+k]
+        # a[i+k:ahi] vs b[j+k:bhi] unknown
+        if k:
+            if alo < i and blo < j:
+                self.__helper(alo, i, blo, j, answer)
+            answer.append(x)
+            if i+k < ahi and j+k < bhi:
+                self.__helper(i+k, ahi, j+k, bhi, answer)
+
+    def get_opcodes(self):
+        """Return list of 5-tuples describing how to turn a into b.
+
+        Each tuple is of the form (tag, i1, i2, j1, j2).  The first tuple
+        has i1 == j1 == 0, and remaining tuples have i1 == the i2 from the
+        tuple preceding it, and likewise for j1 == the previous j2.
+
+        The tags are strings, with these meanings:
+
+        'replace':  a[i1:i2] should be replaced by b[j1:j2]
+        'delete':   a[i1:i2] should be deleted.
+                    Note that j1==j2 in this case.
+        'insert':   b[j1:j2] should be inserted at a[i1:i1].
+                    Note that i1==i2 in this case.
+        'equal':    a[i1:i2] == b[j1:j2]
+
+        >>> a = "qabxcd"
+        >>> b = "abycdf"
+        >>> s = SequenceMatcher(None, a, b)
+        >>> for tag, i1, i2, j1, j2 in s.get_opcodes():
+        ...    print ("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
+        ...           (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2]))
+         delete a[0:1] (q) b[0:0] ()
+          equal a[1:3] (ab) b[0:2] (ab)
+        replace a[3:4] (x) b[2:3] (y)
+          equal a[4:6] (cd) b[3:5] (cd)
+         insert a[6:6] () b[5:6] (f)
+        """
+
+        if self.opcodes is not None:
+            return self.opcodes
+        i = j = 0
+        self.opcodes = answer = []
+        for ai, bj, size in self.get_matching_blocks():
+            # invariant:  we've pumped out correct diffs to change
+            # a[:i] into b[:j], and the next matching block is
+            # a[ai:ai+size] == b[bj:bj+size].  So we need to pump
+            # out a diff to change a[i:ai] into b[j:bj], pump out
+            # the matching block, and move (i,j) beyond the match
+            tag = ''
+            if i < ai and j < bj:
+                tag = 'replace'
+            elif i < ai:
+                tag = 'delete'
+            elif j < bj:
+                tag = 'insert'
+            if tag:
+                answer.append( (tag, i, ai, j, bj) )
+            i, j = ai+size, bj+size
+            # the list of matching blocks is terminated by a
+            # sentinel with size 0
+            if size:
+                answer.append( ('equal', ai, i, bj, j) )
+        return answer
+
+    def ratio(self):
+        """Return a measure of the sequences' similarity (float in [0,1]).
+
+        Where T is the total number of elements in both sequences, and
+        M is the number of matches, this is 2,0*M / T.
+        Note that this is 1 if the sequences are identical, and 0 if
+        they have nothing in common.
+
+        .ratio() is expensive to compute if you haven't already computed
+        .get_matching_blocks() or .get_opcodes(), in which case you may
+        want to try .quick_ratio() or .real_quick_ratio() first to get an
+        upper bound.
+
+        >>> s = SequenceMatcher(None, "abcd", "bcde")
+        >>> s.ratio()
+        0.75
+        >>> s.quick_ratio()
+        0.75
+        >>> s.real_quick_ratio()
+        1.0
+        """
+
+        matches = reduce(lambda sum, triple: sum + triple[-1],
+                         self.get_matching_blocks(), 0)
+        return 2.0 * matches / (len(self.a) + len(self.b))
+
+    def quick_ratio(self):
+        """Return an upper bound on ratio() relatively quickly.
+
+        This isn't defined beyond that it is an upper bound on .ratio(), and
+        is faster to compute.
+        """
+
+        # viewing a and b as multisets, set matches to the cardinality
+        # of their intersection; this counts the number of matches
+        # without regard to order, so is clearly an upper bound
+        if self.fullbcount is None:
+            self.fullbcount = fullbcount = {}
+            for elt in self.b:
+                fullbcount[elt] = fullbcount.get(elt, 0) + 1
+        fullbcount = self.fullbcount
+        # avail[x] is the number of times x appears in 'b' less the
+        # number of times we've seen it in 'a' so far ... kinda
+        avail = {}
+        availhas, matches = avail.has_key, 0
+        for elt in self.a:
+            if availhas(elt):
+                numb = avail[elt]
+            else:
+                numb = fullbcount.get(elt, 0)
+            avail[elt] = numb - 1
+            if numb > 0:
+                matches = matches + 1
+        return 2.0 * matches / (len(self.a) + len(self.b))
+
+    def real_quick_ratio(self):
+        """Return an upper bound on ratio() very quickly.
+
+        This isn't defined beyond that it is an upper bound on .ratio(), and
+        is faster to compute than either .ratio() or .quick_ratio().
+        """
+
+        la, lb = len(self.a), len(self.b)
+        # can't have more matches than the number of elements in the
+        # shorter sequence
+        return 2.0 * min(la, lb) / (la + lb)
+
+def get_close_matches(word, possibilities, n=3, cutoff=0.6):
+    """Use SequenceMatcher to return list of the best "good enough" matches.
+
+    word is a sequence for which close matches are desired (typically a
+    string).
+
+    possibilities is a list of sequences against which to match word
+    (typically a list of strings).
+
+    Optional arg n (default 3) is the maximum number of close matches to
+    return.  n must be > 0.
+
+    Optional arg cutoff (default 0.6) is a float in [0, 1].  Possibilities
+    that don't score at least that similar to word are ignored.
+
+    The best (no more than n) matches among the possibilities are returned
+    in a list, sorted by similarity score, most similar first.
+
+    >>> get_close_matches("appel", ["ape", "apple", "peach", "puppy"])
+    ['apple', 'ape']
+    >>> import keyword
+    >>> get_close_matches("wheel", keyword.kwlist)
+    ['while']
+    >>> get_close_matches("apple", keyword.kwlist)
+    []
+    >>> get_close_matches("accept", keyword.kwlist)
+    ['except']
+    """
+
+    if not n >  0:
+        raise ValueError("n must be > 0: " + `n`)
+    if not 0.0 <= cutoff <= 1.0:
+        raise ValueError("cutoff must be in [0.0, 1.0]: " + `cutoff`)
+    result = []
+    s = SequenceMatcher()
+    s.set_seq2(word)
+    for x in possibilities:
+        s.set_seq1(x)
+        if s.real_quick_ratio() >= cutoff and \
+           s.quick_ratio() >= cutoff and \
+           s.ratio() >= cutoff:
+            result.append((s.ratio(), x))
+    # Sort by score.
+    result.sort()
+    # Retain only the best n.
+    result = result[-n:]
+    # Move best-scorer to head of list.
+    result.reverse()
+    # Strip scores.
+    # Python 2.x list comprehensions: return [x for score, x in result]
+    return_result = []
+    for score, x in result:
+        return_result.append(x)
+    return return_result
+
+def _test():
+    import doctest, difflib
+    return doctest.testmod(difflib)
+
+if __name__ == "__main__":
+    _test()

lib/compat_ndiff.py

@@ -4,6 +4,8 @@
 # Released to the public domain 08-Dec-2000,
 # by Tim Peters (tim.one@home.com).
 
+# Backported to Python 1.5.2 for ViewCVS by pf@artcom-gmbh.de, 24-Dec-2001
+
 # Provided as-is; use at your own risk; no warranty; no promises; enjoy!
 
 """ndiff [-q] file1 file2
@@ -43,7 +45,7 @@ recovered by piping the output through
 See module comments for details and programmatic interface.
 """
 
-__version__ = 1, 5, 0
+__version__ = 1, 6, 1
 
 # SequenceMatcher tries to compute a "human-friendly diff" between
 # two sequences (chiefly picturing a file as a sequence of lines,
@@ -97,9 +99,8 @@ __version__ = 1, 5, 0
 # is sent to stdout.  Or you can call main(args), passing what would
 # have been in sys.argv[1:] had the cmd-line form been used.
 
-from difflib import SequenceMatcher
+from compat_difflib import SequenceMatcher
 
-import string
 TRACE = 0
 
 # define what "junk" means
@@ -200,15 +201,15 @@ def fancy_replace(a, alo, ahi, b, blo, bhi):
         for tag, ai1, ai2, bj1, bj2 in cruncher.get_opcodes():
             la, lb = ai2 - ai1, bj2 - bj1
             if tag == 'replace':
-                atags += '^' * la
-                btags += '^' * lb
+                atags = atags + '^' * la
+                btags = btags + '^' * lb
             elif tag == 'delete':
-                atags += '-' * la
+                atags = atags + '-' * la
             elif tag == 'insert':
-                btags += '+' * lb
+                btags = btags + '+' * lb
             elif tag == 'equal':
-                atags += ' ' * la
-                btags += ' ' * lb
+                atags = atags + ' ' * la
+                btags = btags + ' ' * lb
             else:
                 raise ValueError, 'unknown tag ' + `tag`
         printq(aelt, belt, atags, btags)
@@ -245,7 +246,7 @@ def printq(aline, bline, atags, btags):
 def count_leading(line, ch):
     i, n = 0, len(line)
     while i < n and line[i] == ch:
-        i += 1
+        i = i+1
     return i
 
 def fail(msg):

lib/config.py

@@ -1,27 +1,26 @@
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2008 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
 # config.py: configuration utilities
 #
 # -----------------------------------------------------------------------
-#
 
 import sys
 import os
 import string
 import ConfigParser
 import fnmatch
+import re
+import vclib
 
 
 #########################################################################
@@ -30,28 +29,28 @@ import fnmatch
 #
 # There are three forms of configuration:
 #
-#       1) edit the viewcvs.conf created by the viewcvs-install(er)
-#       2) as (1), but delete all unchanged entries from viewcvs.conf
-#       3) do not use viewcvs.conf and just edit the defaults in this file
+#       1) edit the viewvc.conf created by the viewvc-install(er)
+#       2) as (1), but delete all unchanged entries from viewvc.conf
+#       3) do not use viewvc.conf and just edit the defaults in this file
 #
 # Most users will want to use (1), but there are slight speed advantages
-# to the other two options. Note that viewcvs.conf values are a bit easier
+# to the other two options. Note that viewvc.conf values are a bit easier
 # to work with since it is raw text, rather than python literal values.
 #
 #########################################################################
 
 class Config:
   _sections = ('general', 'options', 'cvsdb', 'templates')
-  _force_multi_value = ('cvs_roots', 'forbidden', 'disable_enscript_lang',
-                        'languages', 'kv_files')
+  _force_multi_value = ('cvs_roots', 'forbidden', 'forbiddenre',
+                        'svn_roots', 'languages', 'kv_files',
+                        'root_parents')
 
   def __init__(self):
     for section in self._sections:
       setattr(self, section, _sub_config())
 
-  def load_config(self, fname, vhost=None):
-    this_dir = os.path.dirname(sys.argv[0])
-    pathname = os.path.join(this_dir, fname)
+  def load_config(self, pathname, vhost=None):
+    self.conf_path = os.path.isfile(pathname) and pathname or None
     self.base = os.path.dirname(pathname)
 
     parser = ConfigParser.ConfigParser()
@@ -106,12 +105,9 @@ class Config:
         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
+      if opt == 'cvs_roots' or opt == 'svn_roots':
+        value = _parse_roots(opt, value)
+
       setattr(sc, opt, value)
 
   def _process_vhost(self, parser, vhost):
@@ -128,6 +124,8 @@ class Config:
 
   def _find_canon_vhost(self, parser, vhost):
     vhost = string.lower(vhost)
+    # Strip (ignore) port number:
+    vhost = string.split(vhost, ':')[0]
 
     for canon_vhost in parser.options('vhosts'):
       value = parser.get('vhosts', canon_vhost)
@@ -142,38 +140,52 @@ class Config:
   def set_defaults(self):
     "Set some default values in the configuration."
 
-    self.general.cvs_roots = {
-      # user-visible-name : path
-      "Development" : "/home/cvsroot",
-      }
-    self.general.default_root = "Development"
+    self.general.cvs_roots = { }
+    self.general.svn_roots = { }
+    self.general.root_parents = []
+    self.general.default_root = ''
     self.general.rcs_path = ''
+    if sys.platform == "win32":
+      self.general.cvsnt_exe_path = 'cvs'
+    else:
+      self.general.cvsnt_exe_path = None
+    self.general.use_rcsparse = 0
+    self.general.svn_path = ''
     self.general.mime_types_file = ''
-    self.general.address = '<a href="mailto:user@insert.your.domain.here">No CVS admin address has been configured</a>'
-    self.general.main_title = 'CVS Repository'
-    self.general.forbidden = ()
-    self.general.kv_files = [ ]
+    self.general.address = '<a href="mailto:user@insert.your.domain.here">No admin address has been configured</a>'
+    self.general.forbidden = []
+    self.general.forbiddenre = []
+    self.general.kv_files = []
     self.general.languages = ['en-us']
 
-    self.templates.directory = 'templates/directory.ezt'
-    self.templates.log = 'templates/log.ezt'
-    self.templates.query = 'templates/query.ezt'
-    self.templates.footer = 'templates/footer.ezt'
-    self.templates.diff = 'templates/diff.ezt'
-    self.templates.graph = 'templates/graph.ezt'
-    self.templates.annotate = 'templates/annotate.ezt'
-    self.templates.markup = 'templates/markup.ezt'
+    self.templates.directory = None
+    self.templates.log = None
+    self.templates.query = None
+    self.templates.diff = None
+    self.templates.graph = None
+    self.templates.annotate = None
+    self.templates.markup = None
+    self.templates.error = None
+    self.templates.query_form = None
+    self.templates.query_results = None
+    self.templates.roots = None
 
     self.cvsdb.enabled = 0
     self.cvsdb.host = ''
+    self.cvsdb.port = 3306
     self.cvsdb.database_name = ''
     self.cvsdb.user = ''
     self.cvsdb.passwd = ''
     self.cvsdb.readonly_user = ''
     self.cvsdb.readonly_passwd = '' 
     self.cvsdb.row_limit = 1000
+    self.cvsdb.rss_row_limit = 100
 
+    self.options.root_as_url_component = 0
+    self.options.default_file_view = "log"
+    self.options.checkout_magic = 0
     self.options.sort_by = 'file'
+    self.options.sort_group_dirs = 1
     self.options.hide_attic = 1
     self.options.log_sort = 'date'
     self.options.diff_format = 'h'
@@ -182,38 +194,117 @@ class Config:
     self.options.hr_funout = 1
     self.options.hr_ignore_white = 1
     self.options.hr_ignore_keyword_subst = 1
+    self.options.hr_intraline = 0
     self.options.allow_annotate = 1
     self.options.allow_markup = 1
     self.options.allow_compress = 1
-    self.options.checkout_magic = 1
+    self.options.template_dir = "templates"
+    self.options.docroot = None
     self.options.show_subdir_lastmod = 0
     self.options.show_logs = 1
     self.options.show_log_in_markup = 1
+    self.options.cross_copies = 0
     self.options.py2html_path = '.'
     self.options.short_log_len = 80
-    self.options.diff_font_face = 'Helvetica,Arial'
-    self.options.diff_font_size = -1
     self.options.use_enscript = 0
     self.options.enscript_path = ''
-    self.options.disable_enscript_lang = ()
+    self.options.use_highlight = 0
+    self.options.highlight_path = ''
+    self.options.highlight_line_numbers = 1
+    self.options.highlight_convert_tabs = 2
+    self.options.use_php = 0
+    self.options.php_exe_path = 'php'
     self.options.allow_tar = 0
     self.options.use_cvsgraph = 0
     self.options.cvsgraph_path = ''
-    self.options.cvsgraph_conf = "<VIEWCVS_INSTALL_DIRECTORY>/cvsgraph.conf"
+    self.options.cvsgraph_conf = "cvsgraph.conf"
     self.options.use_re_search = 0
+    self.options.use_pagesize = 0
+    self.options.limit_changes = 100
+    self.options.use_localtime = 0
+    self.options.http_expiration_time = 600
+    self.options.generate_etags = 1
 
-  def is_forbidden(self, module):
-    if not module:
+  def is_forbidden(self, root, path_parts, pathtype):
+    # If we don't have a root and path to check, get outta here.
+    if not (root and path_parts):
       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
+
+    # Give precedence to the new 'forbiddenre' stuff first.
+    if self.general.forbiddenre:
+
+      # Join the root and path-parts together into one path-like thing.
+      root_and_path = string.join([root] + path_parts, "/")
+      if pathtype == vclib.DIR:
+        root_and_path = root_and_path + '/'
+      
+      # If we still have a list of strings, replace those suckers with
+      # lists of (compiled_regex, negation_flag)
+      if type(self.general.forbiddenre[0]) == type(""):
+        for i in range(len(self.general.forbiddenre)):
+          pat = self.general.forbiddenre[i]
+          if pat[0] == '!':
+            self.general.forbiddenre[i] = (re.compile(pat[1:]), 1)
+          else:
+            self.general.forbiddenre[i] = (re.compile(pat), 0)
+
+      # Do the forbiddenness test.
+      default = 0
+      for (pat, negated) in self.general.forbiddenre:
+        match = pat.search(root_and_path)
+        if negated:
+          default = 1
+          if match:
+            return 0
+        elif match:
+          return 1
+      return default
+
+    # If no 'forbiddenre' is in use, we check 'forbidden', which only
+    # looks at the top-most directory.
+    elif self.general.forbidden:
+
+      # A root and a single non-directory path component?  That's not
+      # a module.
+      if len(path_parts) == 1 and pathtype != vclib.DIR:
+        return 0
+      
+      # Do the forbiddenness test.
+      module = path_parts[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
+
+    # No forbiddenness configuration?  Just allow it.
+    else:
+      return 0
+
+def _parse_roots(config_name, config_value):
+  roots = { }
+  for root in config_value:
+    pos = string.find(root, ':')
+    if pos < 0:
+      raise MalformedRoot(config_name, root)
+    name, path = map(string.strip, (root[:pos], root[pos+1:]))
+    roots[name] = path
+  return roots
+
+
+class MalformedRoot(Exception):
+  def __init__(self, config_name, value_given):
+    Exception.__init__(self, config_name, value_given)
+    self.config_name = config_name
+    self.value_given = value_given
+  def __str__(self):
+    return "malformed configuration: '%s' uses invalid syntax: %s" \
+           % (self.config_name, self.value_given)
+
 
 class _sub_config:
   pass

lib/cvsdb.py

@@ -1,70 +1,41 @@
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2007 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.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
-#
-
-#########################################################################
-#
-# INSTALL-TIME CONFIGURATION
-#
-# These values will be set during the installation process. During
-# development, they will remain None.
-#
-
-CONF_PATHNAME = None
-
-#########################################################################
 
 import os
 import sys
 import string
 import time
+import fnmatch
+import re
 
-import config
 import dbi
-import rlog
 
 
-## load configuration file, the data is used globally here
-if CONF_PATHNAME:
-  _cfg_pathname = CONF_PATHNAME
-else:
-  # developer assistance: running from a CVS working copy
-  _cfg_pathname = os.path.join(os.path.dirname(__file__), os.pardir, 'cgi',
-                               'viewcvs.conf')
-cfg = config.Config()
-cfg.set_defaults()
-cfg.load_config(_cfg_pathname)
-
 ## error
 error = "cvsdb error"
 
-## cached (active) database connections
-gCheckinDatabase = None
-gCheckinDatabaseReadOnly = None
-
-
 ## CheckinDatabase provides all interfaces needed to the SQL database
 ## back-end; it needs to be subclassed, and have its "Connect" method
 ## defined to actually be complete; it should run well off of any DBI 2.0
 ## complient database interface
 
 class CheckinDatabase:
-    def __init__(self, host, user, passwd, database):
+    def __init__(self, host, port, user, passwd, database, row_limit):
         self._host = host
+        self._port = port
         self._user = user
         self._passwd = passwd
         self._database = database
+        self._row_limit = row_limit
 
         ## database lookup caches
         self._get_cache = {}
@@ -73,7 +44,9 @@ class CheckinDatabase:
 
     def Connect(self):
         self.db = dbi.connect(
-            self._host, self._user, self._passwd, self._database)
+            self._host, self._port, self._user, self._passwd, self._database)
+        cursor = self.db.cursor()
+        cursor.execute("SET AUTOCOMMIT=1")
 
     def sql_get_id(self, table, column, value, auto_set):
         sql = "SELECT id FROM %s WHERE %s=%%s" % (table, column)
@@ -264,14 +237,7 @@ class CheckinDatabase:
             self.AddCommit(commit)
 
     def AddCommit(self, commit):
-        ## MORE TIME HELL: the MySQLdb module doesn't construct times
-        ## correctly when created with TimestampFromTicks -- it doesn't
-        ## account for daylight savings time, so we use Python's time
-        ## module to do the conversion
-        temp = time.localtime(commit.GetTime())
-        ci_when = dbi.Timestamp(
-            temp[0], temp[1], temp[2], temp[3], temp[4], temp[5])
-
+        ci_when = dbi.DateTimeFromTicks(commit.GetTime())
         ci_type = commit.GetTypeString()
         who_id = self.GetAuthorID(commit.GetAuthor())
         repository_id = self.GetRepositoryID(commit.GetRepository())
@@ -280,8 +246,8 @@ class CheckinDatabase:
         revision = commit.GetRevision()
         sticky_tag = "NULL"
         branch_id = self.GetBranchID(commit.GetBranch())
-        plus_count = commit.GetPlusCount()
-        minus_count = commit.GetMinusCount()
+        plus_count = commit.GetPlusCount() or '0'
+        minus_count = commit.GetMinusCount() or '0'
         description_id = self.GetDescriptionID(commit.GetDescription())
 
         sql = "REPLACE INTO checkins"\
@@ -295,67 +261,60 @@ class CheckinDatabase:
         cursor = self.db.cursor()
         cursor.execute(sql, sql_args)
 
-    def SQLQueryListString(self, sqlString, query_entry_list):
+    def SQLQueryListString(self, field, query_entry_list):
         sqlList = []
 
         for query_entry in query_entry_list:
+            data = query_entry.data
             ## figure out the correct match type
             if query_entry.match == "exact":
                 match = "="
             elif query_entry.match == "like":
                 match = " LIKE "
+            elif query_entry.match == "glob":
+                match = " REGEXP "
+                # use fnmatch to translate the glob into a regexp
+                data = fnmatch.translate(data)
+                if data[0] != '^': data = '^' + data
             elif query_entry.match == "regex":
                 match = " REGEXP "
+            elif query_entry.match == "notregex":
+                match = " NOT REGEXP "
 
-            sqlList.append(sqlString % (match, query_entry.data))
+            sqlList.append("%s%s%s" % (field, match, self.db.literal(data)))
 
         return "(%s)" % (string.join(sqlList, " OR "))
 
     def CreateSQLQueryString(self, query):
-        tableList = ["checkins"]
+        tableList = [("checkins", None)]
         condList = []
 
-        ## XXX: this is to exclude .ver files -- RN specific hack --JMP
-        tableList.append("files")
-        temp = "(checkins.fileid=files.id AND files.file NOT LIKE \"%.ver\")"
-        condList.append(temp)
-        ## XXX
-
         if len(query.repository_list):
-            tableList.append("repositories")
-
-            sql = "(checkins.repositoryid=repositories.id AND "\
-                  "repositories.repository%s\"%s\")"
-            temp = self.SQLQueryListString(sql, query.repository_list)
+            tableList.append(("repositories",
+                              "(checkins.repositoryid=repositories.id)"))
+            temp = self.SQLQueryListString("repositories.repository",
+                                           query.repository_list)
             condList.append(temp)
 
         if len(query.branch_list):
-            tableList.append("branches")
-
-            sql = "(checkins.branchid=branches.id AND "\
-                  "branches.branch%s\"%s\")"
-            temp = self.SQLQueryListString(sql, query.branch_list)
+            tableList.append(("branches", "(checkins.branchid=branches.id)"))
+            temp = self.SQLQueryListString("branches.branch",
+                                           query.branch_list)
             condList.append(temp)
 
         if len(query.directory_list):
-            tableList.append("dirs")
-
-            sql = "(checkins.dirid=dirs.id AND dirs.dir%s\"%s\")" 
-            temp = self.SQLQueryListString(sql, query.directory_list)
+            tableList.append(("dirs", "(checkins.dirid=dirs.id)"))
+            temp = self.SQLQueryListString("dirs.dir", query.directory_list)
             condList.append(temp)
             
         if len(query.file_list):
-            tableList.append("files")
-
-            sql = "(checkins.fileid=files.id AND files.file%s\"%s\")"
-            temp = self.SQLQueryListString(sql, query.file_list)
+            tableList.append(("files", "(checkins.fileid=files.id)"))
+            temp = self.SQLQueryListString("files.file", query.file_list)
             condList.append(temp)
             
         if len(query.author_list):
-            tableList.append("people")
-
-            sql = "(checkins.whoid=people.id AND people.who%s\"%s\")"
-            temp = self.SQLQueryListString(sql, query.author_list)
+            tableList.append(("people", "(checkins.whoid=people.id)"))
+            temp = self.SQLQueryListString("people.who", query.author_list)
             condList.append(temp)
             
         if query.from_date:
@@ -367,27 +326,38 @@ class CheckinDatabase:
             condList.append(temp)
 
         if query.sort == "date":
-            order_by = "ORDER BY checkins.ci_when DESC"
+            order_by = "ORDER BY checkins.ci_when DESC,descid"
         elif query.sort == "author":
-            order_by = "ORDER BY checkins.whoid"
+            tableList.append(("people", "(checkins.whoid=people.id)"))
+            order_by = "ORDER BY people.who,descid"
         elif query.sort == "file":
-            order_by = "ORDER BY checkins.fileid"
+            tableList.append(("files", "(checkins.fileid=files.id)"))
+            order_by = "ORDER BY files.file,descid"
 
-        ## exclude duplicates from the table list
-        for table in tableList[:]:
-            while tableList.count(table) > 1:
-                tableList.remove(table)
+        ## exclude duplicates from the table list, and split out join
+        ## conditions from table names.  In future, the join conditions
+        ## might be handled by INNER JOIN statements instead of WHERE
+        ## clauses, but MySQL 3.22 apparently doesn't support them well.
+        tables = []
+        joinConds = []
+        for (table, cond) in tableList:
+            if table not in tables:
+                tables.append(table)
+                if cond is not None: joinConds.append(cond)
 
-        tables = string.join(tableList, ",")
-        conditions = string.join(condList, " AND ")
+        tables = string.join(tables, ",")
+        conditions = string.join(joinConds + condList, " AND ")
+        conditions = conditions and "WHERE %s" % conditions
 
         ## limit the number of rows requested or we could really slam
         ## a server with a large database
         limit = ""
-        if cfg.cvsdb.row_limit:
-            limit = "LIMIT %s" % (str(cfg.cvsdb.row_limit))
+        if query.limit:
+            limit = "LIMIT %s" % (str(query.limit))
+        elif self._row_limit:
+            limit = "LIMIT %s" % (str(self._row_limit))
 
-        sql = "SELECT checkins.* FROM %s WHERE %s %s %s" % (
+        sql = "SELECT checkins.* FROM %s %s %s %s" % (
             tables, conditions, order_by, limit)
 
         return sql
@@ -406,28 +376,23 @@ class CheckinDatabase:
              dbFileID, dbRevision, dbStickyTag, dbBranchID, dbAddedLines,
              dbRemovedLines, dbDescID) = row
 
-            commit = CreateCommit()
-
-            ## TIME, TIME, TIME is all fucked up; dateobject.gmticks()
-            ## is broken, dateobject.ticks() returns somthing like
-            ## GMT ticks, except it forgets about daylight savings
-            ## time -- we handle it ourself in the following painful way
-            gmt_time = time.mktime(
-                (dbCI_When.year, dbCI_When.month, dbCI_When.day,
-                 dbCI_When.hour, dbCI_When.minute, dbCI_When.second,
-                 0, 0, dbCI_When.dst))
-    
-            commit.SetTime(gmt_time)
-            
-            commit.SetFile(self.GetFile(dbFileID))
-            commit.SetDirectory(self.GetDirectory(dbDirID))
+            commit = LazyCommit(self)
+            if dbType == 'Add':
+              commit.SetTypeAdd()
+            elif dbType == 'Remove':
+              commit.SetTypeRemove()
+            else:
+              commit.SetTypeChange()
+            commit.SetTime(dbi.TicksFromDateTime(dbCI_When))
+            commit.SetFileID(dbFileID)
+            commit.SetDirectoryID(dbDirID)
             commit.SetRevision(dbRevision)
-            commit.SetRepository(self.GetRepository(dbRepositoryID))
-            commit.SetAuthor(self.GetAuthor(dbAuthorID))
-            commit.SetBranch(self.GetBranch(dbBranchID))
+            commit.SetRepositoryID(dbRepositoryID)
+            commit.SetAuthorID(dbAuthorID)
+            commit.SetBranchID(dbBranchID)
             commit.SetPlusCount(dbAddedLines)
             commit.SetMinusCount(dbRemovedLines)
-            commit.SetDescription(self.GetDescription(dbDescID))
+            commit.SetDescriptionID(dbDescID)
 
             query.AddCommit(commit)
 
@@ -482,37 +447,18 @@ class Commit:
         self.__type = Commit.CHANGE
 
     def SetRepository(self, repository):
-        ## clean up repository path; make sure it doesn't end with a
-        ## path seperator
-        while len(repository) and repository[-1] == os.sep:
-            repository = repository[:-1]
-
         self.__repository = repository
 
     def GetRepository(self):
         return self.__repository
         
     def SetDirectory(self, dir):
-        ## clean up directory path; make sure it doesn't begin
-        ## or end with a path seperator
-        while len(dir) and dir[0] == os.sep:
-            dir = dir[1:]
-        while len(dir) and dir[-1] == os.sep:
-            dir = dir[:-1]
-        
         self.__directory = dir
 
     def GetDirectory(self):
         return self.__directory
 
     def SetFile(self, file):
-        ## clean up filename; make sure it doesn't begin
-        ## or end with a path seperator
-        while len(file) and file[0] == os.sep:
-            file = file[1:]
-        while len(file) and file[-1] == os.sep:
-            file = file[:-1]
-        
         self.__file = file
 
     def GetFile(self):
@@ -537,10 +483,7 @@ class Commit:
         return self.__author
 
     def SetBranch(self, branch):
-        if not branch:
-            self.__branch = ''
-        else:
-            self.__branch = branch
+        self.__branch = branch or ''
 
     def GetBranch(self):
         return self.__branch
@@ -583,6 +526,67 @@ class Commit:
         elif self.__type == Commit.REMOVE:
             return 'Remove'
 
+## LazyCommit overrides a few methods of Commit to only retrieve
+## it's properties as they are needed
+class LazyCommit(Commit):
+  def __init__(self, db):
+    Commit.__init__(self)
+    self.__db = db
+
+  def SetFileID(self, dbFileID):
+    self.__dbFileID = dbFileID
+
+  def GetFileID(self):
+    return self.__dbFileID
+
+  def GetFile(self):
+    return self.__db.GetFile(self.__dbFileID)
+
+  def SetDirectoryID(self, dbDirID):
+    self.__dbDirID = dbDirID
+
+  def GetDirectoryID(self):
+    return self.__dbDirID
+
+  def GetDirectory(self):
+    return self.__db.GetDirectory(self.__dbDirID)
+
+  def SetRepositoryID(self, dbRepositoryID):
+    self.__dbRepositoryID = dbRepositoryID
+
+  def GetRepositoryID(self):
+    return self.__dbRepositoryID
+
+  def GetRepository(self):
+    return self.__db.GetRepository(self.__dbRepositoryID)
+
+  def SetAuthorID(self, dbAuthorID):
+    self.__dbAuthorID = dbAuthorID
+
+  def GetAuthorID(self):
+    return self.__dbAuthorID
+
+  def GetAuthor(self):
+    return self.__db.GetAuthor(self.__dbAuthorID)
+
+  def SetBranchID(self, dbBranchID):
+    self.__dbBranchID = dbBranchID
+
+  def GetBranchID(self):
+    return self.__dbBranchID
+
+  def GetBranch(self):
+    return self.__db.GetBranch(self.__dbBranchID)
+
+  def SetDescriptionID(self, dbDescID):
+    self.__dbDescID = dbDescID
+
+  def GetDescriptionID(self):
+    return self.__dbDescID
+
+  def GetDescription(self):
+    return self.__db.GetDescription(self.__dbDescID)
+
 ## QueryEntry holds data on one match-type in the SQL database
 ## match is: "exact", "like", or "regex"
 class QueryEntry:
@@ -608,6 +612,9 @@ class CheckinDatabaseQuery:
         self.from_date = None
         self.to_date = None
 
+        ## limit on number of rows to return
+        self.limit = None
+
         ## list of commits -- filled in by CVS query
         self.commit_list = []
 
@@ -634,115 +641,94 @@ class CheckinDatabaseQuery:
         self.sort = sort
 
     def SetFromDateObject(self, ticks):
-        self.from_date = dbi.TimestampFromTicks(ticks)
+        self.from_date = dbi.DateTimeFromTicks(ticks)
 
     def SetToDateObject(self, ticks):
-        self.to_date = dbi.TimestampFromTicks(ticks)
+        self.to_date = dbi.DateTimeFromTicks(ticks)
 
     def SetFromDateHoursAgo(self, hours_ago):
         ticks = time.time() - (3600 * hours_ago)
-        self.from_date = dbi.TimestampFromTicks(ticks)
+        self.from_date = dbi.DateTimeFromTicks(ticks)
         
     def SetFromDateDaysAgo(self, days_ago):
         ticks = time.time() - (86400 * days_ago)
-        self.from_date = dbi.TimestampFromTicks(ticks)
+        self.from_date = dbi.DateTimeFromTicks(ticks)
 
     def SetToDateDaysAgo(self, days_ago):
         ticks = time.time() - (86400 * days_ago)
-        self.to_date = dbi.TimestampFromTicks(ticks)
+        self.to_date = dbi.DateTimeFromTicks(ticks)
+
+    def SetLimit(self, limit):
+        self.limit = limit;
 
     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 CreateCheckinDatabase(host, user, passwd, database):
-    return CheckinDatabase(host, user, passwd, database)
-  
 def CreateCommit():
     return Commit()
     
 def CreateCheckinQuery():
     return CheckinDatabaseQuery()
 
-def ConnectDatabaseReadOnly():
-    global gCheckinDatabaseReadOnly
-    
-    if gCheckinDatabaseReadOnly:
-        return gCheckinDatabaseReadOnly
-    
-    gCheckinDatabaseReadOnly = CreateCheckinDatabase(
-        cfg.cvsdb.host,
-        cfg.cvsdb.readonly_user,
-        cfg.cvsdb.readonly_passwd,
-        cfg.cvsdb.database_name)
-    
-    gCheckinDatabaseReadOnly.Connect()
-    return gCheckinDatabaseReadOnly
+def ConnectDatabase(cfg, readonly=0):
+    if readonly:
+        user = cfg.cvsdb.readonly_user
+        passwd = cfg.cvsdb.readonly_passwd
+    else:
+        user = cfg.cvsdb.user
+        passwd = cfg.cvsdb.passwd
+    db = CheckinDatabase(cfg.cvsdb.host, cfg.cvsdb.port, user, passwd,
+                         cfg.cvsdb.database_name, cfg.cvsdb.row_limit)
+    db.Connect()
+    return db
 
-def ConnectDatabase():
-    global gCheckinDatabase
-    
-    gCheckinDatabase = CreateCheckinDatabase(
-        cfg.cvsdb.host,
-        cfg.cvsdb.user,
-        cfg.cvsdb.passwd,
-        cfg.cvsdb.database_name)
-    
-    gCheckinDatabase.Connect()
-    return gCheckinDatabase
+def ConnectDatabaseReadOnly(cfg):
+    return ConnectDatabase(cfg, 1)
 
-def RLogDataToCommitList(repository, rlog_data):
+def GetCommitListFromRCSFile(repository, path_parts, revision=None):
     commit_list = []
 
-    ## the filename in rlog_data contains the entire path of the
-    ## repository; we strip that out here
-    temp = rlog_data.filename[len(repository):]
-    directory, file = os.path.split(temp)
+    directory = string.join(path_parts[:-1], "/")
+    file = path_parts[-1]
 
-    for rlog_entry in rlog_data.rlog_entry_list:
+    revs = repository.itemlog(path_parts, revision, {"cvs_pass_rev": 1})
+    for rev in revs:
         commit = CreateCommit()
-        commit.SetRepository(repository)
+        commit.SetRepository(repository.rootpath)
         commit.SetDirectory(directory)
         commit.SetFile(file)
-        commit.SetRevision(rlog_entry.revision)
-        commit.SetAuthor(rlog_entry.author)
-        commit.SetDescription(rlog_entry.description)
-        commit.SetTime(rlog_entry.time)
-        commit.SetPlusCount(rlog_entry.pluscount)
-        commit.SetMinusCount(rlog_entry.minuscount)
-        commit.SetBranch(rlog_data.LookupBranch(rlog_entry))
+        commit.SetRevision(rev.string)
+        commit.SetAuthor(rev.author)
+        commit.SetDescription(rev.log)
+        commit.SetTime(rev.date)
 
-        if rlog_entry.type == rlog_entry.CHANGE:
-            commit.SetTypeChange()
-        elif rlog_entry.type == rlog_entry.ADD:
+        if rev.changed:
+            # extract the plus/minus and drop the sign
+            plus, minus = string.split(rev.changed)
+            commit.SetPlusCount(plus[1:])
+            commit.SetMinusCount(minus[1:])
+
+            if rev.dead:
+                commit.SetTypeRemove()
+            else:
+                commit.SetTypeChange()
+        else:
             commit.SetTypeAdd()
-        elif rlog_entry.type == rlog_entry.REMOVE:
-            commit.SetTypeRemove()
 
         commit_list.append(commit)
 
+        # if revision is on a branch which has at least one tag
+        if len(rev.number) > 2 and rev.branches:
+            commit.SetBranch(rev.branches[0].name)
+
     return commit_list
 
-def GetCommitListFromRCSFile(repository, filename):
-    try:
-        rlog_data = rlog.GetRLogData(cfg, filename)
-    except rlog.error, e:
-        raise error, e
-    
-    commit_list = RLogDataToCommitList(repository, rlog_data)
-    return commit_list
-
-def GetUnrecordedCommitList(repository, filename):
-    commit_list = GetCommitListFromRCSFile(repository, filename)
-    db = ConnectDatabase()
+def GetUnrecordedCommitList(repository, path_parts, db):
+    commit_list = GetCommitListFromRCSFile(repository, path_parts)
 
     unrecorded_commit_list = []
     for commit in commit_list:
@@ -751,3 +737,31 @@ def GetUnrecordedCommitList(repository, filename):
             unrecorded_commit_list.append(commit)
 
     return unrecorded_commit_list
+
+_re_likechars = re.compile(r"([_%\\])")
+
+def EscapeLike(literal):
+  """Escape literal string for use in a MySQL LIKE pattern"""
+  return re.sub(_re_likechars, r"\\\1", literal)
+
+def FindRepository(db, path):
+  """Find repository path in database given path to subdirectory
+  Returns normalized repository path and relative directory path"""
+  path = os.path.normpath(path)
+  dirs = []
+  while path:
+    rep = os.path.normcase(path)
+    if db.GetRepositoryID(rep, 0) is None:
+      path, pdir = os.path.split(path)
+      if not pdir:
+        return None, None
+      dirs.append(pdir)
+    else:
+      break
+  dirs.reverse()
+  return rep, dirs
+
+def CleanRepository(path):
+  """Return normalized top-level repository path"""
+  return os.path.normcase(os.path.normpath(path))
+

lib/dbi.py

@@ -1,71 +1,63 @@
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
-#
 
 import sys
+import time
+import types
+import re
+import compat
 import MySQLdb
 
+# set to 1 to store commit times in UTC, or 0 to use the ViewVC machine's
+# local timezone. Using UTC is recommended because it ensures that the 
+# database will remain valid even if it is moved to another machine or the host
+# computer's time zone is changed. UTC also avoids the ambiguity associated
+# with daylight saving time (for example if a computer in New York recorded the
+# local time 2002/10/27 1:30 am, there would be no way to tell whether the
+# actual time was recorded before or after clocks were rolled back). Use local
+# times for compatibility with databases used by ViewCVS 0.92 and earlier 
+# versions.
+utc_time = 1
 
-dbi_error = "dbi error"
+def DateTimeFromTicks(ticks):
+  """Return a MySQL DATETIME value from a unix timestamp"""
 
+  if utc_time:
+    t = time.gmtime(ticks)
+  else:
+    t = time.localtime(ticks)
+  return "%04d-%02d-%02d %02d:%02d:%02d" % t[:6]
 
-## 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.
-"""
+_re_datetime = re.compile('([0-9]{4})-([0-9][0-9])-([0-9][0-9]) '
+                          '([0-9][0-9]):([0-9][0-9]):([0-9][0-9])')
 
-if not hasattr(MySQLdb, "Timestamp") or \
-   not hasattr(MySQLdb, "TimestampFromTicks"):
-    sys.stderr.write(_no_datetime)
-    sys.exit(1)
+def TicksFromDateTime(datetime):
+  """Return a unix timestamp from a MySQL DATETIME value"""
 
+  if type(datetime) == types.StringType:
+    # datetime is a MySQL DATETIME string
+    matches = _re_datetime.match(datetime).groups()
+    t = tuple(map(int, matches)) + (0, 0, 0)
+  elif hasattr(datetime, "timetuple"):
+    # datetime is a Python >=2.3 datetime.DateTime object
+    t = datetime.timetuple()
+  else:
+    # datetime is an eGenix mx.DateTime object
+    t = datetime.tuple()
 
-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
+  if utc_time:
+    return compat.timegm(t)
+  else:
+    return time.mktime(t[:8] + (-1,))
     
-
-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)
+def connect(host, port, user, passwd, db):
+    return MySQLdb.connect(host=host, port=port, user=user, passwd=passwd, db=db)

lib/debug.py

@@ -1,22 +1,27 @@
-# -*- Mode: python -*-
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
+
 #
 # Note: a t_start/t_end pair consumes about 0.00005 seconds on a P3/700.
 #       the lambda form (when debugging is disabled) should be even faster.
 #
 
-if 0:
+import sys
+
+
+SHOW_TIMES = 0
+SHOW_CHILD_PROCESSES = 0
+
+if SHOW_TIMES:
 
   import time
 
@@ -35,8 +40,150 @@ if 0:
 
   def dump():
     for name, value in _times.items():
-      print '%s: %.6f<br>' % (name, value)
+      print '%s: %.6f<br />' % (name, value)
 
 else:
 
   t_start = t_end = dump = lambda *args: None
+
+
+class ViewVCException:
+  def __init__(self, msg, status=None):
+    self.msg = msg
+    self.status = status
+
+  def __str__(self):
+    if self.status:
+      return '%s: %s' % (self.status, self.msg)
+    return "ViewVC Unrecoverable Error: %s" % self.msg
+
+
+def PrintException(server, exc_data):
+  status = exc_data['status']
+  msg = exc_data['msg']
+  tb = exc_data['stacktrace']
+  
+  server.header(status=status)
+  server.write("<h3>An Exception Has Occurred</h3>\n")
+
+  s = ''
+  if msg:
+    s = '<p><pre>%s</pre></p>' % server.escape(msg)
+  if status:
+    s = s + ('<h4>HTTP Response Status</h4>\n<p><pre>\n%s</pre></p><hr />\n'
+             % status)
+  server.write(s)
+
+  server.write("<h4>Python Traceback</h4>\n<p><pre>")
+  server.write(server.escape(tb))
+  server.write("</pre></p>\n")
+
+
+def GetExceptionData():
+  # capture the exception before doing anything else
+  exc_type, exc, exc_tb = sys.exc_info()
+
+  exc_dict = {
+    'status' : None,
+    'msg' : None,
+    'stacktrace' : None,
+    }
+  
+  try:
+    import traceback, string
+
+    if isinstance(exc, ViewVCException):
+      exc_dict['msg'] = exc.msg
+      exc_dict['status'] = exc.status
+    
+    tb = string.join(traceback.format_exception(exc_type, exc, exc_tb), '')
+    exc_dict['stacktrace'] = tb
+
+  finally:
+    # prevent circular reference. sys.exc_info documentation warns
+    # "Assigning the traceback return value to a local variable in a function
+    # that is handling an exception will cause a circular reference..."
+    # This is all based on 'exc_tb', and we're now done with it. Toss it.
+    del exc_tb
+
+  return exc_dict
+
+
+if SHOW_CHILD_PROCESSES:
+  class Process:
+    def __init__(self, command, inStream, outStream, errStream):
+      self.command = command
+      self.debugIn = inStream
+      self.debugOut = outStream
+      self.debugErr = errStream
+
+      import sapi
+      if not sapi.server is None:
+        if not sapi.server.pageGlobals.has_key('processes'):
+          sapi.server.pageGlobals['processes'] = [self]
+        else:
+          sapi.server.pageGlobals['processes'].append(self)
+
+  def DumpChildren(server):
+    import os
+
+    if not server.pageGlobals.has_key('processes'):
+      return
+    
+    server.header()
+    lastOut = None
+    i = 0
+
+    for k in server.pageGlobals['processes']:
+      i = i + 1
+      server.write("<table>\n")
+      server.write("<tr><td colspan=\"2\">Child Process%i</td></tr>" % i)
+      server.write("<tr>\n  <td style=\"vertical-align:top\">Command Line</td>  <td><pre>")
+      server.write(server.escape(k.command))
+      server.write("</pre></td>\n</tr>\n")
+      server.write("<tr>\n  <td style=\"vertical-align:top\">Standard In:</td>  <td>")
+
+      if k.debugIn is lastOut and not lastOut is None:
+        server.write("<em>Output from process %i</em>" % (i - 1))
+      elif k.debugIn:
+        server.write("<pre>")
+        server.write(server.escape(k.debugIn.getvalue()))
+        server.write("</pre>")
+        
+      server.write("</td>\n</tr>\n")
+      
+      if k.debugOut is k.debugErr:
+        server.write("<tr>\n  <td style=\"vertical-align:top\">Standard Out & Error:</td>  <td><pre>")
+        if k.debugOut:
+          server.write(server.escape(k.debugOut.getvalue()))
+        server.write("</pre></td>\n</tr>\n")
+        
+      else:
+        server.write("<tr>\n  <td style=\"vertical-align:top\">Standard Out:</td>  <td><pre>")
+        if k.debugOut:
+          server.write(server.escape(k.debugOut.getvalue()))
+        server.write("</pre></td>\n</tr>\n")
+        server.write("<tr>\n  <td style=\"vertical-align:top\">Standard Error:</td>  <td><pre>")
+        if k.debugErr:
+          server.write(server.escape(k.debugErr.getvalue()))
+        server.write("</pre></td>\n</tr>\n")
+
+      server.write("</table>\n")
+      server.flush()
+      lastOut = k.debugOut
+
+    server.write("<table>\n")
+    server.write("<tr><td colspan=\"2\">Environment Variables</td></tr>")
+    for k, v in os.environ.items():
+      server.write("<tr>\n  <td style=\"vertical-align:top\"><pre>")
+      server.write(server.escape(k))
+      server.write("</pre></td>\n  <td style=\"vertical-align:top\"><pre>")
+      server.write(server.escape(v))
+      server.write("</pre></td>\n</tr>")
+    server.write("</table>")
+         
+else:
+
+  def DumpChildren(server):
+    pass
+    

lib/ezt.py

@@ -1,18 +1,19 @@
 #!/usr/bin/env python
 """ezt.py -- easy templating
 
-ezt templates are very similar to standard HTML files.  But additionaly
-they contain directives sprinkled in between.  With these directives
-it possible to generate the dynamic content from the ezt templates.
+ezt templates are simply text files in whatever format you so desire
+(such as XML, HTML, etc.) which contain directives sprinkled
+throughout.  With these directives it is possible to generate the
+dynamic content from the ezt templates.
 
-These directives are enclosed in square brackets.  If you are a 
-C-programmer, you might be familar with the #ifdef directives of the
-C preprocessor 'cpp'.  ezt provides a similar concept for HTML.  Additionally 
-EZT has a 'for' directive, which allows to iterate (repeat) certain 
+These directives are enclosed in square brackets.  If you are a
+C-programmer, you might be familar with the #ifdef directives of the C
+preprocessor 'cpp'.  ezt provides a similar concept.  Additionally EZT
+has a 'for' directive, which allows it to iterate (repeat) certain
 subsections of the template according to sequence of data items
 provided by the application.
 
-The HTML rendering is performed by the method generate() of the Template
+The final rendering is performed by the method generate() of the Template
 class.  Building template instances can either be done using external
 EZT files (convention: use the suffix .ezt for such files):
 
@@ -26,7 +27,7 @@ a EZT template string:
     ... <title>[title_string]</title></head>
     ... <body><h1>[title_string]</h1>
     ...    [for a_sequence] <p>[a_sequence]</p>
-    ...    [end] <hr>
+    ...    [end] <hr />
     ...    The [person] is [if-any state]in[else]out[end].
     ... </body>
     ... </html>
@@ -47,11 +48,32 @@ with the output fileobject to the templates generate method:
      <p>list item 1</p>
      <p>list item 2</p>
      <p>another element</p>
-     <hr>
+     <hr />
     The doctor is out.
     </body>
     </html>
 
+Template syntax error reporting should be improved.  Currently it is 
+very sparse (template line numbers would be nice):
+
+    >>> Template().parse("[if-any where] foo [else] bar [end unexpected args]")
+    Traceback (innermost last):
+      File "<stdin>", line 1, in ?
+      File "ezt.py", line 220, in parse
+        self.program = self._parse(text)
+      File "ezt.py", line 275, in _parse
+        raise ArgCountSyntaxError(str(args[1:]))
+    ArgCountSyntaxError: ['unexpected', 'args']
+    >>> Template().parse("[if unmatched_end]foo[end]")
+    Traceback (innermost last):
+      File "<stdin>", line 1, in ?
+      File "ezt.py", line 206, in parse
+        self.program = self._parse(text)
+      File "ezt.py", line 266, in _parse
+        raise UnmatchedEndError()
+    UnmatchedEndError
+
+
 Directives
 ==========
 
@@ -59,19 +81,58 @@ Directives
  or attributes of objects contained in the data dictionary given to the 
  .generate() method.
 
+ Qualified names
+ ---------------
+
+   Qualified names have two basic forms: a variable reference, or a string
+   constant. References are a name from the data dictionary with optional
+   dotted attributes (where each intermediary is an object with attributes,
+   of course).
+
+   Examples:
+
+     [varname]
+
+     [ob.attr]
+
+     ["string"]
+
  Simple directives
  -----------------
 
    [QUAL_NAME]
 
-   This directive is simply replaced by the value of identifier from the data 
-   dictionary.  QUAL_NAME might be a dotted qualified name refering to some
-   instance attribute of objects contained in the dats dictionary.
-   Numbers are converted to string though.
+   This directive is simply replaced by the value of the qualified name.
+   If the value is a number it's converted to a string before being 
+   outputted. If it is None, nothing is outputted. If it is a python file
+   object (i.e. any object with a "read" method), it's contents are
+   outputted. If it is a callback function (any callable python object
+   is assumed to be a callback function), it is invoked and passed an EZT
+   Context object as an argument.
+
+   [QUAL_NAME QUAL_NAME ...]
+
+   If the first value is a callback function, it is invoked with an EZT
+   Context object as a first argument, and the rest of the values as
+   additional arguments.
+
+   Otherwise, the first value defines a substitution format, specifying
+   constant text and indices of the additional arguments. The arguments
+   are substituted and the result is inserted into the output stream.
+
+   Example:
+     ["abc %0 def %1 ghi %0" foo bar.baz]
+
+   Note that the first value can be any type of qualified name -- a string
+   constant or a variable reference. Use %% to substitute a percent sign.
+   Argument indices are 0-based.
 
    [include "filename"]  or [include QUAL_NAME]
 
-   This directive is replaced by content of the named include file.
+   This directive is replaced by content of the named include file. Note
+   that a string constant is more efficient -- the target file is compiled
+   inline. In the variable form, the target file is compiled and executed
+   at runtime.
 
  Block directives
  ----------------
@@ -79,40 +140,67 @@ Directives
    [for QUAL_NAME] ... [end]
    
    The text within the [for ...] directive and the corresponding [end]
-   is repeated for each element in the sequence referred to by the qualified
-   name in the for directive.  Within the for block this identifiers now 
-   refers to the actual item indexed by this loop iteration.
+   is repeated for each element in the sequence referred to by the
+   qualified name in the for directive.  Within the for block this
+   identifiers now refers to the actual item indexed by this loop
+   iteration.
 
-   [if-any QUAL_NAME] ... [else] ... [end]
+   [if-any QUAL_NAME [QUAL_NAME2 ...]] ... [else] ... [end]
 
-   Test if the value QUAL_NAME is not None or an empty string or list.  
-   The [else] clause is optional.  CAUTION: Numeric values are converted to string,
-   so if QUAL_NAME refers to a numeric value 0, the then-clause is
-   substituted!
+   Test if any QUAL_NAME value is not None or an empty string or list.
+   The [else] clause is optional.  CAUTION: Numeric values are
+   converted to string, so if QUAL_NAME refers to a numeric value 0,
+   the then-clause is substituted!
 
-   [if-index odd] ... [else] ... [end]
-   [if-index even] ... [else] ... [end]
-   [if-index first] ... [else] ... [end]
-   [if-index last] ... [else] ... [end]
-   [if-index NUMBER] ... [else] ... [end]
+   [if-index INDEX_FROM_FOR odd] ... [else] ... [end]
+   [if-index INDEX_FROM_FOR even] ... [else] ... [end]
+   [if-index INDEX_FROM_FOR first] ... [else] ... [end]
+   [if-index INDEX_FROM_FOR last] ... [else] ... [end]
+   [if-index INDEX_FROM_FOR NUMBER] ... [else] ... [end]
 
-   These five directives work similar to [if-any], but are only useful 
-   within a [for ...]-block (see above).  The odd/even directives are 
-   for example useful to choose different background colors for adjacent rows 
-   in a table.  Similar the first/last directives might be used to
-   remove certain parts (for example "Diff to previous" doesn't make sense,
-   if there is no previous).
+   These five directives work similar to [if-any], but are only useful
+   within a [for ...]-block (see above).  The odd/even directives are
+   for example useful to choose different background colors for
+   adjacent rows in a table.  Similar the first/last directives might
+   be used to remove certain parts (for example "Diff to previous"
+   doesn't make sense, if there is no previous).
 
    [is QUAL_NAME STRING] ... [else] ... [end]
    [is QUAL_NAME QUAL_NAME] ... [else] ... [end]
 
-   The [is ...] directive is similar to the other conditional directives
-   above.  But it allows to compare two value references or a value reference
-   with some constant string.
+   The [is ...] directive is similar to the other conditional
+   directives above.  But it allows to compare two value references or
+   a value reference with some constant string.
+
+   [define VARIABLE] ... [end]
+
+   The [define ...] directive allows you to create and modify template
+   variables from within the template itself.  Essentially, any data
+   between inside the [define ...] and its matching [end] will be
+   expanded using the other template parsing and output generation
+   rules, and then stored as a string value assigned to the variable
+   VARIABLE.  The new (or changed) variable is then available for use
+   with other mechanisms such as [is ...] or [if-any ...], as long as
+   they appear later in the template.
+
+   [format STRING] ... [end]
+
+   The format directive controls how the values substituted into
+   templates are escaped before they are put into the output stream. It
+   has no effect on the literal text of the templates, only the output
+   from [QUAL_NAME ...] directives. STRING can be one of "raw" "html" 
+   or "xml". The "raw" mode leaves the output unaltered. The "html" and
+   "xml" modes escape special characters using entity escapes (like
+   &quot; and &gt;)
+
+   [format CALLBACK]
  
+   Python applications using EZT can provide custom formatters as callback
+   variables. "[format CALLBACK][QUAL_NAME][end]" is in most cases
+   equivalent to "[CALLBACK QUAL_NAME]"
 """
 #
-# Copyright (C) 2001 Greg Stein. All Rights Reserved.
+# Copyright (C) 2001-2007 Greg Stein. All Rights Reserved.
 #
 # Redistribution and use in source and binary forms, with or without 
 # modification, are permitted provided that the following conditions are 
@@ -139,15 +227,26 @@ Directives
 #
 #
 # This software is maintained by Greg and is available at:
-#    http://viewcvs.sourceforge.net/
-# it is also used by the following projects:
-#    http://edna.sourceforge.net/
+#    http://svn.webdav.org/repos/projects/ezt/trunk/
 #
 
 import string
 import re
-from types import StringType, IntType, FloatType
+from types import StringType, IntType, FloatType, LongType, TupleType
 import os
+import cgi
+try:
+  import cStringIO
+except ImportError:
+  import StringIO
+  cStringIO = StringIO
+
+#
+# Formatting types
+#
+FORMAT_RAW = 'raw'
+FORMAT_HTML = 'html'
+FORMAT_XML = 'xml'
 
 #
 # This regular expression matches three alternatives:
@@ -170,7 +269,7 @@ _re_parse = re.compile(r'\[(%s(?: +%s)*)\]|(\[\[\])|\[#[^\]]*\]' % (_item, _item
 _re_args = re.compile(r'"(?:[^\\"]|\\.)*"|[-\w.]+')
 
 # block commands and their argument counts
-_block_cmd_specs = { 'if-any':1, 'if-index':2, 'for':1, 'is':2 }
+_block_cmd_specs = { 'if-index':2, 'for':1, 'is':2, 'define':1, 'format':1 }
 _block_cmds = _block_cmd_specs.keys()
 
 # two regular expresssions for compressing whitespace. the first is used to
@@ -187,36 +286,47 @@ _re_subst = re.compile('%(%|[0-9]+)')
 
 class Template:
 
-  def __init__(self, fname=None):
+  def __init__(self, fname=None, compress_whitespace=1,
+               base_format=FORMAT_RAW):
+    self.compress_whitespace = compress_whitespace
     if fname:
-      self.parse_file(fname)
+      self.parse_file(fname, base_format)
 
-  def parse_file(self, fname):
-    """fname -> a string object with pathname of file containg an EZT template.
+  def parse_file(self, fname, base_format=FORMAT_RAW):
+    "fname -> a string object with pathname of file containg an EZT template."
+
+    self.parse(_FileReader(fname), base_format)
+
+  def parse(self, text_or_reader, base_format=FORMAT_RAW):
+    """Parse the template specified by text_or_reader.
+
+    The argument should be a string containing the template, or it should
+    specify a subclass of ezt.Reader which can read templates. The base
+    format for printing values is given by base_format.
     """
-    self.program = self._parse_file(fname)
+    if not isinstance(text_or_reader, Reader):
+      # assume the argument is a plain text string
+      text_or_reader = _TextReader(text_or_reader)
 
-  def parse(self, text):
-    """text -> a string object containing the HTML template.
-
-    parse the template program into: (TEXT DIRECTIVE BRACKET)* TEXT
-    DIRECTIVE will be '[directive]' or None
-    BRACKET will be '[[]' or None
-    """
-    self.program = self._parse(text)
+    self.program = self._parse(text_or_reader, base_format=base_format)
 
   def generate(self, fp, data):
-    ctx = _context()
+    if hasattr(data, '__getitem__') or callable(getattr(data, 'keys', None)):
+      # a dictionary-like object was passed. convert it to an
+      # attribute-based object.
+      class _data_ob:
+        def __init__(self, d):
+          vars(self).update(d)
+      data = _data_ob(data)
+
+    ctx = Context(fp)
     ctx.data = data
-    ctx.for_index = { }
-    self._execute(self.program, fp, ctx)
+    ctx.for_iterators = { }
+    ctx.defines = { }
+    self._execute(self.program, ctx)
 
-  def _parse_file(self, fname, for_names=None, file_args=()):
-    return self._parse(open(fname, "rt").read(), for_names, file_args,
-                       os.path.dirname(fname))
-
-  def _parse(self, text, for_names=None, file_args=(), base=None):
-    """text -> string object containing the HTML template.
+  def _parse(self, reader, for_names=None, file_args=(), base_format=None):
+    """text -> string object containing the template.
 
     This is a private helper function doing the real work for method parse.
     It returns the parsed template as a 'program'.  This program is a sequence
@@ -225,12 +335,16 @@ class Template:
     Note: comment directives [# ...] are automatically dropped by _re_parse.
     """
 
-    parts = _re_parse.split(text)
+    # parse the template program into: (TEXT DIRECTIVE BRACKET)* TEXT
+    parts = _re_parse.split(reader.text)
 
     program = [ ]
     stack = [ ]
     if not for_names:
-       for_names = [ ]
+      for_names = [ ]
+
+    if base_format:
+      program.append((self._cmd_format, _printers[base_format]))
 
     for i in range(len(parts)):
       piece = parts[i]
@@ -238,7 +352,8 @@ class Template:
       if which == 0:
         # TEXT. append if non-empty.
         if piece:
-          piece = _re_whitespace.sub(' ', _re_newline.sub('\n', piece))
+          if self.compress_whitespace:
+            piece = _re_whitespace.sub(' ', _re_newline.sub('\n', piece))
           program.append(piece)
       elif which == 2:
         # BRACKET directive. append '[' if present.
@@ -250,7 +365,7 @@ class Template:
         cmd = args[0]
         if cmd == 'else':
           if len(args) > 1:
-            raise ArgCountSyntaxError()
+            raise ArgCountSyntaxError(str(args[1:]))
           ### check: don't allow for 'for' cmd
           idx = stack[-1][1]
           true_section = program[idx:]
@@ -258,133 +373,138 @@ class Template:
           stack[-1][3] = true_section
         elif cmd == 'end':
           if len(args) > 1:
-            raise ArgCountSyntaxError()
+            raise ArgCountSyntaxError(str(args[1:]))
           # note: true-section may be None
-          cmd, idx, args, true_section = stack.pop()
+          try:
+            cmd, idx, args, true_section = stack.pop()
+          except IndexError:
+            raise UnmatchedEndError()
           else_section = program[idx:]
-          func = getattr(self, '_cmd_' + re.sub('-', '_', cmd))
-          program[idx:] = [ (func, (args, true_section, else_section)) ]
-          if cmd == 'for':
-            for_names.pop()
+          if cmd == 'format':
+            program.append((self._cmd_end_format, None))
+          else:
+            func = getattr(self, '_cmd_' + re.sub('-', '_', cmd))
+            program[idx:] = [ (func, (args, true_section, else_section)) ]
+            if cmd == 'for':
+              for_names.pop()
         elif cmd in _block_cmds:
           if len(args) > _block_cmd_specs[cmd] + 1:
-            raise ArgCountSyntaxError()
-          ### this assumes arg1 is always a ref
-          args[1] = _prepare_ref(args[1], for_names, file_args)
+            raise ArgCountSyntaxError(str(args[1:]))
+          ### this assumes arg1 is always a ref unless cmd is 'define'
+          if cmd != 'define':
+            args[1] = _prepare_ref(args[1], for_names, file_args)
 
           # handle arg2 for the 'is' command
           if cmd == 'is':
             args[2] = _prepare_ref(args[2], for_names, file_args)
           elif cmd == 'for':
-            for_names.append(args[1][0])
+            for_names.append(args[1][0])  # append the refname
+          elif cmd == 'format':
+            if args[1][0]:
+              # argument is a variable reference
+              printer = args[1]
+            else:
+              # argument is a string constant referring to built-in printer
+              printer = _printers.get(args[1][1])
+              if not printer:
+                raise UnknownFormatConstantError(str(args[1:]))
+            program.append((self._cmd_format, printer))
 
           # remember the cmd, current pos, args, and a section placeholder
           stack.append([cmd, len(program), args[1:], None])
         elif cmd == 'include':
           if args[1][0] == '"':
             include_filename = args[1][1:-1]
-            if base:
-              include_filename = os.path.join(base, include_filename)
             f_args = [ ]
             for arg in args[2:]:
               f_args.append(_prepare_ref(arg, for_names, file_args))
-            program.extend(self._parse_file(include_filename, for_names,
-                                            f_args))
+            program.extend(self._parse(reader.read_other(include_filename),
+                                       for_names, f_args))
           else:
             if len(args) != 2:
-              raise ArgCountSyntaxError()
+              raise ArgCountSyntaxError(str(args))
             program.append((self._cmd_include,
                             (_prepare_ref(args[1], for_names, file_args),
-                             base)))
+                             reader)))
+        elif cmd == 'if-any':
+          f_args = [ ]
+          for arg in args[1:]:
+            f_args.append(_prepare_ref(arg, for_names, file_args))
+          stack.append(['if-any', len(program), f_args, None])
         else:
           # implied PRINT command
-          if len(args) > 1:
-            f_args = [ ]
-            for arg in args:
-              f_args.append(_prepare_ref(arg, for_names, file_args))
-            program.append((self._cmd_format, (f_args[0], f_args[1:])))
-          else:
-            program.append((self._cmd_print,
-                            _prepare_ref(args[0], for_names, file_args)))
+          f_args = [ ]
+          for arg in args:
+            f_args.append(_prepare_ref(arg, for_names, file_args))
+          program.append((self._cmd_print, f_args))
 
     if stack:
       ### would be nice to say which blocks...
       raise UnclosedBlocksError()
     return program
 
-  def _execute(self, program, fp, ctx):
+  def _execute(self, program, ctx):
     """This private helper function takes a 'program' sequence as created
     by the method '_parse' and executes it step by step.  strings are written
     to the file object 'fp' and functions are called.
     """
     for step in program:
       if isinstance(step, StringType):
-        fp.write(step)
+        ctx.fp.write(step)
       else:
-        step[0](step[1], fp, ctx)
+        step[0](step[1], ctx)
 
-  def _cmd_print(self, valref, fp, ctx):
-    value = _get_value(valref, ctx)
+  def _cmd_print(self, valrefs, ctx):
+    value = _get_value(valrefs[0], ctx)
+    args = map(lambda valref, ctx=ctx: _get_value(valref, ctx), valrefs[1:])
+    _write_value(value, args, ctx)
 
-    # if the value has a 'read' attribute, then it is a stream: copy it
-    if hasattr(value, 'read'):
-      while 1:
-        chunk = value.read(16384)
-        if not chunk:
-          break
-        fp.write(chunk)
-    else:
-      fp.write(value)
+  def _cmd_format(self, printer, ctx):
+    if type(printer) is TupleType:
+      printer = _get_value(printer, ctx)
+    ctx.printers.append(printer)
 
-  def _cmd_format(self, (valref, args), fp, ctx):
-    fmt = _get_value(valref, ctx)
-    parts = _re_subst.split(fmt)
-    for i in range(len(parts)):
-      piece = parts[i]
-      if i%2 == 1 and piece != '%':
-        idx = int(piece)
-        if idx < len(args):
-          piece = _get_value(args[idx], ctx)
-        else:
-          piece = '<undef>'
-      fp.write(piece)
+  def _cmd_end_format(self, valref, ctx):
+    ctx.printers.pop()
 
-  def _cmd_include(self, (valref, base), fp, ctx):
+  def _cmd_include(self, (valref, reader), ctx):
     fname = _get_value(valref, ctx)
-    if base:
-      fname = os.path.join(base, fname)
     ### note: we don't have the set of for_names to pass into this parse.
     ### I don't think there is anything to do but document it.
-    self._execute(self._parse_file(fname), fp, ctx)
+    self._execute(self._parse(reader.read_other(fname)), ctx)
 
-  def _cmd_if_any(self, args, fp, ctx):
-    "If the value is a non-empty string or non-empty list, then T else F."
-    ((valref,), t_section, f_section) = args
-    value = _get_value(valref, ctx)
-    self._do_if(value, t_section, f_section, fp, ctx)
+  def _cmd_if_any(self, args, ctx):
+    "If any value is a non-empty string or non-empty list, then T else F."
+    (valrefs, t_section, f_section) = args
+    value = 0
+    for valref in valrefs:
+      if _get_value(valref, ctx):
+        value = 1
+        break
+    self._do_if(value, t_section, f_section, ctx)
 
-  def _cmd_if_index(self, args, fp, ctx):
+  def _cmd_if_index(self, args, ctx):
     ((valref, value), t_section, f_section) = args
-    list, idx = ctx.for_index[valref[0]]
+    iterator = ctx.for_iterators[valref[0]]
     if value == 'even':
-      value = idx % 2 == 0
+      value = iterator.index % 2 == 0
     elif value == 'odd':
-      value = idx % 2 == 1
+      value = iterator.index % 2 == 1
     elif value == 'first':
-      value = idx == 0
+      value = iterator.index == 0
     elif value == 'last':
-      value = idx == len(list)-1
+      value = iterator.is_last()
     else:
-      value = idx == int(value)
-    self._do_if(value, t_section, f_section, fp, ctx)
+      value = iterator.index == int(value)
+    self._do_if(value, t_section, f_section, ctx)
 
-  def _cmd_is(self, args, fp, ctx):
+  def _cmd_is(self, args, ctx):
     ((left_ref, right_ref), t_section, f_section) = args
     value = _get_value(right_ref, ctx)
     value = string.lower(_get_value(left_ref, ctx)) == string.lower(value)
-    self._do_if(value, t_section, f_section, fp, ctx)
+    self._do_if(value, t_section, f_section, ctx)
 
-  def _do_if(self, value, t_section, f_section, fp, ctx):
+  def _do_if(self, value, t_section, f_section, ctx):
     if t_section is None:
       t_section = f_section
       f_section = None
@@ -393,19 +513,27 @@ class Template:
     else:
       section = f_section
     if section is not None:
-      self._execute(section, fp, ctx)
+      self._execute(section, ctx)
 
-  def _cmd_for(self, args, fp, ctx):
+  def _cmd_for(self, args, ctx):
     ((valref,), unused, section) = args
     list = _get_value(valref, ctx)
     if isinstance(list, StringType):
       raise NeedSequenceError()
     refname = valref[0]
-    ctx.for_index[refname] = idx = [ list, 0 ]
-    for item in list:
-      self._execute(section, fp, ctx)
-      idx[1] = idx[1] + 1
-    del ctx.for_index[refname]
+    ctx.for_iterators[refname] = iterator = _iter(list)
+    for unused in iterator:
+      self._execute(section, ctx)
+    del ctx.for_iterators[refname]
+
+  def _cmd_define(self, args, ctx):
+    ((name,), unused, section) = args
+    origfp = ctx.fp
+    ctx.fp = cStringIO.StringIO()
+    if section is not None:
+      self._execute(section, ctx)
+    ctx.defines[name] = ctx.fp.getvalue()
+    ctx.fp = origfp
 
 def boolean(value):
   "Return a value suitable for [if-any bool_var] usage in a template."
@@ -418,34 +546,48 @@ def _prepare_ref(refname, for_names, file_args):
   """refname -> a string containing a dotted identifier. example:"foo.bar.bang"
   for_names -> a list of active for sequences.
 
-  Returns a `value reference', a 3-Tupel made out of (refname, start, rest), 
+  Returns a `value reference', a 3-tuple made out of (refname, start, rest), 
   for fast access later.
   """
   # is the reference a string constant?
   if refname[0] == '"':
     return None, refname[1:-1], None
 
+  parts = string.split(refname, '.')
+  start = parts[0]
+  rest = parts[1:]
+
   # if this is an include-argument, then just return the prepared ref
-  if refname[:3] == 'arg':
+  if start[:3] == 'arg':
     try:
-      idx = int(refname[3:])
+      idx = int(start[3:])
     except ValueError:
       pass
     else:
       if idx < len(file_args):
-        return file_args[idx]
+        orig_refname, start, more_rest = file_args[idx]
+        if more_rest is None:
+          # the include-argument was a string constant
+          return None, start, None
+
+        # prepend the argument's "rest" for our further processing
+        rest[:0] = more_rest
+
+        # rewrite the refname to ensure that any potential 'for' processing
+        # has the correct name
+        ### this can make it hard for debugging include files since we lose
+        ### the 'argNNN' names
+        if not rest:
+          return start, start, [ ]
+        refname = start + '.' + string.join(rest, '.')
+
+  if for_names:
+    # From last to first part, check if this reference is part of a for loop
+    for i in range(len(parts), 0, -1):
+      name = string.join(parts[:i], '.')
+      if name in for_names:
+        return refname, name, parts[i:]
 
-  parts = string.split(refname, '.')
-  start = parts[0]
-  rest = parts[1:]
-  while rest and (start in for_names):
-    # check if the next part is also a "for name"
-    name = start + '.' + rest[0]
-    if name in for_names:
-      start = name
-      del rest[0]
-    else:
-      break
   return refname, start, rest
 
 def _get_value((refname, start, rest), ctx):
@@ -459,11 +601,14 @@ def _get_value((refname, start, rest), ctx):
   if rest is None:
     # it was a string constant
     return start
-  if ctx.for_index.has_key(start):
-    list, idx = ctx.for_index[start]
-    ob = list[idx]
-  elif ctx.data.has_key(start):
-    ob = ctx.data[start]
+
+  # get the starting object
+  if ctx.for_iterators.has_key(start):
+    ob = ctx.for_iterators[start].last_item
+  elif ctx.defines.has_key(start):
+    ob = ctx.defines[start]
+  elif hasattr(ctx.data, start):
+    ob = getattr(ctx.data, start)
   else:
     raise UnknownReference(refname)
 
@@ -475,7 +620,9 @@ def _get_value((refname, start, rest), ctx):
       raise UnknownReference(refname)
 
   # make sure we return a string instead of some various Python types
-  if isinstance(ob, IntType) or isinstance(ob, FloatType):
+  if isinstance(ob, IntType) \
+         or isinstance(ob, LongType) \
+         or isinstance(ob, FloatType):
     return str(ob)
   if ob is None:
     return ''
@@ -483,20 +630,173 @@ def _get_value((refname, start, rest), ctx):
   # string or a sequence
   return ob
 
-class _context:
+def _write_value(value, args, ctx):
+  # value is a callback function, generates its own output
+  if callable(value):
+    apply(value, [ctx] + list(args))
+    return
+
+  # pop printer in case it recursively calls _write_value
+  printer = ctx.printers.pop()
+
+  try:
+    # if the value has a 'read' attribute, then it is a stream: copy it
+    if hasattr(value, 'read'):
+      while 1:
+        chunk = value.read(16384)
+        if not chunk:
+          break
+        printer(ctx, chunk)
+
+    # value is a substitution pattern
+    elif args:
+      parts = _re_subst.split(value)
+      for i in range(len(parts)):
+        piece = parts[i]
+        if i%2 == 1 and piece != '%':
+          idx = int(piece)
+          if idx < len(args):
+            piece = args[idx]
+          else:
+            piece = '<undef>'
+        printer(ctx, piece)
+
+    # plain old value, write to output
+    else:
+      printer(ctx, value)
+
+  finally:
+    ctx.printers.append(printer)
+
+
+class Context:
   """A container for the execution context"""
+  def __init__(self, fp):
+    self.fp = fp
+    self.printers = []
+  def write(self, value, args=()):
+    _write_value(value, args, self)
 
-class ArgCountSyntaxError(Exception):
-  pass
+class Reader:
+  "Abstract class which allows EZT to detect Reader objects."
 
-class UnknownReference(Exception):
-  pass
+class _FileReader(Reader):
+  """Reads templates from the filesystem."""
+  def __init__(self, fname):
+    self.text = open(fname, 'rb').read()
+    self._dir = os.path.dirname(fname)
+  def read_other(self, relative):
+    return _FileReader(os.path.join(self._dir, relative))
 
-class NeedSequenceError(Exception):
-  pass
+class _TextReader(Reader):
+  """'Reads' a template from provided text."""
+  def __init__(self, text):
+    self.text = text
+  def read_other(self, relative):
+    raise BaseUnavailableError()
 
-class UnclosedBlocksError(Exception):
-  pass
+class _Iterator:
+  """Specialized iterator for EZT that counts items and can look ahead
+
+  Implements standard iterator interface and provides an is_last() method
+  and two public members:
+
+    index - integer index of the current item
+    last_item - last item returned by next()"""
+
+  def __init__(self, sequence):
+    self._iter = iter(sequence)
+
+  def next(self):
+    if hasattr(self, '_next_item'):
+      self.last_item = self._next_item
+      del self._next_item
+    else:
+      self.last_item = self._iter.next() # may raise StopIteration
+
+    if hasattr(self, 'index'):
+      self.index = self.index + 1
+    else:
+      self.index = 0
+
+    return self.last_item
+
+  def is_last(self):
+    """Return true if the current item is the last in the sequence"""
+    # the only way we can tell if the current item is last is to call next()
+    # and store the return value so it doesn't get lost
+    if not hasattr(self, '_next_item'):
+      try:
+        self._next_item = self._iter.next()
+      except StopIteration:
+        return 1
+    return 0
+
+  def __iter__(self):
+    return self
+
+class _OldIterator:
+  """Alternate implemention of _Iterator for old Pythons without iterators
+
+  This class implements the sequence protocol, instead of the iterator
+  interface, so it's really not an iterator at all. But it can be used in
+  python "for" loops as a drop-in replacement for _Iterator. It also provides
+  the is_last() method and "last_item" and "index" members described in the
+  _Iterator docstring."""
+
+  def __init__(self, sequence):
+    self._seq = sequence
+
+  def __getitem__(self, index):
+    self.last_item = self._seq[index] # may raise IndexError
+    self.index = index
+    return self.last_item
+
+  def is_last(self):
+    return self.index + 1 >= len(self._seq)
+
+try:
+  iter
+except NameError:
+  _iter = _OldIterator
+else:
+  _iter = _Iterator
+
+class EZTException(Exception):
+  """Parent class of all EZT exceptions."""
+
+class ArgCountSyntaxError(EZTException):
+  """A bracket directive got the wrong number of arguments."""
+
+class UnknownReference(EZTException):
+  """The template references an object not contained in the data dictionary."""
+
+class NeedSequenceError(EZTException):
+  """The object dereferenced by the template is no sequence (tuple or list)."""
+
+class UnclosedBlocksError(EZTException):
+  """This error may be simply a missing [end]."""
+
+class UnmatchedEndError(EZTException):
+  """This error may be caused by a misspelled if directive."""
+
+class BaseUnavailableError(EZTException):
+  """Base location is unavailable, which disables includes."""
+
+class UnknownFormatConstantError(EZTException):
+  """The format specifier is an unknown value."""
+
+def _raw_printer(ctx, s):
+  ctx.fp.write(s)
+  
+def _html_printer(ctx, s):
+  ctx.fp.write(cgi.escape(s))
+
+_printers = {
+  FORMAT_RAW  : _raw_printer,
+  FORMAT_HTML : _html_printer,
+  FORMAT_XML  : _html_printer,
+}
 
 # --- standard test environment ---
 def test_parse():

lib/idiff.py

@@ -0,0 +1,190 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# idiff: display differences between files highlighting intraline changes
+#
+# -----------------------------------------------------------------------
+
+from __future__ import generators
+
+import difflib
+import sys
+import re
+import ezt
+import cgi
+
+def sidebyside(fromlines, tolines, context):
+  """Generate side by side diff"""
+
+  ### for some reason mdiff chokes on \n's in input lines
+  line_strip = lambda line: line.rstrip("\n")
+  fromlines = map(line_strip, fromlines)
+  tolines = map(line_strip, tolines)
+
+  gap = False
+  for fromdata, todata, flag in difflib._mdiff(fromlines, tolines, context):
+    if fromdata is None and todata is None and flag is None:
+      gap = True
+    else:
+      from_item = _mdiff_split(flag, fromdata)
+      to_item = _mdiff_split(flag, todata)
+      yield _item(gap=ezt.boolean(gap), columns=(from_item, to_item))
+      gap = False
+
+_re_mdiff = re.compile("\0([+-^])(.*?)\1")
+
+def _mdiff_split(flag, (line_number, text)):
+  """Break up row from mdiff output into segments"""
+  segments = []
+  pos = 0
+  while True:
+    m = _re_mdiff.search(text, pos)
+    if not m:
+      segments.append(_item(text=cgi.escape(text[pos:]), type=None))
+      break
+
+    if m.start() > pos:
+      segments.append(_item(text=cgi.escape(text[pos:m.start()]), type=None))
+
+    if m.group(1) == "+":
+      segments.append(_item(text=cgi.escape(m.group(2)), type="add"))
+    elif m.group(1) == "-":
+      segments.append(_item(text=cgi.escape(m.group(2)), type="remove"))
+    elif m.group(1) == "^":
+      segments.append(_item(text=cgi.escape(m.group(2)), type="change"))
+
+    pos = m.end()
+
+  return _item(segments=segments, line_number=line_number)  
+
+def unified(fromlines, tolines, context):
+  """Generate unified diff"""
+
+  diff = difflib.Differ().compare(fromlines, tolines)
+  lastrow = None
+
+  for row in _trim_context(diff, context):
+    if row[0].startswith("? "):
+      yield _differ_split(lastrow, row[0])
+      lastrow = None
+    else:
+      if lastrow:
+        yield _differ_split(lastrow, None)
+      lastrow = row
+
+  if lastrow:
+    yield _differ_split(lastrow, None)
+
+def _trim_context(lines, context_size):
+  """Trim context lines that don't surround changes from Differ results
+
+  yields (line, leftnum, rightnum, gap) tuples"""
+
+  # circular buffer to hold context lines
+  context_buffer = [None] * (context_size or 0)
+  context_start = context_len = 0
+
+  # number of context lines left to print after encountering a change
+  context_owed = 0
+
+  # current line numbers
+  leftnum = rightnum = 0
+
+  # whether context lines have been dropped
+  gap = False
+
+  for line in lines:
+    row = save = None
+
+    if line.startswith("- "):
+      leftnum = leftnum + 1
+      row = line, leftnum, None
+      context_owed = context_size
+
+    elif line.startswith("+ "):
+      rightnum = rightnum + 1
+      row = line, None, rightnum
+      context_owed = context_size
+
+    else:
+      if line.startswith("  "):
+        leftnum = leftnum = leftnum + 1
+        rightnum = rightnum = rightnum + 1
+        if context_owed > 0:
+          context_owed = context_owed - 1
+        elif context_size is not None:
+          save = True
+
+      row = line, leftnum, rightnum
+
+    if save:
+      # don't yield row right away, store it in buffer
+      context_buffer[(context_start + context_len) % context_size] = row
+      if context_len == context_size:
+        context_start = (context_start + 1) % context_size
+        gap = True
+      else:
+        context_len = context_len + 1
+    else:
+      # yield row, but first drain stuff in buffer
+      context_len == context_size
+      while context_len:
+        yield context_buffer[context_start] + (gap,)
+        gap = False
+        context_start = (context_start + 1) % context_size
+        context_len = context_len - 1
+      yield row + (gap,)
+      gap = False
+
+_re_differ = re.compile(r"[+-^]+")
+
+def _differ_split(row, guide):
+  """Break row into segments using guide line"""
+  line, left_number, right_number, gap = row
+
+  if left_number and right_number:
+    type = "" 
+  elif left_number:
+    type = "remove"
+  elif right_number:
+    type = "add"
+
+  segments = []  
+  pos = 2
+
+  if guide:
+    assert guide.startswith("? ")
+
+    for m in _re_differ.finditer(guide, pos):
+      if m.start() > pos:
+        segments.append(_item(text=cgi.escape(line[pos:m.start()]), type=None))
+      segments.append(_item(text=cgi.escape(line[m.start():m.end()]),
+                            type="change"))
+      pos = m.end()
+
+  segments.append(_item(text=cgi.escape(line[pos:]), type=None))
+
+  return _item(gap=ezt.boolean(gap), type=type, segments=segments,
+               left_number=left_number, right_number=right_number)
+
+class _item:
+  def __init__(self, **kw):
+    vars(self).update(kw)
+
+try:
+  ### Using difflib._mdiff function here was the easiest way of obtaining
+  ### intraline diffs for use in ViewVC, but it doesn't exist prior to
+  ### Python 2.4 and is not part of the public difflib API, so for now
+  ### fall back if it doesn't exist.
+  difflib._mdiff
+except AttributeError:
+  sidebyside = None

lib/popen.py

@@ -1,13 +1,12 @@
+# -*-python-*-
 #
-# Copyright (C) 2000-2001 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 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://viewcvs.sourceforge.net/license-1.html.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
@@ -19,12 +18,63 @@
 # the arguments.
 #
 # -----------------------------------------------------------------------
-#
 
 import os
 import sys
+import sapi
+import threading
+import string
+
+if sys.platform == "win32":
+  import win32popen
+  import win32event
+  import win32process
+  import debug
+  import StringIO
 
 def popen(cmd, args, mode, capture_err=1):
+  if sys.platform == "win32":
+    command = win32popen.CommandLine(cmd, args)
+
+    if string.find(mode, 'r') >= 0:
+      hStdIn = None
+
+      if debug.SHOW_CHILD_PROCESSES:
+        dbgIn, dbgOut = None, StringIO.StringIO()
+
+        handle, hStdOut = win32popen.MakeSpyPipe(0, 1, (dbgOut,))
+
+        if capture_err:
+          hStdErr = hStdOut
+          dbgErr = dbgOut
+        else:
+          dbgErr = StringIO.StringIO()
+          x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
+      else:
+        handle, hStdOut = win32popen.CreatePipe(0, 1)
+        if capture_err:
+          hStdErr = hStdOut
+        else:
+          hStdErr = win32popen.NullFile(1)
+
+    else:
+      if debug.SHOW_CHILD_PROCESSES:
+        dbgIn, dbgOut, dbgErr = StringIO.StringIO(), StringIO.StringIO(), StringIO.StringIO()
+        hStdIn, handle = win32popen.MakeSpyPipe(1, 0, (dbgIn,))
+        x, hStdOut = win32popen.MakeSpyPipe(None, 1, (dbgOut,))
+        x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
+      else:
+        hStdIn, handle = win32popen.CreatePipe(0, 1)
+        hStdOut = None
+        hStdErr = None
+
+    phandle, pid, thandle, tid = win32popen.CreateProcess(command, hStdIn, hStdOut, hStdErr)
+
+    if debug.SHOW_CHILD_PROCESSES:
+      debug.Process(command, dbgIn, dbgOut, dbgErr)
+
+    return _pipe(win32popen.File2FileObject(handle, mode), phandle)
+
   # flush the stdio buffers since we are about to change the FD under them
   sys.stdout.flush()
   sys.stderr.flush()
@@ -35,18 +85,18 @@ def popen(cmd, args, mode, capture_err=1):
     # in the parent
 
     # close the descriptor that we don't need and return the other one.
-    if mode == 'r':
+    if string.find(mode, 'r') >= 0:
       os.close(w)
-      return _pipe(os.fdopen(r, 'r'), pid)
+      return _pipe(os.fdopen(r, mode), pid)
     os.close(r)
-    return _pipe(os.fdopen(w, 'w'), pid)
+    return _pipe(os.fdopen(w, mode), 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':
+  if string.find(mode, 'r') >= 0:
     # hook stdout/stderr to the "write" channel
     os.dup2(w, 1)
     # "close" stdin; the child shouldn't use it
@@ -75,14 +125,82 @@ def popen(cmd, args, mode, capture_err=1):
     os.execvp(cmd, (cmd,) + tuple(args))
   except:
     # aid debugging, if the os.execvp above fails for some reason:
-    import string
     print "<h2>exec failed:</h2><pre>", cmd, string.join(args), "</pre>"
     raise
 
   # crap. shouldn't be here.
   sys.exit(127)
 
-def pipe_cmds(cmds):
+def pipe_cmds(cmds, out=None):
+  """Executes a sequence of commands. The output of each command is directed to
+  the input of the next command. A _pipe object is returned for writing to the
+  first command's input. The output of the last command is directed to the
+  "out" file object or the standard output if "out" is None. If "out" is not an
+  OS file descriptor, a separate thread will be spawned to send data to its
+  write() method."""
+
+  if out is None:
+    out = sys.stdout
+
+  if sys.platform == "win32":
+    ### FIXME: windows implementation ignores "out" argument, always
+    ### writing last command's output to standard out
+
+    if debug.SHOW_CHILD_PROCESSES:
+      dbgIn = StringIO.StringIO()
+      hStdIn, handle = win32popen.MakeSpyPipe(1, 0, (dbgIn,))
+
+      i = 0
+      for cmd in cmds:
+        i = i + 1
+
+        dbgOut, dbgErr = StringIO.StringIO(), StringIO.StringIO()
+
+        if i < len(cmds):
+          nextStdIn, hStdOut = win32popen.MakeSpyPipe(1, 1, (dbgOut,))
+          x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
+        else:
+          ehandle = win32event.CreateEvent(None, 1, 0, None)
+          nextStdIn, hStdOut = win32popen.MakeSpyPipe(None, 1, (dbgOut, sapi.server.file()), ehandle)
+          x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
+
+        command = win32popen.CommandLine(cmd[0], cmd[1:])
+        phandle, pid, thandle, tid = win32popen.CreateProcess(command, hStdIn, hStdOut, hStdErr)
+        if debug.SHOW_CHILD_PROCESSES:
+          debug.Process(command, dbgIn, dbgOut, dbgErr)
+
+        dbgIn = dbgOut
+        hStdIn = nextStdIn
+
+
+    else:
+
+      hStdIn, handle = win32popen.CreatePipe(1, 0)
+      spool = None
+
+      i = 0
+      for cmd in cmds:
+        i = i + 1
+        if i < len(cmds):
+          nextStdIn, hStdOut = win32popen.CreatePipe(1, 1)
+        else:
+          # very last process
+          nextStdIn = None
+
+          if sapi.server.inheritableOut:
+            # send child output to standard out
+            hStdOut = win32popen.MakeInheritedHandle(win32popen.FileObject2File(sys.stdout),0)
+            ehandle = None
+          else:
+            ehandle = win32event.CreateEvent(None, 1, 0, None)
+            x, hStdOut = win32popen.MakeSpyPipe(None, 1, (sapi.server.file(),), ehandle)
+
+        command = win32popen.CommandLine(cmd[0], cmd[1:])
+        phandle, pid, thandle, tid = win32popen.CreateProcess(command, hStdIn, hStdOut, None)
+        hStdIn = nextStdIn
+
+    return _pipe(win32popen.File2FileObject(handle, 'wb'), phandle, ehandle)
+
   # flush the stdio buffers since we are about to change the FD under them
   sys.stdout.flush()
   sys.stderr.flush()
@@ -91,6 +209,8 @@ def pipe_cmds(cmds):
 
   null = os.open('/dev/null', os.O_RDWR)
 
+  child_pids = []
+
   for cmd in cmds[:-1]:
     r, w = os.pipe()
     pid = os.fork()
@@ -122,6 +242,7 @@ def pipe_cmds(cmds):
       sys.exit(127)
 
     # in the parent
+    child_pids.append(pid)
 
     # we don't need these any more
     os.close(prev_r)
@@ -133,7 +254,10 @@ def pipe_cmds(cmds):
   # no longer needed
   os.close(null)
 
-  # done with most of the commands. set up the last command to write to stdout
+  # done with most of the commands. set up the last command to write to "out"
+  if not hasattr(out, 'fileno'):
+    r, w = os.pipe()
+
   pid = os.fork()
   if not pid:
     # in the child (the last command)
@@ -141,6 +265,18 @@ def pipe_cmds(cmds):
     # hook up stdin to the "read" channel
     os.dup2(prev_r, 0)
 
+    # hook up stdout to "out"
+    if hasattr(out, 'fileno'):
+      if out.fileno() != 1:
+        os.dup2(out.fileno(), 1)
+        out.close()
+
+    else:
+      # "out" can't be hooked up directly, so use a pipe and a thread
+      os.dup2(w, 1)
+      os.close(r)
+      os.close(w)
+
     # close these extra descriptors
     os.close(prev_r)
     os.close(parent_w)
@@ -153,21 +289,64 @@ def pipe_cmds(cmds):
 
     sys.exit(127)
 
+  child_pids.append(pid)
   # not needed any more
   os.close(prev_r)
 
-  # write into the first pipe, wait on the final process
-  return _pipe(os.fdopen(parent_w, 'w'), pid)
+  if not hasattr(out, 'fileno'):
+    os.close(w)
+    thread = _copy(r, out)
+    thread.start()
+  else:
+    thread = None
 
+  # write into the first pipe, wait on the final process
+  return _pipe(os.fdopen(parent_w, 'w'), child_pids, thread=thread)
+
+class _copy(threading.Thread):
+  def __init__(self, srcfd, destfile):
+    self.srcfd = srcfd
+    self.destfile = destfile
+    threading.Thread.__init__(self)
+
+  def run(self):
+    try:
+      while 1:
+        s = os.read(self.srcfd, 1024)
+        if not s:
+          break
+        self.destfile.write(s)
+    finally:
+      os.close(self.srcfd)
 
 class _pipe:
   "Wrapper for a file which can wait() on a child process at close time."
 
-  def __init__(self, file, child_pid):
+  def __init__(self, file, child_pid, done_event = None, thread = None):
     self.file = file
     self.child_pid = child_pid
+    if sys.platform == "win32":
+      if done_event:
+        self.wait_for = (child_pid, done_event)
+      else:
+        self.wait_for = (child_pid,)
+    else:
+      self.thread = thread
 
   def eof(self):
+    ### should be calling file.eof() here instead of file.close(), there
+    ### may be data in the pipe or buffer after the process exits
+    if sys.platform == "win32":
+      r = win32event.WaitForMultipleObjects(self.wait_for, 1, 0)
+      if r == win32event.WAIT_OBJECT_0:
+        self.file.close()
+        self.file = None
+        return win32process.GetExitCodeProcess(self.child_pid)
+      return None
+
+    if self.thread and self.thread.isAlive():
+      return None
+
     pid, status = os.waitpid(self.child_pid, os.WNOHANG)
     if pid:
       self.file.close()
@@ -179,12 +358,22 @@ class _pipe:
     if self.file:
       self.file.close()
       self.file = None
-      return os.waitpid(self.child_pid, 0)[1]
+      if sys.platform == "win32":
+        win32event.WaitForMultipleObjects(self.wait_for, 1, win32event.INFINITE)
+        return win32process.GetExitCodeProcess(self.child_pid)
+      else:
+        if self.thread:
+          self.thread.join()
+        if type(self.child_pid) == type([]):
+          for pid in self.child_pid:
+            exit = os.waitpid(pid, 0)[1]
+          return exit
+        else:
+            return os.waitpid(self.child_pid, 0)[1]
     return None
 
   def __getattr__(self, name):
     return getattr(self.file, name)
 
   def __del__(self):
-    if self.file:
-      self.close()
+    self.close()

lib/py2html.py

@@ -1,6 +1,6 @@
-#!/usr/local/bin/python -u
+#!/usr/bin/python -u
 
-""" Python Highlighter for HTML                          Version: 0.5
+""" Python Highlighter                                    Version: 0.8
 
     py2html.py [options] files...
 
@@ -10,8 +10,8 @@
      -stdout        read from files, write to stdout
      -files         read from files, write to filename+'.html' (default)
      -format:
-       html         output HTML page (default)
-       rawhtml      output pure HTML (without headers, titles, etc.)
+       html         output XHTML page (default)
+       rawhtml      output pure XHTML (without headers, titles, etc.)
      -mode:
        color        output in color (default)
        mono         output b/w (for printing)
@@ -20,12 +20,12 @@
      -header:file   use contents of file as header
      -footer:file   use contents of file as footer
      -URL           replace all occurances of 'URL: link' with
-                    '<A HREF="link">link</A>'; this is always enabled
-		    in CGI mode
+                    '<a href="link">link</a>'; this is always enabled
+                    in CGI mode
      -v             verbose
 
     Takes the input, assuming it is Python code and formats it into
-    colored HTML. When called without parameters the script tries to
+    colored XHTML. When called without parameters the script tries to
     work in CGI mode. It looks for a field 'script=URL' and tries to
     use that URL as input file. If it can't find this field, the path
     info (the part of the URL following the CGI script name) is
@@ -34,47 +34,43 @@
  
     * Uses Just van Rossum's PyFontify version 0.3 to tag Python scripts.
       You can get it via his homepage on starship:
-        URL: http://starship.skyport.net/crew/just
+        URL: http://starship.python.net/crew/just
 """
 __comments__ = """
 
     The following snippet is a small shell script I use for viewing
-    Python scripts per less on Unix:
+    Python scripts via less on Unix:
+
+pyless:
 #!/bin/sh
 # Browse pretty printed Python code using ANSI codes for highlighting
-py2html -stdout -format:ansi -mode:mono $* | less -r
+py2html -stdout -format:ansi -mode:color $* | less -r
 
     History:
-	
+
+    0.8: Added patch by Patrick Lynch to have py2html.py use style
+         sheets for markup
+    0.7: Added patch by Ville Skytt<74> to make py2html.py output
+         valid XHTML.
+    0.6: Fixed a bug in .escape_html(); thanks to Vespe Savikko for
+         finding this one.
     0.5: Added a few suggestions by Kevin Ng to make the CGI version
          a little more robust.
 
 """
-__copyright__ = """
------------------------------------------------------------------------------
-(c) Copyright by Marc-Andre Lemburg, 1998 (mailto:mal@lemburg.com)
-
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose and without fee or royalty is hereby granted,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation or portions thereof, including modifications,
-    that you make.
-
-    THE AUTHOR MARC-ANDRE LEMBURG DISCLAIMS ALL WARRANTIES WITH REGARD TO
-    THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
-    INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-    FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-    NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-    WITH THE USE OR PERFORMANCE OF THIS SOFTWARE !
+__copyright__ = """\
+    Copyright (c) 1998-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com
+    Copyright (c) 2000-2002, eGenix.com Software GmbH; mailto:info@egenix.com
+    Distributed under the terms and conditions of the eGenix.com Public
+    License. See http://www.egenix.com/files/python/mxLicense.html for
+    details, or contact the author. All Rights Reserved.\
 """
 
-__version__ = '0.5'
+__version__ = '0.8'
 
-__cgifooter__ = ('\n<PRE># code highlighted using <A HREF='
-		 '"http://starship.skyport.net/~lemburg/">py2html.py</A> '
-		 'version %s</PRE>\n' % __version__)
+__cgifooter__ = ('\n<pre># code highlighted using <a href='
+                 '"http://www.lemburg.com/files/python/">py2html.py</a> '
+                 'version %s</pre>\n' % __version__)
 
 import sys,string,re
 
@@ -86,21 +82,25 @@ sys.path.append('.')
 # URL of the input form the user is redirected to in case no script=xxx
 # form field is given. The URL *must* be absolute. Leave blank to
 # have the script issue an error instead.
-INPUT_FORM = 'http://starship.skyport.net/~lemburg/SoftwareDescriptions.html#py2html.py'
+INPUT_FORM = 'http://www.lemburg.com/files/python/SoftwareDescriptions.html#py2html.py'
+
+# HTML DOCTYPE and XML namespace
+HTML_DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+HTML_XMLNS = ' xmlns="http://www.w3.org/1999/xhtml"'
 
 ### Helpers
 
 def fileio(file, mode='rb', data=None, close=0):
 
     if type(file) == type(''):
-	f = open(file,mode)
-	close = 1
+        f = open(file,mode)
+        close = 1
     else:
-	f = file
+        f = file
     if data:
-	f.write(data)
+        f.write(data)
     else:
-	data = f.read()
+        data = f.read()
     if close: f.close()
     return data
 
@@ -112,35 +112,36 @@ class PrettyPrint:
 
         * supports tagging Python scripts in the following ways: 
 
-	  # format/mode |  color  mono
-	  # --------------------------
-	  # rawhtml     |    x     x   (HTML without headers, etc.)
-	  # html        |    x     x   (a HTML page with HEAD&BODY:)
-	  # ansi        |          x   (with Ansi-escape sequences)
+          # format/mode |  color  mono
+          # --------------------------
+          # rawhtml     |    x     x   (HTML without headers, etc.)
+          # html        |    x     x   (a HTML page with HEAD&BODY:)
+          # ansi        |    x     x   (with Ansi-escape sequences)
 
-	* interfaces:
+        * interfaces:
 
-	   file_filter -- takes two files: input & output (may be stdin/stdout)
-	   filter -- takes a string and returns the highlighted version
-	
-	* to create an instance use:
+           file_filter -- takes two files: input & output (may be stdin/stdout)
+           filter -- takes a string and returns the highlighted version
 
-	  c = PrettyPrint(tagfct,format,mode)
+        * to create an instance use:
 
-	  where format and mode must be strings according to the
-	  above table if you plan to use PyFontify.fontify as
-	  tagfct
+          c = PrettyPrint(tagfct,format,mode)
+
+          where format and mode must be strings according to the
+          above table if you plan to use PyFontify.fontify as
+          tagfct
 
         * the tagfct has to take one argument, text, and return a taglist
-	  (format: [(id,left,right,sublist),...], where id is the
-	  "name" given to the slice left:right in text and sublist is a
-	  taglist for tags inside the slice or None)
+          (format: [(id,left,right,sublist),...], where id is the
+          "name" given to the slice left:right in text and sublist is a
+          taglist for tags inside the slice or None)
 
     """
 
     # misc settings
     title = ''
     bgcolor = '#FFFFFF'
+    css = ''
     header = ''
     footer = ''
     replace_URLs = 0
@@ -149,19 +150,19 @@ class PrettyPrint:
 
     def __init__(self,tagfct=None,format='html',mode='color'):
 
-	self.tag = tagfct
-	self.set_mode = getattr(self,'set_mode_'+format+'_'+mode)
-	self.filter = getattr(self,'filter_'+format)
-	self.set_mode()
+        self.tag = tagfct
+        self.set_mode = getattr(self,'set_mode_%s_%s' % (format, mode))
+        self.filter = getattr(self,'filter_%s' % format)
 
     def file_filter(self,infile,outfile):
 
-	text = fileio(infile,'r')
-	if type(infile) == type('') and self.title == '':
-	    self.title = infile
-	fileio(outfile,'w',self.filter(text))
+        self.set_mode()
+        text = fileio(infile,'r')
+        if type(infile) == type('') and self.title == '':
+            self.title = infile
+        fileio(outfile,'w',self.filter(text))
 
-    ### set pre- and postfixes for formats & modes
+    ### Set pre- and postfixes for formats & modes
     #
     # These methods must set self.formats to a dictionary having
     # an entry for every tag returned by the tagging function.
@@ -175,134 +176,185 @@ class PrettyPrint:
 
     def set_mode_html_color(self):
 
-	self.formats = {
-	    'all':('<PRE>','</PRE>'),
-	    'comment':('<FONT COLOR=#1111CC>','</FONT>'),
-	    'keyword':('<FONT COLOR=#3333CC><B>','</B></FONT>'),
-	    'parameter':('<FONT COLOR=#000066>','</FONT>'),
-	    'identifier':( lambda x,strip=string.strip:
-                           '<A NAME="%s"><FONT COLOR=#CC0000><B>' % (strip(x)),
-	                   '</B></FONT></A>'),
-	    'string':('<FONT COLOR=#115511>','</FONT>')
-	    }
+        self.css = """
+        <STYLE TYPE="text/css">
+          <!--
+            body{ background: %s; }
+            .PY_KEYWORD{ color: #0000C0; font-weight: bold; }
+            .PY_COMMENT{ color: #000080; }
+            .PY_PARAMETER{ color: #C00000; }
+            .PY_IDENTIFIER{ color: #C00000; font-weight: bold; }
+            .PY_STRING{ color: #008000; }
+          -->
+        </STYLE> """ % self.bgcolor
+
+        self.formats = {
+            'all':('<pre>','</pre>'),
+            'comment':('<span class="PY_COMMENT">','</span>'),
+            'keyword':('<span class="PY_KEYWORD">','</span>'),
+            'parameter':('<span class="PY_PARAMETER">','</span>'),
+            'identifier':( lambda x,strip=string.strip:
+                           '<a name="%s"><span class="PY_IDENTIFIER">' % (strip(x)),
+                           '</span></a>'),
+            'string':('<span class="PY_STRING">','</span>')
+            }
 
     set_mode_rawhtml_color = set_mode_html_color
 
     def set_mode_html_mono(self):
 
-	self.formats = {
-	    'all':('<PRE>','</PRE>'),
-	    'comment':('',''),
-	    'keyword':( '<U>','</U>'),
-	    'parameter':('',''),
-	    'identifier':( lambda x,strip=string.strip:
-                           '<A NAME="%s"><B>' % (strip(x)),
-		           '</B>'),
-	    'string':('','')
-	    }
+        self.css = """
+        <STYLE TYPE="text/css">
+          <!--
+            body{ background-color: %s }
+            .PY_KEYWORD{ text-decoration: underline }
+            .PY_COMMENT{ }
+            .PY_PARAMETER{ }
+            .PY_IDENTIFIER{ font-weight: bold}
+            .PY_STRING{ font-style: italic}
+          -->
+        </STYLE> """ % self.bgcolor
+
+        self.formats = {
+            'all':('<pre>','</pre>'),
+            'comment':('<span class="PY_COMMENT">','</span>'),
+            'keyword':( '<span class="PY_KEYWORD">','</span>'),
+            'parameter':('<span class="PY_PARAMETER">','</span>'),
+            'identifier':( lambda x,strip=string.strip:
+                           '<a name="%s"><span class="PY_IDENTIFIER">' % (strip(x)),
+                           '</span></a>'),
+            'string':('<span class="PY_STRING">','</span>')
+            }
 
     set_mode_rawhtml_mono = set_mode_html_mono
 
     def set_mode_ansi_mono(self):
 
-	self.formats = {
-	    'all':('',''),
-	    'comment':('\033[2m','\033[m'),
-	    'keyword':('\033[4m','\033[m'),
-	    'parameter':('',''),
-	    'identifier':('\033[1m','\033[m'),
-	    'string':('','')
-	    }
+        self.formats = {
+            'all':('',''),
+            'comment':('\033[2m','\033[m'),
+            'keyword':('\033[4m','\033[m'),
+            'parameter':('',''),
+            'identifier':('\033[1m','\033[m'),
+            'string':('','')
+            }
 
-    ### filter for Python scripts given as string
+    def set_mode_ansi_color(self):
+
+        self.formats = {
+            'all':('',''),
+            'comment':('\033[34;2m','\033[m'),
+            'keyword':('\033[1;34m','\033[m'),
+            'parameter':('',''),
+            'identifier':('\033[1;31m','\033[m'),
+            'string':('\033[32;2m','\033[m')
+            }
+
+    ### Filters for Python scripts given as string
 
     def escape_html(self,text):
 
-	t = (('<','&lt;'),('>','&gt;'))
-	for x,y in t:
-	    text = string.join(string.split(text,x),y)
-	return text
+        t = (('&','&amp;'),('<','&lt;'),('>','&gt;'))
+        for x,y in t:
+            text = string.join(string.split(text,x),y)
+        return text
 
     def filter_html(self,text):
 
-	output = self.fontify(self.escape_html(text))
-	if self.replace_URLs: 
-	    output = re.sub('URL:([ \t]+)([^ \n\r<]+)',
-			    'URL:\\1<A HREF="\\2">\\2</A>',output)
-	html = """<HTML><HEAD><TITLE>%s</TITLE></HEAD>
-		  <BODY BGCOLOR=%s>
-		  <!--header-->%s
-		  <!--script-->%s
-		  <!--footer-->%s
-		  </BODY>\n"""%(self.title,self.bgcolor,self.header,output,self.footer)
-	return html
+        output = self.fontify(self.escape_html(text))
+        if self.replace_URLs:
+            output = re.sub('URL:([ \t]+)([^ \n\r<]+)',
+                            'URL:\\1<a href="\\2">\\2</a>',output)
+        html = """%s<html%s>
+                  <head>
+                  <title>%s</title>
+                  <!--css-->
+                  %s
+                  </head>
+                  <body>
+                  <!--header-->
+                  %s
+                  <!--script-->
+                  %s
+                  <!--footer-->
+                  %s
+                  </body></html>\n"""%(HTML_DOCTYPE,
+                                       HTML_XMLNS,
+                                       self.title,
+                                       self.css,
+                                       self.header,
+                                       output,
+                                       self.footer)
+        return html
 
     def filter_rawhtml(self,text):
 
-	output = self.fontify(self.escape_html(text))
-	if self.replace_URLs: 
-	    output = re.sub('URL:([ \t]+)([^ \n\r<]+)',
-			    'URL:\\1<A HREF="\\2">\\2</A>',output)
-	return self.header+output+self.footer
+        output = self.fontify(self.escape_html(text))
+        if self.replace_URLs:
+            output = re.sub('URL:([ \t]+)([^ \n\r<]+)',
+                            'URL:\\1<a href="\\2">\\2</a>',output)
+        return self.header + output + self.footer
 
     def filter_ansi(self,text):
 
-	output = self.fontify(text)
-	return self.header+output+self.footer
+        output = self.fontify(text)
+        return self.header + output + self.footer
 
-    ### fontify engine
+    ### Fontify engine
 
     def fontify(self,pytext):
 
-	# parse
-	taglist = self.tag(pytext)
+        # parse
+        taglist = self.tag(pytext)
 
-	# prepend special 'all' tag:
-	taglist[:0] = [('all',0,len(pytext),None)]
+        # prepend special 'all' tag:
+        taglist[:0] = [('all',0,len(pytext),None)]
 
-	# prepare splitting
-	splits = []
-	addsplits(splits,pytext,self.formats,taglist)
+        # prepare splitting
+        splits = []
+        addsplits(splits,pytext,self.formats,taglist)
 
-	# do splitting & inserting
-	splits.sort()
-	l = []
-	li = 0
-	for ri,dummy,insert in splits:
-	    if ri > li: l.append(pytext[li:ri])
-	    l.append(insert)
-	    li = ri
-	if li < len(pytext): l.append(pytext[li:])
-	
-	return string.join(l,'')
+        # do splitting & inserting
+        splits.sort()
+        l = []
+        li = 0
+        for ri,dummy,insert in splits:
+            if ri > li: l.append(pytext[li:ri])
+            l.append(insert)
+            li = ri
+        if li < len(pytext): l.append(pytext[li:])
+
+        return string.join(l,'')
 
 def addsplits(splits,text,formats,taglist):
-    # helper for fontify()
+
+    """ Helper for .fontify()
+    """
     for id,left,right,sublist in taglist:
-	try:
-	    pre,post = formats[id]
-	except KeyError:
-	    # sys.stderr.write('Warning: no format for %s specified\n'%repr(id))
-	    pre,post = '',''
-	if type(pre) != type(''):
-	    pre = pre(text[left:right])
-	if type(post) != type(''):
-	    post = post(text[left:right])
-	# len(splits) is a dummy used to make sorting stable
-	splits.append((left,len(splits),pre))
-	if sublist:
-	    addsplits(splits,text,formats,sublist)
-	splits.append((right,len(splits),post))
+        try:
+            pre,post = formats[id]
+        except KeyError:
+            # sys.stderr.write('Warning: no format for %s specified\n'%repr(id))
+            pre,post = '',''
+        if type(pre) != type(''):
+            pre = pre(text[left:right])
+        if type(post) != type(''):
+            post = post(text[left:right])
+        # len(splits) is a dummy used to make sorting stable
+        splits.append((left,len(splits),pre))
+        if sublist:
+            addsplits(splits,text,formats,sublist)
+        splits.append((right,len(splits),post))
 
 def write_html_error(titel,text):
 
     print """\
-<HTML><HEADER><TITLE>%s</TITLE></HEADER>
-<BODY>
-<H2>%s</H2>
+%s<html%s><head><title>%s</title></head>
+<body>
+<h2>%s</h2>
 %s
-</BODY></HTML>
-""" % (titel,titel,text)
+</body></html>
+""" % (HTML_DOCTYPE,HTML_XMLNS,titel,titel,text)
 
 def redirect_to(url):
 
@@ -310,13 +362,13 @@ def redirect_to(url):
     sys.stdout.write('Status: 302\r\n')
     sys.stdout.write('Location: %s\r\n\r\n' % url)
     print """
-<HTML><HEAD>
-<TITLE>302 Moved Temporarily</TITLE>
-</HEAD><BODY>
-<H1>302 Moved Temporarily</H1>
-The document has moved to <A HREF="%s">%s</A>.<P>
-</BODY></HTML>
-""" % (url,url)
+%s<html%s><head>
+<title>302 Moved Temporarily</title>
+</head><body>
+<h1>302 Moved Temporarily</h1>
+The document has moved to <a href="%s">%s</a>.<p></p>
+</body></html>
+""" % (HTML_DOCTYPE,HTML_XMLNS,url,url)
 
 def main(cmdline):
 
@@ -326,162 +378,162 @@ def main(cmdline):
     options = []
     optvalues = {}
     for o in cmdline[1:]:
-	if o[0] == '-':
-	    if ':' in o:
-		k,v = tuple(string.split(o,':'))
-		optvalues[k] = v
-		options.append(k)
-	    else:
-		options.append(o)
-	else:
-	    break
+        if o[0] == '-':
+            if ':' in o:
+                k,v = tuple(string.split(o,':'))
+                optvalues[k] = v
+                options.append(k)
+            else:
+                options.append(o)
+        else:
+            break
     files = cmdline[len(options)+1:]
 
-    # create converting object	
+    ### create converting object
 
     # load fontifier
     if '-marcs' in options:
-	# use mxTextTool's tagging engine
-	from mxTextTools import tag
-	from mxTextTools.Examples.Python import python_script
-	tagfct = lambda text,tag=tag,pytable=python_script: \
-		 tag(text,pytable)[1]
-	print "Py2HTML: using Marc's tagging engine"
+        # use mxTextTool's tagging engine as fontifier
+        from mx.TextTools import tag
+        from mx.TextTools.Examples.Python import python_script
+        tagfct = lambda text,tag=tag,pytable=python_script: \
+                 tag(text,pytable)[1]
+        print "Py2HTML: using Marc's tagging engine"
     else:
-	# load Just's
-	try:
-	    import PyFontify
-	    if PyFontify.__version__ < '0.3': raise ValueError
-	    tagfct = PyFontify.fontify
-	except:
-	    print """
+        # load Just's fontifier
+        try:
+            import PyFontify
+            if PyFontify.__version__ < '0.3': raise ValueError
+            tagfct = PyFontify.fontify
+        except:
+            print """
     Sorry, but this script needs the PyFontify.py module version 0.3;
     You can download it from Just's homepage at
 
-       URL: http://starship.skyport.net/crew/just
+       URL: http://starship.python.net/crew/just
 """
-	    sys.exit()
-	
+            sys.exit()
+
 
     if '-format' in options:
-	format = optvalues['-format']
+        format = optvalues['-format']
     else:
-	# use default
-	format = 'html'
+        # use default
+        format = 'html'
 
     if '-mode' in options:
-	mode = optvalues['-mode']
+        mode = optvalues['-mode']
     else:
-	# use default
-	mode = 'color'
+        # use default
+        mode = 'color'
 
     c = PrettyPrint(tagfct,format,mode)
     convert = c.file_filter
 
-    # start working
+    ### start working
 
     if '-title' in options:
-	c.title = optvalues['-title']
+        c.title = optvalues['-title']
 
     if '-bgcolor' in options:
-	c.bgcolor = optvalues['-bgcolor']
+        c.bgcolor = optvalues['-bgcolor']
 
     if '-header' in options:
-	try:
-	    f = open(optvalues['-header'])
-	    c.header = f.read()
-	    f.close()
-	except IOError:
-	    if verbose: print 'IOError: header file not found'
-	    
+        try:
+            f = open(optvalues['-header'])
+            c.header = f.read()
+            f.close()
+        except IOError:
+            if verbose: print 'IOError: header file not found'
+
     if '-footer' in options:
-	try:
-	    f = open(optvalues['-footer'])
-	    c.footer = f.read()
-	    f.close()
-	except IOError:
-	    if verbose: print 'IOError: footer file not found'
+        try:
+            f = open(optvalues['-footer'])
+            c.footer = f.read()
+            f.close()
+        except IOError:
+            if verbose: print 'IOError: footer file not found'
 
     if '-URL' in options:
-	c.replace_URLs = 1
+        c.replace_URLs = 1
 
     if '-' in options:
-	convert(sys.stdin,sys.stdout)
-	sys.exit()
+        convert(sys.stdin,sys.stdout)
+        sys.exit()
 
     if '-h' in options:
-	print __doc__
-	sys.exit()
+        print __doc__
+        sys.exit()
 
     if len(files) == 0:
-	# Turn URL processing on
-	c.replace_URLs = 1
-	# Try CGI processing...
-	import cgi,urllib,urlparse,os
-	form = cgi.FieldStorage()
-	if not form.has_key('script'):
-	    # Ok, then try pathinfo
-	    if not os.environ.has_key('PATH_INFO'):
-		if INPUT_FORM:
-		    redirect_to(INPUT_FORM)
-		else:
-		    sys.stdout.write('Content-Type: text/html\r\n\r\n')
-		    write_html_error('Missing Parameter',
-				     'Missing script=URL field in request')
-		sys.exit(1)
-	    url = os.environ['PATH_INFO'][1:] # skip the leading slash
-	else:
-	    url = form['script'].value
-	sys.stdout.write('Content-Type: text/html\r\n\r\n')
-	scheme, host, path, params, query, frag = urlparse.urlparse(url)
-	if not host:
-	    scheme = 'http'
-	    if os.environ.has_key('HTTP_HOST'):
-		host = os.environ['HTTP_HOST']
-	    else:
-		host = 'localhost'
-	    url = urlparse.urlunparse((scheme, host, path, params, query, frag))
-	#print url; sys.exit()
-	network = urllib.URLopener()
-	try:
-	    tempfile,headers = network.retrieve(url)
-	except IOError,reason:
-	    write_html_error('Error opening "%s"' % url,
-			     'The given URL could not be opened. Reason: %s' %\
-			     str(reason))
-	    sys.exit(1)
-	f = open(tempfile,'rb')
-	c.title = url
-	c.footer = __cgifooter__
-	convert(f,sys.stdout)
-	f.close()
-	network.close()
-	sys.exit()
+        # Turn URL processing on
+        c.replace_URLs = 1
+        # Try CGI processing...
+        import cgi,urllib,urlparse,os
+        form = cgi.FieldStorage()
+        if not form.has_key('script'):
+            # Ok, then try pathinfo
+            if not os.environ.has_key('PATH_INFO'):
+                if INPUT_FORM:
+                    redirect_to(INPUT_FORM)
+                else:
+                    sys.stdout.write('Content-Type: text/html\r\n\r\n')
+                    write_html_error('Missing Parameter',
+                                     'Missing script=URL field in request')
+                sys.exit(1)
+            url = os.environ['PATH_INFO'][1:] # skip the leading slash
+        else:
+            url = form['script'].value
+        sys.stdout.write('Content-Type: text/html\r\n\r\n')
+        scheme, host, path, params, query, frag = urlparse.urlparse(url)
+        if not host:
+            scheme = 'http'
+            if os.environ.has_key('HTTP_HOST'):
+                host = os.environ['HTTP_HOST']
+            else:
+                host = 'localhost'
+            url = urlparse.urlunparse((scheme, host, path, params, query, frag))
+        #print url; sys.exit()
+        network = urllib.URLopener()
+        try:
+            tempfile,headers = network.retrieve(url)
+        except IOError,reason:
+            write_html_error('Error opening "%s"' % url,
+                             'The given URL could not be opened. Reason: %s' %\
+                             str(reason))
+            sys.exit(1)
+        f = open(tempfile,'rb')
+        c.title = url
+        c.footer = __cgifooter__
+        convert(f,sys.stdout)
+        f.close()
+        network.close()
+        sys.exit()
 
     if '-stdout' in options:
-	filebreak = '-'*72
-	for f in files:
-	    try:
-		if len(files) > 1:
-		    print filebreak
-		    print 'File:',f
-		    print filebreak
-		convert(f,sys.stdout)
-	    except IOError:
-		pass
+        filebreak = '-'*72
+        for f in files:
+            try:
+                if len(files) > 1:
+                    print filebreak
+                    print 'File:',f
+                    print filebreak
+                convert(f,sys.stdout)
+            except IOError:
+                pass
     else:
-	verbose = ('-v' in options)
-	if verbose:
-	    print 'Py2HTML: working on',
-	for f in files:
-	    try:
-		if verbose: print f,
-		convert(f,f+'.html')
-	    except IOError:
-		if verbose: print '(IOError!)',
-	if verbose:
-	    print
-	    print 'Done.'
+        verbose = ('-v' in options)
+        if verbose:
+            print 'Py2HTML: working on',
+        for f in files:
+            try:
+                if verbose: print f,
+                convert(f,f+'.html')
+            except IOError:
+                if verbose: print '(IOError!)',
+        if verbose:
+            print
+            print 'Done.'
 
 if __name__=='__main__':
     main(sys.argv)

lib/query.py

@@ -1,47 +1,34 @@
-#!/usr/bin/python
-# -*- Mode: python -*-
+#!/usr/bin/env python
+# -*-python-*-
 #
-# Copyright (C) 2000 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2008 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.
+# the LICENSE.html file which can be found at the top level of the ViewVC
+# distribution or at http://viewvc.org/license-1.html.
 #
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://www.lyra.org/viewcvs/
+# For more information, visit http://viewvc.org/
 #
 # -----------------------------------------------------------------------
 #
 # CGI script to process and display queries to CVSdb
 #
-# This script is part of the ViewCVS package. More information can be
-# found at http://www.lyra.org/viewcvs/.
+# This script is part of the ViewVC package. More information can be
+# found at http://viewvc.org
 #
 # -----------------------------------------------------------------------
-#
-
-#########################################################################
-#
-# INSTALL-TIME CONFIGURATION
-#
-# These values will be set during the installation process. During
-# development, they will remain None.
-#
-
-CONF_PATHNAME = None
-
-#########################################################################
 
 import os
 import sys
 import string
-import cgi
 import time
 
 import cvsdb
-import viewcvs
+import viewvc
+import vclib
 import ezt
+import debug
+import urllib
 
 class FormData:
     def __init__(self, form):
@@ -277,42 +264,65 @@ def form_to_cvsdb_query(form_data):
             
     return query
 
-def cvsroot_name_from_path(cvsroot):
-    ## we need to resolve the cvsroot path from the database
-    ## to the name given to it in the viewcvs.conf file
-    for key, value in cfg.general.cvs_roots.items():
-        if value == cvsroot:
-            return key
+def prev_rev(rev):
+    '''Returns a string representing the previous revision of the argument.'''
+    r = string.split(rev, '.')
+    # decrement final revision component
+    r[-1] = str(int(r[-1]) - 1)
+    # prune if we pass the beginning of the branch
+    if len(r) > 2 and r[-1] == '0':
+        r = r[:-2]
+    return string.join(r, '.')
 
-    return None
-
-def build_commit(desc, files):
+def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
     ob = _item(num_files=len(files), files=[])
     
     if desc:
-        ob.desc = string.replace(cgi.escape(desc), '\n', '<br>')
+        ob.log = string.replace(server.escape(desc), '\n', '<br />')
     else:
-        ob.desc = '&nbsp;'
+        ob.log = '&nbsp;'
 
     for commit in files:
+        parts = filter(None, string.split(commit.GetDirectory(), '/'))
+        if parts and cfg.options.hide_cvsroot and parts[0] == 'CVSROOT':
+            continue
+
         ctime = commit.GetTime()
         if not ctime:
-            ctime = "&nbsp";
+            ctime = "&nbsp;"
         else:
-            ctime = time.strftime("%y/%m/%d %H:%M", time.localtime(ctime))
-
+          if (cfg.options.use_localtime):
+            ctime = time.strftime("%y/%m/%d %H:%M %Z", time.localtime(ctime))
+          else:
+            ctime = time.strftime("%y/%m/%d %H:%M", time.gmtime(ctime)) \
+                  + ' UTC'
+        
         ## make the file link
-        file = os.path.join(commit.GetDirectory(), commit.GetFile())
-        file_full_path = os.path.join(commit.GetRepository(), file)
+        repository = commit.GetRepository()
+        directory = commit.GetDirectory()
+        file = (directory and directory + "/") + commit.GetFile()
+        cvsroot_name = cvsroots.get(repository)
+
+        ## skip forbidden files
+        if cfg.is_forbidden(cvsroot_name,
+                            filter(None, string.split(file, "/")), vclib.FILE):
+            continue
 
         ## if we couldn't find the cvsroot path configured in the 
-        ## viewcvs.conf file, then don't make the link
-        cvsroot_name = cvsroot_name_from_path(commit.GetRepository())
+        ## viewvc.conf file, then don't make the link
         if cvsroot_name:
-            flink = '<a href="viewcvs.cgi/%s?cvsroot=%s">%s</a>' \
-                    % (file, cvsroot_name, file_full_path)
+            flink = '[%s] <a href="%s/%s?root=%s">%s</a>' % (
+                    cvsroot_name, viewvc_link, urllib.quote(file),
+                    cvsroot_name, file)
+            if commit.GetType() == commit.CHANGE:
+                dlink = '%s/%s?root=%s&amp;view=diff&amp;r1=%s&amp;r2=%s' % (
+                    viewvc_link, urllib.quote(file), cvsroot_name,
+                    prev_rev(commit.GetRevision()), commit.GetRevision())
+            else:
+                dlink = None
         else:
-            flink = file_full_path
+            flink = '[%s] %s' % (repository, file)
+            dlink = None
 
         ob.files.append(_item(date=ctime,
                               author=commit.GetAuthor(),
@@ -321,13 +331,15 @@ def build_commit(desc, files):
                               branch=commit.GetBranch(),
                               plus=int(commit.GetPlusCount()),
                               minus=int(commit.GetMinusCount()),
+                              type=commit.GetTypeString(),
+                              difflink=dlink,
                               ))
 
     return ob
 
-def run_query(form_data):
+def run_query(server, cfg, form_data, viewvc_link):
     query = form_to_cvsdb_query(form_data)
-    db = cvsdb.ConnectDatabaseReadOnly()
+    db = cvsdb.ConnectDatabaseReadOnly(cfg)
     db.RunQuery(query)
 
     if not query.commit_list:
@@ -336,6 +348,11 @@ def run_query(form_data):
     commits = [ ]
     files = [ ]
 
+    cvsroots = {}
+    rootitems = cfg.general.svn_roots.items() + cfg.general.cvs_roots.items()
+    for key, value in rootitems:
+        cvsroots[cvsdb.CleanRepository(value)] = key
+
     current_desc = query.commit_list[0].GetDescription()
     for commit in query.commit_list:
         desc = commit.GetDescription()
@@ -343,44 +360,53 @@ def run_query(form_data):
             files.append(commit)
             continue
 
-        commits.append(build_commit(current_desc, files))
+        commits.append(build_commit(server, cfg, current_desc, files,
+                                    cvsroots, viewvc_link))
 
         files = [ commit ]
         current_desc = desc
 
     ## add the last file group to the commit list
-    commits.append(build_commit(current_desc, files))
+    commits.append(build_commit(server, cfg, current_desc, files,
+                                cvsroots, viewvc_link))
 
+    # Strip out commits that don't have any files attached to them.  The
+    # files probably aren't present because they've been blocked via
+    # forbiddenness.
+    def _only_with_files(commit):
+        return len(commit.files) > 0
+    commits = filter(_only_with_files, commits)
+  
     return commits
 
-def handle_config():
-    viewcvs.handle_config()
-    global cfg
-    cfg = viewcvs.cfg
+def main(server, cfg, viewvc_link):
+  try:
 
-def main():
-    handle_config()
-    
-    form = cgi.FieldStorage()
+    form = server.FieldStorage()
     form_data = FormData(form)
 
     if form_data.valid:
-        commits = run_query(form_data)
+        commits = run_query(server, cfg, form_data, viewvc_link)
         query = None
     else:
         commits = [ ]
         query = 'skipped'
 
+    script_name = server.getenv('SCRIPT_NAME', '')
+
     data = {
       'cfg' : cfg,
       'address' : cfg.general.address,
-      'vsn' : viewcvs.__version__,
+      'vsn' : viewvc.__version__,
 
-      'repository' : cgi.escape(form_data.repository, 1),
-      'branch' : cgi.escape(form_data.branch, 1),
-      'directory' : cgi.escape(form_data.directory, 1),
-      'file' : cgi.escape(form_data.file, 1),
-      'who' : cgi.escape(form_data.who, 1),
+      'repository' : server.escape(form_data.repository, 1),
+      'branch' : server.escape(form_data.branch, 1),
+      'directory' : server.escape(form_data.directory, 1),
+      'file' : server.escape(form_data.file, 1),
+      'who' : server.escape(form_data.who, 1),
+      'docroot' : cfg.options.docroot is None \
+                  and viewvc_link + '/' + viewvc.docroot_magic_path \
+                  or cfg.options.docroot,
 
       'sortby' : form_data.sortby,
       'date' : form_data.date,
@@ -388,6 +414,7 @@ def main():
       'query' : query,
       'commits' : commits,
       'num_commits' : len(commits),
+      'rss_href' : None,
       }
 
     if form_data.hours:
@@ -395,36 +422,18 @@ def main():
     else:
       data['hours'] = 2
 
-    template = ezt.Template()
-    template.parse_file(os.path.join(viewcvs.g_install_dir,
-                                     cfg.templates.query))
-
-    viewcvs.http_header()
+    server.header()
 
     # generate the page
+    template = viewvc.get_view_template(cfg, "query")
     template.generate(sys.stdout, data)
 
-def run_cgi():
-
-  ### be nice to share all this logic with viewcvs.run_cgi
-
-  try:
-    main()
   except SystemExit, e:
-    # don't catch SystemExit (caused by sys.exit()). propagate the exit code
-    sys.exit(e[0])
+    pass
   except:
-    info = sys.exc_info()
-    viewcvs.http_header()
-    print '<html><head><title>Python Exception Occurred</title></head>'
-    print '<body bgcolor=white><h1>Python Exception Occurred</h1>'
-    import traceback
-    lines = apply(traceback.format_exception, info)
-    print '<pre>'
-    print cgi.escape(string.join(lines, ''))
-    print '</pre>'
-    viewcvs.html_footer()
-
+    exc_info = debug.GetExceptionData()
+    server.header(status=exc_info['status'])
+    debug.PrintException(server, exc_info) 
 
 class _item:
   def __init__(self, **kw):

lib/rcsparse.py

@@ -1,441 +0,0 @@
-#
-# Copyright (C) 2000-2001 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://viewcvs.sourceforge.net/license-1.html.
-#
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
-#
-# -----------------------------------------------------------------------
-#
-# This software is being maintained as part of the ViewCVS project.
-# Information is available at:
-#    http://viewcvs.sourceforge.net/
-#
-# This file was originally based on portions of the blame.py script by
-# Curt Hagenlocher.
-#
-# -----------------------------------------------------------------------
-
-import string
-import time
-
-
-class _TokenStream:
-  token_term = string.whitespace + ';'
-
-  # the algorithm is about the same speed for any CHUNK_SIZE chosen.
-  # grab a good-sized chunk, but not too large to overwhelm memory.
-  CHUNK_SIZE  = 100000
-
-#  CHUNK_SIZE  = 5	# for debugging, make the function grind...
-
-  def __init__(self, file):
-    self.rcsfile = file
-    self.idx = 0
-    self.buf = self.rcsfile.read(self.CHUNK_SIZE)
-    if self.buf == '':
-      raise RuntimeError, 'EOF'
-
-  def get(self):
-    "Get the next token from the RCS file."
-
-    # Note: we can afford to loop within Python, examining individual
-    # characters. For the whitespace and tokens, the number of iterations
-    # is typically quite small. Thus, a simple iterative loop will beat
-    # out more complex solutions.
-
-    buf = self.buf
-    idx = self.idx
-
-    while 1:
-      if idx == len(buf):
-        buf = self.rcsfile.read(self.CHUNK_SIZE)
-        if buf == '':
-          # signal EOF by returning None as the token
-          del self.buf	# so we fail if get() is called again
-          return None
-        idx = 0
-
-      if buf[idx] not in string.whitespace:
-        break
-
-      idx = idx + 1
-
-    if buf[idx] == ';':
-      self.buf = buf
-      self.idx = idx + 1
-      return ';'
-
-    if buf[idx] != '@':
-      end = idx + 1
-      token = ''
-      while 1:
-        # find token characters in the current buffer
-        while end < len(buf) and buf[end] not in self.token_term:
-          end = end + 1
-        token = token + buf[idx:end]
-
-        if end < len(buf):
-          # we stopped before the end, so we have a full token
-          idx = end
-          break
-
-        # we stopped at the end of the buffer, so we may have a partial token
-        buf = self.rcsfile.read(self.CHUNK_SIZE)
-        idx = end = 0
-
-      self.buf = buf
-      self.idx = idx
-      return token
-
-    # a "string" which starts with the "@" character. we'll skip it when we
-    # search for content.
-    idx = idx + 1
-
-    chunks = [ ]
-
-    while 1:
-      if idx == len(buf):
-        idx = 0
-        buf = self.rcsfile.read(self.CHUNK_SIZE)
-        if buf == '':
-          raise RuntimeError, 'EOF'
-      i = string.find(buf, '@', idx)
-      if i == -1:
-        chunks.append(buf[idx:])
-        idx = len(buf)
-        continue
-      if i == len(buf) - 1:
-        chunks.append(buf[idx:i])
-        idx = 0
-        buf = '@' + self.rcsfile.read(self.CHUNK_SIZE)
-        if buf == '@':
-          raise RuntimeError, 'EOF'
-        continue
-      if buf[i + 1] == '@':
-        chunks.append(buf[idx:i+1])
-        idx = i + 2
-        continue
-
-      chunks.append(buf[idx:i])
-
-      self.buf = buf
-      self.idx = i + 1
-
-      return string.join(chunks, '')
-
-#  _get = get
-#  def get(self):
-    token = self._get()
-    print 'T:', `token`
-    return token
-
-  def match(self, match):
-    "Try to match the next token from the input buffer."
-
-    token = self.get()
-    if token != match:
-      raise RuntimeError, ('Unexpected parsing error in RCS file.\n' +
-                           'Expected token: %s, but saw: %s' % (match, token))
-
-  def unget(self, token):
-    "Put this token back, for the next get() to return."
-
-    # Override the class' .get method with a function which clears the
-    # overridden method then returns the pushed token. Since this function
-    # will not be looked up via the class mechanism, it should be a "normal"
-    # function, meaning it won't have "self" automatically inserted.
-    # Therefore, we need to pass both self and the token thru via defaults.
-
-    # note: we don't put this into the input buffer because it may have been
-    # @-unescaped already.
-
-    def give_it_back(self=self, token=token):
-      del self.get
-      return token
-
-    self.get = give_it_back
-
-class Parser:
-
-  def parse_rcs_admin(self):
-    while 1:
-      # Read initial token at beginning of line
-      token = self.ts.get()
-
-      # We're done once we reach the description of the RCS tree
-      if token[0] in string.digits:
-        self.ts.unget(token)
-        return
-
-      if token == "head":
-        self.sink.set_head_revision(self.ts.get())
-        self.ts.match(';')
-      elif token == "branch":
-        self.sink.set_principal_branch(self.ts.get())
-        self.ts.match(';')
-      elif token == "symbols":
-        while 1:
-          tag = self.ts.get()
-          if tag == ';':
-            break
-          (tag_name, tag_rev) = string.split(tag, ':')
-          self.sink.define_tag(tag_name, tag_rev)
-      elif token == "comment":
-        self.sink.set_comment(self.ts.get())
-        self.ts.match(';')
-
-      # Ignore all these other fields - We don't care about them. Also chews
-      # up "newphrase".
-      elif token in ("locks", "strict", "expand", "access"):
-        while 1:
-          tag = self.ts.get()
-          if tag == ';':
-            break
-      else:
-        pass
-        # warn("Unexpected RCS token: $token\n")
-
-    raise RuntimeError, "Unexpected EOF";
-
-  def parse_rcs_tree(self):
-    while 1:
-      revision = self.ts.get()
-
-      # End of RCS tree description ?
-      if revision == 'desc':
-        self.ts.unget(revision)
-        return
-
-      # Parse date
-      self.ts.match('date')
-      date = self.ts.get()
-      self.ts.match(';')
-
-      # 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
-      timestamp = time.mktime(tuple(date_fields))
-
-      # Parse author
-      self.ts.match('author')
-      author = self.ts.get()
-      self.ts.match(';')
-
-      # Parse state
-      self.ts.match('state')
-      state = ''
-      while 1:
-        token = self.ts.get()
-        if token == ';':
-          break
-        state = state + token + ' '
-      state = state[:-1]	# toss the trailing space
-
-      # Parse branches
-      self.ts.match('branches')
-      branches = [ ]
-      while 1:
-        token = self.ts.get()
-        if token == ';':
-          break
-        branches.append(token)
-
-      # Parse revision of next delta in chain
-      self.ts.match('next')
-      next = self.ts.get()
-      if next == ';':
-        next = None
-      else:
-        self.ts.match(';')
-
-      # there are some files with extra tags in them. for example:
-      #    owner	640;
-      #    group	15;
-      #    permissions	644;
-      #    hardlinks	@configure.in@;
-      # this is "newphrase" in RCSFILE(5). we just want to skip over these.
-      while 1:
-        token = self.ts.get()
-        if token == 'desc' or token[0] in string.digits:
-          self.ts.unget(token)
-          break
-        # consume everything up to the semicolon
-        while self.ts.get() != ';':
-          pass
-
-      self.sink.define_revision(revision, timestamp, author, state, branches,
-                                next)
-
-  def parse_rcs_description(self):
-    self.ts.match('desc')
-    self.sink.set_description(self.ts.get())
-
-  def parse_rcs_deltatext(self):
-    while 1:
-      revision = self.ts.get()
-      if revision is None:
-        # EOF
-        break
-      self.ts.match('log')
-      log = self.ts.get()
-      ### need to add code to chew up "newphrase"
-      self.ts.match('text')
-      text = self.ts.get()
-      self.sink.set_revision_info(revision, log, text)
-
-  def parse(self, file, sink):
-    self.ts = _TokenStream(file)
-    self.sink = sink
-
-    self.parse_rcs_admin()
-    self.parse_rcs_tree()
-
-    # many sinks want to know when the tree has been completed so they can
-    # do some work to prep for the arrival of the deltatext
-    self.sink.tree_completed()
-
-    self.parse_rcs_description()
-    self.parse_rcs_deltatext()
-
-    # easiest for us to tell the sink it is done, rather than worry about
-    # higher level software doing it.
-    self.sink.parse_completed()
-
-    self.ts = self.sink = None
-
-
-class Sink:
-  def set_head_revision(self, revision):
-    pass
-  def set_principal_branch(self, branch_name):
-    pass
-  def define_tag(self, name, revision):
-    pass
-  def set_comment(self, comment):
-    pass
-  def set_description(self, description):
-    pass
-  def define_revision(self, revision, timestamp, author, state,
-                      branches, next):
-    pass
-  def set_revision_info(self, revision, log, text):
-    pass
-  def tree_completed(self):
-    pass
-  def parse_completed(self):
-    pass
-
-# --------------------------------------------------------------------------
-#
-# TESTING AND DEBUGGING TOOLS
-#
-
-class DebugSink:
-  def set_head_revision(self, revision):
-    print 'head:', revision
-
-  def set_principal_branch(self, branch_name):
-    print 'branch:', branch_name
-
-  def define_tag(self, name, revision):
-    print 'tag:', name, '=', revision
-
-  def set_comment(self, comment):
-    print 'comment:', comment
-
-  def set_description(self, description):
-    print 'description:', description
-
-  def define_revision(self, revision, timestamp, author, state,
-                      branches, next):
-    print 'revision:', revision
-    print '    timestamp:', timestamp
-    print '    author:', author
-    print '    state:', state
-    print '    branches:', branches
-    print '    next:', next
-
-  def set_revision_info(self, revision, log, text):
-    print 'revision:', revision
-    print '    log:', log
-    print '    text:', text[:100], '...'
-
-class DumpSink:
-  """Dump all the parse information directly to stdout.
-
-  The output is relatively unformatted and untagged. It is intended as a
-  raw dump of the data in the RCS file. A copy can be saved, then changes
-  made to the parsing engine, then a comparison of the new output against
-  the old output.
-  """
-  def __init__(self):
-    global sha
-    import sha
-
-  def set_head_revision(self, revision):
-    print revision
-
-  def set_principal_branch(self, branch_name):
-    print branch_name
-
-  def define_tag(self, name, revision):
-    print name, revision
-
-  def set_comment(self, comment):
-    print comment
-
-  def set_description(self, description):
-    print description
-
-  def define_revision(self, revision, timestamp, author, state,
-                      branches, next):
-    print revision, timestamp, author, state, branches, next
-
-  def set_revision_info(self, revision, log, text):
-    print revision, sha.new(log).hexdigest(), sha.new(text).hexdigest()
-
-  def tree_completed(self):
-    print 'tree_completed'
-
-  def parse_completed(self):
-    print 'parse_completed'
-
-def dump_file(fname):
-  Parser().parse(open(fname), DumpSink())
-
-def time_file(fname):
-  import time
-  p = Parser().parse
-  f = open(fname)
-  s = Sink()
-  t = time.time()
-  p(f, s)
-  t = time.time() - t
-  print t
-
-def _usage():
-  print 'This is normally a module for importing, but it has a couple'
-  print 'features for testing as an executable script.'
-  print 'USAGE: %s COMMAND filename,v' % sys.argv[0]
-  print '  where COMMAND is one of:'
-  print '    dump: filename is "dumped" to stdout'
-  print '    time: filename is parsed with the time written to stdout'
-  sys.exit(1)
-
-if __name__ == '__main__':
-  import sys
-  if len(sys.argv) != 3:
-    usage()
-  if sys.argv[1] == 'dump':
-    dump_file(sys.argv[2])
-  elif sys.argv[1] == 'time':
-    time_file(sys.argv[2])
-  else:
-    usage()

lib/rlog.py

@@ -1,339 +0,0 @@
-# -*- Mode: python -*-
-#
-# Copyright (C) 2000-2001 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://viewcvs.sourceforge.net/license-1.html.
-#
-# Contact information:
-#   Greg Stein, PO Box 760, Palo Alto, CA, 94302
-#   gstein@lyra.org, http://viewcvs.sourceforge.net/
-#
-# -----------------------------------------------------------------------
-#
-
-import os
-import string
-import re
-import time
-
-
-## RLogOutputParser uses the output of rlog to build a list of Commit
-## objects describing all the checkins from a given RCS file; this
-## parser is fairly optimized, and therefore can be delicate if the
-## rlog output varies between versions of rlog; I don't know if it does;
-## to make really fast, I should wrap the C rcslib
-
-## there's definately not much error checking here; I'll assume things
-## will go smoothly, and trap errors via exception handlers above this
-## function
-
-## exception for this class
-error = 'rlog error'
-
-
-class RLogData:
-    "Container object for all data parsed from a 'rlog' output."
-  
-    def __init__(self, filename):
-        self.filename = filename
-        self.symbolic_name_hash = {}
-        self.rlog_entry_list = []
-
-    def LookupBranch(self, rlog_entry):
-        index = string.rfind(rlog_entry.revision, '.')
-        branch_revision = rlog_entry.revision[:index]
-
-        try:
-            branch = self.symbolic_name_hash[branch_revision]
-        except KeyError:
-            branch = ''
-
-        return branch
-    
-
-class RLogEntry:
-    ## static constants for type of log entry; this will be changed
-    ## to strings I guess -JMP
-    CHANGE = 0
-    ADD = 1
-    REMOVE = 2
-
-## Here's the init function, which isn't needed since this class
-## is fully initalized by RLogParser when creating a new log entry.
-## Let's keep this initializer as a description of what is held in
-## the class, but keep it commented out since it only makes things
-## slow.
-##
-##     def __init__(self):
-##         self.revision = ''
-##         self.author = ''
-##         self.branch = ''
-##         self.pluscount = ''
-##         self.minuscount = ''
-##         self.description = ''
-##         self.time = None
-##         self.type = RLogEntry.CHANGE
-
-
-class RLog:
-    "Provides a alternative file-like interface for running 'rlog'."
-    
-    def __init__(self, cfg, filename, revision, date):
-        self.filename = self.fix_filename(filename)
-        self.checkout_filename = self.create_checkout_filename(self.filename)
-        self.revision = revision
-        self.date = date
-
-        arg_list = []
-        if self.revision:
-            arg_list.append('-r%s' % (self.revision))
-        if self.date:
-            arg_list.append('-d%s' % (self.date))
-
-        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):
-        ## all RCS files have the ",v" ending
-        if filename[-2:] != ",v":
-            filename = "%s,v" % (filename)
-
-        if os.path.isfile(filename):
-            return filename
-
-        ## check the Attic for the RCS file
-        path, basename = os.path.split(filename)
-        filename = os.path.join(path, "Attic", basename)
-
-        if os.path.isfile(filename):
-            return filename
-        
-        raise error, "rlog file not found: %s" % (filename)
-
-    def create_checkout_filename(self, filename):
-        ## cut off the ",v"
-        checkout_filename = filename[:-2]
-
-        ## check if the file is in the Attic
-        path, basename = os.path.split(checkout_filename)
-        if path[-6:] != '/Attic':
-            return checkout_filename
-
-        ## remove the "Attic" part of the path
-        checkout_filename = os.path.join(path[:-6], basename)
-        return checkout_filename
-        
-    def readline(self):
-        try:
-            line = self.rlog.readline()
-        except AttributeError:
-            self.error()
-            
-        if line:
-            return line
-
-        status = self.close()
-        if status:
-            self.error()
-
-        return None
-
-    def close(self):
-        status = self.rlog.close()
-        self.rlog = None
-        return status
-
-
-    def error(self):
-        raise error, "unexpected rlog exit: %s" % (self.cmd)
-
-
-## constants used in the output parser
-
-_rlog_commit_sep = '----------------------------\n'
-_rlog_end = '=============================================================================\n'
-
-## regular expression used in the output parser
-_re_symbolic_name = re.compile("\s+([^:]+):\s+(.+)$")
-
-_re_revision = re.compile("^revision\s+([0-9.]+).*")
-
-_re_data_line = re.compile(
-    "^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+"\
-    "author:\s+([^;]+);\s+"\
-    "state:\s+([^;]+);\s+"\
-    "lines:\s+\+(\d+)\s+\-(\d+)$")
-
-_re_data_line_add = re.compile(
-    "^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+"\
-    "author:\s+([^;]+);\s+"\
-    "state:\s+([^;]+);$")
-
-class RLogOutputParser:
-    
-    def __init__(self, rlog):
-        self.rlog = rlog
-        self.rlog_data = RLogData(rlog.checkout_filename)
-
-        ## run the parser
-        self.parse_to_symbolic_names()
-        self.parse_symbolic_names()
-        self.parse_to_description()
-        self.parse_rlog_entries()
-    
-    def parse_to_symbolic_names(self):
-        while 1:
-            line = self.rlog.readline()
-            if line[:15] == 'symbolic names:':
-                break
-
-    def parse_symbolic_names(self):
-        ## parse all the tags int the branch_hash, it's used later to get
-        ## the text names of non-head branches
-        while 1:
-            line = self.rlog.readline()
-            match = _re_symbolic_name.match(line)
-            if not match:
-                break
-
-            (tag, revision) = match.groups()
-
-            ## check if the tag represents a branch, in RCS this means
-            ## the second-to-last number is a zero
-            index = string.rfind(revision, '.')
-            if revision[index-2:index] == '.0':
-                revision = revision[:index-2] + revision[index:]
-            
-            self.rlog_data.symbolic_name_hash[revision] = tag
-
-    def parse_to_description(self):
-        while 1:
-            line = self.rlog.readline()
-            if line[:12] == 'description:':
-                break
-            
-        ## eat all lines until we reach '-----' seperator
-        while 1:
-            line = self.rlog.readline()
-            if line == _rlog_commit_sep:
-                break
-
-    def parse_rlog_entries(self):
-        while 1:
-            rlog_entry = self.parse_one_rlog_entry()
-            if not rlog_entry:
-                break
-            self.rlog_data.rlog_entry_list.append(rlog_entry)
-
-    def parse_one_rlog_entry(self):
-        ## revision line/first line
-        line = self.rlog.readline()
-	# Since FreeBSD's rlog outputs extra "---...---\n" before
-	# "===...===\n", _rlog_end may be occured here.
-        if not line or line == _rlog_end:
-            return None
-
-        ## revision
-        match = _re_revision.match(line)
-        (revision,) = match.groups()
-
-        ## data line
-        line = self.rlog.readline()
-        match = _re_data_line.match(line)
-        if not match:
-            match = _re_data_line_add.match(line)
-
-        if not match:
-            raise error, "bad rlog parser, no cookie!"
-
-        ## retrieve the matched grops as a tuple in hopes
-        ## this will be faster (ala profiler)
-        groups = match.groups()
-
-        year = string.atoi(groups[0])
-        month = string.atoi(groups[1])
-        day = string.atoi(groups[2])
-        hour = string.atoi(groups[3])
-        minute = string.atoi(groups[4])
-        second = string.atoi(groups[5])
-        author = groups[6]
-        state = groups[7]
-
-        ## very strange; here's the deal: if this is a newly added file,
-        ## then there is no plus/minus count count of lines; if there
-        ## is, then this could be a "CHANGE" or "REMOVE", you can tell
-        ## if the file has been removed by looking if state == 'dead'
-        try:
-            pluscount = groups[8]
-            minuscount = groups[9]
-        except IndexError:
-            pluscount = ''
-            minuscount = ''
-            cmit_type = RLogEntry.ADD
-        else:
-            if state == 'dead':
-                cmit_type = RLogEntry.REMOVE
-            else:
-                cmit_type = RLogEntry.CHANGE
-        
-        ## branch line: pretty much ignored if it's there
-        desc_line_list = []
-                
-        line = self.rlog.readline()
-        if not line[:10] == 'branches: ':
-            desc_line_list.append(string.rstrip(line))
-
-        ## suck up description
-        while 1:
-            line = self.rlog.readline()
-
-            ## the last line printed out by rlog is '===='...
-            ## or '------'... between entries
-            if line == _rlog_commit_sep or line == _rlog_end:
-                break
-
-            ## append line to the descripton list
-            desc_line_list.append(string.rstrip(line))
-
-        ## compute time using time routines in seconds from epoc GMT
-        ## NOTE: mktime's arguments are in local time, and we have
-        ##       them in GMT from RCS; therefore, we have to manually
-        ##       subtract out the timezone correction
-        ##
-        ## XXX: Linux glib2.0.7 bug: it looks like mktime doesn't honor
-        ##      the '0' flag to force no timezone correction, so we look
-        ##      at the correction ourself and do the right thing after
-        ##      mktime mangles the date
-        gmt_time = \
-            time.mktime((year, month, day, hour, minute, second, 0, 0, -1))
-
-        if time.localtime(gmt_time)[8] == 1:
-            # dst time active?  
-            # XXX: This is still wrong in those both nights, 
-            #      where the switch between DST and normal time occurs.
-            gmt_time = gmt_time - time.altzone
-        else:
-            gmt_time = gmt_time - time.timezone
-
-        ## now create and return the RLogEntry
-        rlog_entry = RLogEntry()
-        rlog_entry.type = cmit_type
-        rlog_entry.revision = revision
-        rlog_entry.author = author
-        rlog_entry.description = string.join(desc_line_list, '\n')
-        rlog_entry.time = gmt_time
-        rlog_entry.pluscount = pluscount
-        rlog_entry.minuscount = minuscount
-
-        return rlog_entry
-
-
-## entrypoints
-
-def GetRLogData(cfg, path, revision = '', date = ''):
-    rlog = RLog(cfg, path, revision, date)
-    rlog_parser = RLogOutputParser(rlog)
-    return rlog_parser.rlog_data

lib/sapi.py

@@ -0,0 +1,391 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# generic server api - currently supports normal cgi, mod_python, and
+# active server pages
+#
+# -----------------------------------------------------------------------
+
+import types
+import string
+import os
+import sys
+import re
+
+
+# global server object. It will be either a CgiServer or a proxy to
+# an AspServer or ModPythonServer object.
+server = None
+
+
+class Server:
+  def __init__(self):
+    self.pageGlobals = {}
+
+  def self(self):
+    return self
+
+  def close(self):
+    pass
+
+
+class ThreadedServer(Server):
+  def __init__(self):
+    Server.__init__(self)
+
+    self.inheritableOut = 0
+
+    global server
+    if not isinstance(server, ThreadedServerProxy):
+      server = ThreadedServerProxy()
+    if not isinstance(sys.stdout, File):
+      sys.stdout = File(server)
+    server.registerThread(self)
+
+  def file(self):
+    return File(self)
+
+  def close(self):
+    server.unregisterThread()
+
+
+class ThreadedServerProxy:
+  """In a multithreaded server environment, ThreadedServerProxy stores the
+  different server objects being used to display pages and transparently
+  forwards access to them based on the current thread id."""
+
+  def __init__(self):
+    self.__dict__['servers'] = { }
+    global thread
+    import thread
+
+  def registerThread(self, server):
+    self.__dict__['servers'][thread.get_ident()] = server
+
+  def unregisterThread(self):
+    del self.__dict__['servers'][thread.get_ident()]
+
+  def self(self):
+    """This function bypasses the getattr and setattr trickery and returns
+    the actual server object."""
+    return self.__dict__['servers'][thread.get_ident()]
+
+  def __getattr__(self, key):
+    return getattr(self.self(), key)
+
+  def __setattr__(self, key, value):
+    setattr(self.self(), key, value)
+
+  def __delattr__(self, key):
+    delattr(self.self(), key)
+
+
+class File:
+  def __init__(self, server):
+    self.closed = 0
+    self.mode = 'w'
+    self.name = "<AspFile file>"
+    self.softspace = 0
+    self.server = server
+
+  def write(self, s):
+    self.server.write(s)
+
+  def writelines(self, list):
+    for s in list:
+      self.server.write(s)
+
+  def flush(self):
+    self.server.flush()
+
+  def truncate(self, size):
+    pass
+
+  def close(self):
+    pass
+
+
+class CgiServer(Server):
+  def __init__(self, inheritableOut = 1):
+    Server.__init__(self)
+    self.headerSent = 0
+    self.headers = []
+    self.inheritableOut = inheritableOut
+    self.iis = os.environ.get('SERVER_SOFTWARE', '')[:13] == 'Microsoft-IIS'
+
+    if sys.platform == "win32" and inheritableOut:
+      import msvcrt
+      msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+
+    global server
+    server = self
+
+    global cgi
+    import cgi
+
+  def addheader(self, name, value):
+    self.headers.append((name, value))
+
+  def header(self, content_type='text/html; charset=UTF-8', status=None):
+    if not self.headerSent:
+      self.headerSent = 1
+
+      extraheaders = ''
+      for (name, value) in self.headers:
+        extraheaders = extraheaders + '%s: %s\r\n' % (name, value)
+
+      # The only way ViewVC pages and error messages are visible under 
+      # IIS is if a 200 error code is returned. Otherwise IIS instead
+      # sends the static error page corresponding to the code number.
+      if status is None or (status[:3] != '304' and self.iis):
+        status = ''
+      else:
+        status = 'Status: %s\r\n' % status
+
+      sys.stdout.write('%sContent-Type: %s\r\n%s\r\n'
+                       % (status, content_type, extraheaders))
+
+  def redirect(self, url):
+    if self.iis: url = fix_iis_url(self, url)
+    self.addheader('Location', url)
+    self.header(status='301 Moved')
+    print 'This document is located <a href="%s">here</a>.' % url
+    sys.exit(0)
+
+  def escape(self, s, quote = None):
+    return cgi.escape(s, quote)
+
+  def getenv(self, name, value=None):
+    ret = os.environ.get(name, value)
+    if self.iis and name == 'PATH_INFO' and ret:
+      ret = fix_iis_path_info(self, ret)
+    return ret
+
+  def params(self):
+    return cgi.parse()
+
+  def FieldStorage(fp=None, headers=None, outerboundary="",
+                 environ=os.environ, keep_blank_values=0, strict_parsing=0):
+    return cgi.FieldStorage(fp, headers, outerboundary, environ,
+      keep_blank_values, strict_parsing)
+
+  def write(self, s):
+    sys.stdout.write(s)
+
+  def flush(self):
+    sys.stdout.flush()
+
+  def file(self):
+    return sys.stdout
+
+
+class AspServer(ThreadedServer):
+  def __init__(self, Server, Request, Response, Application):
+    ThreadedServer.__init__(self)
+    self.headerSent = 0
+    self.server = Server
+    self.request = Request
+    self.response = Response
+    self.application = Application
+
+  def addheader(self, name, value):
+    self.response.AddHeader(name, value)
+
+  def header(self, content_type=None, status=None):
+    # Normally, setting self.response.ContentType after headers have already
+    # been sent simply results in an AttributeError exception, but sometimes
+    # it leads to a fatal ASP error. For this reason I'm keeping the
+    # self.headerSent member and only checking for the exception as a
+    # secondary measure
+    if not self.headerSent:
+      try:
+        self.headerSent = 1
+        if content_type is None:
+          self.response.ContentType = 'text/html; charset=UTF-8'
+        else:
+          self.response.ContentType = content_type
+        if status is not None: self.response.Status = status
+      except AttributeError:
+        pass
+
+  def redirect(self, url):
+    self.response.Redirect(url)
+    sys.exit()
+
+  def escape(self, s, quote = None):
+    return self.server.HTMLEncode(str(s))
+
+  def getenv(self, name, value = None):
+    ret = self.request.ServerVariables(name)()
+    if not type(ret) is types.UnicodeType:
+      return value
+    ret = str(ret)
+    if name == 'PATH_INFO':
+      ret = fix_iis_path_info(self, ret)
+    return ret
+
+  def params(self):
+    p = {}
+    for i in self.request.Form:
+      p[str(i)] = map(str, self.request.Form[i])
+    for i in self.request.QueryString:
+      p[str(i)] = map(str, self.request.QueryString[i])
+    return p
+
+  def FieldStorage(self, fp=None, headers=None, outerboundary="",
+                 environ=os.environ, keep_blank_values=0, strict_parsing=0):
+
+    # Code based on a very helpful usenet post by "Max M" (maxm@mxm.dk)
+    # Subject "Re: Help! IIS and Python"
+    # http://groups.google.com/groups?selm=3C7C0AB6.2090307%40mxm.dk
+
+    from StringIO import StringIO
+    from cgi import FieldStorage
+
+    environ = {}
+    for i in self.request.ServerVariables:
+      environ[str(i)] = str(self.request.ServerVariables(i)())
+
+    # this would be bad for uploaded files, could use a lot of memory
+    binaryContent, size = self.request.BinaryRead(int(environ['CONTENT_LENGTH']))
+
+    fp = StringIO(str(binaryContent))
+    fs = FieldStorage(fp, None, "", environ, keep_blank_values, strict_parsing)
+    fp.close()
+    return fs
+
+  def write(self, s):
+    t = type(s)
+    if t is types.StringType:
+      s = buffer(s)
+    elif not t is types.BufferType:
+      s = buffer(str(s))
+
+    self.response.BinaryWrite(s)
+
+  def flush(self):
+    self.response.Flush()
+
+
+_re_status = re.compile("\\d+")
+
+
+class ModPythonServer(ThreadedServer):
+  def __init__(self, request):
+    ThreadedServer.__init__(self)
+    self.request = request
+    self.headerSent = 0
+    
+    global cgi
+    import cgi
+
+  def addheader(self, name, value):
+    self.request.headers_out.add(name, value)
+
+  def header(self, content_type=None, status=None):
+    if content_type is None: 
+      self.request.content_type = 'text/html; charset=UTF-8'
+    else:
+      self.request.content_type = content_type
+    self.headerSent = 1
+
+    if status is not None:
+      m = _re_status.match(status)
+      if not m is None:
+        self.request.status = int(m.group())
+
+  def redirect(self, url):
+    import mod_python.apache
+    self.request.headers_out['Location'] = url
+    self.request.status = mod_python.apache.HTTP_MOVED_TEMPORARILY
+    self.request.write("You are being redirected to <a href=\"%s\">%s</a>"
+      % (url, url))
+    sys.exit()
+
+  def escape(self, s, quote = None):
+    return cgi.escape(s, quote)
+
+  def getenv(self, name, value = None):
+    try:
+      return self.request.subprocess_env[name]
+    except KeyError:
+      return value
+
+  def params(self):
+    import mod_python.util
+    if self.request.args is None:
+      return {}
+    else:
+      return mod_python.util.parse_qs(self.request.args)
+
+  def FieldStorage(self, fp=None, headers=None, outerboundary="",
+                 environ=os.environ, keep_blank_values=0, strict_parsing=0):
+    import mod_python.util
+    return mod_python.util.FieldStorage(self.request, keep_blank_values, strict_parsing)
+
+  def write(self, s):
+    self.request.write(s)
+
+  def flush(self):
+    pass
+
+
+def fix_iis_url(server, url):
+  """When a CGI application under IIS outputs a "Location" header with a url
+  beginning with a forward slash, IIS tries to optimise the redirect by not
+  returning any output from the original CGI script at all and instead just
+  returning the new page in its place. Because of this, the browser does
+  not know it is getting a different page than it requested. As a result,
+  The address bar that appears in the browser window shows the wrong location
+  and if the new page is in a different folder than the old one, any relative
+  links on it will be broken.
+
+  This function can be used to circumvent the IIS "optimization" of local
+  redirects. If it is passed a location that begins with a forward slash it
+  will return a URL constructed with the information in CGI environment.
+  If it is passed a URL or any location that doens't begin with a forward slash
+  it will return just argument unaltered.
+  """
+  if url[0] == '/':
+    if server.getenv('HTTPS') == 'on':
+      dport = "443"
+      prefix = "https://"
+    else:
+      dport = "80"
+      prefix = "http://"
+    prefix = prefix + server.getenv('HTTP_HOST')
+    if server.getenv('SERVER_PORT') != dport:
+      prefix = prefix + ":" + server.getenv('SERVER_PORT')
+    return prefix + url
+  return url
+
+
+def fix_iis_path_info(server, path_info):
+  """Fix the PATH_INFO value in IIS"""
+  # If the viewvc cgi's are in the /viewvc/ folder on the web server and a
+  # request looks like
+  #
+  #      /viewvc/viewvc.cgi/myproject/?someoption
+  #
+  # The CGI environment variables on IIS will look like this:
+  #
+  #      SCRIPT_NAME  =  /viewvc/viewvc.cgi
+  #      PATH_INFO    =  /viewvc/viewvc.cgi/myproject/
+  #
+  # Whereas on Apache they look like:
+  #
+  #      SCRIPT_NAME  =  /viewvc/viewvc.cgi
+  #      PATH_INFO    =  /myproject/
+  #
+  # This function converts the IIS PATH_INFO into the nonredundant form
+  # expected by ViewVC
+  return path_info[len(server.getenv('SCRIPT_NAME', '')):]

lib/vclib/__init__.py

@@ -0,0 +1,264 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"""Version Control lib is an abstract API to access versioning systems
+such as CVS.
+"""
+
+import string
+import types
+
+
+# item types returned by Repository.itemtype().
+FILE = 'FILE'
+DIR = 'DIR'
+
+# diff types recognized by Repository.rawdiff().
+UNIFIED = 1
+CONTEXT = 2
+SIDE_BY_SIDE = 3
+
+# ======================================================================
+#
+class Repository:
+  """Abstract class representing a repository."""
+
+  def itemtype(self, path_parts, rev):
+    """Return the type of the item (file or dir) at the given path and revision
+
+    The result will be vclib.DIR or vclib.FILE
+
+    The path is specified as a list of components, relative to the root
+    of the repository. e.g. ["subdir1", "subdir2", "filename"]
+
+    rev is the revision of the item to check
+    """
+    pass
+
+  def openfile(self, path_parts, rev):
+    """Open a file object to read file contents at a given path and revision.
+
+    The return value is a 2-tuple of containg the file object and revision
+    number in canonical form.
+
+    The path is specified as a list of components, relative to the root
+    of the repository. e.g. ["subdir1", "subdir2", "filename"]
+
+    rev is the revision of the file to check out
+    """
+
+  def listdir(self, path_parts, rev, options):
+    """Return list of files in a directory
+
+    The result is a list of DirEntry objects
+
+    The path is specified as a list of components, relative to the root
+    of the repository. e.g. ["subdir1", "subdir2", "filename"]
+
+    rev is the revision of the directory to list
+
+    options is a dictionary of implementation specific options
+    """
+
+  def dirlogs(self, path_parts, rev, entries, options):
+    """Augment directory entries with log information
+
+    New properties will be set on all of the DirEntry objects in the entries
+    list. At the very least, a "rev" property will be set to a revision
+    number or None if the entry doesn't have a number. Other properties that
+    may be set include "date", "author", and "log".
+
+    The path is specified as a list of components, relative to the root
+    of the repository. e.g. ["subdir1", "subdir2", "filename"]
+
+    rev is the revision of the directory listing and will effect which log
+    messages are returned
+
+    entries is a list of DirEntry objects returned from a previous call to
+    the listdir() method
+
+    options is a dictionary of implementation specific options
+    """
+  
+  def itemlog(self, path_parts, rev, options):
+    """Retrieve an item's log information
+
+    The result is a list of Revision objects
+
+    The path is specified as a list of components, relative to the root
+    of the repository. e.g. ["subdir1", "subdir2", "filename"]
+
+    rev is the revision of the item to return information about
+
+    options is a dictionary of implementation specific options
+    """
+
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
+    """Return a diff (in GNU diff format) of two file revisions
+
+    type is the requested diff type (UNIFIED, CONTEXT, etc)
+
+    options is a dictionary that can contain the following options plus
+    implementation-specific options
+
+      context - integer, number of context lines to include
+      funout - boolean, include C function names
+      ignore_white - boolean, ignore whitespace
+
+    Return value is a python file object
+    """
+
+  def annotate(self, path_parts, rev):
+    """Return a list of annotate file content lines and a revision.
+
+    The annotated lines are an collection of objects with the
+    following addressable members:
+
+       text        - raw text of a line of file contents
+       line_number - line number on which the line is found
+       rev         - revision in which the line was last modified
+       prev_rev    - revision prior to 'rev'
+       author      - author who last modified the line
+       date        - date on which the line was last modified, in seconds
+                     since the epoch, GMT
+
+    These object are sort by their line_number components.
+    """
+    
+
+# ======================================================================
+class DirEntry:
+  "Instances represent items in a directory listing"
+
+  def __init__(self, name, kind, errors=[]):
+    self.name = name
+    self.kind = kind
+    self.errors = errors
+
+class Revision:
+  """Instances holds information about revisions of versioned resources"""
+
+  """Create a new Revision() item:
+        NUMBER:  Revision in an integer-based, sortable format
+        STRING:  Revision as a string
+        DATE:  Seconds since Epoch (GMT) that this revision was created
+        AUTHOR:  Author of the revision
+        CHANGED:  Lines-changed (contextual diff) information
+        LOG:  Log message associated with the creation of this revision
+        SIZE:  Size (in bytes) of this revision's fulltext (files only)
+  """
+  def __init__(self, number, string, date, author, changed, log, size):
+    self.number = number
+    self.string = string
+    self.date = date
+    self.author = author
+    self.changed = changed
+    self.log = log
+    self.size = size
+
+  def __cmp__(self, other):
+    return cmp(self.number, other.number)
+
+# ======================================================================
+
+class Error(Exception):
+  pass
+class ReposNotFound(Error):
+  pass
+class ItemNotFound(Error):
+  def __init__(self, path):
+    # use '/' rather than os.sep because this is for user consumption, and
+    # it was defined using URL separators
+    if type(path) in (types.TupleType, types.ListType):
+      path = string.join(path, '/')
+    Error.__init__(self, path)
+class InvalidRevision(Error):
+  def __init__(self, revision=None):
+    if revision is None:
+      Error.__init__(self, "Invalid revision")
+    else:
+      Error.__init__(self, "Invalid revision " + str(revision))
+
+# ======================================================================
+# Implementation code used by multiple vclib modules
+
+import popen
+import os
+import time
+
+def _diff_args(type, options):
+  """generate argument list to pass to diff or rcsdiff"""
+  args = []
+  if type == CONTEXT:
+    if options.has_key('context'):
+      args.append('--context=%i' % options['context'])
+    else:
+      args.append('-c')
+  elif type == UNIFIED:
+    if options.has_key('context'):
+      args.append('--unified=%i' % options['context'])
+    else:
+      args.append('-u')
+  elif type == SIDE_BY_SIDE:
+    args.append('--side-by-side')
+    args.append('--width=164')
+  else:
+    raise NotImplementedError
+
+  if options.get('funout', 0):
+    args.append('-p')
+
+  if options.get('ignore_white', 0):
+    args.append('-w')
+
+  return args
+
+class _diff_fp:
+  """File object reading a diff between temporary files, cleaning up
+  on close"""
+
+  def __init__(self, temp1, temp2, info1=None, info2=None, diff_opts=[]):
+    self.temp1 = temp1
+    self.temp2 = temp2
+    args = diff_opts[:]
+    if info1 and info2:
+      args.extend(["-L", self._label(info1), "-L", self._label(info2)])
+    args.extend([temp1, temp2])
+    self.fp = popen.popen("diff", args, "r")
+
+  def read(self, bytes):
+    return self.fp.read(bytes)
+
+  def readline(self):
+    return self.fp.readline()
+
+  def close(self):
+    try:
+      if self.fp:
+        self.fp.close()
+        self.fp = None
+    finally:
+      try:
+        if self.temp1:
+          os.remove(self.temp1)
+          self.temp1 = None
+      finally:
+        if self.temp2:
+          os.remove(self.temp2)
+          self.temp2 = None
+
+  def __del__(self):
+    self.close()
+
+  def _label(self, (path, date, rev)):
+    date = date and time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date))
+    return "%s\t%s\t%s" % (path, date, rev)

lib/vclib/ccvs/__init__.py

@@ -0,0 +1,351 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"""
+This is a Version Control library driver for locally accessible cvs-repositories.
+"""
+
+import os
+import string
+import re
+import cStringIO
+import tempfile
+
+import vclib
+import rcsparse
+import blame
+
+### The functionality shared with bincvs should probably be moved to a
+### separate module
+from vclib.bincvs import CVSRepository, Revision, Tag, \
+                         _file_log, _log_path
+
+class CCVSRepository(CVSRepository):
+  def dirlogs(self, path_parts, rev, entries, options):
+    """see vclib.Repository.dirlogs docstring
+
+    rev can be a tag name or None. if set only information from revisions
+    matching the tag will be retrieved
+
+    Option values recognized by this implementation:
+
+      cvs_subdirs
+        boolean. true to fetch logs of the most recently modified file in each
+        subdirectory
+
+    Option values returned by this implementation:
+
+      cvs_tags, cvs_branches
+        lists of tag and branch names encountered in the directory
+    """
+    subdirs = options.get('cvs_subdirs', 0)
+
+    dirpath = self._getpath(path_parts)
+    alltags = {           # all the tags seen in the files of this dir
+      'MAIN' : '',
+      'HEAD' : '1.1'
+    }
+
+    for entry in entries:
+      entry.rev = entry.date = entry.author = entry.dead = entry.log = None
+      path = _log_path(entry, dirpath, subdirs)
+      if path:
+        entry.path = path
+        try:
+          rcsparse.Parser().parse(open(path, 'rb'), InfoSink(entry, rev, alltags))
+        except IOError, e:
+          entry.errors.append("rcsparse error: %s" % e)
+        except RuntimeError, e:
+          entry.errors.append("rcsparse error: %s" % e)
+        except rcsparse.RCSStopParser:
+          pass
+
+    branches = options['cvs_branches'] = []
+    tags = options['cvs_tags'] = []
+    for name, rev in alltags.items():
+      if Tag(None, rev).is_branch:
+        branches.append(name)
+      else:
+        tags.append(name)
+
+  def itemlog(self, path_parts, rev, options):
+    """see vclib.Repository.itemlog docstring
+
+    rev parameter can be a revision number, a branch number, a tag name,
+    or None. If None, will return information about all revisions, otherwise,
+    will only return information about the specified revision or branch.
+
+    Option values returned by this implementation:
+
+      cvs_tags
+        dictionary of Tag objects for all tags encountered
+    """
+    path = self.rcsfile(path_parts, 1)
+    sink = TreeSink()
+    rcsparse.Parser().parse(open(path, 'rb'), sink)
+    filtered_revs = _file_log(sink.revs.values(), sink.tags,
+                              sink.default_branch, rev)
+    for rev in filtered_revs:
+      if rev.prev and len(rev.number) == 2:
+        rev.changed = rev.prev.next_changed
+    options['cvs_tags'] = sink.tags
+
+    return filtered_revs
+
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
+    temp1 = tempfile.mktemp()
+    open(temp1, 'wb').write(self.openfile(path_parts1, rev1)[0].getvalue())
+    temp2 = tempfile.mktemp()
+    open(temp2, 'wb').write(self.openfile(path_parts2, rev2)[0].getvalue())
+
+    r1 = self.itemlog(path_parts1, rev1, {})[-1]
+    r2 = self.itemlog(path_parts2, rev2, {})[-1]
+
+    info1 = (self.rcsfile(path_parts1, root=1, v=0), r1.date, r1.string)
+    info2 = (self.rcsfile(path_parts2, root=1, v=0), r2.date, r2.string)
+
+    diff_args = vclib._diff_args(type, options)
+
+    return vclib._diff_fp(temp1, temp2, info1, info2, diff_args)
+
+  def annotate(self, path_parts, rev=None):
+    source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
+    return source, source.revision
+
+  def openfile(self, path_parts, rev=None):
+    path = self.rcsfile(path_parts, 1)
+    sink = COSink(rev)
+    rcsparse.Parser().parse(open(path, 'rb'), sink)
+    revision = sink.last and sink.last.string
+    return cStringIO.StringIO(string.join(sink.sstext.text, "\n")), revision
+
+class MatchingSink(rcsparse.Sink):
+  """Superclass for sinks that search for revisions based on tag or number"""
+
+  def __init__(self, find):
+    """Initialize with tag name or revision number string to match against"""
+    if not find or find == 'MAIN' or find == 'HEAD':
+      self.find = None
+    else:
+      self.find = find
+
+    self.find_tag = None
+
+  def set_principal_branch(self, branch_number):
+    if self.find is None:
+      self.find_tag = Tag(None, branch_number)
+
+  def define_tag(self, name, revision):
+    if name == self.find:
+      self.find_tag = Tag(None, revision)
+
+  def admin_completed(self):
+    if self.find_tag is None:
+      if self.find is None:
+        self.find_tag = Tag(None, '')
+      else:
+        try:
+          self.find_tag = Tag(None, self.find)
+        except ValueError:
+          pass
+
+class InfoSink(MatchingSink):
+  def __init__(self, entry, tag, alltags):
+    MatchingSink.__init__(self, tag)
+    self.entry = entry
+    self.alltags = alltags
+    self.matching_rev = None
+    self.perfect_match = 0
+
+  def define_tag(self, name, revision):
+    MatchingSink.define_tag(self, name, revision)
+    self.alltags[name] = revision
+
+  def admin_completed(self):
+    MatchingSink.admin_completed(self)
+    if self.find_tag is None:
+      # tag we're looking for doesn't exist
+      raise rcsparse.RCSStopParser
+
+  def define_revision(self, revision, date, author, state, branches, next):
+    if self.perfect_match:
+      return
+
+    tag = self.find_tag
+    rev = Revision(revision, date, author, state == "dead")
+
+    # perfect match if revision number matches tag number or if revision is on
+    # trunk and tag points to trunk. imperfect match if tag refers to a branch
+    # and this revision is the highest revision so far found on that branch
+    perfect = ((rev.number == tag.number) or
+               (not tag.number and len(rev.number) == 2))
+    if perfect or (tag.is_branch and tag.number == rev.number[:-1] and
+                   (not self.matching_rev or
+                    rev.number > self.matching_rev.number)):
+      self.matching_rev = rev
+      self.perfect_match = perfect
+
+  def set_revision_info(self, revision, log, text):
+    if self.matching_rev:
+      if revision == self.matching_rev.string:
+        self.entry.rev = self.matching_rev.string
+        self.entry.date = self.matching_rev.date
+        self.entry.author = self.matching_rev.author
+        self.entry.dead = self.matching_rev.dead
+        self.entry.log = log
+        raise rcsparse.RCSStopParser
+    else:
+      raise rcsparse.RCSStopParser
+
+class TreeSink(rcsparse.Sink):
+  d_command = re.compile('^d(\d+)\\s(\\d+)')
+  a_command = re.compile('^a(\d+)\\s(\\d+)')
+
+  def __init__(self):
+    self.revs = { }
+    self.tags = { }
+    self.head = None
+    self.default_branch = None
+
+  def set_head_revision(self, revision):
+    self.head = revision
+
+  def set_principal_branch(self, branch_number):
+    self.default_branch = branch_number
+
+  def define_tag(self, name, revision):
+    # check !tags.has_key(tag_name)
+    self.tags[name] = revision
+
+  def define_revision(self, revision, date, author, state, branches, next):
+    # check !revs.has_key(revision)
+    self.revs[revision] = Revision(revision, date, author, state == "dead")
+
+  def set_revision_info(self, revision, log, text):
+    # check revs.has_key(revision)
+    rev = self.revs[revision]
+    rev.log = log
+
+    changed = None
+    added = 0
+    deled = 0
+    if self.head != revision:
+      changed = 1
+      lines = string.split(text, '\n')
+      idx = 0
+      while idx < len(lines):
+        command = lines[idx]
+        dmatch = self.d_command.match(command)
+        idx = idx + 1
+        if dmatch:
+          deled = deled + string.atoi(dmatch.group(2))
+        else:
+          amatch = self.a_command.match(command)
+          if amatch:
+            count = string.atoi(amatch.group(2))
+            added = added + count
+            idx = idx + count
+          elif command:
+            raise "error while parsing deltatext: %s" % command
+
+    if len(rev.number) == 2:
+      rev.next_changed = changed and "+%i -%i" % (deled, added)
+    else:
+      rev.changed = changed and "+%i -%i" % (added, deled)
+
+class StreamText:
+  d_command = re.compile('^d(\d+)\\s(\\d+)')
+  a_command = re.compile('^a(\d+)\\s(\\d+)')
+
+  def __init__(self, text):
+    self.text = string.split(text, "\n")
+
+  def command(self, cmd):
+    adjust = 0
+    add_lines_remaining = 0
+    diffs = string.split(cmd, "\n")
+    if diffs[-1] == "":
+      del diffs[-1]
+    if len(diffs) == 0:
+      return
+    if diffs[0] == "":
+      del diffs[0]
+    for command in diffs:
+      if add_lines_remaining > 0:
+        # Insertion lines from a prior "a" command
+        self.text.insert(start_line + adjust, command)
+        add_lines_remaining = add_lines_remaining - 1
+        adjust = adjust + 1
+        continue
+      dmatch = self.d_command.match(command)
+      amatch = self.a_command.match(command)
+      if dmatch:
+        # "d" - Delete command
+        start_line = string.atoi(dmatch.group(1))
+        count      = string.atoi(dmatch.group(2))
+        begin = start_line + adjust - 1
+        del self.text[begin:begin + count]
+        adjust = adjust - count
+      elif amatch:
+        # "a" - Add command
+        start_line = string.atoi(amatch.group(1))
+        count      = string.atoi(amatch.group(2))
+        add_lines_remaining = count
+      else:
+        raise RuntimeError, 'Error parsing diff commands'
+
+def secondnextdot(s, start):
+  # find the position the second dot after the start index.
+  return string.find(s, '.', string.find(s, '.', start) + 1)
+
+
+class COSink(MatchingSink):
+  def __init__(self, rev):
+    MatchingSink.__init__(self, rev)
+
+  def set_head_revision(self, revision):
+    self.head = Revision(revision)
+    self.last = None
+    self.sstext = None
+
+  def admin_completed(self):
+    MatchingSink.admin_completed(self)
+    if self.find_tag is None:
+      raise vclib.InvalidRevision(self.find)
+
+  def set_revision_info(self, revision, log, text):
+    tag = self.find_tag
+    rev = Revision(revision)
+
+    if rev.number == tag.number:
+      self.log = log
+
+    depth = len(rev.number)
+
+    if rev.number == self.head.number:
+      assert self.sstext is None
+      self.sstext = StreamText(text)
+    elif (depth == 2 and tag.number and rev.number >= tag.number[:depth]):
+      assert len(self.last.number) == 2
+      assert rev.number < self.last.number
+      self.sstext.command(text)
+    elif (depth > 2 and rev.number[:depth-1] == tag.number[:depth-1] and
+          (rev.number <= tag.number or len(tag.number) == depth-1)):
+      assert len(rev.number) - len(self.last.number) in (0, 2)
+      assert rev.number > self.last.number
+      self.sstext.command(text)
+    else:
+      rev = None
+
+    if rev:
+      #print "tag =", tag.number, "rev =", rev.number, "<br>"
+      self.last = rev

lib/vclib/ccvs/blame.py

@@ -0,0 +1,464 @@
+#!/usr/bin/env python
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# blame.py: Annotate each line of a CVS file with its author,
+#           revision #, date, etc.
+#
+# -----------------------------------------------------------------------
+#
+# 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 re
+import time
+import math
+import rcsparse
+
+class CVSParser(rcsparse.Sink):
+  # Precompiled regular expressions
+  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.last_revision = {}
+    self.prev_revision = {}
+    self.revision_date = {}
+    self.revision_author = {}
+    self.revision_branches = {}
+    self.next_delta = {}
+    self.prev_delta = {}
+    self.tag_revision = {}
+    self.timestamp = {}
+    self.revision_ctime = {}
+    self.revision_age = {}
+    self.revision_log = {}
+    self.revision_deltatext = {}
+    self.revision_map = []    # map line numbers to revisions
+    self.lines_added  = {}
+    self.lines_removed = {}
+
+  # 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
+
+  # Split deltatext specified by rev to each line.
+  def deltatext_split(self, rev):
+    lines = string.split(self.revision_deltatext[rev], '\n')
+    if lines[-1] == '':
+      del lines[-1]
+    return lines
+
+  # 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 = self.deltatext_split(self.head_revision)
+
+    # Iterate, applying deltas to previous revision
+    for revision in path:
+      adjust = 0
+      diffs = self.deltatext_split(revision)
+      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 set_head_revision(self, revision):
+    self.head_revision = revision
+
+  def set_principal_branch(self, branch_name):
+    self.principal_branch = branch_name
+
+  def define_tag(self, name, revision):
+    # Create an associate array that maps from tag name to
+    # revision number and vice-versa.
+    self.tag_revision[name] = revision
+
+  def set_comment(self, comment):
+    self.file_description = comment
+
+  def set_description(self, description):
+    self.rcs_file_description = description
+
+  # 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 define_revision(self, revision, timestamp, author, state,
+                      branches, next):
+    self.tag_revision[revision] = revision
+    branch = self.last_branch.match(revision).group(1)
+    self.last_revision[branch] = revision
+
+    #self.revision_date[revision] = date
+    self.timestamp[revision] = timestamp
+
+    # 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)
+
+    # save author
+    self.revision_author[revision] = author
+
+    # ignore the state
+
+    # process the branch information
+    branch_text = ''
+    for branch in branches:
+      self.prev_revision[branch] = revision
+      self.next_delta[revision] = branch
+      self.prev_delta[branch] = revision
+      branch_text = branch_text + branch + ''
+    self.revision_branches[revision] = branch_text
+
+    # process the "next revision" information
+    if next:
+      self.next_delta[revision] = next
+      self.prev_delta[next] = revision
+      is_trunk_revision = self.trunk_rev.match(revision) is not None
+      if is_trunk_revision:
+        self.prev_revision[revision] = next
+      else:
+        self.prev_revision[next] = revision
+
+  # 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 set_revision_info(self, revision, log, text):
+    self.revision_log[revision] = log
+    self.revision_deltatext[revision] = text
+
+  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:
+      rcsfile = open(rcs_pathname, 'rb')
+    except:
+      raise RuntimeError, ('error: %s appeared to be under CVS control, ' +
+              'but the RCS file is inaccessible.') % rcs_pathname
+
+    rcsparse.Parser().parse(rcsfile, 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 = self.deltatext_split(self.head_revision)
+      line_count = len(tmp_array)
+
+    skip = 0
+
+    rev = self.prev_revision.get(self.head_revision)
+    while rev:
+      diffs = self.deltatext_split(rev)
+      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 = self.deltatext_split(last_revision)
+
+        # 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 = self.deltatext_split(revision)
+        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))
+              adj_begin  = start_line + adjust - 1
+              adj_end    = start_line + adjust - 1 + count
+              del self.revision_map[adj_begin:adj_end]
+              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
+
+
+class BlameSource:
+  def __init__(self, rcs_file, opt_rev=None):
+    # Parse the CVS file
+    parser = CVSParser()
+    revision = parser.parse_cvs_file(rcs_file, opt_rev)
+    count = len(parser.revision_map)
+    lines = parser.extract_revision(revision)
+    if len(lines) != count:
+      raise RuntimeError, 'Internal consistency error'
+
+    # set up some state variables
+    self.revision = revision
+    self.lines = lines
+    self.num_lines = count
+    self.parser = parser
+
+    # keep track of where we are during an iteration
+    self.idx = -1
+    self.last = None
+
+  def __getitem__(self, idx):
+    if idx == self.idx:
+      return self.last
+    if idx >= self.num_lines:
+      raise IndexError("No more annotations")
+    if idx != self.idx + 1:
+      raise BlameSequencingError()
+
+    # Get the line and metadata for it.
+    rev = self.parser.revision_map[idx]
+    prev_rev = self.parser.prev_revision.get(rev)
+    line_number = idx + 1
+    author = self.parser.revision_author[rev]
+    thisline = self.lines[idx]
+    ### TODO:  Put a real date in here.
+    item = _item(text=thisline, line_number=line_number, rev=rev,
+                 prev_rev=prev_rev, author=author, date=None)
+    self.last = item
+    self.idx = idx
+    return item
+
+
+class BlameSequencingError(Exception):
+  pass
+
+
+class _item:
+  def __init__(self, **kw):
+    vars(self).update(kw)
+

lib/vclib/ccvs/rcsparse/__init__.py

@@ -0,0 +1,26 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"""This package provides parsing tools for RCS files."""
+
+from common import *
+
+try:
+  from tparse import parse
+except ImportError:
+  try:
+    from texttools import Parser
+  except ImportError:
+    from default import Parser
+
+  def parse(file, sink):
+    return Parser().parse(file, sink)

lib/vclib/ccvs/rcsparse/common.py

@@ -0,0 +1,290 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"""common.py: common classes and functions for the RCS parsing tools."""
+
+import time
+import string
+
+### compat isn't in vclib right now. need to work up a solution
+import compat
+
+
+class Sink:
+  def set_head_revision(self, revision):
+    pass
+  def set_principal_branch(self, branch_name):
+    pass
+  def define_tag(self, name, revision):
+    pass
+  def set_access(self, accessors):
+    pass
+  def set_expansion(self, mode):
+    pass
+  def set_locking(self, mode):
+    """Used to signal locking mode.
+
+    Called with mode argument 'strict' if strict locking
+    Not called when no locking used."""
+    pass
+  def set_locker(self, revision, locker):
+    pass
+  def set_comment(self, comment):
+    pass
+  def set_description(self, description):
+    pass
+  def define_revision(self, revision, timestamp, author, state,
+                      branches, next):
+    pass
+  def set_revision_info(self, revision, log, text):
+    pass
+  def admin_completed(self):
+    pass
+  def tree_completed(self):
+    pass
+  def parse_completed(self):
+    pass
+
+
+# --------------------------------------------------------------------------
+#
+# EXCEPTIONS USED BY RCSPARSE
+#
+
+class RCSParseError(Exception):
+  pass
+class RCSIllegalCharacter(RCSParseError):
+  pass
+### need more work on this one
+class RCSExpected(RCSParseError):
+  def __init__(self, got, wanted):
+    RCSParseError.__init__(self, got, wanted)
+
+class RCSStopParser(Exception):
+  pass
+
+# --------------------------------------------------------------------------
+#
+# STANDARD TOKEN STREAM-BASED PARSER
+#
+
+class _Parser:
+  stream_class = None  # subclasses need to define this
+
+  def parse_rcs_admin(self):
+    while 1:
+      # Read initial token at beginning of line
+      token = self.ts.get()
+
+      # We're done once we reach the description of the RCS tree
+      if token[0] in string.digits:
+        self.ts.unget(token)
+        return
+
+      if token == "head":
+        semi, rev = self.ts.mget(2)
+        self.sink.set_head_revision(rev)
+        if semi != ';':
+          raise RCSExpected(semi, ';')
+      elif token == "branch":
+        semi, branch = self.ts.mget(2)
+        if semi == ';':
+          self.sink.set_principal_branch(branch)
+        else:
+          if branch == ';':
+            self.ts.unget(semi);
+          else:
+            raise RCSExpected(semi, ';')
+      elif token == "symbols":
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            break
+          self.ts.match(':')
+          tag_name = tag
+          tag_rev = self.ts.get()
+          self.sink.define_tag(tag_name, tag_rev)
+      elif token == "comment":
+        semi, comment = self.ts.mget(2)
+        self.sink.set_comment(comment)
+        if semi != ';':
+          raise RCSExpected(semi, ';')
+      elif token == "expand":
+        semi, expand_mode = self.ts.mget(2)
+        self.sink.set_expansion(expand_mode)
+        if semi != ';':
+          raise RCSExpected(semi, ';')
+      elif token == "locks":
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            break
+          (locker, rev) = string.split(tag,':')
+          self.sink.set_locker(rev, locker)
+
+        tag = self.ts.get()
+        if tag == "strict":
+          self.sink.set_locking("strict")
+          self.ts.match(';')
+        else:
+          self.ts.unget(tag)
+      elif token == "access":
+        accessors = []
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            if accessors != []:
+              self.sink.set_access(accessors)
+            break
+          accessors = accessors + [ tag ]
+
+      # Chew up "newphrase"
+      else:
+        pass
+        # warn("Unexpected RCS token: $token\n")
+
+    raise RuntimeError, "Unexpected EOF"
+
+  def parse_rcs_tree(self):
+    while 1:
+      revision = self.ts.get()
+
+      # End of RCS tree description ?
+      if revision == 'desc':
+        self.ts.unget(revision)
+        return
+
+      # Parse date
+      semi, date, sym = self.ts.mget(3)
+      if sym != 'date':
+        raise RCSExpected(sym, 'date')
+      if semi != ';':
+        raise RCSExpected(semi, ';')
+
+      # Convert date into timestamp
+      date_fields = string.split(date, '.') + ['0', '0', '0']
+      date_fields = map(string.atoi, date_fields)
+      # need to make the date four digits for timegm
+      EPOCH = 1970
+      if date_fields[0] < EPOCH:
+          if date_fields[0] < 70:
+              date_fields[0] = date_fields[0] + 2000
+          else:
+              date_fields[0] = date_fields[0] + 1900
+          if date_fields[0] < EPOCH:
+              raise ValueError, 'invalid year'
+
+      timestamp = compat.timegm(tuple(date_fields))
+
+      # Parse author
+      ### NOTE: authors containing whitespace are violations of the
+      ### RCS specification.  We are making an allowance here because
+      ### CVSNT is known to produce these sorts of authors.
+      self.ts.match('author')
+      author = ''
+      while 1:
+        token = self.ts.get()
+        if token == ';':
+          break
+        author = author + token + ' '
+      author = author[:-1]  # toss the trailing space
+
+      # Parse state
+      self.ts.match('state')
+      state = ''
+      while 1:
+        token = self.ts.get()
+        if token == ';':
+          break
+        state = state + token + ' '
+      state = state[:-1]  # toss the trailing space
+
+      # Parse branches
+      self.ts.match('branches')
+      branches = [ ]
+      while 1:
+        token = self.ts.get()
+        if token == ';':
+          break
+        branches.append(token)
+
+      # Parse revision of next delta in chain
+      next, sym = self.ts.mget(2)
+      if sym != 'next':
+        raise RCSExpected(sym, 'next')
+      if next == ';':
+        next = None
+      else:
+        self.ts.match(';')
+
+      # there are some files with extra tags in them. for example:
+      #    owner	640;
+      #    group	15;
+      #    permissions	644;
+      #    hardlinks	@configure.in@;
+      # this is "newphrase" in RCSFILE(5). we just want to skip over these.
+      while 1:
+        token = self.ts.get()
+        if token == 'desc' or token[0] in string.digits:
+          self.ts.unget(token)
+          break
+        # consume everything up to the semicolon
+        while self.ts.get() != ';':
+          pass
+
+      self.sink.define_revision(revision, timestamp, author, state, branches,
+                                next)
+
+  def parse_rcs_description(self):
+    self.ts.match('desc')
+    self.sink.set_description(self.ts.get())
+
+  def parse_rcs_deltatext(self):
+    while 1:
+      revision = self.ts.get()
+      if revision is None:
+        # EOF
+        break
+      text, sym2, log, sym1 = self.ts.mget(4)
+      if sym1 != 'log':
+        print `text[:100], sym2[:100], log[:100], sym1[:100]`
+        raise RCSExpected(sym1, 'log')
+      if sym2 != 'text':
+        raise RCSExpected(sym2, 'text')
+      ### need to add code to chew up "newphrase"
+      self.sink.set_revision_info(revision, log, text)
+
+  def parse(self, file, sink):
+    self.ts = self.stream_class(file)
+    self.sink = sink
+
+    self.parse_rcs_admin()
+
+    # let sink know when the admin section has been completed
+    self.sink.admin_completed()
+
+    self.parse_rcs_tree()
+
+    # many sinks want to know when the tree has been completed so they can
+    # do some work to prep for the arrival of the deltatext
+    self.sink.tree_completed()
+
+    self.parse_rcs_description()
+    self.parse_rcs_deltatext()
+
+    # easiest for us to tell the sink it is done, rather than worry about
+    # higher level software doing it.
+    self.sink.parse_completed()
+
+    self.ts = self.sink = None
+
+# --------------------------------------------------------------------------

lib/vclib/ccvs/rcsparse/debug.py

@@ -0,0 +1,122 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"""debug.py: various debugging tools for the rcsparse package."""
+
+import time
+
+from __init__ import parse
+import common
+
+
+class DebugSink(common.Sink):
+  def set_head_revision(self, revision):
+    print 'head:', revision
+
+  def set_principal_branch(self, branch_name):
+    print 'branch:', branch_name
+
+  def define_tag(self, name, revision):
+    print 'tag:', name, '=', revision
+
+  def set_comment(self, comment):
+    print 'comment:', comment
+
+  def set_description(self, description):
+    print 'description:', description
+
+  def define_revision(self, revision, timestamp, author, state,
+                      branches, next):
+    print 'revision:', revision
+    print '    timestamp:', timestamp
+    print '    author:', author
+    print '    state:', state
+    print '    branches:', branches
+    print '    next:', next
+
+  def set_revision_info(self, revision, log, text):
+    print 'revision:', revision
+    print '    log:', log
+    print '    text:', text[:100], '...'
+
+
+class DumpSink(common.Sink):
+  """Dump all the parse information directly to stdout.
+
+  The output is relatively unformatted and untagged. It is intended as a
+  raw dump of the data in the RCS file. A copy can be saved, then changes
+  made to the parsing engine, then a comparison of the new output against
+  the old output.
+  """
+  def __init__(self):
+    global sha
+    import sha
+
+  def set_head_revision(self, revision):
+    print revision
+
+  def set_principal_branch(self, branch_name):
+    print branch_name
+
+  def define_tag(self, name, revision):
+    print name, revision
+
+  def set_comment(self, comment):
+    print comment
+
+  def set_description(self, description):
+    print description
+
+  def define_revision(self, revision, timestamp, author, state,
+                      branches, next):
+    print revision, timestamp, author, state, branches, next
+
+  def set_revision_info(self, revision, log, text):
+    print revision, sha.new(log).hexdigest(), sha.new(text).hexdigest()
+
+  def tree_completed(self):
+    print 'tree_completed'
+
+  def parse_completed(self):
+    print 'parse_completed'
+
+
+def dump_file(fname):
+  parse(open(fname, 'rb'), DumpSink())
+
+def time_file(fname):
+  f = open(fname, 'rb')
+  s = common.Sink()
+  t = time.time()
+  parse(f, s)
+  t = time.time() - t
+  print t
+
+def _usage():
+  print 'This is normally a module for importing, but it has a couple'
+  print 'features for testing as an executable script.'
+  print 'USAGE: %s COMMAND filename,v' % sys.argv[0]
+  print '  where COMMAND is one of:'
+  print '    dump: filename is "dumped" to stdout'
+  print '    time: filename is parsed with the time written to stdout'
+  sys.exit(1)
+
+if __name__ == '__main__':
+  import sys
+  if len(sys.argv) != 3:
+    _usage()
+  if sys.argv[1] == 'dump':
+    dump_file(sys.argv[2])
+  elif sys.argv[1] == 'time':
+    time_file(sys.argv[2])
+  else:
+    _usage()

lib/vclib/ccvs/rcsparse/default.py

@@ -0,0 +1,240 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# This file was originally based on portions of the blame.py script by
+# Curt Hagenlocher.
+#
+# -----------------------------------------------------------------------
+
+import string
+import common
+
+class _TokenStream:
+  token_term = string.whitespace + ';'
+
+  # the algorithm is about the same speed for any CHUNK_SIZE chosen.
+  # grab a good-sized chunk, but not too large to overwhelm memory.
+  # note: we use a multiple of a standard block size
+  CHUNK_SIZE  = 192 * 512  # about 100k
+
+#  CHUNK_SIZE  = 5  # for debugging, make the function grind...
+
+  def __init__(self, file):
+    self.rcsfile = file
+    self.idx = 0
+    self.buf = self.rcsfile.read(self.CHUNK_SIZE)
+    if self.buf == '':
+      raise RuntimeError, 'EOF'
+
+  def get(self):
+    "Get the next token from the RCS file."
+
+    # Note: we can afford to loop within Python, examining individual
+    # characters. For the whitespace and tokens, the number of iterations
+    # is typically quite small. Thus, a simple iterative loop will beat
+    # out more complex solutions.
+
+    buf = self.buf
+    idx = self.idx
+
+    while 1:
+      if idx == len(buf):
+        buf = self.rcsfile.read(self.CHUNK_SIZE)
+        if buf == '':
+          # signal EOF by returning None as the token
+          del self.buf  # so we fail if get() is called again
+          return None
+        idx = 0
+
+      if buf[idx] not in string.whitespace:
+        break
+
+      idx = idx + 1
+
+    if buf[idx] == ';':
+      self.buf = buf
+      self.idx = idx + 1
+      return ';'
+
+    if buf[idx] != '@':
+      end = idx + 1
+      token = ''
+      while 1:
+        # find token characters in the current buffer
+        while end < len(buf) and buf[end] not in self.token_term:
+          end = end + 1
+        token = token + buf[idx:end]
+
+        if end < len(buf):
+          # we stopped before the end, so we have a full token
+          idx = end
+          break
+
+        # we stopped at the end of the buffer, so we may have a partial token
+        buf = self.rcsfile.read(self.CHUNK_SIZE)
+        idx = end = 0
+
+      self.buf = buf
+      self.idx = idx
+      return token
+
+    # a "string" which starts with the "@" character. we'll skip it when we
+    # search for content.
+    idx = idx + 1
+
+    chunks = [ ]
+
+    while 1:
+      if idx == len(buf):
+        idx = 0
+        buf = self.rcsfile.read(self.CHUNK_SIZE)
+        if buf == '':
+          raise RuntimeError, 'EOF'
+      i = string.find(buf, '@', idx)
+      if i == -1:
+        chunks.append(buf[idx:])
+        idx = len(buf)
+        continue
+      if i == len(buf) - 1:
+        chunks.append(buf[idx:i])
+        idx = 0
+        buf = '@' + self.rcsfile.read(self.CHUNK_SIZE)
+        if buf == '@':
+          raise RuntimeError, 'EOF'
+        continue
+      if buf[i + 1] == '@':
+        chunks.append(buf[idx:i+1])
+        idx = i + 2
+        continue
+
+      chunks.append(buf[idx:i])
+
+      self.buf = buf
+      self.idx = i + 1
+
+      return string.join(chunks, '')
+
+#  _get = get
+#  def get(self):
+    token = self._get()
+    print 'T:', `token`
+    return token
+
+  def match(self, match):
+    "Try to match the next token from the input buffer."
+
+    token = self.get()
+    if token != match:
+      raise RuntimeError, ('Unexpected parsing error in RCS file.\n' +
+                           'Expected token: %s, but saw: %s' % (match, token))
+
+  def unget(self, token):
+    "Put this token back, for the next get() to return."
+
+    # Override the class' .get method with a function which clears the
+    # overridden method then returns the pushed token. Since this function
+    # will not be looked up via the class mechanism, it should be a "normal"
+    # function, meaning it won't have "self" automatically inserted.
+    # Therefore, we need to pass both self and the token thru via defaults.
+
+    # note: we don't put this into the input buffer because it may have been
+    # @-unescaped already.
+
+    def give_it_back(self=self, token=token):
+      del self.get
+      return token
+
+    self.get = give_it_back
+
+  def mget(self, count):
+    "Return multiple tokens. 'next' is at the end."
+    result = [ ]
+    for i in range(count):
+      result.append(self.get())
+    result.reverse()
+    return result
+
+
+class Parser(common._Parser):
+  stream_class = _TokenStream
+
+  def parse_rcs_admin(self):
+    while 1:
+      # Read initial token at beginning of line
+      token = self.ts.get()
+
+      # We're done once we reach the description of the RCS tree
+      if token[0] in string.digits:
+        self.ts.unget(token)
+        return
+
+      if token == "head":
+        semi, rev = self.ts.mget(2)
+        self.sink.set_head_revision(rev)
+        if semi != ';':
+          raise common.RCSExpected(semi, ';')
+      elif token == "branch":
+        semi, branch = self.ts.mget(2)
+        if semi == ';':
+          self.sink.set_principal_branch(branch)
+        else:
+          if branch == ';':
+            self.ts.unget(semi);
+          else:
+            raise common.RCSExpected(semi, ';')
+      elif token == "symbols":
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            break
+          (tag_name, tag_rev) = string.split(tag, ':')
+          self.sink.define_tag(tag_name, tag_rev)
+      elif token == "comment":
+        semi, comment = self.ts.mget(2)
+        self.sink.set_comment(comment)
+        if semi != ';':
+          raise common.RCSExpected(semi, ';')
+      elif token == "expand":
+        semi, expand_mode = self.ts.mget(2)
+        self.sink.set_expansion(expand_mode)
+        if semi != ';':
+          raise RCSExpected(semi, ';')
+      elif token == "locks":
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            break
+          (locker, rev) = string.split(tag,':')
+          self.sink.set_locker(rev, locker)
+
+        tag = self.ts.get()
+        if tag == "strict":
+          self.sink.set_locking("strict")
+          self.ts.match(';')
+        else:
+          self.ts.unget(tag)
+      elif token == "access":
+        accessors = []
+        while 1:
+          tag = self.ts.get()
+          if tag == ';':
+            if accessors != []:
+              self.sink.set_access(accessors)
+            break
+          accessors = accessors + [ tag ]
+
+      # Chew up "newphrase".
+      else:
+        pass
+        # warn("Unexpected RCS token: $token\n")
+
+    raise RuntimeError, "Unexpected EOF"

lib/vclib/ccvs/rcsparse/texttools.py

@@ -0,0 +1,309 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2006 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+import string
+
+# note: this will raise an ImportError if it isn't available. the rcsparse
+# package will recognize this and switch over to the default parser.
+from mx import TextTools
+
+import common
+
+
+# for convenience
+_tt = TextTools
+
+_idchar_list = map(chr, range(33, 127)) + map(chr, range(160, 256))
+_idchar_list.remove('$')
+_idchar_list.remove(',')
+#_idchar_list.remove('.')  # leave as part of 'num' symbol
+_idchar_list.remove(':')
+_idchar_list.remove(';')
+_idchar_list.remove('@')
+_idchar = string.join(_idchar_list, '')
+_idchar_set = _tt.set(_idchar)
+
+_onechar_token_set = _tt.set(':;')
+
+_not_at_set = _tt.invset('@')
+
+_T_TOKEN = 30
+_T_STRING_START = 40
+_T_STRING_SPAN = 60
+_T_STRING_END = 70
+
+_E_COMPLETE = 100     # ended on a complete token
+_E_TOKEN = 110        # ended mid-token
+_E_STRING_SPAN = 130  # ended within a string
+_E_STRING_END = 140   # ended with string-end ('@') (could be mid-@@)
+
+_SUCCESS = +100
+
+_EOF = 'EOF'
+_CONTINUE = 'CONTINUE'
+_UNUSED = 'UNUSED'
+
+
+# continuation of a token over a chunk boundary
+_c_token_table = (
+  (_T_TOKEN,      _tt.AllInSet, _idchar_set),
+  )
+
+class _mxTokenStream:
+
+  # the algorithm is about the same speed for any CHUNK_SIZE chosen.
+  # grab a good-sized chunk, but not too large to overwhelm memory.
+  # note: we use a multiple of a standard block size
+  CHUNK_SIZE  = 192 * 512  # about 100k
+
+#  CHUNK_SIZE  = 5  # for debugging, make the function grind...
+
+  def __init__(self, file):
+    self.rcsfile = file
+    self.tokens = [ ]
+    self.partial = None
+
+    self.string_end = None
+
+  def _parse_chunk(self, buf, start=0):
+    "Get the next token from the RCS file."
+
+    buflen = len(buf)
+
+    assert start < buflen
+
+    # construct a tag table which refers to the buffer we need to parse.
+    table = (
+      # ignore whitespace. with or without whitespace, move to the next rule.
+      (None, _tt.AllInSet, _tt.whitespace_set, +1),
+
+      (_E_COMPLETE, _tt.EOF + _tt.AppendTagobj, _tt.Here, +1, _SUCCESS),
+
+      # accumulate token text and exit, or move to the next rule.
+      (_UNUSED,      _tt.AllInSet + _tt.AppendMatch, _idchar_set, +2),
+
+      (_E_TOKEN,  _tt.EOF + _tt.AppendTagobj, _tt.Here, -3, _SUCCESS),
+
+      # single character tokens exit immediately, or move to the next rule
+      (_UNUSED,    _tt.IsInSet + _tt.AppendMatch, _onechar_token_set, +2),
+
+      (_E_COMPLETE, _tt.EOF + _tt.AppendTagobj, _tt.Here, -5, _SUCCESS),
+
+      # if this isn't an '@' symbol, then we have a syntax error (go to a
+      # negative index to indicate that condition). otherwise, suck it up
+      # and move to the next rule.
+      (_T_STRING_START, _tt.Is + _tt.AppendTagobj, '@'),
+
+      (None, _tt.Is, '@', +4, +1),
+      (buf, _tt.Is, '@', +1, -1),
+      (_T_STRING_END, _tt.Skip + _tt.AppendTagobj, 0, 0, +1),
+      (_E_STRING_END, _tt.EOF + _tt.AppendTagobj, _tt.Here, -10, _SUCCESS),
+
+      (_E_STRING_SPAN, _tt.EOF + _tt.AppendTagobj, _tt.Here, +1, _SUCCESS),
+
+      # suck up everything that isn't an AT. go to next rule to look for EOF
+      (buf,  _tt.AllInSet, _not_at_set, 0, +1),
+
+      # go back to look for double AT if we aren't at the end of the string
+      (_E_STRING_SPAN,   _tt.EOF + _tt.AppendTagobj, _tt.Here, -6, _SUCCESS),
+      )
+
+    success, taglist, idx = _tt.tag(buf, table, start)
+
+    if not success:
+      ### need a better way to report this error
+      raise common.RCSIllegalCharacter()
+    assert idx == buflen
+
+    # pop off the last item
+    last_which = taglist.pop()
+
+    i = 0
+    tlen = len(taglist)
+    while i < tlen:
+      if taglist[i] == _T_STRING_START:
+        j = i + 1
+        while j < tlen:
+          if taglist[j] == _T_STRING_END:
+            s = _tt.join(taglist, '', i+1, j)
+            del taglist[i:j]
+            tlen = len(taglist)
+            taglist[i] = s
+            break
+          j = j + 1
+        else:
+          assert last_which == _E_STRING_SPAN
+          s = _tt.join(taglist, '', i+1)
+          del taglist[i:]
+          self.partial = (_T_STRING_SPAN, [ s ])
+          break
+      i = i + 1
+
+    # figure out whether we have a partial last-token
+    if last_which == _E_TOKEN:
+      self.partial = (_T_TOKEN, [ taglist.pop() ])
+    elif last_which == _E_COMPLETE:
+      pass
+    elif last_which == _E_STRING_SPAN:
+      assert self.partial
+    else:
+      assert last_which == _E_STRING_END
+      self.partial = (_T_STRING_END, [ taglist.pop() ])
+
+    taglist.reverse()
+    taglist.extend(self.tokens)
+    self.tokens = taglist
+
+  def _set_end(self, taglist, text, l, r, subtags):
+    self.string_end = l
+
+  def _handle_partial(self, buf):
+    which, chunks = self.partial
+    if which == _T_TOKEN:
+      success, taglist, idx = _tt.tag(buf, _c_token_table)
+      if not success:
+        # The start of this buffer was not a token. So the end of the
+        # prior buffer was a complete token.
+        self.tokens.insert(0, string.join(chunks, ''))
+      else:
+        assert len(taglist) == 1 and taglist[0][0] == _T_TOKEN \
+               and taglist[0][1] == 0 and taglist[0][2] == idx
+        if idx == len(buf):
+          #
+          # The whole buffer was one huge token, so we may have a
+          # partial token again.
+          #
+          # Note: this modifies the list of chunks in self.partial
+          #
+          chunks.append(buf)
+
+          # consumed the whole buffer
+          return len(buf)
+
+        # got the rest of the token.
+        chunks.append(buf[:idx])
+        self.tokens.insert(0, string.join(chunks, ''))
+
+      # no more partial token
+      self.partial = None
+
+      return idx
+
+    if which == _T_STRING_END:
+      if buf[0] != '@':
+        self.tokens.insert(0, string.join(chunks, ''))
+        return 0
+      chunks.append('@')
+      start = 1
+    else:
+      start = 0
+
+    self.string_end = None
+    string_table = (
+      (None,    _tt.Is, '@', +3, +1),
+      (_UNUSED, _tt.Is + _tt.AppendMatch, '@', +1, -1),
+      (self._set_end, _tt.Skip + _tt.CallTag, 0, 0, _SUCCESS),
+
+      (None,    _tt.EOF, _tt.Here, +1, _SUCCESS),
+
+      # suck up everything that isn't an AT. move to next rule to look
+      # for EOF
+      (_UNUSED, _tt.AllInSet + _tt.AppendMatch, _not_at_set, 0, +1),
+
+      # go back to look for double AT if we aren't at the end of the string
+      (None,    _tt.EOF, _tt.Here, -5, _SUCCESS),
+      )
+
+    success, unused, idx = _tt.tag(buf, string_table,
+                                   start, len(buf), chunks)
+
+    # must have matched at least one item
+    assert success
+
+    if self.string_end is None:
+      assert idx == len(buf)
+      self.partial = (_T_STRING_SPAN, chunks)
+    elif self.string_end < len(buf):
+      self.partial = None
+      self.tokens.insert(0, string.join(chunks, ''))
+    else:
+      self.partial = (_T_STRING_END, chunks)
+
+    return idx
+
+  def _parse_more(self):
+    buf = self.rcsfile.read(self.CHUNK_SIZE)
+    if not buf:
+      return _EOF
+
+    if self.partial:
+      idx = self._handle_partial(buf)
+      if idx is None:
+        return _CONTINUE
+      if idx < len(buf):
+        self._parse_chunk(buf, idx)
+    else:
+      self._parse_chunk(buf)
+
+    return _CONTINUE
+
+  def get(self):
+    try:
+      return self.tokens.pop()
+    except IndexError:
+      pass
+
+    while not self.tokens:
+      action = self._parse_more()
+      if action == _EOF:
+        return None
+
+    return self.tokens.pop()
+
+
+#  _get = get
+#  def get(self):
+    token = self._get()
+    print 'T:', `token`
+    return token
+
+  def match(self, match):
+    if self.tokens:
+      token = self.tokens.pop()
+      if token != match:
+        raise RuntimeError, ('Unexpected parsing error in RCS file.\n'
+                             'Expected token: %s, but saw: %s'
+                             % (match, token))
+    else:
+      token = self.get()
+      if token != match:
+        raise RuntimeError, ('Unexpected parsing error in RCS file.\n'
+                             'Expected token: %s, but saw: %s'
+                             % (match, token))
+
+  def unget(self, token):
+    self.tokens.append(token)
+
+  def mget(self, count):
+    "Return multiple tokens. 'next' is at the end."
+    while len(self.tokens) < count:
+      action = self._parse_more()
+      if action == _EOF:
+        ### fix this
+        raise RuntimeError, 'EOF hit while expecting tokens'
+    result = self.tokens[-count:]
+    del self.tokens[-count:]
+    return result
+
+
+class Parser(common._Parser):
+  stream_class = _mxTokenStream

lib/vclib/svn/__init__.py

@@ -0,0 +1,752 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2008 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"Version Control lib driver for locally accessible Subversion repositories"
+
+import vclib
+import os
+import os.path
+import stat
+import string
+import cStringIO
+import signal
+import shutil
+import time
+import tempfile
+import popen
+import re
+from svn import fs, repos, core, delta
+
+
+### Require Subversion 1.2.0 or better.
+if (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_PATCH) < (1, 2, 0):
+  raise Exception, "Version requirement not met (needs 1.2.0 or better)"
+
+  
+def _allow_all(root, path, pool):
+  """Generic authz_read_func that permits access to all paths"""
+  return 1
+
+
+def _fs_path_join(base, relative):
+  # Subversion filesystem paths are '/'-delimited, regardless of OS.
+  joined_path = base + '/' + relative
+  parts = filter(None, string.split(joined_path, '/'))
+  return string.join(parts, '/')
+
+
+def _cleanup_path(path):
+  """Return a cleaned-up Subversion filesystem path"""
+  return string.join(filter(None, string.split(path, '/')), '/')
+  
+
+def _compare_paths(path1, path2):
+  path1_len = len (path1);
+  path2_len = len (path2);
+  min_len = min(path1_len, path2_len)
+  i = 0
+
+  # Are the paths exactly the same?
+  if path1 == path2:
+    return 0
+  
+  # Skip past common prefix
+  while (i < min_len) and (path1[i] == path2[i]):
+    i = i + 1
+
+  # Children of paths are greater than their parents, but less than
+  # greater siblings of their parents
+  char1 = '\0'
+  char2 = '\0'
+  if (i < path1_len):
+    char1 = path1[i]
+  if (i < path2_len):
+    char2 = path2[i]
+    
+  if (char1 == '/') and (i == path2_len):
+    return 1
+  if (char2 == '/') and (i == path1_len):
+    return -1
+  if (i < path1_len) and (char1 == '/'):
+    return -1
+  if (i < path2_len) and (char2 == '/'):
+    return 1
+
+  # Common prefix was skipped above, next character is compared to
+  # determine order
+  return cmp(char1, char2)
+
+
+def _datestr_to_date(datestr, pool):
+  if datestr is None:
+    return None
+  return core.svn_time_from_cstring(datestr, pool) / 1000000
+
+  
+def _fs_rev_props(fsptr, rev, pool):
+  author = fs.revision_prop(fsptr, rev, core.SVN_PROP_REVISION_AUTHOR, pool)
+  msg = fs.revision_prop(fsptr, rev, core.SVN_PROP_REVISION_LOG, pool)
+  date = fs.revision_prop(fsptr, rev, core.SVN_PROP_REVISION_DATE, pool)
+  return date, author, msg
+
+
+def date_from_rev(svnrepos, rev):
+  if (rev < 0) or (rev > svnrepos.youngest):
+    raise vclib.InvalidRevision(rev)
+  datestr = fs.revision_prop(svnrepos.fs_ptr, rev,
+                             core.SVN_PROP_REVISION_DATE, svnrepos.pool)
+  return _datestr_to_date(datestr, svnrepos.pool)
+
+
+def get_location(svnrepos, path, rev, old_rev):
+  try:
+    results = repos.svn_repos_trace_node_locations(svnrepos.fs_ptr, path,
+                                                   rev, [old_rev],
+                                                   _allow_all, svnrepos.pool)
+  except core.SubversionException, e:
+    if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
+      raise vclib.ItemNotFound(path)
+    raise
+
+  try:
+    old_path = results[old_rev]
+  except KeyError:
+    raise vclib.ItemNotFound(path)
+
+  return _cleanup_path(old_path)
+
+
+def last_rev(svnrepos, path, peg_revision, limit_revision=None):
+  """Given PATH, known to exist in PEG_REVISION, find the youngest
+  revision older than, or equal to, LIMIT_REVISION in which path
+  exists.  Return that revision, and the path at which PATH exists in
+  that revision."""
+  
+  # Here's the plan, man.  In the trivial case (where PEG_REVISION is
+  # the same as LIMIT_REVISION), this is a no-brainer.  If
+  # LIMIT_REVISION is older than PEG_REVISION, we can use Subversion's
+  # history tracing code to find the right location.  If, however,
+  # LIMIT_REVISION is younger than PEG_REVISION, we suffer from
+  # Subversion's lack of forward history searching.  Our workaround,
+  # ugly as it may be, involves a binary search through the revisions
+  # between PEG_REVISION and LIMIT_REVISION to find our last live
+  # revision.
+  peg_revision = svnrepos._getrev(peg_revision)
+  limit_revision = svnrepos._getrev(limit_revision)
+  try:
+    if peg_revision == limit_revision:
+      return peg_revision, path
+    elif peg_revision > limit_revision:
+      fsroot = svnrepos._getroot(peg_revision)
+      history = fs.node_history(fsroot, path, svnrepos.scratch_pool)
+      while history:
+        path, peg_revision = fs.history_location(history,
+                                                 svnrepos.scratch_pool);
+        if peg_revision <= limit_revision:
+          return max(peg_revision, limit_revision), _cleanup_path(path)
+        history = fs.history_prev(history, 1, svnrepos.scratch_pool)
+      return peg_revision, _cleanup_path(path)
+    else:
+      ### Warning: this is *not* an example of good pool usage.
+      orig_id = fs.node_id(svnrepos._getroot(peg_revision), path,
+                           svnrepos.scratch_pool)
+      while peg_revision != limit_revision:
+        mid = (peg_revision + 1 + limit_revision) / 2
+        try:
+          mid_id = fs.node_id(svnrepos._getroot(mid), path,
+                              svnrepos.scratch_pool)
+        except core.SubversionException, e:
+          if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
+            cmp = -1
+          else:
+            raise
+        else:
+          ### Not quite right.  Need a comparison function that only returns
+          ### true when the two nodes are the same copy, not just related.
+          cmp = fs.compare_ids(orig_id, mid_id)
+
+        if cmp in (0, 1):
+          peg_revision = mid
+        else:
+          limit_revision = mid - 1
+
+      return peg_revision, path
+  finally:
+    svnrepos._scratch_clear()
+
+
+def created_rev(svnrepos, full_name, rev):
+  fsroot = svnrepos._getroot(rev)
+  return fs.node_created_rev(fsroot, full_name, svnrepos.pool)
+
+
+class Revision(vclib.Revision):
+  "Hold state for each revision's log entry."
+  def __init__(self, rev, date, author, msg, size,
+               filename, copy_path, copy_rev):
+    vclib.Revision.__init__(self, rev, str(rev), date, author, None, msg, size)
+    self.filename = filename
+    self.copy_path = copy_path
+    self.copy_rev = copy_rev
+
+
+class NodeHistory:
+  def __init__(self, fs_ptr, show_all_logs):
+    self.histories = {}
+    self.fs_ptr = fs_ptr
+    self.show_all_logs = show_all_logs
+    
+  def add_history(self, path, revision, pool):
+    # If filtering, only add the path and revision to the histories
+    # list if they were actually changed in this revision (where
+    # change means the path itself was changed, or one of its parents
+    # was copied).  This is useful for omitting bubble-up directory
+    # changes.
+    if not self.show_all_logs:
+      rev_root = fs.revision_root(self.fs_ptr, revision, pool)
+      changed_paths = fs.paths_changed(rev_root, pool)
+      paths = changed_paths.keys()
+      if path not in paths:
+        # Look for a copied parent
+        test_path = path
+        found = 0
+        subpool = core.svn_pool_create(pool)
+        while 1:
+          core.svn_pool_clear(subpool)
+          off = string.rfind(test_path, '/')
+          if off < 0:
+            break
+          test_path = test_path[0:off]
+          if test_path in paths:
+            copyfrom_rev, copyfrom_path = \
+                          fs.copied_from(rev_root, test_path, subpool)
+            if copyfrom_rev >= 0 and copyfrom_path:
+              found = 1
+              break
+        core.svn_pool_destroy(subpool)
+        if not found:
+          return
+    self.histories[revision] = _cleanup_path(path)
+    
+  
+def _get_history(svnrepos, full_name, rev, options={}):
+  fsroot = svnrepos._getroot(rev)
+  show_all_logs = options.get('svn_show_all_dir_logs', 0)
+  if not show_all_logs:
+    # See if the path is a file or directory.
+    kind = fs.check_path(fsroot, full_name, svnrepos.pool)
+    if kind is core.svn_node_file:
+      show_all_logs = 1
+      
+  # Instantiate a NodeHistory collector object.
+  history = NodeHistory(svnrepos.fs_ptr, show_all_logs)
+
+  # Do we want to cross copy history?
+  cross_copies = options.get('svn_cross_copies', 0)
+
+  # Get the history items for PATH.
+  repos.svn_repos_history(svnrepos.fs_ptr, full_name, history.add_history,
+                          1, rev, cross_copies, svnrepos.pool)
+  return history.histories
+
+
+class ChangedPath:
+  def __init__(self, filename, pathtype, prop_mods, text_mods,
+               base_path, base_rev, action, is_copy):
+    self.filename = filename
+    self.pathtype = pathtype
+    self.prop_mods = prop_mods
+    self.text_mods = text_mods
+    self.base_path = base_path
+    self.base_rev = base_rev
+    self.action = action
+    self.is_copy = is_copy
+
+
+def get_revision_info(svnrepos, rev):
+  fsroot = svnrepos._getroot(rev)
+
+  # Get the changes for the revision
+  editor = repos.ChangeCollector(svnrepos.fs_ptr, fsroot, svnrepos.pool)
+  e_ptr, e_baton = delta.make_editor(editor, svnrepos.pool)
+  repos.svn_repos_replay(fsroot, e_ptr, e_baton, svnrepos.pool)
+  changes = editor.get_changes()
+  changedpaths = {}
+  
+  # Copy the Subversion changes into a new hash, converting them into
+  # ChangedPath objects.
+  for path in changes.keys():
+    change = changes[path]
+    if change.path:
+      change.path = _cleanup_path(change.path)
+    if change.base_path:
+      change.base_path = _cleanup_path(change.base_path)
+    is_copy = 0
+    if not hasattr(change, 'action'): # new to subversion 1.4.0
+      action = 'modified'
+      if not change.path:
+        action = 'deleted'
+      elif change.added:
+        action = 'added'
+        replace_check_path = path
+        if change.base_path and change.base_rev:
+          replace_check_path = change.base_path
+        if changedpaths.has_key(replace_check_path) \
+           and changedpaths[replace_check_path].action == 'deleted':
+          action = 'replaced'
+    else:
+      if change.action == repos.CHANGE_ACTION_ADD:
+        action = 'added'
+      elif change.action == repos.CHANGE_ACTION_DELETE:
+        action = 'deleted'
+      elif change.action == repos.CHANGE_ACTION_REPLACE:
+        action = 'replaced'
+      else:
+        action = 'modified'
+    if (action == 'added' or action == 'replaced') \
+       and change.base_path \
+       and change.base_rev:
+      is_copy = 1
+    if change.item_kind == core.svn_node_dir:
+      pathtype = vclib.DIR
+    elif change.item_kind == core.svn_node_file:
+      pathtype = vclib.FILE
+    else:
+      pathtype = None
+    changedpaths[path] = ChangedPath(path, pathtype, change.prop_changes,
+                                     change.text_changed, change.base_path,
+                                     change.base_rev, action, is_copy)
+
+  # Actually, what we want is a sorted list of ChangedPath objects.
+  change_items = changedpaths.values()
+  change_items.sort(lambda a, b: _compare_paths(a.filename, b.filename))
+  
+  # Now get the revision property info.  Would use
+  # editor.get_root_props(), but something is broken there...
+  datestr, author, msg = _fs_rev_props(svnrepos.fs_ptr, rev, svnrepos.pool)
+  date = _datestr_to_date(datestr, svnrepos.pool)
+
+  return date, author, msg, change_items
+
+
+def _log_helper(svnrepos, rev, path, pool):
+  rev_root = fs.revision_root(svnrepos.fs_ptr, rev, pool)
+
+  # Was this path@rev the target of a copy?
+  copyfrom_rev, copyfrom_path = fs.copied_from(rev_root, path, pool)
+
+  # Assemble our LogEntry
+  datestr, author, msg = _fs_rev_props(svnrepos.fs_ptr, rev, pool)
+  date = _datestr_to_date(datestr, pool)
+  if fs.is_file(rev_root, path, pool):
+    size = fs.file_length(rev_root, path, pool)
+  else:
+    size = None
+  entry = Revision(rev, date, author, msg, size, path,
+                   copyfrom_path and _cleanup_path(copyfrom_path),
+                   copyfrom_rev)
+  return entry
+  
+
+def _fetch_log(svnrepos, full_name, which_rev, options, pool):
+  revs = []
+
+  if options.get('svn_latest_log', 0):
+    rev = _log_helper(svnrepos, which_rev, full_name, pool)
+    if rev:
+      revs.append(rev)
+  else:
+    history_set = _get_history(svnrepos, full_name, which_rev, options)
+    history_revs = history_set.keys()
+    history_revs.sort()
+    history_revs.reverse()
+    subpool = core.svn_pool_create(pool)
+    for history_rev in history_revs:
+      core.svn_pool_clear(subpool)
+      rev = _log_helper(svnrepos, history_rev, history_set[history_rev],
+                        subpool)
+      if rev:
+        revs.append(rev)
+    core.svn_pool_destroy(subpool)
+  return revs
+
+
+def _get_last_history_rev(fsroot, path, pool):
+  history = fs.node_history(fsroot, path, pool)
+  history = fs.history_prev(history, 0, pool)
+  history_path, history_rev = fs.history_location(history, pool);
+  return history_rev
+  
+  
+def get_logs(svnrepos, full_name, rev, files):
+  fsroot = svnrepos._getroot(rev)
+  subpool = core.svn_pool_create(svnrepos.pool)
+  for file in files:
+    core.svn_pool_clear(subpool)
+    path = _fs_path_join(full_name, file.name)
+    rev = _get_last_history_rev(fsroot, path, subpool)
+    datestr, author, msg = _fs_rev_props(svnrepos.fs_ptr, rev, subpool)
+    date = _datestr_to_date(datestr, subpool)
+    file.rev = str(rev)
+    file.date = date
+    file.author = author
+    file.log = msg
+    if file.kind == vclib.FILE:
+      file.size = fs.file_length(fsroot, path, subpool)
+  core.svn_pool_destroy(subpool)
+
+
+def get_youngest_revision(svnrepos):
+  return svnrepos.youngest
+
+def temp_checkout(svnrepos, path, rev, pool):
+  """Check out file revision to temporary file"""
+  temp = tempfile.mktemp()
+  fp = open(temp, 'wb')
+  try:
+    root = svnrepos._getroot(rev)
+    stream = fs.file_contents(root, path, pool)
+    try:
+      while 1:
+        chunk = core.svn_stream_read(stream, core.SVN_STREAM_CHUNK_SIZE)
+        if not chunk:
+          break
+        fp.write(chunk)
+    finally:
+      core.svn_stream_close(stream)
+  finally:
+    fp.close()
+  return temp
+
+class FileContentsPipe:
+  def __init__(self, root, path, pool):
+    self._pool = core.svn_pool_create(pool)
+    self._stream = fs.file_contents(root, path, self._pool)
+    self._eof = 0
+
+  def __del__(self):
+    core.svn_pool_destroy(self._pool)
+    
+  def read(self, len=None):
+    chunk = None
+    if not self._eof:
+      if len is None:
+        buffer = cStringIO.StringIO()
+        try:
+          while 1:
+            hunk = core.svn_stream_read(self._stream, 8192)
+            if not hunk:
+              break
+            buffer.write(hunk)
+          chunk = buffer.getvalue()
+        finally:
+          buffer.close()
+
+      else:
+        chunk = core.svn_stream_read(self._stream, len)   
+    if not chunk:
+      self._eof = 1
+    return chunk
+  
+  def readline(self):
+    chunk = None
+    if not self._eof:
+      chunk, self._eof = core.svn_stream_readline(self._stream, '\n',
+                                                  self._pool)
+      if not self._eof:
+        chunk = chunk + '\n'
+    if not chunk:
+      self._eof = 1
+    return chunk
+
+  def readlines(self):
+    lines = []
+    while True:
+      line = self.readline()
+      if not line:
+        break
+      lines.append(line)
+    return lines
+
+  def close(self):
+    return core.svn_stream_close(self._stream)
+
+  def eof(self):
+    return self._eof
+
+
+_re_blameinfo = re.compile(r"\s*(\d+)\s*(.*)")
+
+class BlameSource:
+  def __init__(self, svn_client_path, rootpath, fs_path, rev, first_rev):
+    self.idx = -1
+    self.line_number = 1
+    self.last = None
+    self.first_rev = first_rev
+    
+    # Do a little dance to get a URL that works in both Unix-y and
+    # Windows worlds.
+    rootpath = os.path.abspath(rootpath)
+    if rootpath and rootpath[0] != '/':
+      rootpath = '/' + rootpath
+    if os.sep != '/':
+      rootpath = string.replace(rootpath, os.sep, '/')
+
+    # Make a read-only temporary directory for Subversion to use as
+    # its runtime config dir.  (Read-only because that will prevent
+    # Subversion from fleshing out all the default runtime config
+    # contents.)
+    self.config_dir = self._mkdtemp()
+    os.chmod(self.config_dir, stat.S_IRUSR | stat.S_IXUSR)
+    
+    url = 'file://' + string.join([rootpath, fs_path], "/")
+    fp = popen.popen(svn_client_path,
+                     ("blame",
+                      "-r%d" % int(rev),
+                      "--non-interactive",
+                      "--config-dir", self.config_dir,
+                      "%s@%d" % (url, int(rev))),
+                     'rb', 1)
+    self.fp = fp
+
+  def _mkdtemp(self):
+    ### FIXME: When we require Python 2.3, this can go away.
+    for i in range(10):
+      dir = tempfile.mktemp()
+      try:
+        os.mkdir(dir, 0700)
+        return dir
+      except OSError, e:
+        if e.errno == errno.EEXIST:
+          continue # try again
+        raise
+    raise IOError, (errno.EEXIST, "No usable temporary directory name found")
+    
+  def __getitem__(self, idx):
+    if idx == self.idx:
+      return self.last
+    if idx != self.idx + 1:
+      raise BlameSequencingError()
+    line = self.fp.readline()
+    if not line:
+      raise IndexError("No more annotations")
+    m = _re_blameinfo.match(line[:17])
+    if not m:
+      raise vclib.Error("Could not parse blame output at line %i\n%s"
+                        % (idx+1, line))
+    rev, author = m.groups()
+    text = line[18:]
+    rev = int(rev)
+    prev_rev = None
+    if rev > self.first_rev:
+      prev_rev = rev - 1
+    item = _item(text=text, line_number=idx+1, rev=rev,
+                 prev_rev=prev_rev, author=author, date=None)
+    self.last = item
+    self.idx = idx
+    return item
+  
+  def __del__(self):
+    try:
+      if self.config_dir:
+        shutil.rmtree(self.config_dir)
+    except:
+      pass
+
+
+class BlameSequencingError(Exception):
+  pass
+
+  
+class SubversionRepository(vclib.Repository):
+  def __init__(self, name, rootpath, svn_path):
+    if not os.path.isdir(rootpath):
+      raise vclib.ReposNotFound(name)
+
+    # Initialize some stuff.
+    self.pool = None
+    self.apr_init = 0
+    self.rootpath = rootpath
+    self.name = name
+    self.svn_client_path = os.path.normpath(os.path.join(svn_path, 'svn'))
+
+    # Register a handler for SIGTERM so we can have a chance to
+    # cleanup.  If ViewVC takes too long to start generating CGI
+    # output, Apache will grow impatient and SIGTERM it.  While we
+    # don't mind getting told to bail, we want to gracefully close the
+    # repository before we bail.
+    def _sigterm_handler(signum, frame, self=self):
+      self._close()
+      sys.exit(-1)
+    try:
+      signal.signal(signal.SIGTERM, _sigterm_handler)
+    except ValueError:
+      # This is probably "ValueError: signal only works in main
+      # thread", which will get thrown by the likes of mod_python
+      # when trying to install a signal handler from a thread that
+      # isn't the main one.  We'll just not care.
+      pass
+
+    # Initialize APR and get our top-level pool.
+    core.apr_initialize()
+    self.apr_init = 1
+    self.pool = core.svn_pool_create(None)
+    self.scratch_pool = core.svn_pool_create(self.pool)
+    
+    # Open the repository and init some other variables.
+    self.repos = repos.svn_repos_open(rootpath, self.pool)
+    self.fs_ptr = repos.svn_repos_fs(self.repos)
+    self.youngest = fs.youngest_rev(self.fs_ptr, self.pool)
+    self._fsroots = {}
+
+  def __del__(self):
+    self._close()
+    
+  def _close(self):
+    if self.pool:
+      core.svn_pool_destroy(self.pool)
+      self.pool = None
+    if self.apr_init:
+      core.apr_terminate()
+      self.apr_init = 0
+
+  def _scratch_clear(self):
+    core.svn_pool_clear(self.scratch_pool)
+
+  def itemtype(self, path_parts, rev):
+    rev = self._getrev(rev)
+    basepath = self._getpath(path_parts)
+    kind = fs.check_path(self._getroot(rev), basepath, self.scratch_pool)
+    self._scratch_clear()
+    if kind == core.svn_node_dir:
+      return vclib.DIR
+    if kind == core.svn_node_file:
+      return vclib.FILE
+    raise vclib.ItemNotFound(path_parts)
+
+  def openfile(self, path_parts, rev):
+    path = self._getpath(path_parts)
+    rev = self._getrev(rev)
+    fsroot = self._getroot(rev)
+    revision = str(_get_last_history_rev(fsroot, path, self.scratch_pool))
+    self._scratch_clear()
+    fp = FileContentsPipe(fsroot, path, self.pool)
+    return fp, revision
+
+  def listdir(self, path_parts, rev, options):
+    basepath = self._getpath(path_parts)
+    if self.itemtype(path_parts, rev) != vclib.DIR:
+      raise vclib.Error("Path '%s' is not a directory." % basepath)
+
+    rev = self._getrev(rev)
+    fsroot = self._getroot(rev)
+    dirents = fs.dir_entries(fsroot, basepath, self.scratch_pool)
+    entries = [ ]
+    for entry in dirents.values():
+      if entry.kind == core.svn_node_dir:
+        kind = vclib.DIR
+      elif entry.kind == core.svn_node_file:
+        kind = vclib.FILE              
+      entries.append(vclib.DirEntry(entry.name, kind))
+    self._scratch_clear()
+    return entries
+
+  def dirlogs(self, path_parts, rev, entries, options):
+    get_logs(self, self._getpath(path_parts), self._getrev(rev), entries)
+
+  def itemlog(self, path_parts, rev, options):
+    """see vclib.Repository.itemlog docstring
+
+    Option values recognized by this implementation
+
+      svn_show_all_dir_logs
+        boolean, default false. if set for a directory path, will include
+        revisions where files underneath the directory have changed
+
+      svn_cross_copies
+        boolean, default false. if set for a path created by a copy, will
+        include revisions from before the copy
+
+      svn_latest_log
+        boolean, default false. if set will return only newest single log
+        entry
+    """
+    path = self._getpath(path_parts)
+    rev = self._getrev(rev)
+
+    revs = _fetch_log(self, path, rev, options, self.scratch_pool)
+    self._scratch_clear()
+    
+    revs.sort()
+    prev = None
+    for rev in revs:
+      rev.prev = prev
+      prev = rev
+
+    return revs
+
+  def annotate(self, path_parts, rev):
+    path = self._getpath(path_parts)
+    rev = self._getrev(rev)
+    fsroot = self._getroot(rev)
+
+    history_set = _get_history(self, path, rev, {'svn_cross_copies': 1})
+    history_revs = history_set.keys()
+    history_revs.sort()
+    revision = history_revs[-1]
+    first_rev = history_revs[0]
+    source = BlameSource(self.svn_client_path, self.rootpath,
+                         path, rev, first_rev)
+    return source, revision
+    
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
+    p1 = self._getpath(path_parts1)
+    p2 = self._getpath(path_parts2)
+    r1 = self._getrev(rev1)
+    r2 = self._getrev(rev2)
+    args = vclib._diff_args(type, options)
+
+    try:
+      temp1 = temp_checkout(self, p1, r1, self.pool)
+      temp2 = temp_checkout(self, p2, r2, self.pool)
+      info1 = p1, date_from_rev(self, r1), r1
+      info2 = p2, date_from_rev(self, r2), r2
+      return vclib._diff_fp(temp1, temp2, info1, info2, args)
+    except vclib.svn.core.SubversionException, e:
+      if e.apr_err == vclib.svn.core.SVN_ERR_FS_NOT_FOUND:
+        raise vclib.InvalidRevision
+      raise
+
+  def _getpath(self, path_parts):
+    return string.join(path_parts, '/')
+
+  def _getrev(self, rev):
+    if rev is None or rev == 'HEAD':
+      return self.youngest
+    try:
+      rev = int(rev)
+    except ValueError:
+      raise vclib.InvalidRevision(rev)
+    if (rev < 0) or (rev > self.youngest):
+      raise vclib.InvalidRevision(rev)
+    return rev
+
+  def _getroot(self, rev):
+    try:
+      return self._fsroots[rev]
+    except KeyError:
+      r = self._fsroots[rev] = fs.revision_root(self.fs_ptr, rev, self.pool)
+      return r
+
+class _item:
+  def __init__(self, **kw):
+    vars(self).update(kw)

lib/vclib/svn_ra/__init__.py

@@ -0,0 +1,450 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2008 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+
+"Version Control lib driver for remotely accessible Subversion repositories."
+
+import vclib
+import sys
+import os
+import string
+import re
+import tempfile
+import popen2
+import time
+from vclib.svn import Revision, ChangedPath, _datestr_to_date, _compare_paths, _cleanup_path
+from svn import core, delta, client, wc, ra
+
+
+### Require Subversion 1.3.0 or better. (for svn_ra_get_locations support)
+if (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_PATCH) < (1, 3, 0):
+  raise Exception, "Version requirement not met (needs 1.3.0 or better)"
+
+  
+def _rev2optrev(rev):
+  assert type(rev) is int
+  rt = core.svn_opt_revision_t()
+  rt.kind = core.svn_opt_revision_number
+  rt.value.number = rev
+  return rt
+
+
+def date_from_rev(svnrepos, rev):
+  datestr = ra.svn_ra_rev_prop(svnrepos.ra_session, rev,
+                               'svn:date', svnrepos.pool)
+  return _datestr_to_date(datestr, svnrepos.pool)
+
+
+def get_location(svnrepos, path, rev, old_rev):
+  try:
+    results = ra.get_locations(svnrepos.ra_session, path, rev,
+                               [old_rev], svnrepos.pool)
+  except core.SubversionException, e:
+    if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
+      raise vclib.ItemNotFound(path)
+    raise
+
+  try:
+    old_path = results[old_rev]
+  except KeyError:
+    raise vclib.ItemNotFound(path)
+
+  return _cleanup_path(old_path)
+
+
+def last_rev(svnrepos, path, peg_revision, limit_revision=None):
+  """Given PATH, known to exist in PEG_REVISION, find the youngest
+  revision older than, or equal to, LIMIT_REVISION in which path
+  exists.  Return that revision, and the path at which PATH exists in
+  that revision."""
+  
+  # Here's the plan, man.  In the trivial case (where PEG_REVISION is
+  # the same as LIMIT_REVISION), this is a no-brainer.  If
+  # LIMIT_REVISION is older than PEG_REVISION, we can use Subversion's
+  # history tracing code to find the right location.  If, however,
+  # LIMIT_REVISION is younger than PEG_REVISION, we suffer from
+  # Subversion's lack of forward history searching.  Our workaround,
+  # ugly as it may be, involves a binary search through the revisions
+  # between PEG_REVISION and LIMIT_REVISION to find our last live
+  # revision.
+  peg_revision = svnrepos._getrev(peg_revision)
+  limit_revision = svnrepos._getrev(limit_revision)
+  if peg_revision == limit_revision:
+    return peg_revision, path
+  elif peg_revision > limit_revision:
+    path = get_location(svnrepos, path, peg_revision, limit_revision)
+    return limit_revision, path
+  else:
+    ### Warning: this is *not* an example of good pool usage.
+    direction = 1
+    while peg_revision != limit_revision:
+      mid = (peg_revision + 1 + limit_revision) / 2
+      try:
+        path = get_location(svnrepos, path, peg_revision, mid)
+      except vclib.ItemNotFound:
+        limit_revision = mid - 1
+      else:
+        peg_revision = mid
+    return peg_revision, path
+
+
+def created_rev(svnrepos, full_name, rev):
+  kind = ra.svn_ra_check_path(svnrepos.ra_session, full_name, rev,
+                              svnrepos.pool)
+  if kind == core.svn_node_dir:
+    retval = ra.svn_ra_get_dir(svnrepos.ra_session, full_name,
+                               rev, svnrepos.pool)
+    if type(retval) == type([]) and len(retval) == 3:
+      props = retval[2]
+    else: # compat with older (broken) bindings
+      props = retval
+    return int(props[core.SVN_PROP_ENTRY_COMMITTED_REV])
+  return core.SVN_INVALID_REVNUM
+
+
+class LastHistoryCollector:
+  def __init__(self):
+    self.has_history = 0
+
+  def add_history(self, paths, revision, author, date, message, pool):
+    if not self.has_history:
+      self.has_history = 1
+      self.revision = revision
+      self.author = author
+      self.date = date
+      self.message = message
+      self.changes = []
+
+      if not paths:
+        return
+      changed_paths = paths.keys()
+      changed_paths.sort(lambda a, b: _compare_paths(a, b))
+      action_map = { 'D' : 'deleted',
+                     'A' : 'added',
+                     'R' : 'replaced',
+                     'M' : 'modified',
+                     }
+      for changed_path in changed_paths:
+        change = paths[changed_path]
+        action = action_map.get(change.action, 'modified')
+        ### Wrong, diddily wrong wrong wrong.  Can you say,
+        ### "Manufacturing data left and right because it hurts to
+        ### figure out the right stuff?"
+        if change.copyfrom_path and change.copyfrom_rev:
+          self.changes.append(ChangedPath(changed_path[1:], None, 0, 0,
+                                          change.copyfrom_path,
+                                          change.copyfrom_rev, action, 1))
+        else:
+          self.changes.append(ChangedPath(changed_path[1:], None, 0, 0,
+                                          changed_path[1:], 0, action, 0))
+
+  def get_history(self):
+    if not self.has_history:
+      return None, None, None, None, None
+    return self.revision, self.author, self.date, self.message, self.changes
+
+
+def _get_rev_details(svnrepos, rev, pool):
+  lhc = LastHistoryCollector()
+  client.svn_client_log([svnrepos.rootpath],
+                        _rev2optrev(rev), _rev2optrev(rev),
+                        1, 0, lhc.add_history, svnrepos.ctx, pool)
+  return lhc.get_history()
+
+  
+def get_revision_info(svnrepos, rev):
+  rev, author, date, log, changes = \
+       _get_rev_details(svnrepos, rev, svnrepos.pool)
+  return _datestr_to_date(date, svnrepos.pool), author, log, changes
+
+
+class LogCollector:
+  def __init__(self, path, show_all_logs):
+    # This class uses leading slashes for paths internally
+    if not path:
+      self.path = '/'
+    else:
+      self.path = path[0] == '/' and path or '/' + path
+    self.logs = []
+    self.show_all_logs = show_all_logs
+    
+  def add_log(self, paths, revision, author, date, message, pool):
+    # Changed paths have leading slashes
+    changed_paths = paths.keys()
+    changed_paths.sort(lambda a, b: _compare_paths(a, b))
+    copyfrom_path = copyfrom_rev = this_path = None
+    if self.path in changed_paths:
+      this_path = self.path
+      change = paths[self.path]
+      if change.copyfrom_path:
+        this_path = change.copyfrom_path
+        copyfrom_path = change.copyfrom_path[1:]
+        copyfrom_rev = change.copyfrom_rev
+    for changed_path in changed_paths:
+      if changed_path != self.path:
+        # If a parent of our path was copied, our "next previous"
+        # (huh?) path will exist elsewhere (under the copy source).
+        if (string.rfind(self.path, changed_path) == 0) and \
+               self.path[len(changed_path)] == '/':
+          change = paths[changed_path]
+          if change.copyfrom_path:
+            this_path = change.copyfrom_path + self.path[len(changed_path):]
+    if self.show_all_logs or this_path:
+      date = _datestr_to_date(date, pool)
+      entry = Revision(revision, date, author, message, None,
+                       self.path[1:], copyfrom_path, copyfrom_rev)
+      self.logs.append(entry)
+    if this_path:
+      self.path = this_path
+    
+
+def get_logs(svnrepos, full_name, rev, files):
+  dirents = svnrepos._get_dirents(full_name, rev)
+  subpool = core.svn_pool_create(svnrepos.pool)
+  rev_info_cache = { }
+  for file in files:
+    core.svn_pool_clear(subpool)
+    entry = dirents[file.name]
+    if rev_info_cache.has_key(entry.created_rev):
+      rev, author, date, log = rev_info_cache[entry.created_rev]
+    else:
+      ### i think this needs some get_last_history action to be accurate
+      rev, author, date, log, changes = \
+           _get_rev_details(svnrepos, entry.created_rev, subpool)
+      rev_info_cache[entry.created_rev] = rev, author, date, log
+    file.rev = rev
+    file.author = author
+    file.date = _datestr_to_date(date, subpool)
+    file.log = log
+    file.size = entry.size
+  core.svn_pool_destroy(subpool)    
+
+def get_youngest_revision(svnrepos):
+  return svnrepos.youngest
+
+def temp_checkout(svnrepos, path, rev, pool):
+  """Check out file revision to temporary file"""
+  temp = tempfile.mktemp()
+  stream = core.svn_stream_from_aprfile(temp, pool)
+  url = svnrepos.rootpath + (path and '/' + path)
+  client.svn_client_cat(core.Stream(stream), url, _rev2optrev(rev),
+                        svnrepos.ctx, pool)
+  core.svn_stream_close(stream)
+  return temp
+
+class SelfCleanFP:
+  def __init__(self, path):
+    self._fp = open(path, 'r')
+    self._path = path
+    self._eof = 0
+    
+  def read(self, len=None):
+    if len:
+      chunk = self._fp.read(len)
+    else:
+      chunk = self._fp.read()
+    if chunk == '':
+      self._eof = 1
+    return chunk
+  
+  def readline(self):
+    chunk = self._fp.readline()
+    if chunk == '':
+      self._eof = 1
+    return chunk
+
+  def close(self):
+    self._fp.close()
+    os.remove(self._path)
+
+  def __del__(self):
+    self.close()
+    
+  def eof(self):
+    return self._eof
+
+
+class SubversionRepository(vclib.Repository):
+  def __init__(self, name, rootpath):
+    # Init the client app
+    core.apr_initialize()
+    pool = core.svn_pool_create(None)
+    core.svn_config_ensure(None, pool)
+
+    # Start populating our members
+    self.pool = pool
+    self.name = name
+    self.rootpath = rootpath
+
+    # Setup the client context baton, complete with non-prompting authstuffs.
+    ctx = client.svn_client_ctx_t()
+    providers = []
+    providers.append(client.svn_client_get_simple_provider(pool))
+    providers.append(client.svn_client_get_username_provider(pool))
+    providers.append(client.svn_client_get_ssl_server_trust_file_provider(pool))
+    providers.append(client.svn_client_get_ssl_client_cert_file_provider(pool))
+    providers.append(client.svn_client_get_ssl_client_cert_pw_file_provider(pool))
+    ctx.auth_baton = core.svn_auth_open(providers, pool)
+    ctx.config = core.svn_config_get_config(None, pool)
+    self.ctx = ctx
+
+    ra_callbacks = ra.svn_ra_callbacks_t()
+    ra_callbacks.auth_baton = ctx.auth_baton
+    self.ra_session = ra.svn_ra_open(self.rootpath, ra_callbacks, None,
+                                     ctx.config, pool)
+    self.youngest = ra.svn_ra_get_latest_revnum(self.ra_session, pool)
+    self._dirent_cache = { }
+
+  def __del__(self):
+    core.svn_pool_destroy(self.pool)
+    core.apr_terminate()
+    
+  def itemtype(self, path_parts, rev):
+    path = self._getpath(path_parts[:-1])
+    rev = self._getrev(rev)
+    if not len(path_parts):
+      return vclib.DIR
+    dirents = self._get_dirents(path, rev)
+    try:
+      entry = dirents[path_parts[-1]]
+      if entry.kind == core.svn_node_dir:
+        return vclib.DIR
+      if entry.kind == core.svn_node_file:
+        return vclib.FILE
+    except KeyError:
+      raise vclib.ItemNotFound(path_parts)
+
+  def openfile(self, path_parts, rev):
+    rev = self._getrev(rev)
+    url = self.rootpath
+    if len(path_parts):
+      url = self.rootpath + '/' + self._getpath(path_parts)
+    tmp_file = tempfile.mktemp()
+    stream = core.svn_stream_from_aprfile(tmp_file, self.pool)
+    ### rev here should be the last history revision of the URL
+    client.svn_client_cat(core.Stream(stream), url,
+                          _rev2optrev(rev), self.ctx, self.pool)
+    core.svn_stream_close(stream)
+    return SelfCleanFP(tmp_file), rev
+
+  def listdir(self, path_parts, rev, options):
+    path = self._getpath(path_parts)
+    rev = self._getrev(rev)
+    entries = [ ]
+    dirents = self._get_dirents(path, rev)
+    for name in dirents.keys():
+      entry = dirents[name]
+      if entry.kind == core.svn_node_dir:
+        kind = vclib.DIR
+      elif entry.kind == core.svn_node_file:
+        kind = vclib.FILE
+      entries.append(vclib.DirEntry(name, kind))
+    return entries
+
+  def dirlogs(self, path_parts, rev, entries, options):
+    get_logs(self, self._getpath(path_parts), self._getrev(rev), entries)
+
+  def itemlog(self, path_parts, rev, options):
+    full_name = self._getpath(path_parts)
+    rev = self._getrev(rev)
+
+    # It's okay if we're told to not show all logs on a file -- all
+    # the revisions should match correctly anyway.
+    lc = LogCollector(full_name, options.get('svn_show_all_dir_logs', 0))
+    dir_url = self.rootpath
+    if full_name:
+      dir_url = dir_url + '/' + full_name
+
+    cross_copies = options.get('svn_cross_copies', 0)
+    client.svn_client_log([dir_url], _rev2optrev(rev), _rev2optrev(1),
+                          1, not cross_copies, lc.add_log,
+                          self.ctx, self.pool)
+    revs = lc.logs
+    revs.sort()
+    prev = None
+    for rev in revs:
+      rev.prev = prev
+      prev = rev
+
+    return revs
+
+  def annotate(self, path_parts, rev):
+    path = self._getpath(path_parts)
+    rev = self._getrev(rev)
+    url = self.rootpath + (path and '/' + path)
+
+    blame_data = []
+
+    def _blame_cb(line_no, revision, author, date,
+                  line, pool, blame_data=blame_data):
+      prev_rev = None
+      if revision > 1:
+        prev_rev = revision - 1
+      blame_data.append(_item(text=line, line_number=line_no+1,
+                              rev=revision, prev_rev=prev_rev,
+                              author=author, date=None))
+      
+    client.svn_client_blame(url, _rev2optrev(1), _rev2optrev(rev),
+                            _blame_cb, self.ctx, self.pool)
+
+    return blame_data, rev
+    
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
+    p1 = self._getpath(path_parts1)
+    p2 = self._getpath(path_parts2)
+    r1 = self._getrev(rev1)
+    r2 = self._getrev(rev2)
+    args = vclib._diff_args(type, options)
+
+    try:
+      temp1 = temp_checkout(self, p1, r1, self.pool)
+      temp2 = temp_checkout(self, p2, r2, self.pool)
+      info1 = p1, date_from_rev(self, r1), r1
+      info2 = p2, date_from_rev(self, r2), r2
+      return vclib._diff_fp(temp1, temp2, info1, info2, args)
+    except vclib.svn.core.SubversionException, e:
+      if e.apr_err == vclib.svn.core.SVN_ERR_FS_NOT_FOUND:
+        raise vclib.InvalidRevision
+      raise
+
+  def _getpath(self, path_parts):
+    return string.join(path_parts, '/')
+
+  def _getrev(self, rev):
+    if rev is None or rev == 'HEAD':
+      return self.youngest
+    try:
+      rev = int(rev)
+    except ValueError:
+      raise vclib.InvalidRevision(rev)
+    if (rev < 0) or (rev > self.youngest):
+      raise vclib.InvalidRevision(rev)
+    return rev
+
+  def _get_dirents(self, path, rev):
+    if path:
+      key = str(rev) + '/' + path
+      dir_url = self.rootpath + '/' + path
+    else:
+      key = str(rev)
+      dir_url = self.rootpath
+    dirents = self._dirent_cache.get(key)
+    if dirents:
+      return dirents
+    dirents = client.svn_client_ls(dir_url, _rev2optrev(rev), 0,
+                                   self.ctx, self.pool)
+    self._dirent_cache[key] = dirents
+    return dirents
+    
+    
+class _item:
+  def __init__(self, **kw):
+    vars(self).update(kw)

lib/win32popen.py

@@ -0,0 +1,235 @@
+# -*-python-*-
+#
+# Copyright (C) 1999-2007 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 ViewVC
+# distribution or at http://viewvc.org/license-1.html.
+#
+# For more information, visit http://viewvc.org/
+#
+# -----------------------------------------------------------------------
+#
+# Utilities for controlling processes and pipes on win32
+#
+# -----------------------------------------------------------------------
+
+import os, sys, traceback, string, thread
+try:
+  import win32api
+except ImportError, e:
+  raise ImportError, str(e) + """
+
+Did you install the Python for Windows Extensions?
+
+   http://sourceforge.net/projects/pywin32/
+"""
+
+import win32process, win32pipe, win32con
+import win32event, win32file, winerror
+import pywintypes, msvcrt
+
+# Buffer size for spooling
+SPOOL_BYTES = 4096
+
+# File object to write error messages
+SPOOL_ERROR = sys.stderr
+#SPOOL_ERROR = open("m:/temp/error.txt", "wt")
+
+def CommandLine(command, args):
+  """Convert an executable path and a sequence of arguments into a command
+  line that can be passed to CreateProcess"""
+
+  cmd = "\"" + string.replace(command, "\"", "\"\"") + "\""
+  for arg in args:
+    cmd = cmd + " \"" + string.replace(arg, "\"", "\"\"") + "\""
+  return cmd
+
+def CreateProcess(cmd, hStdInput, hStdOutput, hStdError):
+  """Creates a new process which uses the specified handles for its standard
+  input, output, and error. The handles must be inheritable. 0 can be passed
+  as a special handle indicating that the process should inherit the current
+  process's input, output, or error streams, and None can be passed to discard
+  the child process's output or to prevent it from reading any input."""
+
+  # initialize new process's startup info
+  si = win32process.STARTUPINFO()
+  si.dwFlags = win32process.STARTF_USESTDHANDLES
+
+  if hStdInput == 0:
+    si.hStdInput = win32api.GetStdHandle(win32api.STD_INPUT_HANDLE)
+  else:
+    si.hStdInput = hStdInput
+
+  if hStdOutput == 0:
+    si.hStdOutput = win32api.GetStdHandle(win32api.STD_OUTPUT_HANDLE)
+  else:
+    si.hStdOutput = hStdOutput
+
+  if hStdError == 0:
+    si.hStdError = win32api.GetStdHandle(win32api.STD_ERROR_HANDLE)
+  else:
+    si.hStdError = hStdError
+
+  # create the process
+  phandle, pid, thandle, tid = win32process.CreateProcess \
+  ( None,                            # appName
+    cmd,                             # commandLine
+    None,                            # processAttributes
+    None,                            # threadAttributes
+    1,                               # bInheritHandles
+    win32con.NORMAL_PRIORITY_CLASS,  # dwCreationFlags
+    None,                            # newEnvironment
+    None,                            # currentDirectory
+    si                               # startupinfo
+  )
+
+  if hStdInput and hasattr(hStdInput, 'Close'):
+    hStdInput.Close()
+
+  if hStdOutput and hasattr(hStdOutput, 'Close'):
+    hStdOutput.Close()
+
+  if hStdError and hasattr(hStdError, 'Close'):
+    hStdError.Close()
+
+  return phandle, pid, thandle, tid
+
+def CreatePipe(readInheritable, writeInheritable):
+  """Create a new pipe specifying whether the read and write ends are
+  inheritable and whether they should be created for blocking or nonblocking
+  I/O."""
+
+  r, w = win32pipe.CreatePipe(None, SPOOL_BYTES)
+  if readInheritable:
+    r = MakeInheritedHandle(r)
+  if writeInheritable:
+    w = MakeInheritedHandle(w)
+  return r, w
+
+def File2FileObject(pipe, mode):
+  """Make a C stdio file object out of a win32 file handle"""
+  if string.find(mode, 'r') >= 0:
+    wmode = os.O_RDONLY
+  elif string.find(mode, 'w') >= 0:
+    wmode = os.O_WRONLY
+  if string.find(mode, 'b') >= 0:
+    wmode = wmode | os.O_BINARY
+  if string.find(mode, 't') >= 0:
+    wmode = wmode | os.O_TEXT
+  return os.fdopen(msvcrt.open_osfhandle(pipe.Detach(),wmode),mode)
+
+def FileObject2File(fileObject):
+  """Get the win32 file handle from a C stdio file object"""
+  return win32file._get_osfhandle(fileObject.fileno())
+
+def DuplicateHandle(handle):
+  """Duplicates a win32 handle."""
+  proc = win32api.GetCurrentProcess()
+  return win32api.DuplicateHandle(proc,handle,proc,0,0,win32con.DUPLICATE_SAME_ACCESS)
+
+def MakePrivateHandle(handle, replace = 1):
+  """Turn an inherited handle into a non inherited one. This avoids the
+  handle duplication that occurs on CreateProcess calls which can create
+  uncloseable pipes."""
+
+  ### Could change implementation to use SetHandleInformation()...
+
+  flags = win32con.DUPLICATE_SAME_ACCESS
+  proc = win32api.GetCurrentProcess()
+  if replace: flags = flags | win32con.DUPLICATE_CLOSE_SOURCE
+  newhandle = win32api.DuplicateHandle(proc,handle,proc,0,0,flags)
+  if replace: handle.Detach() # handle was already deleted by the last call
+  return newhandle
+
+def MakeInheritedHandle(handle, replace = 1):
+  """Turn a private handle into an inherited one."""
+
+  ### Could change implementation to use SetHandleInformation()...
+
+  flags = win32con.DUPLICATE_SAME_ACCESS
+  proc = win32api.GetCurrentProcess()
+  if replace: flags = flags | win32con.DUPLICATE_CLOSE_SOURCE
+  newhandle = win32api.DuplicateHandle(proc,handle,proc,0,1,flags)
+  if replace: handle.Detach() # handle was deleted by the last call
+  return newhandle
+
+def MakeSpyPipe(readInheritable, writeInheritable, outFiles = None, doneEvent = None):
+  """Return read and write handles to a pipe that asynchronously writes all of
+  its input to the files in the outFiles sequence. doneEvent can be None, or a
+  a win32 event handle that will be set when the write end of pipe is closed.
+  """
+
+  if outFiles is None:
+    return CreatePipe(readInheritable, writeInheritable)
+
+  r, writeHandle = CreatePipe(0, writeInheritable)
+  if readInheritable is None:
+    readHandle, w = None, None
+  else:
+    readHandle, w = CreatePipe(readInheritable, 0)
+
+  thread.start_new_thread(SpoolWorker, (r, w, outFiles, doneEvent))
+
+  return readHandle, writeHandle
+
+def SpoolWorker(srcHandle, destHandle, outFiles, doneEvent):
+  """Thread entry point for implementation of MakeSpyPipe"""
+  try:
+    buffer = win32file.AllocateReadBuffer(SPOOL_BYTES)
+
+    while 1:
+      try:
+        #print >> SPOOL_ERROR, "Calling ReadFile..."; SPOOL_ERROR.flush()
+        hr, data = win32file.ReadFile(srcHandle, buffer)
+        #print >> SPOOL_ERROR, "ReadFile returned '%s', '%s'" % (str(hr), str(data)); SPOOL_ERROR.flush()
+        if hr != 0:
+          raise "win32file.ReadFile returned %i, '%s'" % (hr, data)
+        elif len(data) == 0:
+          break
+      except pywintypes.error, e:
+        #print >> SPOOL_ERROR, "ReadFile threw '%s'" % str(e); SPOOL_ERROR.flush()
+        if e.args[0] == winerror.ERROR_BROKEN_PIPE:
+          break
+        else:
+          raise e
+
+      #print >> SPOOL_ERROR, "Writing to %i file objects..." % len(outFiles); SPOOL_ERROR.flush()
+      for f in outFiles:
+        f.write(data)
+      #print >> SPOOL_ERROR, "Done writing to file objects."; SPOOL_ERROR.flush()
+
+      #print >> SPOOL_ERROR, "Writing to destination %s" % str(destHandle); SPOOL_ERROR.flush()
+      if destHandle:
+        #print >> SPOOL_ERROR, "Calling WriteFile..."; SPOOL_ERROR.flush()
+        hr, bytes = win32file.WriteFile(destHandle, data)
+        #print >> SPOOL_ERROR, "WriteFile() passed %i bytes and returned %i, %i" % (len(data), hr, bytes); SPOOL_ERROR.flush()
+        if hr != 0 or bytes != len(data):
+          raise "win32file.WriteFile() passed %i bytes and returned %i, %i" % (len(data), hr, bytes)
+
+    srcHandle.Close()
+
+    if doneEvent:
+      win32event.SetEvent(doneEvent)
+
+    if destHandle:
+      destHandle.Close()
+
+  except:
+    info = sys.exc_info()
+    SPOOL_ERROR.writelines(apply(traceback.format_exception, info), '')
+    SPOOL_ERROR.flush()
+    del info
+
+def NullFile(inheritable):
+  """Create a null file handle."""
+  if inheritable:
+    sa = pywintypes.SECURITY_ATTRIBUTES()
+    sa.bInheritHandle = 1
+  else:
+    sa = None
+
+  return win32file.CreateFile("nul",
+    win32file.GENERIC_READ | win32file.GENERIC_WRITE,
+    win32file.FILE_SHARE_READ | win32file.FILE_SHARE_WRITE,
+    sa, win32file.OPEN_EXISTING, 0, None)

notes/TODO

@@ -0,0 +1,53 @@
+PREFACE
+-------
+This file will go away soon after release 0.8.  Please use the SourceForge 
+tracker to resubmit any of the items listed below, if you think, it is 
+still an issue:  
+	http://sourceforge.net/tracker/?group_id=18760
+Before reporting please check, whether someone else has already done this.
+Working patches increase the chance to be included into the next release.
+                                                     -- PeFu / October 2001
+
+TODO ITEMS
+----------
+*) add Tamminen Eero's comments on how to make Linux directly execute
+   the Python script. From email on Feb 19.
+   [ add other examples, such as my /bin/sh hack or the teeny CGI stub 
+     importing the bulk hack ]
+
+*) insert rcs_path into PATH before calling "rcsdiff". rcsdiff might
+   use "co" and needs to find it on the path.
+
+*) show the "locked" flag (attach it to the LogEntry objects).
+   Idea from Russell Gordon <russell@hoopscotch.dhs.org>
+
+*) committing with a specific revision number:
+   http://mailman.lyra.org/pipermail/viewcvs/2000q1/000008.html
+
+*) add capability similar to cvs2cl.pl:
+     http://mailman.lyra.org/pipermail/viewcvs/2000q2/000050.html
+   suggestion from Chris Meyer <cmeyer@gatan.com>.
+
+*) add a tree view of the directory structure (and files?)
+
+*) include a ConfigParser.py to help older Python installations
+
+*) add a check for the rcs programs/paths to viewvc-install. clarify the
+   dependency on RCS in the docs.
+
+*) have a "check" mode that verifies binaries are available on rcs_path
+
+   -> alternately (probably?): use rcsparse rather than external tools
+
+KNOWN BUGS
+----------
+*) time.timezone seems to not be available on some 1.5.2 installs.
+   I was unable to verify this.  On RedHat and SuSE Linux this bug
+   is non existant.
+
+*) With old repositories containing many branches, tags or thousands
+   or revisions, the cvsgraph feature becomes unusable (see INSTALL).
+   ViewVC can't do much about this, but it might be possible to
+   investigate the number of branches, tags and revision in advance
+   and disable the cvsgraph links, if the numbers exceed a certain
+   treshold.

notes/releases.txt

@@ -0,0 +1,85 @@
+                        RELEASE MANAGEMENT
+
+ViewVC rolls releases from release branches associate with each minor
+version of the software.  For example, the 1.1.0 is rolled from the
+1.1.x branch.  The same is true for the 1.1.1, 1.1.2, ... releases.
+
+There is a script, `tools/make-release', which creates a release
+directory and the various archive files that we distribute.  All other
+steps required to get a ViewVC release out of the door require manual
+execution (currently by C. Michael Pilato).  Those steps are as
+follows:
+
+Checkout a working copy of the release branch for the release you
+intend to roll, and in that working copy, perform the following steps
+(X, Y, and Z below represent integral major, minor, and patch version
+numbers, and not literal):
+
+1.  Review any open bug reports:
+
+       http://viewvc.tigris.org/servlets/ProjectIssues
+
+2.  Add a new subsection to the file 'docs/upgrading.html' describing
+    all user visible changes for users of previous releases of ViewVC.
+    Commit any modifications.  NOTE: This step should not be necessary
+    for patch releases.
+
+3.  Verify that copyright years are correct in both the LICENSE.html
+    file and the source code.
+
+4.  Update and commit the 'CHANGES' file.
+
+5.  Test, test, test!  There is no automatic testsuite available.  So
+    just run with permuting different `viewvc.conf' settings... and
+    pray.  Fix what needs fixin', keeping the CHANGES file in sync
+    with the branch.
+
+6.  At this point, the source code committed to the release branch
+    should exactly reflect what you wish to distribute and dub "the
+    release".
+
+7.  Edit the file 'lib/viewvc.py' and remove the "-dev" suffix from
+    __version__.  The remainder should be of the form "X.Y.Z", where X,
+    Y, and Z are positive integers.  Do NOT commit this change.
+
+8.  Update your working copy to HEAD, and tag the release:
+
+       svn update
+       svn cp -m "Tag the X.Y.Z final release." . \
+                 http://viewvc.tigris.org/svn/viewvc/tags/X.Y.Z
+
+9.  Go into an empty directory and run the 'make-release' script:
+
+       tools/make-release viewvc-X.Y.Z X.Y.Z
+
+10. Verify the archive files:
+
+       - do they have a LICENSE.html file?
+       - do they have necessary include documentation?
+       - do they *not* have unnecessary stuff?
+       - do they install and work correctly?
+
+11. Upload the created archive files (tar.gz and zip) into the Files
+    and Documents section of the Tigris.org project, and modify the
+    CHECKSUMS document there accordingly.  Also, drop a copy of the
+    archive files into the root directory of the viewvc.org website
+    (unversioned).
+
+12. Update the websites (both the viewvc.org/ and www/ ones) to refer
+    to the new release files.
+
+13. Edit the file 'lib/viewvc.py' again, re-adding the "-dev" suffix
+    and incrementing the patch number assigned to the __version__
+    variable, and commit:
+
+       svn ci -m "Begin a new release cycle."
+
+14. Edit the Issue Tracker configuration options, adding a new Version
+    for the just-released one, and a new Milestone for the next patch
+    (and possibly, minor or major) release.  (For the Milestone sort
+    key, use a packed integer XXYYZZ:  1.0.3 == 10003, 2.11.4 == 21104.)
+
+15. Write an announcement explaining all the cool new features and
+    post it to the announce@ list, to the project's News area, and to
+    other places interested in this sort of stuff, such as Freshmeat
+    (http://www.freshmeat.net).

templates/annotate.ezt

@@ -1,3 +1,43 @@
-[include "header.ezt" "annotate"]
+[# setup page definitions][define page_title]Annotation of /[where][end][define help_href][docroot]/help_rootview.html[end][# end][include "include/header.ezt" "annotate"]
+[include "include/file_header.ezt"]
 
-<hr noshade>
+<hr />
+
+<p>
+Revision [if-any revision_href]<a href="[revision_href]"><strong>[rev]</strong></a>[else]<strong>[rev]</strong>[end] -
+(<a href="[view_href]"><strong>view</strong></a>)
+(<a href="[download_href]"><strong>download</strong></a>)
+[if-any download_text_href](<a href="[download_text_href]"><strong>as text</strong></a>)[end]
+[if-any orig_path]
+  <br />Original Path: <a href="[orig_href]"><em>[orig_path]</em></a>
+[end]
+</p>
+
+
+[define class1]vc_row_even[end]
+[define class2]vc_row_odd[end]
+[define last_rev]0[end]
+[define rowclass][class1][end]
+
+<table cellspacing="0" cellpadding="0">
+[for lines]
+  [is lines.rev last_rev]
+  [else]
+    [is rowclass class1]
+      [define rowclass][class2][end]
+    [else]
+      [define rowclass][class1][end]
+    [end]
+  [end]
+
+  <tr class="[rowclass]" id="l[lines.line_number]">
+    <td class="vc_blame_line">[lines.line_number] :</td>
+    <td class="vc_blame_author">[is lines.rev last_rev]&nbsp;[else][lines.author][end]</td>
+    <td class="vc_blame_rev">[is lines.rev last_rev]&nbsp;[else][if-any lines.diff_url]<a href="[lines.diff_url]">[end][lines.rev][if-any lines.diff_url]</a>[end][end]</td>
+    <td class="vc_blame_text">[lines.text]</td>
+  </tr>
+  [define last_rev][lines.rev][end]
+[end]
+</table>
+
+[include "include/footer.ezt"]

templates/diff.ezt

@@ -1,88 +1,234 @@
-[include "header.ezt" "diff"]
+[# setup page definitions]
+  [define page_title]Diff of /[where][end]
+  [define help_href][docroot]/help_rootview.html[end]
+[# end]
 
-<h3 align=center>Diff for /[where] between version [rev1] and [rev2]</h3>
-<table border=0 cellspacing=0 cellpadding=0 width="100%">
-  <tr bgcolor=white>
-    <th width="50%" valign=top>
-      version [rev1][date1]
-      [if-any tag1]<br>Tag: [tag1][end]
-    </th>
-    <th width="50%" valign=top>
-      version [rev2][date2]
-      [if-any tag2]<br>Tag: [tag2][end]
-    </th>
-  </tr>
+[include "include/header.ezt" "diff"]
+[include "include/file_header.ezt"]
 
-[for changes]
-  [is changes.type "header"]
-    <tr bgcolor="#99cccc"><td width="50%">
-      <table width="100%" border=1 cellpadding=5><tr>
-        <td><b>Line [changes.line1]</b>&nbsp;<font
-           size="-1">[changes.extra]</font></td>
-      </tr></table></td><td width="50%">
-      <table width="100%" border=1 cellpadding=5><tr>
-        <td><b>Line [changes.line2]</b>&nbsp;<font
-           size="-1">[changes.extra]</font></td>
-      </tr></table>
-    </td></tr>
-  [else]
-  [is changes.type "add"]
-    <tr>
-      <td bgcolor="#cccccc">&nbsp;</td>
-      <td bgcolor="#aaffaa">[changes.right]</td>
-    </tr>
-  [else]
-  [is changes.type "remove"]
-    <tr>
-      <td bgcolor="#ffaaaa">[changes.left]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
-    </tr>
-  [else]
-  [is changes.type "change"]
-    <tr>
-    [if-any changes.have_left]<td bgcolor="#ffff77">[changes.left]</td>
-    [else]<td bgcolor="#eeee77">&nbsp;</td>[end]
-    [if-any changes.have_right]<td bgcolor="#ffff77">[changes.right]</td>
-    [else]<td bgcolor="#eeee77">&nbsp;</td>[end]
-    </tr>
-  [else]
-  [is changes.type "no-changes"]
-    <tr><td colspan=2>&nbsp;</td></tr>
-    <tr bgcolor="#cccccc"><td colspan=2 align=center>
-      <br><b>- No changes -</b><br>&nbsp;
-    </td></tr>
-  [else][# a line of context]
-    <tr><td>[changes.left]</td><td>[changes.right]</td></tr>
-  [end][end][end][end][end]
+<h3 style="text-align:center;"></h3>
+
+[if-any raw_diff]
+  <pre class="vc_raw_diff">[raw_diff]</pre>
 [end]
 
-</table><br><hr noshade width="100%">
-<table border=0 cellpadding=10><tr><td>
-
-  <table border=1><tr><td>Legend:<br>
-  <table border=0 cellspacing=0 cellpadding=1>
-  <tr>
-    <td align=center bgcolor="#ffaaaa">Removed from v.[rev1]</td>
-    <td bgcolor="#cccccc">&nbsp;</td>
+[if-any changes]
+<table cellspacing="0" cellpadding="0">
+  <tr class="vc_diff_header">
+    <th style="width:6%;"></th>
+    <th style="width:47%; vertical-align:top;">
+      [is path_left path_right][else][path_left][end]
+      revision [rev_left], [date_left]
+      [if-any tag_left]<br />Tag: [tag_left][end]
+    </th>
+    <th style="width:47%; vertical-align:top;">
+      [is path_left path_right][else][path_right][end]
+      revision [rev_right], [date_right]
+      [if-any tag_right]<br />Tag: [tag_right][end]
+    </th>
   </tr>
-  <tr bgcolor="#ffff77"><td align=center colspan=2>changed lines</td></tr>
-  <tr>
-    <td bgcolor="#cccccc">&nbsp;</td>
-    <td align=center bgcolor="#aaffaa">Added in v.[rev2]</td>
-  </tr>
-  </table></td></tr></table></td>
 
-  <td><form method="GET" action="[request.url]">
-    [hidden_values]
-    <select name="diff_format" onchange="submit()">
-      <option value="h" [is diff_format "h"]selected[end]>Colored Diff</option>
-      <option value="l" [is diff_format "l"]selected[end]>Long Colored Diff</option>
-      <option value="u" [is diff_format "u"]selected[end]>Unidiff</option>
-      <option value="c" [is diff_format "c"]selected[end]>Context Diff</option>
-      <option value="s" [is diff_format "s"]selected[end]>Side by Side</option>
-    </select>
-    <input type=submit value="Show">
-  </form></td></tr>
+  [for changes]
+    [is changes.type "header"]
+      <tr class="vc_diff_chunk_header" id="h[changes.line_info_right]">
+        <td style="width:6%;"><strong>#</strong></td>
+        <td style="width:47%;">
+          <strong>Line [changes.line_info_left]</strong>&nbsp;
+          <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span>
+        </td>
+        <td style="width:47%;">
+          <strong>Line [changes.line_info_right]</strong>&nbsp;
+          <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span>
+        </td>
+      </tr>
+    [else]
+      [is changes.type "add"]
+        <tr>
+          <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td>
+          <td class="vc_diff_empty">&nbsp;</td>
+          <td class="vc_diff_add">&nbsp;[changes.right]</td>
+        </tr>
+      [else]
+        [is changes.type "remove"]
+          <tr>
+            <td></td>
+            <td class="vc_diff_remove">&nbsp;[changes.left]</td>
+            <td class="vc_diff_empty">&nbsp;</td>
+          </tr>
+        [else]
+          [is changes.type "change"]
+            <tr>
+              [if-any changes.have_right]
+                <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td>
+              [else]
+                <td></td>
+              [end]
+              [if-any changes.have_left]
+                <td class="vc_diff_change">&nbsp;[changes.left]</td>
+              [else]
+                <td class="vc_diff_change_empty">&nbsp;</td>
+              [end]
+              [if-any changes.have_right]
+                <td class="vc_diff_change">&nbsp;[changes.right]</td>
+              [else]
+                <td class="vc_diff_change_empty">&nbsp;</td>
+              [end]
+            </tr>
+          [else]
+            [is changes.type "no-changes"]
+              <tr>
+                <td colspan="3">&nbsp;</td>
+              </tr>
+              <tr class="vc_diff_empty">
+                <td colspan="3" style="text-align:center;"><br />
+                <strong>- No changes -</strong><br />&nbsp; </td>
+              </tr>
+            [else]
+              [is changes.type "binary-diff"]
+                <tr>
+                  <td colspan="3">&nbsp;</td>
+                </tr>
+                <tr class="vc_diff_empty">
+                  <td colspan="3" style="text-align:center;"><br />
+                  <strong>- Binary file revisions differ -</strong><br />&nbsp; </td>
+                </tr>
+              [else]
+                [is changes.type "error"]
+                  <tr>
+                    <td colspan="3">&nbsp;</td>
+                  </tr>
+                  <tr class="vc_diff_empty">
+                    <td colspan="3" style="text-align:center;"> <br />
+                    <strong>- ViewVC depends on rcsdiff and GNU diff to create 
+                    this page.  ViewVC cannot find GNU diff. Even if you 
+                    have GNU diff installed, the rcsdiff program must be 
+                    configured and compiled with the GNU diff location.
+                    -</strong> <br />&nbsp; </td>
+                  </tr>
+                [else]
+                  <tr>
+                    <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td>
+                    <td class="vc_diff_nochange">&nbsp;[changes.left]</td>
+                    <td class="vc_diff_nochange">&nbsp;[changes.right]</td>
+                  </tr>
+                [end]
+              [end]
+            [end]
+          [end]
+        [end]
+      [end]
+    [end]
+  [end]
+</table>
+[end]
+
+[if-any sidebyside]
+  <table class="vc_idiff">
+    <colgroup><col /><col class="content" /></colgroup>
+    <colgroup><col /><col class="content" /></colgroup>
+    <thead>
+      <tr>
+        <th colspan="2">    
+          [is path_left path_right][else][path_left][end]
+          Revision [rev_left]
+        </th>
+        <th colspan="2">
+          [is path_left path_right][else][path_right][end]
+          Revision [rev_right]
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      [for sidebyside]
+        [if-any sidebyside.gap]
+          <tr>
+            <th>&hellip;</th><th></th>
+            <th>&hellip;</th><th></th>
+          </tr>
+        [end]
+        <tr>
+          [for sidebyside.columns]
+            <th>[sidebyside.columns.line_number]</th><td[if-any sidebyside.columns.line_number][else] class="vc_idiff_empty"[end]>[for sidebyside.columns.segments][if-any sidebyside.columns.segments.type]<span class="vc_idiff_[sidebyside.columns.segments.type]">[sidebyside.columns.segments.text]</span>[else][sidebyside.columns.segments.text][end][end]</td>
+          [end]
+        </tr>
+      [end]
+    </tbody>
+  </table>
+[end]
+
+[if-any unified]
+  <table class="vc_idiff">
+    <thead>
+      <tr>
+        <th>r[rev_left]</th>
+        <th>r[rev_right]</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      [for unified]
+        [if-any unified.gap]
+          <tr>
+            <th>&hellip;</th>
+            <th>&hellip;</th>
+            <th></th>
+          </tr>
+        [end]
+        <tr>
+          <th>[unified.left_number]</th>
+          <th>[unified.right_number]</th>
+          <td[if-any unified.type] class="vc_idiff_[unified.type]"[end]>[for unified.segments][if-any unified.segments.type]<span class="vc_idiff_[unified.segments.type]">[unified.segments.text]</span>[else][unified.segments.text][end][end]</td>
+        </tr>
+      [end]
+    </tbody>
+  </table>
+[end]
+
+<hr style="margin-top:1em;" />
+
+<table cellpadding="10" class="auto">
+  <tr>
+    <td>
+      <form method="get" action="[diff_format_action]">
+        <div>
+          [diff_format_hidden_values]
+          <select name="diff_format" onchange="submit()">
+            <option value="h" [is diff_format "h"]selected="selected"[end]>Colored Diff</option>
+            <option value="l" [is diff_format "l"]selected="selected"[end]>Long Colored Diff</option>
+            <option value="u" [is diff_format "u"]selected="selected"[end]>Unidiff</option>
+            <option value="c" [is diff_format "c"]selected="selected"[end]>Context Diff</option>
+            <option value="s" [is diff_format "s"]selected="selected"[end]>Side by Side</option>
+          </select>
+          <input type="submit" value="Show" />
+          </div>
+      </form>
+    </td>
+    <td>
+[if-any raw_diff]
+      &nbsp;
+[else]
+      <table style="border:solid gray 1px;" class="auto">
+        <tr>
+          <td>Legend:<br />
+            <table cellspacing="0" cellpadding="1">
+              <tr>
+                <td style="text-align:center;" class="vc_diff_remove">Removed from v.[rev_left]</td>
+                <td class="vc_diff_empty">&nbsp;</td>
+              </tr>
+              <tr>
+                <td style="text-align:center;" colspan="2" class="vc_diff_change">changed lines</td>
+              </tr>
+              <tr>
+                <td class="vc_diff_empty">&nbsp;</td>
+                <td style="text-align:center;" class="vc_diff_add">Added in v.[rev_right]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+[end]
+    </td>
+  </tr>
 </table>
 
-[include "footer.ezt"]
+[include "include/footer.ezt"]

templates/dir_alternate.ezt

@@ -1,307 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
- "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head>
-<!-- ViewCVS       -- http://viewcvs.sourceforge.net/
-     by Greg Stein -- mailto:gstein@lyra.org
-  -->
-<title>[if-any where][where][else][cfg.general.main_title][end]</title>
-</head>
-<body text="#000000" bgcolor="#ffffff">
-<table width="100%" border=0 cellspacing=0 cellpadding=0>
-  <tr>
-    <td rowspan=2><h1>[if-any where][where][else][cfg.general.main_title][end]</h1></td>
-    <td align=right><img src="/icons/apache_pb.gif" alt="(logo)" border=0
-			width=259 height=32></td>
-  </tr>
-  <tr>
-    <td align=right><h3><b><a target="_blank"
-href="[request.script_name]/*docroot*/help_[if-any where]dir[else]root[end]view.html">ViewCVS and CVS Help</a></b></h3></td>
-  </tr>
-</table>
-
-[if-any where][else]
-  <!-- you may insert repository access instructions here -->
-
-  [if-any roots]
-    <h3>Project Root</h3>
-    <form method=GET action="./">
-      <select name=cvsroot onchange="submit()">
-      [for roots]
-        [is roots current_root]
-          <option selected>[roots]</option>
-        [else]
-          <option>[roots]</option>
-        [end]
-      [end]
-      </select>
-      <input type=submit value="Go">
-    </form>
-  [end]
-[end]
-
-<p><a name="dirlist"></a></p>
-
-[if-any where]
-<table>
-<tr><td>Current directory:</td><td><b>[nav_path]</b></td></tr>
-[if-any view_tag]
-<tr><td>Current tag:</td><td><b>[view_tag]</b></td></tr>
-[end]
-[if-any search_re]
-<tr><td>Current search:</td><td><b>[search_re]</b></td></tr>
-[end]
-[is num_files "0"]
-[else]
-<tr><td>Files shown:</td><td><b>[files_shown]</b></td></tr>
-[end]
-</table>
-[end]
-
-<hr noshade>
-
-[# if you want a colored border around the table of directory
-   information, then add this additional table tag:
-
-   <table border=0 cellpadding=0 width="100%"><tr>
-     <td bgcolor="#999999">
-]
-
-
-<table width="100%" border=0 cellspacing=1 cellpadding=2>
-<tr>
-[if-any have_logs]
-  [is sortby "rev"]
-    <th align=left bgcolor="#88ff88">Rev.</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_rev_href]"#dirlist>Rev.</a></th>
-  [end]
-  [is sortby "file"]
-    <th align=left bgcolor="#88ff88"
-      [is cfg.options.use_cvsgraph "1"]colspan=2[end]
-      >File</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      [is cfg.options.use_cvsgraph "1"]colspan=2[end]
-      ><a href="./[sortby_file_href]#dirlist">File</a></th>
-  [end]
-  [is sortby "date"]
-    <th align=left bgcolor="#88ff88">Age</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_date_href]#dirlist">Age</a></th>
-  [end]
-  [is sortby "author"]
-    <th align=left bgcolor="#88ff88">Author</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_author_href]#dirlist">Author</a></th>
-  [end]
-  [is sortby "log"]
-    <th align=left bgcolor="#88ff88">Last log entry</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_log_href]#dirlist">Last log entry</a></th>
-  [end]
-[else]
-  <th align=left bgcolor="#cccccc">File</th>
-[end]
-</tr>
-
-[for rows]
-  <tr bgcolor="[if-index rows even]#ffffff[else]#ccccee[end]">
-  [is rows.type "unreadable"]
-    [if-any have_logs]
-      <td>&nbsp;</td> [# revision ]
-    [end]
-    <td><a name="[rows.anchor]">[rows.name]</a>
-      [if-any have_logs]
-        </td>
-        <td colspan=[is cfg.options.use_cvsgraph "1"]4[else]3[end]>
-          <i>this entry is unreadable</i>
-        </td>
-      [else]
-      - <i>this entry is unreadable</i>
-      [end]
-    </td>
-  [else]
-    [is rows.type "dir"]
-      [if-any have_logs]
-        <td>&nbsp;</td> [# revision ]
-      [end]
-      <td [if-any have_logs][is cfg.options.use_cvsgraph "1"]colspan=2[end][end]>
-        <a name="[rows.anchor]" href="[rows.href]">
-        <img src="/icons/small/dir.gif" alt="(dir)" border=0 width=16 height=16>
-        [rows.name]
-        </a>
-        [is rows.name "Attic/"]
-          &nbsp; <a href="./[show_attic_href]#dirlist">[[]show contents]</a>
-        [end]
-      </td>
-      [is rows.cvs "error"]
-        [# for an error to occur, we must have some logs. always use colspan]
-        <td colspan=3>
-          <i>Last modification unavailable - could not read CVS information</i>
-        </td>
-      [else]
-      [if-any have_logs]
-        [is rows.cvs "none"]
-          <td>&nbsp;</td> [# age ]
-          <td>&nbsp;</td> [# author ]
-          <td>&nbsp;</td> [# log ]
-        [else]
-          <td>&nbsp;[rows.time]</td>
-          [if-any rows.author]
-            <td>&nbsp;[rows.author]</td>
-          [end]
-          [if-any rows.show_log]
-            <td>&nbsp;[rows.log_file]/[rows.log_rev]<br>
-              &nbsp;<font size="-1">[rows.log]</font></td>
-          [end]
-        [end]
-      [end]
-      [end]
-          
-    [else]
-      [is rows.cvs "error"]
-        <td>&nbsp;</td>
-        <td [is cfg.options.use_cvsgraph "1"]colspan=2[end]>
-          <a name="[rows.anchor]">[rows.name]</a>
-        </td>
-        <td colspan=3><i>CVS information is unreadable</i></td>
-      [else]
-        <td>&nbsp;<a href="[rows.href]"><b>[rows.rev]</b></a></td>
-        <td width="1%"><a name="[rows.anchor]" href="[rows.rev_href]&content-type=text/vnd.viewcvs-markup">
-[# to display the revision in a separate window, you could use:
-
-   <a name="{rows.anchor}" href="{rows.rev_href}" target="cvs_checkout"
-      onClick="window.open('{rows.rev_href}', 'cvs_checkout',
-                           'resizeable=1,scrollbars=1')"><b>{rows.rev}</b></a>
-
-   (substitute brackets for the braces)
-]
-            <img src="/icons/small/text.gif" alt="(file)" border=0
-                 width=16 height=16>
-            [rows.name]
-            </a>
-            [is rows.state "dead"]
-              [# don't let this phrase/link be wrapped ]
-              [if-any view_tag](not&nbsp;exist)[else](in&nbsp;the&nbsp;Attic)[end]&nbsp;<a href="./[hide_attic_href]#dirlist">[[]hide]</a>
-            [end]
-        </td>
-        [if-any rows.graph_href]
-          <td width="1%"><a href="[rows.graph_href]"><img
-            src="[request.script_name]/*docroot*/images/cvsgraph_16x16.png"
-            alt="(graph)" width=16 height=16 border=0>
-          </a></td>
-        [end]
-
-        <td>&nbsp;[rows.time]</td>
-        [if-any rows.author]
-          <td>&nbsp;[rows.author]</td>
-        [end]
-        [if-any rows.show_log]
-          <td>&nbsp;[rows.log]</td>
-        [end]
-      [end]
-    [end]
-  [end]
-  </tr>
-[end]
-
-</table>
-
-[# if you are using a table border (see above), then add:
-
-   </td></tr></table>
-]
-
-[if-any no_match]
-  <p><b>NOTE:</b> There are [num_files] files, but none match the
-  current selection criteria.
-[end]
-
-[if-any unreadable]
-  <hr size=1 noshade>
-  <b>NOTE:</b> One or more files were unreadable. The files in the CVS
-  repository should be readable by the web server process. Please
-  report this condition to the administrator of this CVS repository.
-[end]
-
-[if-any selection_form]
-  <hr size=1 noshade>
-
-  [# this table holds the selectors on the left, and reset on the right ]
-  <table><tr><td>
-
-  <form method=GET action="./">
-  [for params]
-    <input type=hidden name="[params.name]" value="[params.value]">
-  [end]
-
-  <table>
-  [if-any has_tags]
-  <tr>
-    <td>Show files using tag:</td>
-    <td>
-  <select name=only_with_tag onchange="submit()">
-    [if-any branch_tags]
-      <option value="">- Branches -</option>
-      [for branch_tags]
-        [is branch_tags view_tag]
-          <option selected>[branch_tags]</option>
-        [else]
-          <option>[branch_tags]</option>
-        [end]
-      [end]
-    [end]
-    <option value="">- Non-branch tags -</option>
-    [for plain_tags]
-      [is plain_tags view_tag]
-        <option selected>[plain_tags]</option>
-      [else]
-        <option>[plain_tags]</option>
-      [end]
-    [end]
-  </select></td>
-  </tr>
-  [end]
-
-  [is cfg.options.use_re_search "1"]
-  <tr>
-    <td>Show files containing the regular expression:</td>
-    <td><input type="text" name="search" value="[search_re]">
-  </tr>
-  [end]
-
-  <tr><td>&nbsp;</td><td><input type="submit" value="Show"></td></tr>
-  </table>
-  </form>
-
-  </td>
-
-  [if-any view_tag]
-    <td valign=bottom><form method=GET action="./">
-      [for params]
-        <input type=hidden name="[params.name]" value="[params.value]">
-      [end]
-      <input type="submit" value="Show all files">
-    </form></td>
-  [else][if-any search_re]
-    <td valign=bottom><form method=GET action="./">
-      [for params]
-        <input type=hidden name="[params.name]" value="[params.value]">
-      [end]
-      <input type="submit" value="Show all files">
-    </form></td>
-  [end][end]
-
-  </tr></table>
-[end]
-
-[# if you want to disable tarball generation remove the following: ]
-[if-any tarball_href]
-  <a href="[tarball_href]">Download tarball</a>
-[end]
-
-[include "footer.ezt"]

templates/dir_new.ezt

@@ -0,0 +1,118 @@
+[include "include/dir_header.ezt"]
+
+<table cellspacing="1" cellpadding="2">
+<thead>
+<tr>
+  <th class="vc_header[is sortby "file"]_sort[end]" colspan="2">
+    <a href="[sortby_file_href]#dirlist">File
+    [is sortby "file"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+  <th class="vc_header[is sortby "rev"]_sort[end]">
+    <a href="[sortby_rev_href]#dirlist">Last Change
+    [is sortby "rev"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+</tr>
+</thead>
+
+<tbody>
+[if-any up_href]
+  <tr class="vc_row_odd">
+    <td>
+      <a href="[up_href]">
+      <img src="[docroot]/images/back_small.png" alt="" width="16" height="16"
+      />&nbsp;Parent&nbsp;Directory</a>
+    </td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+ [end]
+[for entries]
+  <tr class="vc_row_[if-index entries even]even[else]odd[end]">
+    <td>
+    <a name="[entries.anchor]" href="[is entries.pathtype "dir"][entries.view_href][else][if-any entries.prefer_markup][entries.view_href][else][entries.download_href][end][end]" title="[is entries.pathtype "dir"]View Directory Contents[else][if-any entries.prefer_markup]View[else]Download[end] File Contents[end]">
+       <img src="[docroot]/images/[is entries.pathtype "dir"]dir[else][is entries.state "dead"]broken[else]text[end][end].png" alt="" width="16" height="16" />
+       [entries.name][is entries.pathtype "dir"]/[end]</a>
+       [is entries.state "dead"](dead)[end]
+    </td>
+
+    [if-any entries.errors]
+      <td colspan="2">[for entries.errors]<em>[entries.errors]</em>[end]</td>
+    [else]
+      <td style="width:1%; white-space: nowrap">
+
+        [# Icon column. We might want to add more icons like a tarball
+         # icon for directories or a diff to previous icon for files. ]
+
+        [if-any entries.log_href]
+        <a href="[entries.log_href]"><img
+        src="[docroot]/images/log.png"
+        alt="View Log" width="16" height="16" /></a>
+        [end]
+
+        [is entries.pathtype "dir"]
+          [is roottype "cvs"]
+            [# no point in showing icon when there's only one to choose from]
+          [else]
+            <a href="[entries.view_href]"><img
+            src="[docroot]/images/list.png"
+            alt="View Directory Listing" width="16" height="16" /></a>
+          [end]
+        [end]
+
+        [is entries.pathtype "file"]
+          [if-any entries.graph_href]
+          <a href="[entries.graph_href]"
+          title="View Revision Graph"><img
+          src="[docroot]/images/cvsgraph_16x16.png"
+          alt="View Revision Graph" width="16" height="16" />
+          </a>
+          [end]
+
+          [if-any entries.view_href]
+          <a href="[entries.view_href]"><img
+          src="[docroot]/images/view.png"
+          alt="View File" width="16" height="16" /></a>
+          [end]
+
+          [if-any entries.download_href]
+          <a href="[entries.download_href]"><img
+          src="[docroot]/images/download.png"
+          alt="Download File" width="16" height="16" /></a>
+          [end]
+
+          [if-any entries.annotate_href]
+          <a href="[entries.annotate_href]"><img
+          src="[docroot]/images/annotate.png"
+          alt="Annotate File" width="16" height="16" /></a>
+          [end]
+        [end]
+      </td>
+      <td>
+        [if-any entries.rev]
+          <strong>[if-any entries.revision_href]<a href="[entries.revision_href]">[entries.rev]</a>[else][entries.rev][end]</strong>
+          ([entries.ago] ago)
+          by <em>[entries.author]</em>:
+          [entries.log]
+          [is entries.pathtype "dir"][is roottype "cvs"]
+            <em>(from [entries.log_file]/[entries.log_rev])</em>
+          [end][end]
+        [end]
+      </td>
+    [end]
+  </tr>
+[end]
+</tbody>
+
+</table>
+
+[include "include/dir_footer.ezt"]

templates/directory.ezt

@@ -1,305 +1,118 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
- "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head>
-<!-- ViewCVS       -- http://viewcvs.sourceforge.net/
-     by Greg Stein -- mailto:gstein@lyra.org
-  -->
-<title>[if-any where][where][else][cfg.general.main_title][end]</title>
-</head>
-<body text="#000000" bgcolor="#ffffff">
-<table width="100%" border=0 cellspacing=0 cellpadding=0>
-  <tr>
-    <td rowspan=2><h1>[if-any where][where][else][cfg.general.main_title][end]</h1></td>
-    <td align=right><img src="/icons/apache_pb.gif" alt="(logo)" border=0
-			width=259 height=32></td>
-  </tr>
-  <tr>
-    <td align=right><h3><b><a target="_blank"
-href="[request.script_name]/*docroot*/help_[if-any where]dir[else]root[end]view.html">ViewCVS and CVS Help</a></b></h3></td>
-  </tr>
-</table>
+[include "include/dir_header.ezt"]
 
-[if-any where][else]
-  <!-- you may insert repository access instructions here -->
-
-  [if-any roots]
-    <h3>Project Root</h3>
-    <form method=GET action="./">
-      <select name=cvsroot onchange="submit()">
-      [for roots]
-        [is roots current_root]
-          <option selected>[roots]</option>
-        [else]
-          <option>[roots]</option>
-        [end]
-      [end]
-      </select>
-      <input type=submit value="Go">
-    </form>
-  [end]
-[end]
-
-<p><a name="dirlist"></a></p>
-
-[if-any where]
-<table>
-<tr><td>Current directory:</td><td><b>[nav_path]</b></td></tr>
-[if-any view_tag]
-<tr><td>Current tag:</td><td><b>[view_tag]</b></td></tr>
-[end]
-[if-any search_re]
-<tr><td>Current search:</td><td><b>[search_re]</b></td></tr>
-[end]
-[is num_files "0"]
-[else]
-<tr><td>Files shown:</td><td><b>[files_shown]</b></td></tr>
-[end]
-</table>
-[end]
-
-<hr noshade>
-
-[# if you want a colored border around the table of directory
-   information, then add this additional table tag:
-
-   <table border=0 cellpadding=0 width="100%"><tr>
-     <td bgcolor="#999999">
-]
-
-
-<table width="100%" border=0 cellspacing=1 cellpadding=2>
+<table cellspacing="1" cellpadding="2">
+<thead>
 <tr>
-[if-any have_logs]
-  [is sortby "file"]
-    <th align=left bgcolor="#88ff88"
-      [is cfg.options.use_cvsgraph "1"]colspan=2[end]
-      >File</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      [is cfg.options.use_cvsgraph "1"]colspan=2[end]
-      ><a href="./[sortby_file_href]#dirlist">File</a></th>
-  [end]
-  [is sortby "rev"]
-    <th align=left bgcolor="#88ff88">Rev.</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_rev_href]"#dirlist>Rev.</a></th>
-  [end]
-  [is sortby "date"]
-    <th align=left bgcolor="#88ff88">Age</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_date_href]#dirlist">Age</a></th>
-  [end]
-  [is sortby "author"]
-    <th align=left bgcolor="#88ff88">Author</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_author_href]#dirlist">Author</a></th>
-  [end]
-  [is sortby "log"]
-    <th align=left bgcolor="#88ff88">Last log entry</th>
-  [else]
-    <th align=left bgcolor="#cccccc"
-      ><a href="./[sortby_log_href]#dirlist">Last log entry</a></th>
-  [end]
-[else]
-  <th align=left bgcolor="#cccccc">File</th>
+  <th class="vc_header[is sortby "file"]_sort[end]" colspan="2">
+    <a href="[sortby_file_href]#dirlist">File
+    [is sortby "file"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+  <th class="vc_header[is sortby "rev"]_sort[end]">
+    <a href="[sortby_rev_href]#dirlist">Rev.
+    [is sortby "rev"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+  <th class="vc_header[is sortby "date"]_sort[end]">
+    <a href="[sortby_date_href]#dirlist">Age
+    [is sortby "date"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+  <th class="vc_header[is sortby "author"]_sort[end]">
+    <a href="[sortby_author_href]#dirlist">Author
+    [is sortby "author"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
+[is cfg.options.show_logs "1"]
+  <th class="vc_header[is sortby "log"]_sort[end]">
+    <a href="[sortby_log_href]#dirlist">Last log entry
+    [is sortby "log"]
+      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
+        width="13" height="13"
+        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
+    [end]
+    </a>
+  </th>
 [end]
 </tr>
+</thead>
 
-[for rows]
-  <tr bgcolor="[if-index rows even]#ffffff[else]#ccccee[end]">
-  [is rows.type "unreadable"]
-    <td><a name="[rows.anchor]">[rows.name]</a>
-      [if-any have_logs]
-        </td>
-        <td colspan=[is cfg.options.use_cvsgraph "1"]5[else]4[end]>
-          <i>this entry is unreadable</i>
-        </td>
-      [else]
-      - <i>this entry is unreadable</i>
-      [end]
+<tbody>
+[if-any up_href]
+  <tr class="vc_row_odd">
+    <td colspan="2">
+      <a href="[up_href]">
+      <img src="[docroot]/images/back_small.png" alt="" width="16" height="16"
+      />&nbsp;Parent&nbsp;Directory</a>
     </td>
-  [else]
-    [is rows.type "dir"]
-      <td [if-any have_logs][is cfg.options.use_cvsgraph "1"]colspan=2[end][end]>
-        <a name="[rows.anchor]" href="[rows.href]">
-        <img src="/icons/small/dir.gif" alt="(dir)" border=0 width=16 height=16>
-        [rows.name]
-        </a>
-        [is rows.name "Attic/"]
-          &nbsp; <a href="./[show_attic_href]#dirlist">[[]show contents]</a>
-        [end]
-      </td>
-      [is rows.cvs "error"]
-        [# for an error to occur, we must have some logs. always use colspan]
-        <td colspan=4>
-          <i>Last modification unavailable - could not read CVS information</i>
-        </td>
-      [else]
-      [if-any have_logs]
-        <td>&nbsp;</td> [# revision ]
-        [is rows.cvs "none"]
-          <td>&nbsp;</td> [# age ]
-          <td>&nbsp;</td> [# author ]
-          <td>&nbsp;</td> [# log ]
-        [else]
-          <td>&nbsp;[rows.time]</td>
-          [if-any rows.author]
-            <td>&nbsp;[rows.author]</td>
-          [end]
-          [if-any rows.show_log]
-            <td>&nbsp;[rows.log_file]/[rows.log_rev]<br>
-              &nbsp;<font size="-1">[rows.log]</font></td>
-          [end]
-        [end]
-      [end]
-      [end]
-          
-    [else]
-      [is rows.cvs "error"]
-        <td [is cfg.options.use_cvsgraph "1"]colspan=2[end]>
-          <a name="[rows.anchor]">[rows.name]</a>
-        </td>
-        <td colspan=4><i>CVS information is unreadable</i></td>
-      [else]
-        <td><a name="[rows.anchor]" href="[rows.href]">
-            <img src="/icons/small/text.gif" alt="(file)" border=0
-                 width=16 height=16>
-            [rows.name]
-            </a>
-            [is rows.state "dead"]
-              [# don't let this phrase/link be wrapped ]
-              [if-any view_tag](not&nbsp;exist)[else](in&nbsp;the&nbsp;Attic)[end]&nbsp;<a href="./[hide_attic_href]#dirlist">[[]hide]</a>
-            [end]
-        </td>
-        [if-any rows.graph_href]
-          <td width="1%"><a href="[rows.graph_href]"><img
-            src="[request.script_name]/*docroot*/images/cvsgraph_16x16.png"
-            alt="(graph)" width=16 height=16 border=0>
-          </a></td>
-        [end]
-
-        <td>&nbsp;
-          <a href="[rows.rev_href]&content-type=text/vnd.viewcvs-markup">
-            <b>[rows.rev]</b>
-          </a>
-[# to display the revision in a separate window, you could use:
-
-   <a href="{rows.rev_href}" target="cvs_checkout"
-      onClick="window.open('{rows.rev_href}', 'cvs_checkout',
-                           'resizeable=1,scrollbars=1')"><b>{rows.rev}</b></a>
-
-   (substitute brackets for the braces)
-]
-        </td>
-        <td>&nbsp;[rows.time]</td>
-        [if-any rows.author]
-          <td>&nbsp;[rows.author]</td>
-        [end]
-        [if-any rows.show_log]
-          <td>&nbsp;[rows.log]</td>
-        [end]
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+    [is cfg.options.show_logs "1"]
+      <td>&nbsp;</td>
+    [end]
+  </tr>
+ [end]
+ [for entries]
+   <tr class="vc_row_[if-index entries even]even[else]odd[end]">
+     <td[if-any entries.graph_href][else] colspan="2"[end]>
+       [is entries.pathtype "dir"]
+       <a name="[entries.anchor]" href="[entries.view_href]" title="View directory contents">
+       [else]
+       <a name="[entries.anchor]" href="[entries.log_href]" title="View file revision log">
+       [end]
+       <img src="[docroot]/images/[is entries.pathtype "dir"]dir[else][is entries.state "dead"]broken[else]text[end][end].png" alt="" width="16" height="16" />
+       [entries.name][is entries.pathtype "dir"]/[end]</a>
+       [is entries.state "dead"](dead)[end]
+     </td>
+     [if-any entries.graph_href]
+       <td style="width:1%"><a href="[entries.graph_href]"
+       title="View Revision Graph"><img
+       src="[docroot]/images/cvsgraph_16x16.png"
+       alt="View Revision Graph" width="16" height="16" />
+       </a></td>
+     [end]
+     [if-any entries.errors]
+       <td colspan=[is cfg.options.show_logs "1"]4[else]3[end]>
+         [for entries.errors]<em>[entries.errors]</em>[end]
+       </td>
+     [else]
+       [is entries.pathtype "dir"]
+       <td>&nbsp;[if-any entries.rev]<a href="[entries.log_href]" title="View directory revision log"><strong>[entries.rev]</strong></a>[end]</td>
+       [else]
+       <td>&nbsp;[if-any entries.rev]<a href="[if-any entries.prefer_markup][entries.view_href][else][entries.download_href][end]" title="[if-any entries.prefer_markup]View[else]Download[end] file contents"><strong>[entries.rev]</strong></a>[end]</td>
+       [end]
+       <td>&nbsp;[entries.ago]</td>
+       <td>&nbsp;[entries.author]</td>
+       [is cfg.options.show_logs "1"]
+         [if-any entries.log]
+           <td>&nbsp;[entries.log][is entries.pathtype "dir"][is roottype "cvs"]
+             <em>(from [entries.log_file]/[entries.log_rev])</em>[end][end]</td>
+         [else]
+           <td>&nbsp;</td>
+         [end]
       [end]
     [end]
-  [end]
   </tr>
 [end]
+</tbody>
 
 </table>
 
-[# if you are using a table border (see above), then add:
-
-   </td></tr></table>
-]
-
-[if-any no_match]
-  <p><b>NOTE:</b> There are [num_files] files, but none match the
-  current selection criteria.
-[end]
-
-[if-any unreadable]
-  <hr size=1 noshade>
-  <b>NOTE:</b> One or more files were unreadable. The files in the CVS
-  repository should be readable by the web server process. Please
-  report this condition to the administrator of this CVS repository.
-[end]
-
-[if-any selection_form]
-  <hr size=1 noshade>
-
-  [# this table holds the selectors on the left, and reset on the right ]
-  <table><tr><td>
-
-  <form method=GET action="./">
-  [for params]
-    <input type=hidden name="[params.name]" value="[params.value]">
-  [end]
-
-  <table>
-  [if-any has_tags]
-  <tr>
-    <td>Show files using tag:</td>
-    <td>
-  <select name=only_with_tag onchange="submit()">
-    [if-any branch_tags]
-      <option value="">- Branches -</option>
-      [for branch_tags]
-        [is branch_tags view_tag]
-          <option selected>[branch_tags]</option>
-        [else]
-          <option>[branch_tags]</option>
-        [end]
-      [end]
-    [end]
-    <option value="">- Non-branch tags -</option>
-    [for plain_tags]
-      [is plain_tags view_tag]
-        <option selected>[plain_tags]</option>
-      [else]
-        <option>[plain_tags]</option>
-      [end]
-    [end]
-  </select></td>
-  </tr>
-  [end]
-
-  [is cfg.options.use_re_search "1"]
-  <tr>
-    <td>Show files containing the regular expression:</td>
-    <td><input type="text" name="search" value="[search_re]">
-  </tr>
-  [end]
-
-  <tr><td>&nbsp;</td><td><input type="submit" value="Show"></td></tr>
-  </table>
-  </form>
-
-  </td>
-
-  [if-any view_tag]
-    <td valign=bottom><form method=GET action="./">
-      [for params]
-        <input type=hidden name="[params.name]" value="[params.value]">
-      [end]
-      <input type="submit" value="Show all files">
-    </form></td>
-  [else][if-any search_re]
-    <td valign=bottom><form method=GET action="./">
-      [for params]
-        <input type=hidden name="[params.name]" value="[params.value]">
-      [end]
-      <input type="submit" value="Show all files">
-    </form></td>
-  [end][end]
-
-  </tr></table>
-[end]
-
-[# if you want to disable tarball generation remove the following: ]
-[if-any tarball_href]
-  <a href="[tarball_href]">Download tarball</a>
-[end]
-
-[include "footer.ezt"]
+[include "include/dir_footer.ezt"]

templates/docroot/help.css

@@ -0,0 +1,14 @@
+/************************************/
+/***  ViewVC Help CSS Stylesheet ***/
+/************************************/
+
+/*** Standard Tags ***/
+body {
+  margin: 0.5em;
+}
+img { border: none; }
+
+table { width: 100%; }
+td { vertical-align: top; }
+
+col.menu { width:12em; }

templates/docroot/help_dirview.html

@@ -0,0 +1,130 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>ViewVC Help: Directory View</title>
+  <link rel="stylesheet" href="help.css" type="text/css" />
+</head>
+<body>
+  <table>
+    <col class="menu" />
+    <col />
+    <tr>
+      <td><a href="http://viewvc.org/index.html"><img
+	     src="images/logo.png" alt="ViewVC logotype" /></a>
+      </td>
+      <td>
+	<h1>ViewVC Help: Directory View</h1>
+      </td>
+    </tr>
+    <tr><td>
+       <h3>Help</h3>
+       <a href="help_rootview.html">General</a><br />
+       <strong>Directory&nbsp;View</strong><br />
+       <a href="help_log.html">Log&nbsp;View</a><br />
+
+       <h3>Internet</h3>
+       <a href="http://viewvc.org/index.html">Home</a><br />
+       <a href="http://viewvc.org/upgrading.html">Upgrading</a><br />
+       <a href="http://viewvc.org/contributing.html">Contributing</a><br />
+       <a href="http://viewvc.org/license-1.html">License</a><br />
+    </td><td colspan="2">
+
+    <p>The directory listing view should be a familiar sight to any
+    computer user. It shows the path of the current directory being viewed
+    at the top of the page. Below that is a table summarizing the
+    directory contents, and then comes actual contents, a sortable list of
+    all files and subdirectories inside the current directory.</p>
+
+    <p><a name="summary"></a>The summary table is made up of some or all
+    of the following rows:</p>
+    <ul>
+      <li><a name="summary-files-shown"><strong>Files Shown</strong></a>
+      - Number of files shown in the directory listing. This might be less
+      than the actual number of files in the directory if a
+      <a href="#option-search">regular expression search</a> is in place,
+      hiding files which don't meet the search criteria. In CVS directory
+      listings, this row will also have a link to toggle display of
+      <a href="help_rootview.html#dead-files">dead files</a>, if any are
+      present.</li>
+
+      <li><a name="summary-revision"><strong>Directory
+      Revision</strong></a> - For Subversion directories only.
+      Shown as "# of #" where the first number is the most recent
+      repository revision where the directory (or a path underneath it)
+      was modified. The second number is just the latest repository
+      revision. Both numbers are links to
+      <a href="help_rootview.html#view-rev">revision views</a></li>
+
+     <li><a name="summary-sticky-revision-tag"><strong>Sticky
+     Revision/Tag</strong></a> - shows the current
+     <a href="help_rootview.html#sticky-revision-tag">sticky revision or
+     tag</a> and contains form fields to set or clear it.</li>
+
+     <li><a name="summary-search"><strong>Current Search</strong></a> -
+     If a <a href="#option-search">regular expression search</a> is in place,
+     shows the search string.</li>
+
+     <li><a name="summary-query"><strong>Query</strong></a> - Provides
+     a link to a <a href="help_rootview.html#view-query">query form</a>
+     for the directory</li>
+   </ul>
+
+  <p><a name="list"></a>The actual directory list is a table with
+  filenames and directory names in one column and information about the
+  most recent revisions where each file or directory was modified in the
+  other columns. Column headers can be clicked to sort the directory
+  entries in order by a column, and clicked again to reverse the sort
+  order.</p>
+
+  <p>
+  <!-- If using directory.ezt template -->
+  File names are links to <a href="help_log.html">log views</a>
+  showing a list of revisions where a file was modified. Revision
+  numbers are links to either
+  <a href="help_rootview.html#view-markup">view</a>
+  or <a href="help_rootview.html#view-checkout">download</a> a file
+  (depending on its file type). The links are reversed for directories.
+  Directory revision numbers are links to <a href="help_log.html">log
+  views</a>, while directory names are links showing the contents of those
+  directories.
+
+  <!-- If using dir_alt.ezt template -->
+  <!--
+  File and directory names are links to retrieve their contents.
+  File links may be either
+  <a href="help_rootview.html#view-markup">view</a>
+  or <a href="help_rootview.html#view-download">download</a> links
+  depending on the file type. Directory links go to directory
+  listings. Revision numbers are links to <a href="help_log.html">log
+  views</a> showing lists of revisions where a file or directory was
+  modified.
+  -->
+
+  Also, in CVS repositories with the
+  <a href="help_rootview.html#view-graph">graph view</a> enabled, there
+  will be small
+  <img src="images/cvsgraph_16x16.png" width="16" height="16" alt="graph">
+  icons next to file names which are links to revision graphs.</p>
+
+  <p>Depending on how ViewVC is configured, there may be more options
+  at the bottom of directory pages:</p>
+
+  <ul>
+    <li><a name="option-search"><strong>Regular expression
+    search</strong></a> - If enabled, will show a form field accepting
+    a search string (a
+    <a href="http://doc.python.org/lib/re-syntax.html">python regular
+    expression</a>). Once submitted, only files that have at least
+    one occurance of the expression will show up in directory listings.
+    </li>
+    <li><a name="option-tarball"><strong>Tarball download</strong></a> -
+    If enabled, will show a link to download a gzipped tar archive of
+    the directory contents.</li>
+  </ul>
+
+  </td></tr></table>
+  <hr />
+  <address><a href="mailto:users@viewvc.tigris.org">ViewVC Users Mailinglist</a></address>
+  </body>
+</html>

templates/docroot/help_log.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>ViewVC Help: Log View</title>
+  <link rel="stylesheet" href="help.css" type="text/css" />
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+  <table>
+    <col class="menu" />
+    <col />
+    <tr>
+      <td><a href="http://viewvc.org/index.html"><img
+	     src="images/logo.png" alt="ViewVC logotype" /></a>
+      </td>
+      <td>
+	<h1>ViewVC Help: Log View</h1>
+      </td>
+    </tr>
+    <tr><td>
+       <h3>Help</h3>
+       <a href="help_rootview.html">General</a><br />
+       <a href="help_dirview.html">Directory&nbsp;View</a><br />
+       <strong>Log&nbsp;View</strong><br />
+
+       <h3>Internet</h3>
+       <a href="http://viewvc.org/index.html">Home</a><br />
+       <a href="http://viewvc.org/upgrading.html">Upgrading</a><br />
+       <a href="http://viewvc.org/contributing.html">Contributing</a><br />
+       <a href="http://viewvc.org/license-1.html">License</a><br />
+    </td><td colspan="2">
+    <p>
+      The log view displays the revision history of the selected source
+      file or directory. For each revision the following information is
+      displayed:
+
+      <ul>
+        <li>The revision number. In Subversion repositories, this is a
+            link to the <a href="help_rootview.html#view-rev">revision
+            view</a></li>
+        <li>For files, links to
+        <a href="help_rootview.html#view-markup">view</a>,
+        <a href="help_rootview.html#view-checkout">download</a>, and
+        <a href="help_rootview.html#view-annotate">annotate</a> the
+          revision. For directories, a link to
+        <a href="help_dirview.html">list directory contents</a></li>
+        <li>A link to select the revision for diffs (see below)</li>
+        <li>The date and age of the change</li>
+        <li>The author of the modification</li>
+        <li>The CVS branch (usually <em>MAIN</em>, if not on a branch)</li>
+        <li>Possibly a list of CVS tags bound to the revision (if any)</li>
+        <li>The size of the change measured in added and removed lines of
+            code. (CVS only)</li>
+        <li>The size of the file in bytes at the time of the revision
+            (Subversion only)</li>
+        <li>Links to view diffs to the previous revision or possibly to
+            an arbitrary selected revision (if any, see above)</li>
+        <li>If the revision is the result of a copy, the path and revision
+            copied from</li>
+        <li>If the revision precedes a copy or rename, the path at the
+            time of the revision</li>
+        <li>And last but not least, the commit log message which should tell
+            about the reason for the change.</li>
+      </ul>
+    <p>
+      At the bottom of the page you will find a form which allows
+      to request diffs between arbitrary revisions.
+    </p>
+  </td></tr></table>
+  <hr />
+  <address><a href="mailto:users@viewvc.tigris.org">ViewVC Users Mailinglist</a></address>
+  </body>
+</html>

templates/docroot/help_query.html

@@ -1,31 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
- "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head>
-  <title>ViewCVS Help: Query The Commit Database</title>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>ViewVC Help: Query The Commit Database</title>
+  <link rel="stylesheet" href="help.css" type="text/css" />
 </head>
-
-<body background="images/chalk.jpg">
-<table width="100%" border=0 cellspacing=5 cellpadding=0>
+<body>
+<table>
+  <col class="menu" />
+  <col />
   <tr>
-    <td width="1%"><a href=".."><img border=0
-        src="images/logo.png"></a>
+    <td><a href=".."><img
+        src="images/logo.png" alt="ViewVC logotype" /></a>
     </td>
-    <td><h1>ViewCVS Help: Query The Commit Database</h1></td>
+    <td><h1>ViewVC Help: Query The Commit Database</h1></td>
   </tr>
-  <tr><td width="1%" valign="top" bgcolor="#ffffff">
+  <tr><td>
      <h3>Other&nbsp;Help:</h3>
-     <a href="help_rootview.html">General</a><br>
-     <a href="help_dirview.html">Directory&nbsp;View</a><br>
-     <a href="help_log.html">Classic&nbsp;Log&nbsp;View</a><br>
-     <a href="help_logtable.html">Alternative&nbsp;Log&nbsp;View</a><br>
-     <b>Query&nbsp;Database</b>
+     <a href="help_rootview.html">General</a><br />
+     <a href="help_dirview.html">Directory&nbsp;View</a><br />
+     <a href="help_log.html">Classic&nbsp;Log&nbsp;View</a><br />
+     <a href="help_logtable.html">Alternative&nbsp;Log&nbsp;View</a><br />
+     <strong>Query&nbsp;Database</strong>
 
      <h3>Internet</h3>
-     <a href="http://viewcvs.sf.net/index.html">Home</a><br>
-     <a href="http://viewcvs.sf.net/upgrading.html">Upgrading</a><br>
-     <a href="http://viewcvs.sf.net/contributing.html">Contributing</a><br>
-     <a href="http://viewcvs.sf.net/license-1.html">License</a><br>
-  </td><td colspan=2>
+     <a href="http://viewvc.org/index.html">Home</a><br />
+     <a href="http://viewvc.org/upgrading.html">Upgrading</a><br />
+     <a href="http://viewvc.org/contributing.html">Contributing</a><br />
+     <a href="http://viewvc.org/license-1.html">License</a><br />
+  </td><td colspan="2">
 
   <p> 
     Select your parameters for querying the CVS commit database in the
@@ -37,8 +40,8 @@
   <p>
     Any of the text entry fields can take a comma-seperated list of
     search arguments.  For example, to search for all commits from
-    authors <i>jpaint</i> and <i>gstein</i>, just type: <code>jpaint,
-    gstein</code> in the <i>Author</i> input box.  If you are searching
+    authors <em>jpaint</em> and <em>gstein</em>, just type: <code>jpaint,
+    gstein</code> in the <em>Author</em> input box.  If you are searching
     for items containing spaces or quotes, you will need to quote your
     request.  For example, the same search above with quotes is:
     <code>"jpaint", "gstein"</code>.
@@ -52,8 +55,8 @@
     command character for regular expressions is <code>r</code>, and is
     passed directly to MySQL, so you'll need to refer to the MySQL
     manual for the exact regex syntax.  It is very similar to Perl.  A
-    wildard search for all files with a <i>.py</i> extention is:
-    <code>l"%.py"</code> in the <i>File</i> input box.  The same search done
+    wildard search for all files with a <em>.py</em> extention is:
+    <code>l"%.py"</code> in the <em>File</em> input box.  The same search done
     with a regular expression is: <code>r".*\.py"</code>.
   </p>
   <p>                  

templates/docroot/help_rootview.html

@@ -0,0 +1,169 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>ViewVC Help: General</title>
+  <link rel="stylesheet" href="help.css" type="text/css" />
+</head>
+<body>
+  <table>
+    <col class="menu" />
+    <col />
+    <tr>
+      <td><a href=".."><img
+	     src="images/logo.png" alt="ViewVC logotype" /></a>
+      </td>
+      <td>
+	<h1>ViewVC Help: General</h1>
+      </td>
+    </tr>
+    <tr><td>
+       <h3>Help</h3>
+       <strong>General</strong><br />
+       <a href="help_dirview.html">Directory&nbsp;View</a><br />
+       <a href="help_log.html">Log&nbsp;View</a><br />
+
+       <h3>Internet</h3>
+       <a href="http://viewvc.org/index.html">Home</a><br />
+       <a href="http://viewvc.org/upgrading.html">Upgrading</a><br />
+       <a href="http://viewvc.org/contributing.html">Contributing</a><br />
+       <a href="http://viewvc.org/license-1.html">License</a><br />
+    </td><td colspan="2">
+
+  <p><em>ViewVC</em> is a WWW interface for CVS and Subversion
+  repositories. It allows you to browse the files and directories in a
+  repository while showing you metadata from the repository history: log
+  messages, modification dates, author names, revision numbers, copy
+  history, and so on. It provides several different views of repository
+  data to help you find the information you are looking for:</p>
+
+  <ul>
+    <li><a name="view-dir" href="help_dirview.html"><strong>Directory
+    View</strong></a> - Shows a list of files and subdirectories in a
+    directory of the repository, along with metadata like author names and
+    log entries.</li>
+
+    <li><a name="view-log" href="help_log.html"><strong>Log
+    View</strong></a> - Shows a revision by revision list of all the
+    changes that have made to a file or directory in the repository, with
+    metadata and links to views of each revision.</li>
+
+    <li><a name="view-markup"><strong>File Contents View (Markup
+    View)</strong></a> - Shows the contents of a file at a particular
+    revision, with revision information at the top of the page. File
+    revisions which are GIF, PNG, or JPEG images are displayed inline on
+    the page. Other file types are displayed as marked up text. The markup
+    may be limited to turning URLs and email addresses into links, or
+    configured to show colorized source code.</li>
+
+    <li><a name="view-checkout"><strong>File Download (Checkout
+    View)</strong></a> - Retrieves the unaltered contents of a file
+    revision. Browsers may try to display the file, or just save it to
+    disk.</li>
+
+    <li><a name="view-annotate"><strong>File Annotate View</strong></a> -
+    Shows the contents of a file revision and breaks it down line by line,
+    showing the revision number where each one was last modified, along
+    with links and other information. <em>This view is disabled in some
+    ViewVC configurations</em></li>
+
+    <li><a name="view-diff"><strong>File Diff View</strong></a> - Shows
+    the changes made between two revisions of a file</li>
+
+    <li><a name="view-tarball"><strong>Directory Tarball View</strong> -
+    Retrieves a gzipped tar archive containing the contents of a
+    directory.<em>This view is disabled in the default ViewVC
+    configuration.</em></li>
+
+    <li><a name="view-query"><strong>Directory Query View</strong></a> -
+    Shows information about changes made to all subdirectories and files
+    under a parent directory, sorted and filtered by criteria you specify.
+    <em>This view is disabled in the default ViewVC configuration.</em>
+    </li>
+
+    <li><a name="view-rev"><strong>Revision View</strong> - Shows
+    information about a revision including log message, author, and a list
+    of changed paths. <em>For Subversion repositories only.</em></li>
+
+    <li><a name="view-graph"><strong>Graph View</strong></a> - Shows a
+    graphical representation of a file's revisions and branches complete
+    with tag and author names and links to markup and diff pages.
+    <em>For CVS repositories only, and disabled in the default
+    configuration.</em></li>
+  </ul>
+
+  <h3><a name="multiple-repositories">Multiple Repositories</a></h3>
+
+  <p>A single installation of ViewVC is often used to provide access to
+  more than one repository. In these installations, ViewVC shows a
+  <em>Project Root</em> drop down box in the top right corner of every
+  generated page to allow for quick access to any repository.</p>
+
+  <h3><a name="sticky-revision-tag">Sticky Revision and Tag</a></h3>
+
+  <p>By default, ViewVC will show the files and directories and revisions
+  that currently exist in the repository. But it's also possible to browse
+  the contents of a repository at a point in its past history by choosing
+  a "sticky tag" (in CVS) or a "sticky revision" (in Subversion) from the
+  forms at the top of directory and log pages. They're called sticky
+  because once they're chosen, they stick around when you navigate to
+  other pages, until you reset them. When they're set, directory and log
+  pages only show revisions preceding the specified point in history. In
+  CVS, when a tag refers to a branch or a revision on a branch, only
+  revisions from the branch history are shown, including branch points and
+  their preceding revisions.</p>
+
+  <h3><a name="dead-files">Dead Files</a></h3>
+
+  <p>In CVS directory listings, ViewVC can optionally display dead files.
+  Dead files are files which used to be in a directory but are currently
+  deleted, or files which just don't exist in the currently selected
+  <a href="#sticky-revision-tag">sticky tag</a>. Dead files cannot be
+  shown in Subversion repositories. The only way to see a deleted file in
+  a Subversion directory is to navigate to a sticky revision where the
+  file previously existed.</p>
+
+  <h3><a name="artificial-tags">Artificial Tags</a></h3>
+
+  <p>In CVS Repositories, ViewVC adds artificial tags <em>HEAD</em> and
+  <em>MAIN</em> to tag listings and accepts them in place of revision
+  numbers and real tag names in all URLs. <em>MAIN</em> acts like a branch
+  tag pointing at the default branch, while <em>HEAD</em> acts like a
+  revision tag pointing to the latest revision on the default branch. The
+  default branch is usually just the trunk, but may be set to other
+  branches inside individual repository files. CVS will always check out
+  revisions from a file's default branch when no other branch is specified
+  on the command line.</p>
+
+  <h3><a name="more-information">More Information</a></h3>
+
+  <p>More information about <em>ViewVC</em> is available from
+  <a href="http://viewvc.org/">viewvc.org</a>.
+  See the links below for guides to CVS and Subversion</p>
+
+  <h4>Documentation about CVS</h4>
+  <blockquote>
+    <p>
+      <a href="http://cvsbook.red-bean.com/"><em>Open Source
+      Development with CVS</em></a><br />
+      <a href="http://www.loria.fr/~molli/cvs/doc/cvs_toc.html">CVS
+      User's Guide</a><br />
+      <a href="http://cellworks.washington.edu/pub/docs/cvs/tutorial/cvs_tutorial_1.html">Another CVS tutorial</a><br />
+      <a href="http://www.csc.calpoly.edu/~dbutler/tutorials/winter96/cvs/">Yet another CVS tutorial (a little old, but nice)</a><br />
+      <a href="http://www.cs.utah.edu/dept/old/texinfo/cvs/FAQ.txt">An old but very useful FAQ about CVS</a>
+    </p>
+  </blockquote>
+
+  <h4>Documentation about Subversion</h3>
+  <blockquote>
+    <p>
+      <a href="http://svnbook.red-bean.com/"><em>Version Control with
+      Subversion</em></a><br />
+    </p>
+  </blockquote>
+
+  </td></tr></table>
+  <hr />
+  <address><a href="mailto:users@viewvc.tigris.org">ViewVC Users Mailinglist</a></address>
+  </body>
+</html>