Tag the 1.1.8 final release.

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

CHANGES

@@ -1,54 +1,3 @@
-Version 1.1.14 (released 12-Jun-2012)
-
-  * fix annotation of svn files with non-URI-safe paths (issue #504)
-  * handle file:/// Subversion rootpaths as local roots (issue #446)
-  * fix bug caused by trying to case-normalize anon usernames (issue #505)
-  * speed up log handling by reusing tokenization results (issue #506)
-  * add support for custom review log markup rules (issue #429)
-
-Version 1.1.13 (released 23-Jan-2012)
-
-  * fix svndbadmin failure on deleted paths under Subversion 1.7 (issue #499)
-  * fix annotation of files in svn roots with non-URI-safe paths
-  * fix stray annotation warning in markup display of images
-  * more gracefully handle attempts to display binary content (issue #501)
-
-Version 1.1.12 (released 03-Nov-2011)
-
-  * fix path display in patch and certain diff views (issue #485)
-  * fix broken cvsdb glob searching (issue 486)
-  * allow svn revision specifiers to have leading r's (issue #441, #448) 
-  * allow environmental override of configuration location (issue #494)
-  * fix exception HTML-escaping non-string data under WSGI (issue #454)
-  * add links to root logs from roots view (issue #470)
-  * use Pygments lexer-guessing functionality (issue #495)
-
-Version 1.1.11 (released 17-May-2011)
-
-  * security fix: remove user-reachable override of cvsdb row limit
-  * fix broken standalone.py -c and -d options handling
-  * add --help option to standalone.py
-  * fix stack trace when asked to checkout a directory (issue #478)
-  * improve memory usage and speed of revision log markup (issue #477)
-  * fix broken annotation view in CVS keyword-bearing files (issue #479)
-  * warn users when query results are incomplete (issue #433)
-  * avoid parsing errors on RCS newphrases in the admin section (issue #483)
-  * make rlog parsing code more robust in certain error cases (issue #444)
-
-Version 1.1.10 (released 15-Mar-2011)
-
-  * fix stack trace in Subversion revision info logic (issue #475, issue #476)
-
-Version 1.1.9 (released 18-Feb-2011)
-
-  * vcauth universal access determinations (issue #425)
-  * rework svn revision info cache for performance
-  * make revision log "extra pages" count configurable
-  * fix Subversion 1.4.x revision log compatibility code regression
-  * display sanitized error when authzfile is malformed
-  * restore markup of URLs in file contents (issue #455)
-  * optionally display last-committed metadata in roots view (issue #457)
-
 Version 1.1.8 (released 02-Dec-2010)
 
   * fix slowness triggered by allow_compress=1 configuration (issue #467)

INSTALL

@@ -19,7 +19,7 @@ Congratulations on getting this far. :-)
 
     For CVS Support: 
 
-      * Python 1.5.2 or later (sorry, no 3.x support yet)
+      * Python 1.5.2 or later
           (http://www.python.org/)
       * RCS, Revision Control System
           (http://www.cs.purdue.edu/homes/trinkle/RCS/)
@@ -30,11 +30,11 @@ Congratulations on getting this far. :-)
 
     For Subversion Support:
 
-      * Python 2.0 or later (sorry, no 3.x support yet)
+      * Python 2.0 or later
           (http://www.python.org/)
       * Subversion, Version Control System, 1.3.1 or later
           (binary installation and Python bindings)
-          (http://subversion.apache.org/)
+          (http://subversion.tigris.org/)
 
     Optional:
 
@@ -176,24 +176,7 @@ APACHE CONFIGURATION
    or /etc/local. Use the vendor documentation or the find utility if
    in doubt.
 
-2) Depending on how your Apache configuration is setup by default, you
-   might need to explicitly allow high-level access to the ViewVC
-   install location.
-
-      <Directory <VIEWVC_INSTALLATION_DIRECTORY>>
-        Order allow,deny
-        Allow from all
-      </Directory>
-
-   For example, if ViewVC is installed in /usr/local/viewvc-1.0 on
-   your system:
-
-      <Directory /usr/local/viewvc-1.0>
-        Order allow,deny
-        Allow from all
-      </Directory>
-
-3) Configure Apache to expose ViewVC to users at the URL of your choice.
+2) Configure Apache to expose ViewVC to users at the URL of your choice.
 
    ViewVC provides several different ways to do this.  Choose one of
    the following methods:
@@ -204,13 +187,13 @@ APACHE CONFIGURATION
    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
+     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
+     ScriptAlias /viewvc /usr/local/viewvc-1.0/bin/cgi/viewvc.cgi
+     ScriptAlias /query /usr/local/viewvc-1.0/bin/cgi/query.cgi
 
    ----------------------------------------
    METHOD B:  CGI mode in cgi-bin directory
@@ -218,10 +201,6 @@ APACHE CONFIGURATION
    Copy the CGI scripts from 
    <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
    to the /cgi-bin/ directory configured in your httpd.conf file.
-
-   You can override configuration file location using:
-
-       SetEnv VIEWVC_CONF_PATHNAME /etc/viewvc.conf
    
    ------------------------------------------
    METHOD C:  CGI mode in ExecCGI'd directory
@@ -231,8 +210,8 @@ APACHE CONFIGURATION
    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
+     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"
@@ -248,10 +227,6 @@ APACHE CONFIGURATION
    In httpd.conf, make sure that "AllowOverride All" or at least 
    "AllowOverride FileInfo Options" are enabled for the directory
    you copied the files to.
-
-   You can override configuration file location using:
-
-       SetEnv VIEWVC_CONF_PATHNAME /etc/viewvc.conf
    
    Note: If you are using Mod_Python under Apache 1.3 the tarball generation
    feature may not work because it uses multithreading.  This works fine
@@ -303,6 +278,13 @@ APACHE CONFIGURATION
       ScriptAlias /viewvc /usr/local/viewvc/bin/wsgi/viewvc.fcgi
       ScriptAlias /query /usr/local/viewvc/bin/wsgi/query.fcgi
 
+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".  Other systems use "apachectl restart".
+
 4) [Optional] Add access control.
 
    In your httpd.conf you can control access to certain modules by
@@ -324,14 +306,7 @@ APACHE CONFIGURATION
       http://<server_name>/viewvc/~checkout~/<module_name>
       http://<server_name>/viewvc/<module_name>.tar.gz?view=tar
 
-5) 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".  Other systems use "apachectl restart".
-
-6) Optional: Protect your ViewVC instance from server-whacking webcrawlers.
+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

LICENSE.html

@@ -15,7 +15,7 @@
 
 <blockquote>
 
-<p><strong>Copyright &copy; 1999-2012 The ViewCVS Group.  All rights
+<p><strong>Copyright &copy; 1999-2010 The ViewCVS Group.  All rights
    reserved.</strong></p>
 
 <p>By using ViewVC, you agree to the terms and conditions set forth
@@ -61,8 +61,6 @@
   <li>February 22, 2008 &mdash; copyright years updated</li>
   <li>March 18, 2009 &mdash; copyright years updated</li>
   <li>March 29, 2010 &mdash; copyright years updated</li>
-  <li>February 18, 2011 &mdash; copyright years updated</li>
-  <li>January 23, 2012 &mdash; copyright years updated</li>
 </ul>
 
 </body>

bin/asp/query.asp

@@ -3,7 +3,7 @@
 
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/asp/viewvc.asp

@@ -3,7 +3,7 @@
 
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/cgi/query.cgi

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/cgi/viewvc.cgi

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/cvsdbadmin

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/loginfo-handler

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/make-database

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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

bin/mod_python/handler.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/mod_python/query.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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

bin/mod_python/viewvc.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

bin/standalone.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -76,6 +76,8 @@ except ImportError:
 
 class Options:
   port = 49152      # default TCP/IP port used for the server
+  start_gui = 0     # No GUI unless requested.
+  daemon = 0        # stay in the foreground by default
   repositories = {} # use default repositories specified in config
   host = sys.platform == 'mac' and '127.0.0.1' or 'localhost'
   script_alias = 'viewvc'
@@ -705,66 +707,13 @@ def gui(host, port):
 
 # --- command-line interface: ----------------------------------------------
 
-
-def usage():
-  clean_options = Options()
-  cmd = os.path.basename(sys.argv[0])
-  port = clean_options.port
-  host = clean_options.host
-  script_alias = clean_options.script_alias
-  sys.stderr.write("""Usage: %(cmd)s [OPTIONS]
-
-Run a simple, standalone HTTP server configured to serve up ViewVC requests.
-
-Options:
-
-  --config-file=FILE (-c)    Read configuration options from FILE.  If not
-                             specified, ViewVC will look for a configuration
-                             file in its installation tree, falling back to
-                             built-in default values.  (Not valid in GUI mode.)
-                             
-  --daemon (-d)              Background the server process.
-
-  --gui (-g)                 Pop up a graphical configuration interface.
-                             Requires a valid X11 display connection.
-
-  --help                     Show this usage message and exit.
-  
-  --host=HOSTNAME (-h)       Listen on HOSTNAME.  Required for access from a
-                             remote machine.  [default: %(host)s]
-
-  --htpasswd-file=FILE       Authenticate incoming requests, validating against
-                             against FILE, which is an Apache HTTP Server
-                             htpasswd file.  (CRYPT only; no DIGEST support.)
-
-  --port=PORT (-p)           Listen on PORT.  [default: %(port)d]
-
-  --repository=PATH (-r)     Serve the Subversion or CVS repository located
-                             at PATH.  This option may be used more than once.
-
-  --script-alias=PATH (-s)   Use PATH as the virtual script location (similar
-                             to Apache HTTP Server's ScriptAlias directive).
-                             For example, "--script-alias=repo/view" will serve
-                             ViewVC at "http://HOSTNAME:PORT/repo/view".
-                             [default: %(script_alias)s]
-""" % locals())
-  sys.exit(0)
-
-
-def badusage(errstr):
-  cmd = os.path.basename(sys.argv[0])
-  sys.stderr.write("ERROR: %s\n\n"
-                   "Try '%s --help' for detailed usage information.\n"
-                   % (errstr, cmd))
-  sys.exit(1)
-
-
-def main(argv):
+def cli(argv):
   """Command-line interface (looks at argv to decide what to do)."""
   import getopt
+  class BadUsage(Exception): pass
 
-  short_opts = string.join(['c:',
-                            'd',
+  short_opts = string.join(['c',
+                            'd:',
                             'g',
                             'h:',
                             'p:',
@@ -774,7 +723,6 @@ def main(argv):
   long_opts = ['daemon',
                'config-file=',
                'gui',
-               'help',
                'host=',
                'htpasswd-file=',
                'port=',
@@ -782,98 +730,113 @@ def main(argv):
                'script-alias=',
                ]
     
-  opt_daemon = 0
-  opt_gui = 0
-  opt_host = None
-  opt_port = None
-  opt_htpasswd_file = None
-  opt_config_file = None
-  opt_script_alias = None
-  opt_repositories = []
-
-  # Parse command-line options.
-  try:  
+  try:
     opts, args = getopt.getopt(argv[1:], short_opts, long_opts)
     for opt, val in opts:
-      if opt in ['--help']:
-        usage()
-      elif opt in ['-g', '--gui']:
-        opt_gui = 1
-      elif opt in ['-r', '--repository']: # may be used more than once
-        opt_repositories.append(val)
-      elif opt in ['-d', '--daemon']:
-        opt_daemon = 1
-      elif opt in ['-p', '--port']:
-        opt_port = val
-      elif opt in ['-h', '--host']:
-        opt_host = val
-      elif opt in ['-s', '--script-alias']:
-        opt_script_alias = val
-      elif opt in ['-c', '--config-file']:
-        opt_config_file = val
-      elif opt in ['--htpasswd-file']:
-        opt_htpasswd_file = val
-  except getopt.error, err:
-    badusage(str(err))
+      if opt in ('-g', '--gui'):
+        options.start_gui = 1
+      elif opt in ('-r', '--repository'):
+        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 ('-d', '--daemon'):
+        options.daemon = 1
+      elif opt in ('-p', '--port'):
+        try:
+          options.port = int(val)
+        except ValueError:
+          raise BadUsage, "Port '%s' is not a valid port number" % (val)
+      elif opt in ('-h', '--host'):
+        options.host = val
+      elif opt in ('-s', '--script-alias'):
+        options.script_alias = \
+          string.join(filter(None, string.split(val, '/')), '/')
+      elif opt in ('-c', '--config-file'):
+        if not os.path.isfile(val):
+          raise BadUsage, "'%s' does not appear to be a valid " \
+                          "configuration file." % (val)
+        options.config_file = val
+      elif opt in ('-c', '--htpasswd-file'):
+        if not os.path.isfile(val):
+          raise BadUsage, "'%s' does not appear to be a valid " \
+                          "htpasswd file." % (val)
+        if not has_crypt:
+          raise BadUsage, "Unable to locate suitable `crypt' module for use " \
+                          "with --htpasswd-file option.  If your Python " \
+                          "distribution does not include this module (as is " \
+                          "the case on many non-Unix platforms), consider " \
+                          "installing the `fcrypt' module instead (see " \
+                          "http://carey.geek.nz/code/python-fcrypt/)."
+        options.htpasswd_file = val
+    if options.start_gui and options.config_file:
+      raise BadUsage, "--config-file option is not valid in GUI mode."
+    if not options.start_gui and not options.port:
+      raise BadUsage, "You must supply a valid port, or run in GUI mode."
+    if options.daemon:
+      pid = os.fork()
+      if pid != 0:
+        sys.exit()  
+    if options.start_gui:
+      gui(options.host, options.port)
+      return
+    elif options.port:
+      def ready(server):
+        print 'server ready at %s%s' % (server.url, options.script_alias)
+      serve(options.host, options.port, ready)
+      return
+  except (getopt.error, BadUsage), err:
+    cmd = os.path.basename(sys.argv[0])
+    port = options.port
+    host = options.host
+    script_alias = options.script_alias
+    if str(err):
+      sys.stderr.write("ERROR: %s\n\n" % (str(err)))
+    sys.stderr.write("""Usage: %(cmd)s [OPTIONS]
 
-  # Validate options that need validating.
-  class BadUsage(Exception): pass
-  try:
-    if opt_port is not None:
-      try:
-        options.port = int(opt_port)
-      except ValueError:
-        raise BadUsage("Port '%s' is not a valid port number" % (opt_port))
-      if not options.port:
-        raise BadUsage("You must supply a valid port.")
-    if opt_htpasswd_file is not None:
-      if not os.path.isfile(opt_htpasswd_file):
-        raise BadUsage("'%s' does not appear to be a valid htpasswd file."
-                       % (opt_htpasswd_file))
-      if not has_crypt:
-        raise BadUsage("Unable to locate suitable `crypt' module for use "
-                       "with --htpasswd-file option.  If your Python "
-                       "distribution does not include this module (as is "
-                       "the case on many non-Unix platforms), consider "
-                       "installing the `fcrypt' module instead (see "
-                       "http://carey.geek.nz/code/python-fcrypt/).")
-      options.htpasswd_file = opt_htpasswd_file
-    if opt_config_file is not None:
-      if not os.path.isfile(opt_config_file):
-        raise BadUsage("'%s' does not appear to be a valid configuration file."
-                       % (opt_config_file))
-      options.config_file = opt_config_file
-    if opt_host is not None:
-      options.host = opt_host
-    if opt_script_alias is not None:
-      options.script_alias = string.join(filter(None,
-                                                string.split(opt_script_alias,
-                                                             '/')),
-                                         '/')
-    for repository in opt_repositories:
-      if not options.repositories.has_key('Development'):
-        rootname = 'Development'
-      else:
-        rootname = 'Repository%d' % (len(options.repositories.keys()) + 1)
-      options.repositories[rootname] = repository
-  except BadUsage, err:
-    badusage(str(err))
-      
-  # Fork if we're in daemon mode.
-  if opt_daemon:
-    pid = os.fork()
-    if pid != 0:
-      sys.exit()
+Run a simple, standalone HTTP server configured to serve up ViewVC
+requests.
 
-  # Finaly, start the server.
-  if opt_gui:
-    gui(options.host, options.port)
-  else:
-    def ready(server):
-      print 'server ready at %s%s' % (server.url, options.script_alias)
-    serve(options.host, options.port, ready)
+Options:
 
+  --config-file=PATH (-c)    Use the file at PATH as the ViewVC configuration
+                             file.  If not specified, ViewVC will try to use
+                             the configuration file in its installation tree;
+                             otherwise, built-in default values are used.
+                             (Not valid in GUI mode.)
+                             
+  --daemon (-d)              Background the server process.
+  
+  --host=HOST (-h)           Start the 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]
+
+  --port=PORT (-p)           Start the server on the given PORT.
+                             [default: %(port)d]
+
+  --repository=PATH (-r)     Serve up the Subversion or CVS repository located
+                             at PATH.  This option may be used more than once.
+
+  --script-alias=PATH (-s)   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 be accessible
+                             at "http://%(host)s:%(port)s/cgi-bin/viewvc".
+                             [default: %(script_alias)s]
+
+  --htpasswd-file=FILE       Demand authentication from clients, validating
+                             authentication credentials against FILE, which is
+                             an Apache htpasswd file that employs CRYPT
+                             encryption.  (Sorry, no DIGEST support yet.)
+
+  --gui (-g)                 Pop up a graphical interface for serving and
+                             testing ViewVC.  NOTE: this requires a valid
+                             X11 display connection.
+""" % locals())
 
 if __name__ == '__main__':
   options = Options()
-  main(sys.argv)
+  cli(sys.argv)

bin/svndbadmin

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 2004-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2004-2008 The ViewCVS Group. All Rights Reserved.
 # Copyright (C) 2004-2007 James Henstridge
 #
 # By using this file, you agree to the terms and conditions set forth in
@@ -153,7 +153,7 @@ class SvnRev:
         fsroot = self._get_root_for_rev(rev)
         
         # find changes in the revision
-        editor = svn.repos.ChangeCollector(repo.fs, fsroot)
+        editor = svn.repos.RevisionChangeCollector(repo.fs, rev)
         e_ptr, e_baton = svn.delta.make_editor(editor)
         svn.repos.svn_repos_replay(fsroot, e_ptr, e_baton)
 
@@ -164,33 +164,21 @@ class SvnRev:
                 continue
 
             # deal with the change types we handle
-            action = None
             base_root = None
-            base_path = change.base_path
             if change.base_path:
                 base_root = self._get_root_for_rev(change.base_rev)
-
-            # figure out what kind of change this is, and get a diff
-            # object for it.  note that prior to 1.4 Subversion's
-            # bindings didn't give us change.action, but that's okay
-            # because back then deleted paths always had a change.path
-            # of None.
-            if hasattr(change, 'action') \
-               and change.action == svn.repos.CHANGE_ACTION_DELETE:
-                action = 'remove'
-            elif not change.path:
+                
+            if not change.path:
                 action = 'remove'
             elif change.added:
                 action = 'add'
             else:
                 action = 'change'
 
-            if action == 'remove':
-                diffobj = svn.fs.FileDiff(base_root, base_path, None, None)
-            else:
-                diffobj = svn.fs.FileDiff(base_root, base_path,
-                                          fsroot, change.path)
-
+            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)
             diff_fp = diffobj.get_pipe()
             plus, minus = _get_diff_counts(diff_fp)
             self.changes.append((path, action, plus, minus))
@@ -300,7 +288,7 @@ def usage():
 located at REPOS-PATH.
 
 Usage: 1. %s [-v] rebuild REPOS-PATH
-       2. %s [-v] update REPOS-PATH [REV[:REV2]] [--force]
+       2. %s [-v] update REPOS-PATH [REV:[REV2]] [--force]
        3. %s [-v] purge REPOS-PATH
 
 1.  Rebuild the commit database information for the repository located

bin/wsgi/query.fcgi

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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

bin/wsgi/query.wsgi

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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

bin/wsgi/viewvc.fcgi

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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

bin/wsgi/viewvc.wsgi

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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

conf/viewvc.conf.dist

@@ -86,8 +86,8 @@
 
 ## cvs_roots: Specifies each of the CVS roots on your system and
 ## assigns names to them. Each root should be given by a "name: path"
-## value (where the path is an absolute filesystem path). Multiple roots
-## should be separated by commas and can be placed on separate lines.
+## value. Multiple roots should be separated by commas and can be
+## placed on separate lines.
 ##
 ## Example:
 ## cvs_roots = cvsroot: /opt/cvs/repos1,
@@ -97,13 +97,8 @@
 
 ## svn_roots: Specifies each of the Subversion roots (repositories) on
 ## your system and assigns names to them. Each root should be given by
-## a "name: path" value (where the path is an absolute filesystem path).
-## Multiple roots should be separated by commas and can be placed on
-## separate lines.
-##
-## NOTE: ViewVC offers *experimental* support for displaying remote
-## Subversion repositories.  Simply use the repository's URL instead
-## of a local filesystem path when defining the root.
+## a "name: path" value. Multiple roots should be separated by commas
+## and can be placed on separate lines.
 ##
 ## Example:
 ## svn_roots = svnrepos: /opt/svn/,
@@ -114,8 +109,7 @@
 ## root_parents: Specifies a list of directories under which any
 ## number of repositories may reside.  You can specify multiple root
 ## parents separated by commas or new lines, each of which is of the
-## form "path: type" (where the type is either "cvs" or "svn", and
-## the path is an absolute filesystem path).
+## form "path: type" (where type is either "cvs" or "svn").
 ##
 ## Rather than force you to add a new entry to 'cvs_roots' or
 ## 'svn_roots' each time you create a new repository, ViewVC rewards
@@ -351,43 +345,7 @@
 ## allowed_views: List the ViewVC views which are enabled.  Views not
 ## in this comma-delited list will not be served (or, will return an
 ## error on attempted access).
-##
-## Valid items for this list include: "annotate", "co", "diff", "markup",
-## "roots", "tar".
-##
-## ----------+---------------------------------------------------------
-##    VIEW   |                       DESCRIPTION
-## ----------+---------------------------------------------------------
-##  annotate | The 'annotate' view shows the contents of a single
-##           | revision of a versioned file in exactly the same way as
-##           | the markup view, but with additional line-by-line
-##           | change attribution (the revision number, author, etc.
-##           | the most recent edit to that line of text as of the
-##           | displayed version).
-## ----------+---------------------------------------------------------
-##  co       | The 'co' (aka "checkout" or "download") view isn't
-##           | really a branded view at all, but allows for direct
-##           | downloading of the contents of a single revision of a 
-##           | versioned file.
-## ----------+---------------------------------------------------------
-##  diff     | The 'diff' view displays line-based differences between
-##           | two revisions of a versioned file in a variety of
-##           | different user-selectable formats.
-## ----------+---------------------------------------------------------
-##  markup   | The 'markup' view shows the contents of a single
-##           | revision of a versioned file, with syntax highlighting
-##           | where possible and enabled.  It can also optionally
-##           | show change log information for that revision of the
-##           | file.
-## ----------+---------------------------------------------------------
-##  roots    | The 'roots' view is a simple listing of the various
-##           | repositories which ViewVC has been configured to serve
-##           | to users.
-## ----------+---------------------------------------------------------
-##  tar      | The 'tar' view isn't a branded view, but generates
-##           | a GNU Tar archive file containing a single versioned
-##           | directory and its contents (recursively).
-## ----------+---------------------------------------------------------
+## Possible values: "annotate", "co", "diff", "markup", "roots", "tar"
 ##
 #allowed_views = annotate, diff, markup, roots
 
@@ -433,26 +391,6 @@
 ##
 #mangle_email_addresses = 0
 
-## custom_log_formatting: Specifies mappings of regular expressions to
-## substitution format strings used to URL-ize strings found in
-## revision log messages.  Multiple mappings (specified as
-## REGEXP:FORMATSTRING) may be defined, separated by commas.
-##
-## NOTE: Due to a limitation of the configuration format, commas may
-## not be used in the regular expression portion of each mapping.
-## Commas "in the raw" may not be used in the format string portion,
-## either, but you can probably use the URI-encoded form of the comma
-## ("%2C") instead with no ill side-effects.  If you must specify a
-## colon character in either the regular expression or the format
-## string, escape it with a preceding backslash ("\:").
-##
-## Example:
-## custom_log_formatting =
-##     artf[0-9]+ : http://example.com/tracker?id=\0,
-##     issue ([0-9]+) : http://example.com/bug?id=\1&opts=full%2csortby=id
-##
-#custom_log_formatting =
-
 ## default_file_view: "log", "co", or "markup"
 ## Controls whether the default view for file URLs is a checkout view or
 ## a log view. "log" is the default for backwards compatibility with old
@@ -634,14 +572,6 @@
 ##
 #show_subdir_lastmod = 0
 
-## show_roots_lastmod: In the root listing view, show the most recent
-## modifications made to the root.  (Subversion roots only.)
-##
-## NOTE: Enabling this feature will significantly reduce the
-## performance of the root listing view.
-##
-#show_roots_lastmod = 0
-
 ## show_logs: Show the most recent log entry in directory listings.
 ##
 #show_logs = 1
@@ -665,13 +595,7 @@
 #short_log_len = 80
 
 ## enable_syntax_coloration: Should we colorize known file content
-## syntaxes?
-##
-## NOTE: This feature requires the Pygments Python module
-## (http://pygments.org) and works only when ViewVC can determine the
-## MIME content type of the file whose contents it wishes to colorize.
-## Use the 'mime_types_files' configuration option to specify MIME
-## type mapping files useful for making that determination.
+## syntaxes?  [Requires Pygments Python module]
 ##
 #enable_syntax_coloration = 1
 
@@ -725,26 +649,6 @@
 ##
 #log_pagesize = 0
 
-## log_pagesextra: Maximum number of extra pages (based on
-## log_pagesize) of revision log data to fetch and present to the user
-## as additional options for display.  Revision log information
-## "beyond" this window is still accessible, but must be navigated to
-## in multiple steps.
-##
-## Example:
-## log_pagesize = 100
-## log_pagesextra = 3
-##
-## For a versioned file with 1000 revisions, the above settings would
-## present to the user the first 100 of those 1000 revisions, with
-## links to three additional pages (the 200-299th revisions, 300-399th
-## revisions, and 400-499th revisions) plus a link to the 500th
-## revision.  Following these links slides the display "window",
-## showing the requested set of revisions plus links to three
-## additional pages beyond those, and so on.
-##
-#log_pagesextra = 3
-
 ## limit_changes: Maximum number of changed paths shown per commit in
 ## the Subversion revision view and in query results. This is not a
 ## hard limit (the UI provides options to show all changed paths), but
@@ -865,14 +769,6 @@
 ## row_limit: Maximum number of rows returned by a given normal query
 ## to the database.
 ##
-## NOTE: This limits the amount of data provided to ViewVC by the
-## database.  It is from this already-reduced data set that ViewVC
-## builds the query response it presents to the user, which may or may
-## not include still more limiting via the query form's 'limit'
-## parameter.  In other words, there is no value which the user can use
-## in the query form's 'limit' parameter which will cause more data to
-## be returned by the database for ViewVC to process.
-##
 #row_limit = 1000
 
 ## rss_row_limit: Maximum number of rows returned by a given query to
@@ -880,9 +776,6 @@
 ## that RSS readers tend to poll regularly for new data, you might want
 ## to keep this set to a conservative number.)
 ##
-## See also the `NOTE' for the 'row_limit' option, which applies here
-## as well.
-##
 #rss_row_limit = 100
 
 ## check_database_for_root: Check if the repository is found in the

docs/template-authoring-guide.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>ViewVC 1.1 Template Authoring Guide</title>
+<title>ViewVC 1.0 Template Authoring Guide</title>
 <style>
 body {
   background-color: rgb(180,193,205);
@@ -38,13 +38,13 @@ td {
 </head>
 <body>
 
-<h1>ViewVC 1.1 Template Authoring Guide</h1>
+<h1>ViewVC 1.0 Template Authoring Guide</h1>
 
 <div class="h2">
 <h2 id="introduction">Introduction</h2>
 
 <p>This document represents an (unfinished) attempt at providing
-   instructions for how to customize ViewVC's HTML output via
+   documentation for how to customize ViewVC 1.0-dev's HTML output via
    modification of its templates.</p>
 
 </div>
@@ -802,11 +802,6 @@ td {
   <td>String</td>
   <td>This is a URL for the markup view of the left file.</td>
 </tr>
-<tr class="varlevel1">
-  <td class="varname">patch_href</td>
-  <td>String</td>
-  <td>URL of the patch view for the file.</td>
-</tr>
 <tr class="varlevel1">
   <td class="varname">raw_diff</td>
   <td>String</td>
@@ -1826,14 +1821,6 @@ td {
   <td>Indicates how query results are being sorted. Possible values: 
       <tt>date</tt>, <tt>author</tt>, and <tt>file</tt>.</td>
 </tr>
-<tr class="varlevel1">
-  <td class="varname">row_limit_reached</td>
-  <td>Boolean</td>
-  <td>Indicates whether the internal database row limit threshold (set
-      via the <code>cvsdb.row_limit</code>
-      and <code>cvsdb.rss_row_limit</code> configuration options) was
-      reached by the query.</td>
-</tr>
 <tr class="varlevel1">
   <td class="varname">show_branch</td>
   <td>Boolean</td>
@@ -2157,38 +2144,6 @@ td {
   <td>List</td>
   <td>Set of configured viewable repositories.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">roots.ago</td>
-  <td>String</td>
-  <td>Textual description of the time since <var>roots.date</var>.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">roots.author</td>
-  <td>String</td>
-  <td>Username of the last modifier of the root.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">root.date</td>
-  <td>String</td>
-  <td>Date (in UTC if not otherwise configured) of the last
-      modification of the root.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">roots.href</td>
-  <td>String</td>
-  <td>URL of root directory view for a configured repository.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">roots.log</td>
-  <td>String</td>
-  <td>Log message of last modification to the root.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">roots.log_href</td>
-  <td>String</td>
-  <td>URL of log revision view for the top-most (root) directory of
-    the root (repository).</td>
-</tr>
 <tr class="varlevel2">
   <td class="varname">roots.name</td>
   <td>String</td>
@@ -2202,24 +2157,17 @@ td {
       configuration can have negative security implications.  Use this
       token at your own risk.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">roots.rev</td>
-  <td>String</td>
-  <td>Youngest revision of the root.</td>
-</tr>
-<tr class="varlevel2">
-  <td class="varname">roots.short_log</td>
-  <td>String</td>
-  <td>Log message of last modification to the root, truncated to
-      contain no more than the number of characters specified by
-      the <code>short_log_len</code> configuration option.</td>
-</tr>
 <tr class="varlevel2">
   <td class="varname">roots.type</td>
   <td>String</td>
   <td>Version control type of a configured repository.  Valid
       values: <tt>cvs</tt>, <tt>svn</tt>.</td>
 </tr>
+<tr class="varlevel2">
+  <td class="varname">roots.href</td>
+  <td>String</td>
+  <td>URL of root directory view for a configured repository.</td>
+</tr>
 </tbody>
 </table>
 

docs/url-reference.html

@@ -1192,6 +1192,13 @@ th.caption {
         commands to back out changes instead showing a normal query result
         page</td>
   </tr>
+  <tr>
+    <td><code>limit=<var>LIMIT</var></code></td>
+    <td>optional</td>
+    <td>maximum number of file-revisions to process during a
+        query. Default is value of <code>row_limit</code> configuration
+        option</td>
+  </tr>
   <tr>
     <td><code>limit_changes=<var>LIMIT_CHANGES</var></code></td>
     <td>optional</td>

lib/accept.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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

lib/blame.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -74,8 +74,7 @@ class HTMLBlameSource:
     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,
-                                                         True)
+    self.annotation, self.revision = self.repos.annotate(path_parts, opt_rev)
 
   def __getitem__(self, idx):
     item = self.annotation.__getitem__(idx)

lib/compat.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/config.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -112,7 +112,6 @@ class Config:
   _force_multi_value = (
     # Configuration values with multiple, comma-separated values.
     'allowed_views',
-    'custom_log_formatting',
     'cvs_roots',
     'kv_files',
     'languages',
@@ -399,7 +398,6 @@ class Config:
     self.options.allowed_views = ['annotate', 'diff', 'markup', 'roots']
     self.options.authorizer = None
     self.options.mangle_email_addresses = 0
-    self.options.custom_log_formatting = []
     self.options.default_file_view = "log"
     self.options.http_expiration_time = 600
     self.options.generate_etags = 1
@@ -422,7 +420,6 @@ class Config:
     self.options.template_dir = "templates"
     self.options.docroot = None
     self.options.show_subdir_lastmod = 0
-    self.options.show_roots_lastmod = 0
     self.options.show_logs = 1
     self.options.show_log_in_markup = 1
     self.options.cross_copies = 1
@@ -436,7 +433,6 @@ class Config:
     self.options.use_re_search = 0
     self.options.dir_pagesize = 0
     self.options.log_pagesize = 0
-    self.options.log_pagesextra = 3
     self.options.limit_changes = 100
 
     self.templates.diff = None

lib/cvsdb.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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
@@ -38,12 +38,13 @@ error = "cvsdb error"
 ## complient database interface
 
 class CheckinDatabase:
-    def __init__(self, host, port, 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
         self._version = None
 
         ## database lookup caches
@@ -168,9 +169,6 @@ class CheckinDatabase:
 
         return list
 
-    def GetCommitsTable(self):
-        return self._version >= 1 and 'commits' or 'checkins'
-        
     def GetTableList(self):
         sql = "SHOW TABLES"
         cursor = self.db.cursor()
@@ -311,7 +309,8 @@ class CheckinDatabase:
         minus_count = commit.GetMinusCount() or '0'
         description_id = self.GetDescriptionID(commit.GetDescription())
 
-        sql = "REPLACE INTO %s" % (self.GetCommitsTable())
+        commits_table = self._version >= 1 and 'commits' or 'checkins'
+        sql = "REPLACE INTO %s" % (commits_table)
         sql = sql + \
               "  (type,ci_when,whoid,repositoryid,dirid,fileid,revision,"\
               "   stickytag,branchid,addedlines,removedlines,descid)"\
@@ -352,17 +351,9 @@ class CheckinDatabase:
                 match = " LIKE "
             elif query_entry.match == "glob":
                 match = " REGEXP "
-                # Use fnmatch to translate the glob into a regular
-                # expression.  Sadly, we have to account for the fact
-                # that in Python 2.6, fnmatch.translate() started
-                # sticking '\Z(?ms)' at the end of the regular
-                # expression instead of just '$', and doesn't prepend
-                # the '^'.
+                # use fnmatch to translate the glob into a regexp
                 data = fnmatch.translate(data)
-                if data[0] != '^':
-                    data = '^' + data
-                if data[-7:] == '\Z(?ms)':
-                    data = data[:-7] + '$'
+                if data[0] != '^': data = '^' + data
             elif query_entry.match == "regex":
                 match = " REGEXP "
             elif query_entry.match == "notregex":
@@ -372,8 +363,8 @@ class CheckinDatabase:
 
         return "(%s)" % (string.join(sqlList, " OR "))
 
-    def CreateSQLQueryString(self, query, detect_leftover=0):
-        commits_table = self.GetCommitsTable()
+    def CreateSQLQueryString(self, query):
+        commits_table = self._version >= 1 and 'commits' or 'checkins'
         tableList = [(commits_table, None)]
         condList = []
 
@@ -453,14 +444,13 @@ class CheckinDatabase:
         conditions = string.join(joinConds + condList, " AND ")
         conditions = conditions and "WHERE %s" % conditions
 
-        ## apply the query's row limit, if any (so we avoid really
-        ## slamming a server with a large database)
+        ## limit the number of rows requested or we could really slam
+        ## a server with a large database
         limit = ""
         if query.limit:
-            if detect_leftover:
-                limit = "LIMIT %s" % (str(query.limit + 1))
-            else:
-                limit = "LIMIT %s" % (str(query.limit))
+            limit = "LIMIT %s" % (str(query.limit))
+        elif self._row_limit:
+            limit = "LIMIT %s" % (str(self._row_limit))
 
         sql = "SELECT %s.* FROM %s %s %s %s" \
               % (commits_table, tables, conditions, order_by, limit)
@@ -468,20 +458,14 @@ class CheckinDatabase:
         return sql
     
     def RunQuery(self, query):
-        sql = self.CreateSQLQueryString(query, 1)
+        sql = self.CreateSQLQueryString(query)
         cursor = self.db.cursor()
         cursor.execute(sql)
-        query.SetExecuted()
-        row_count = 0
         
         while 1:
             row = cursor.fetchone()
             if not row:
                 break
-            row_count = row_count + 1
-            if query.limit and (row_count > query.limit):
-                query.SetLimitReached()
-                break
             
             (dbType, dbCI_When, dbAuthorID, dbRepositoryID, dbDirID,
              dbFileID, dbRevision, dbStickyTag, dbBranchID, dbAddedLines,
@@ -520,12 +504,13 @@ class CheckinDatabase:
         if file_id == None:
             return None
 
+        commits_table = self._version >= 1 and 'commits' or 'checkins'
         sql = "SELECT * FROM %s WHERE "\
               "  repositoryid=%%s "\
               "  AND dirid=%%s"\
               "  AND fileid=%%s"\
               "  AND revision=%%s"\
-              % (self.GetCommitsTable())
+              % (commits_table)
         sql_args = (repository_id, dir_id, file_id, commit.GetRevision())
 
         cursor = self.db.cursor()
@@ -542,9 +527,10 @@ class CheckinDatabase:
     def sql_delete(self, table, key, value, keep_fkey = None):
         sql = "DELETE FROM %s WHERE %s=%%s" % (table, key)
         sql_args = (value, )
+        commits_table = self._version >= 1 and 'commits' or 'checkins'
         if keep_fkey:
             sql += " AND %s NOT IN (SELECT %s FROM %s WHERE %s = %%s)" \
-                   % (key, keep_fkey, self.GetCommitsTable(), keep_fkey)
+                   % (key, keep_fkey, commits_table, keep_fkey)
             sql_args = (value, value)
         cursor = self.db.cursor()
         cursor.execute(sql, sql_args)
@@ -783,9 +769,8 @@ class QueryEntry:
         self.data = data
         self.match = match
 
-## CheckinDatabaseQuery is an object which contains the search
-## parameters for a query to the Checkin Database and -- after the
-## query is executed -- the data returned by the query.
+## CheckinDatabaseQueryData is a object which contains the search parameters
+## for a query to the CheckinDatabase
 class CheckinDatabaseQuery:
     def __init__(self):
         ## sorting
@@ -805,8 +790,7 @@ class CheckinDatabaseQuery:
 
         ## limit on number of rows to return
         self.limit = None
-        self.limit_reached = 0
-        
+
         ## list of commits -- filled in by CVS query
         self.commit_list = []
 
@@ -814,9 +798,6 @@ class CheckinDatabaseQuery:
         ## are added
         self.commit_cb = None
 
-        ## has this query been run?
-        self.executed = 0
-
     def SetRepository(self, repository, match = "exact"):
         self.repository_list.append(QueryEntry(repository, match))
 
@@ -862,20 +843,6 @@ class CheckinDatabaseQuery:
     def AddCommit(self, commit):
         self.commit_list.append(commit)
 
-    def SetExecuted(self):
-        self.executed = 1
-
-    def SetLimitReached(self):
-        self.limit_reached = 1
-
-    def GetLimitReached(self):
-        assert self.executed
-        return self.limit_reached
-
-    def GetCommitList(self):
-        assert self.executed
-        return self.commit_list
-        
 
 ##
 ## entrypoints
@@ -894,7 +861,7 @@ def ConnectDatabase(cfg, readonly=0):
         user = cfg.cvsdb.user
         passwd = cfg.cvsdb.passwd
     db = CheckinDatabase(cfg.cvsdb.host, cfg.cvsdb.port, user, passwd,
-                         cfg.cvsdb.database_name)
+                         cfg.cvsdb.database_name, cfg.cvsdb.row_limit)
     db.Connect()
     return db
 

lib/dbi.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/debug.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/idiff.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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

lib/popen.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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

lib/query.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -217,9 +217,8 @@ def decode_command(cmd):
     else:
         return "exact"
 
-def form_to_cvsdb_query(cfg, form_data):
+def form_to_cvsdb_query(form_data):
     query = cvsdb.CreateCheckinQuery()
-    query.SetLimit(cfg.cvsdb.row_limit)
 
     if form_data.repository:
         for cmd, str in listparse_string(form_data.repository):
@@ -378,15 +377,12 @@ def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
     return ob
 
 def run_query(server, cfg, form_data, viewvc_link):
-    query = form_to_cvsdb_query(cfg, form_data)
+    query = form_to_cvsdb_query(form_data)
     db = cvsdb.ConnectDatabaseReadOnly(cfg)
     db.RunQuery(query)
 
-    commit_list = query.GetCommitList()
-    if not commit_list:
-        return [ ], 0
-
-    row_limit_reached = query.GetLimitReached()
+    if not query.commit_list:
+        return [ ]
 
     commits = [ ]
     files = [ ]
@@ -397,8 +393,8 @@ def run_query(server, cfg, form_data, viewvc_link):
     for key, value in rootitems:
         cvsroots[cvsdb.CleanRepository(value)] = key
 
-    current_desc = commit_list[0].GetDescription()
-    for commit in commit_list:
+    current_desc = query.commit_list[0].GetDescription()
+    for commit in query.commit_list:
         desc = commit.GetDescription()
         if current_desc == desc:
             files.append(commit)
@@ -421,7 +417,7 @@ def run_query(server, cfg, form_data, viewvc_link):
         return len(commit.files) > 0
     commits = filter(_only_with_files, commits)
   
-    return commits, row_limit_reached
+    return commits
 
 def main(server, cfg, viewvc_link):
   try:
@@ -430,12 +426,10 @@ def main(server, cfg, viewvc_link):
     form_data = FormData(form)
 
     if form_data.valid:
-        commits, row_limit_reached = run_query(server, cfg,
-                                               form_data, viewvc_link)
+        commits = run_query(server, cfg, form_data, viewvc_link)
         query = None
     else:
         commits = [ ]
-        row_limit_reached = 0
         query = 'skipped'
 
     docroot = cfg.options.docroot
@@ -455,7 +449,6 @@ def main(server, cfg, viewvc_link):
       'sortby' : form_data.sortby,
       'date' : form_data.date,
       'query' : query,
-      'row_limit_reached' : ezt.boolean(row_limit_reached),
       'commits' : commits,
       'num_commits' : len(commits),
       'rss_href' : None,

lib/sapi.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -233,6 +233,9 @@ class WsgiServer(Server):
     self.header(status='301 Moved')
     self._wsgi_write('This document is located <a href="%s">here</a>.' % url)
 
+  def escape(self, s, quote = None):
+    return cgi.escape(s, quote)
+
   def getenv(self, name, value=None):
     return self._environ.get(name, value)
 

lib/vcauth/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 2006-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-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
@@ -29,15 +29,7 @@ class GenericViewVCAuthorizer:
   def check_root_access(self, rootname):
     """Return 1 iff the associated username is permitted to read ROOTNAME."""
     pass
-
-  def check_universal_access(self, rootname):
-    """Return 1 if the associated username is permitted to read every
-    path in the repository at every revision, 0 if the associated
-    username is prohibited from reading any path in the repository, or
-    None if no such determination can be made (perhaps because the
-    cost of making it is too great)."""
-    pass
-    
+  
   def check_path_access(self, rootname, path_parts, pathtype, rev=None):
     """Return 1 iff the associated username is permitted to read
     revision REV of the path PATH_PARTS (of type PATHTYPE) in
@@ -52,9 +44,6 @@ class ViewVCAuthorizer(GenericViewVCAuthorizer):
   """The uber-permissive authorizer."""
   def check_root_access(self, rootname):
     return 1
-
-  def check_universal_access(self, rootname):
-    return 1
     
   def check_path_access(self, rootname, path_parts, pathtype, rev=None):
     return 1

lib/vcauth/forbidden/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 2006-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-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
@@ -23,14 +23,7 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
 
   def check_root_access(self, rootname):
     return 1
-
-  def check_universal_access(self, rootname):
-    # If there aren't any forbidden paths, we can grant universal read
-    # access.  Otherwise, we make no claim.
-    if not self.forbidden:
-      return 1
-    return None
-    
+  
   def check_path_access(self, rootname, path_parts, pathtype, rev=None):
     # No path?  No problem.
     if not path_parts:

lib/vcauth/forbiddenre/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 2008-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 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
@@ -46,13 +46,6 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
   def check_root_access(self, rootname):
     return self._check_root_path_access(rootname)
   
-  def check_universal_access(self, rootname):
-    # If there aren't any forbidden regexps, we can grant universal
-    # read access.  Otherwise, we make no claim.
-    if not self.forbidden:
-      return 1
-    return None
-    
   def check_path_access(self, rootname, path_parts, pathtype, rev=None):
     root_path = rootname
     if path_parts:

lib/vcauth/svnauthz/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 2006-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-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
@@ -34,9 +34,9 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
     # See if the admin wants us to do case normalization of usernames.
     self.force_username_case = params.get('force_username_case')
     if self.force_username_case == "upper":
-      self.username = username and string.upper(username) or username
+      self.username = username.upper()
     elif self.force_username_case == "lower":
-      self.username = username and string.lower(username) or username
+      self.username = username.lower()
     elif not self.force_username_case:
       self.username = username
     else:
@@ -54,10 +54,7 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
     # option names.
     cp = ConfigParser()
     cp.optionxform = lambda x: x
-    try:
-      cp.read(self.authz_file)
-    except:
-      raise debug.ViewVCException("Unable to parse configured authzfile file")
+    cp.read(self.authz_file)
 
     # Figure out if there are any aliases for the current username
     aliases = []
@@ -224,36 +221,6 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
     paths = self._get_paths_for_root(rootname)
     return (paths is not None) and 1 or 0
   
-  def check_universal_access(self, rootname):
-    paths = self._get_paths_for_root(rootname)
-    if not paths: # None or empty.
-      return 0
-
-    # Search the access determinations.  If there's a mix, we can't
-    # claim a universal access determination.
-    found_allow = 0
-    found_deny = 0
-    for access in paths.values():
-      if access:
-        found_allow = 1
-      else:
-        found_deny = 1
-      if found_allow and found_deny:
-        return None
-
-    # We didn't find both allowances and denials, so we must have
-    # found one or the other.  Denials only is a universal denial.
-    if found_deny:
-      return 0
-
-    # ... but allowances only is only a universal allowance if read
-    # access is granted to the root directory.
-    if found_allow and paths.has_key('/'):
-      return 1
-
-    # Anything else is indeterminable.
-    return None
-    
   def check_path_access(self, rootname, path_parts, pathtype, rev=None):
     # Crawl upward from the path represented by PATH_PARTS toward to
     # the root of the repository, looking for an explicitly grant or

lib/vclib/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -76,7 +76,7 @@ class Repository:
     """
     pass
 
-  def openfile(self, path_parts, rev, options):
+  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
@@ -86,8 +86,6 @@ class Repository:
     of the repository. e.g. ["subdir1", "subdir2", "filename"]
 
     rev is the revision of the file to check out
-
-    options is a dictionary of implementation specific options
     """
 
   def listdir(self, path_parts, rev, options):
@@ -170,19 +168,12 @@ class Repository:
     Return value is a python file object
     """
 
-  def annotate(self, path_parts, rev, include_text=False):
-    """Return a list of Annotation object, sorted by their
-    "line_number" components, which describe the lines of given
-    version of a file.
+  def annotate(self, path_parts, rev):
+    """Return a list of annotate file content lines and a revision.
 
-    The file 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.
-    
-    If include_text is true, populate the Annotation objects' "text"
-    members with the corresponding line of file content; otherwise,
-    leave that member set to None."""
+    The result is a list of Annotation objects, sorted by their
+    line_number components.
+    """
 
   def revinfo(self, rev):
     """Return information about a global revision

lib/vclib/ccvs/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -14,7 +14,6 @@ import os.path
 
 
 def canonicalize_rootpath(rootpath):
-  assert os.path.isabs(rootpath)
   return os.path.normpath(rootpath)
 
 
@@ -23,7 +22,6 @@ def expand_root_parent(parent_path):
   # "CVSROOT/config" is added the set of returned roots.  Or, if the
   # PARENT_PATH itself contains a child "CVSROOT/config", then all its
   # subdirectories are returned as roots.
-  assert os.path.isabs(parent_path)
   roots = {}
   subpaths = os.listdir(parent_path)
   cvsroot = os.path.exists(os.path.join(parent_path, "CVSROOT", "config"))

lib/vclib/ccvs/bincvs.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -40,11 +40,6 @@ class BaseCVSRepository(vclib.Repository):
     if not vclib.check_root_access(self):
       raise vclib.ReposNotFound(name)
 
-  def open(self):
-    # See if a universal read access determination can be made.
-    if self.auth and self.auth.check_universal_access(self.name) == 1:
-      self.auth = None
-
   def rootname(self):
     return self.name
 
@@ -167,14 +162,7 @@ class BinCVSRepository(BaseCVSRepository):
       return revs[-1]
     return None
 
-  def openfile(self, path_parts, rev, options):
-    """see vclib.Repository.openfile docstring
-
-    Option values recognized by this implementation:
-
-      cvs_oldkeywords
-        boolean. true to use the original keyword substitution values.
-    """
+  def openfile(self, path_parts, rev):
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file."
                         % (string.join(path_parts, "/")))
@@ -182,14 +170,12 @@ class BinCVSRepository(BaseCVSRepository):
       rev_flag = '-p'
     else:
       rev_flag = '-p' + rev
-    if options.get('cvs_oldkeywords', 0):
-      kv_flag = '-ko'
-    else:
-      kv_flag = '-kkv'
     full_name = self.rcsfile(path_parts, root=1, v=0)
+
     used_rlog = 0
     tip_rev = None  # used only if we have to fallback to using rlog
-    fp = self.rcs_popen('co', (kv_flag, rev_flag, full_name), 'rb') 
+
+    fp = self.rcs_popen('co', (rev_flag, full_name), 'rb') 
     try:
       filename, revision = _parse_co_header(fp)
     except COMissingRevision:
@@ -332,13 +318,13 @@ class BinCVSRepository(BaseCVSRepository):
       args = rcs_args
     return popen.popen(cmd, args, mode, capture_err)
 
-  def annotate(self, path_parts, rev=None, include_text=False):
+  def annotate(self, path_parts, rev=None):
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file."
                         % (string.join(path_parts, "/")))
                         
     from vclib.ccvs import blame
-    source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, include_text)
+    source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
     return source, source.revision
 
   def revinfo(self, rev):
@@ -1036,16 +1022,16 @@ def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
         file.errors.append("rlog error: %s" % msg)
         continue
 
-      tag = None
       if view_tag == 'MAIN' or view_tag == 'HEAD':
         tag = Tag(None, default_branch)
       elif taginfo.has_key(view_tag):
         tag = Tag(None, taginfo[view_tag])
-      elif view_tag and (eof != _EOF_FILE):
-        # the tag wasn't found, so skip this file (unless we already
-        # know there's nothing left of it to read)
+      elif view_tag:
+        # the tag wasn't found, so skip this file
         _skip_file(rlog)
-        eof = _EOF_FILE
+        eof = 1
+      else:
+        tag = None
 
       # we don't care about the specific values -- just the keys and whether
       # the values point to branches or revisions. this the fastest way to 

lib/vclib/ccvs/blame.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2008 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
@@ -414,7 +414,7 @@ class CVSParser(rcsparse.Sink):
 
 
 class BlameSource:
-  def __init__(self, rcs_file, opt_rev=None, include_text=False):
+  def __init__(self, rcs_file, opt_rev=None):
     # Parse the CVS file
     parser = CVSParser()
     revision = parser.parse_cvs_file(rcs_file, opt_rev)
@@ -428,7 +428,6 @@ class BlameSource:
     self.lines = lines
     self.num_lines = count
     self.parser = parser
-    self.include_text = include_text
 
     # keep track of where we are during an iteration
     self.idx = -1
@@ -448,8 +447,6 @@ class BlameSource:
     line_number = idx + 1
     author = self.parser.revision_author[rev]
     thisline = self.lines[idx]
-    if not self.include_text:
-      thisline = None
     ### TODO:  Put a real date in here.
     item = vclib.Annotation(thisline, line_number, rev, prev_rev, author, None)
     self.last = item

lib/vclib/ccvs/ccvs.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -127,9 +127,9 @@ class CCVSRepository(BaseCVSRepository):
                         % (string.join(path_parts2, "/")))
     
     temp1 = tempfile.mktemp()
-    open(temp1, 'wb').write(self.openfile(path_parts1, rev1, {})[0].getvalue())
+    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())
+    open(temp2, 'wb').write(self.openfile(path_parts2, rev2)[0].getvalue())
 
     r1 = self.itemlog(path_parts1, rev1, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
     r2 = self.itemlog(path_parts2, rev2, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
@@ -142,17 +142,17 @@ class CCVSRepository(BaseCVSRepository):
     return vclib._diff_fp(temp1, temp2, info1, info2,
                           self.utilities.diff or 'diff', diff_args)
 
-  def annotate(self, path_parts, rev=None, include_text=False):
+  def annotate(self, path_parts, rev=None):
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file."
                         % (string.join(path_parts, "/")))
-    source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, include_text)
+    source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
     return source, source.revision
 
   def revinfo(self, rev):
     raise vclib.UnsupportedFeature
 
-  def openfile(self, path_parts, rev, options):
+  def openfile(self, path_parts, rev=None):
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file."
                         % (string.join(path_parts, "/")))

lib/vclib/ccvs/rcsparse/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/vclib/ccvs/rcsparse/common.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -194,8 +194,7 @@ class _Parser:
         else:
           # Chew up "newphrase"
           # warn("Unexpected RCS token: $token\n")
-          while self.ts.get() != ';':
-            pass
+          pass
       else:
         if f is None:
           self.ts.unget(token)

lib/vclib/ccvs/rcsparse/debug.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/vclib/ccvs/rcsparse/default.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/vclib/ccvs/rcsparse/texttools.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

lib/vclib/svn/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC
@@ -15,50 +15,17 @@
 import os
 import os.path
 import re
-import urllib
 
 _re_url = re.compile('^(http|https|file|svn|svn\+[^:]+)://')
 
-def _canonicalize_path(path):
-  import svn.core
-  try:
-    return svn.core.svn_path_canonicalize(path)
-  except AttributeError: # svn_path_canonicalize() appeared in 1.4.0 bindings
-    # There's so much more that we *could* do here, but if we're
-    # here at all its because there's a really old Subversion in
-    # place, and those older Subversion versions cared quite a bit
-    # less about the specifics of path canonicalization.
-    if re.search(_re_url, path):
-      return path.rstrip('/')
-    else:
-      return os.path.normpath(path)
-
-
 def canonicalize_rootpath(rootpath):
-  # Try to canonicalize the rootpath using Subversion semantics.
-  rootpath = _canonicalize_path(rootpath)
-  
-  # ViewVC's support for local repositories is more complete and more
-  # performant than its support for remote ones, so if we're on a
-  # Unix-y system and we have a file:/// URL, convert it to a local
-  # path instead.
-  if os.name == 'posix':
-    rootpath_lower = rootpath.lower()
-    if rootpath_lower in ['file://localhost',
-                          'file://localhost/',
-                          'file://',
-                          'file:///'
-                          ]:
-      return '/'
-    if rootpath_lower.startswith('file://localhost/'):
-      rootpath = os.path.normpath(urllib.unquote(rootpath[16:]))
-    elif rootpath_lower.startswith('file:///'):
-      rootpath = os.path.normpath(urllib.unquote(rootpath[7:]))
-
-  # Ensure that we have an absolute path (or URL), and return.
-  if not re.search(_re_url, rootpath):
-    assert os.path.isabs(rootpath)
-  return rootpath
+  try:
+    import svn.core
+    return svn.core.svn_path_canonicalize(rootpath)
+  except:
+    if re.search(_re_url, rootpath):
+      return rootpath[-1] == '/' and rootpath[:-1] or rootpath
+    return os.path.normpath(rootpath)
 
 
 def expand_root_parent(parent_path):
@@ -68,7 +35,6 @@ def expand_root_parent(parent_path):
   else:
     # Any subdirectories of PARENT_PATH which themselves have a child
     # "format" are returned as roots.
-    assert os.path.isabs(parent_path)
     subpaths = os.listdir(parent_path)
     for rootname in subpaths:
       rootpath = os.path.join(parent_path, rootname)

lib/vclib/svn/svn_ra.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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
@@ -20,10 +20,7 @@ import re
 import tempfile
 import time
 import urllib
-from svn_repos import Revision, SVNChangedPath, _datestr_to_date, \
-                      _compare_paths, _path_parts, _cleanup_path, \
-                      _rev2optrev, _fix_subversion_exception, \
-                      _split_revprops, _canonicalize_path
+from svn_repos import Revision, SVNChangedPath, _datestr_to_date, _compare_paths, _path_parts, _cleanup_path, _rev2optrev, _fix_subversion_exception, _split_revprops
 from svn import core, delta, client, wc, ra
 
 
@@ -60,7 +57,7 @@ def client_log(url, start_rev, end_rev, log_limit, cross_copies,
     client.svn_client_log4([url], start_rev, start_rev, end_rev,
                            log_limit, 1, not cross_copies, 0, None,
                            cb_func, ctx)
-  except AttributeError:
+  except NameError:
     # Wrap old svn_log_message_receiver_t interface with a
     # svn_log_entry_t one.
     def cb_convert(paths, revision, author, date, message, pool):
@@ -206,10 +203,6 @@ class RemoteSubversionRepository(vclib.Repository):
     self.youngest = ra.svn_ra_get_latest_revnum(self.ra_session)
     self._dirent_cache = { }
     self._revinfo_cache = { }
-
-    # See if a universal read access determination can be made.
-    if self.auth and self.auth.check_universal_access(self.name) == 1:
-      self.auth = None
     
   def rootname(self):
     return self.name
@@ -244,7 +237,7 @@ class RemoteSubversionRepository(vclib.Repository):
       raise vclib.ItemNotFound(path_parts)
     return pathtype
 
-  def openfile(self, path_parts, rev, options):
+  def openfile(self, path_parts, rev):
     path = self._getpath(path_parts)
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file." % path)
@@ -341,7 +334,7 @@ class RemoteSubversionRepository(vclib.Repository):
                                         _rev2optrev(rev), 0, self.ctx)
     return pairs and pairs[0][1] or {}
   
-  def annotate(self, path_parts, rev, include_text=False):
+  def annotate(self, path_parts, rev):
     path = self._getpath(path_parts)
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file." % path)
@@ -355,13 +348,12 @@ class RemoteSubversionRepository(vclib.Repository):
       prev_rev = None
       if revision > 1:
         prev_rev = revision - 1
-      if not include_text:
-        line = None
-      blame_data.append(vclib.Annotation(line, line_no + 1, revision, prev_rev,
+      blame_data.append(vclib.Annotation(line, line_no+1, revision, prev_rev,
                                          author, None))
       
     client.svn_client_blame(url, _rev2optrev(1), _rev2optrev(rev),
                             _blame_cb, self.ctx)
+
     return blame_data, rev
 
   def revinfo(self, rev):
@@ -411,11 +403,8 @@ class RemoteSubversionRepository(vclib.Repository):
     if rev is None or rev == 'HEAD':
       return self.youngest
     try:
-      if type(rev) == type(''):
-        while rev[0] == 'r':
-          rev = rev[1:]
       rev = int(rev)
-    except:
+    except ValueError:
       raise vclib.InvalidRevision(rev)
     if (rev < 0) or (rev > self.youngest):
       raise vclib.InvalidRevision(rev)
@@ -424,8 +413,7 @@ class RemoteSubversionRepository(vclib.Repository):
   def _geturl(self, path=None):
     if not path:
       return self.rootpath
-    path = self.rootpath + '/' + urllib.quote(path)
-    return _canonicalize_path(path)
+    return self.rootpath + '/' + urllib.quote(path, "/*~")
 
   def _get_dirents(self, path, rev):
     """Return a 2-type of dirents and locks, possibly reading/writing

lib/vclib/svn/svn_repos.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -22,7 +22,6 @@ import time
 import tempfile
 import popen
 import re
-import urllib
 from svn import fs, repos, core, client, delta
 
 
@@ -43,14 +42,7 @@ def _fix_subversion_exception(e):
     e.apr_err = e[1]
   if not hasattr(e, 'message'):
     e.message = e[0]
-
-### Pre-1.4 Subversion doesn't have svn_path_canonicalize()
-def _canonicalize_path(path):
-  try:
-    return core.svn_path_canonicalize(path)
-  except AttributeError:
-    return path
-
+  
 def _allow_all(root, path, pool):
   """Generic authz_read_func that permits access to all paths"""
   return 1
@@ -116,16 +108,11 @@ def _rev2optrev(rev):
 
 def _rootpath2url(rootpath, path):
   rootpath = os.path.abspath(rootpath)
-  drive, rootpath = os.path.splitdrive(rootpath)
+  if rootpath and rootpath[0] != '/':
+    rootpath = '/' + rootpath
   if os.sep != '/':
     rootpath = string.replace(rootpath, os.sep, '/')
-  rootpath = urllib.quote(rootpath)
-  path = urllib.quote(path)
-  if drive:
-    url = 'file:///' + drive + rootpath + '/' + path
-  else:
-    url = 'file://' + rootpath + '/' + path
-  return _canonicalize_path(url)
+  return 'file://' + string.join([rootpath, path], "/")
 
 
 # Given a dictionary REVPROPS of revision properties, pull special
@@ -217,6 +204,59 @@ class NodeHistory:
   def __getitem__(self, idx):
     return self.histories[idx]
 
+
+def _get_history(svnrepos, path, rev, path_type, limit=0, options={}):
+  if svnrepos.youngest == 0:
+    return []
+
+  rev_paths = []
+  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, path)
+    if kind is core.svn_node_file:
+      show_all_logs = 1
+      
+  # Instantiate a NodeHistory collector object, and use it to collect
+  # history items for PATH@REV.
+  history = NodeHistory(svnrepos.fs_ptr, show_all_logs, limit)
+  try:
+    repos.svn_repos_history(svnrepos.fs_ptr, path, history.add_history,
+                            1, rev, options.get('svn_cross_copies', 0))
+  except core.SubversionException, e:
+    _fix_subversion_exception(e)
+    if e.apr_err != _SVN_ERR_CEASE_INVOCATION:
+      raise
+
+  # Now, iterate over those history items, checking for changes of
+  # location, pruning as necessitated by authz rules.
+  for hist_rev, hist_path in history:
+    path_parts = _path_parts(hist_path)
+    if not vclib.check_path_access(svnrepos, path_parts, path_type, hist_rev):
+      break
+    rev_paths.append([hist_rev, hist_path])
+  return rev_paths
+
+
+def _log_helper(svnrepos, path, rev, lockinfo):
+  rev_root = fs.revision_root(svnrepos.fs_ptr, rev)
+
+  # Was this path@rev the target of a copy?
+  copyfrom_rev, copyfrom_path = fs.copied_from(rev_root, path)
+
+  # Assemble our LogEntry
+  date, author, msg, revprops, changes = svnrepos._revinfo(rev)
+  if fs.is_file(rev_root, path):
+    size = fs.file_length(rev_root, path)
+  else:
+    size = None
+  entry = Revision(rev, date, author, msg, size, lockinfo, path,
+                   copyfrom_path and _cleanup_path(copyfrom_path),
+                   copyfrom_rev)
+  return entry
+  
+
 def _get_last_history_rev(fsroot, path):
   history = fs.node_history(fsroot, path)
   history = fs.history_prev(history, 0)
@@ -295,11 +335,10 @@ class FileContentsPipe:
 
 
 class BlameSource:
-  def __init__(self, local_url, rev, first_rev, include_text, config_dir):
+  def __init__(self, local_url, rev, first_rev, config_dir):
     self.idx = -1
     self.first_rev = first_rev
     self.blame_data = []
-    self.include_text = include_text
 
     ctx = client.svn_client_create_context()
     core.svn_config_ensure(config_dir)
@@ -320,8 +359,6 @@ class BlameSource:
     prev_rev = None
     if rev > self.first_rev:
       prev_rev = rev - 1
-    if not self.include_text:
-      text = None
     self.blame_data.append(vclib.Annotation(text, line_no + 1, rev,
                                             prev_rev, author, None))
 
@@ -390,10 +427,6 @@ class LocalSubversionRepository(vclib.Repository):
     self._fsroots = {}
     self._revinfo_cache = {}
 
-    # See if a universal read access determination can be made.
-    if self.auth and self.auth.check_universal_access(self.name) == 1:
-      self.auth = None
-
   def rootname(self):
     return self.name
 
@@ -409,14 +442,19 @@ class LocalSubversionRepository(vclib.Repository):
   def itemtype(self, path_parts, rev):
     rev = self._getrev(rev)
     basepath = self._getpath(path_parts)
-    pathtype = self._gettype(basepath, rev)
-    if pathtype is None:
+    kind = fs.check_path(self._getroot(rev), basepath)
+    pathtype = None
+    if kind == core.svn_node_dir:
+      pathtype = vclib.DIR
+    elif kind == core.svn_node_file:
+      pathtype = vclib.FILE
+    else:
       raise vclib.ItemNotFound(path_parts)
     if not vclib.check_path_access(self, path_parts, pathtype, rev):
       raise vclib.ItemNotFound(path_parts)
     return pathtype
 
-  def openfile(self, path_parts, rev, options):
+  def openfile(self, path_parts, rev):
     path = self._getpath(path_parts)
     if self.itemtype(path_parts, rev) != vclib.FILE:  # does auth-check
       raise vclib.Error("Path '%s' is not a file." % path)
@@ -504,19 +542,20 @@ class LocalSubversionRepository(vclib.Repository):
     # 'limit' parameter here as numeric cut-off for the depth of our
     # history search.
     if options.get('svn_latest_log', 0):
-      revision = self._log_helper(path, rev, lockinfo)
+      revision = _log_helper(self, path, rev, lockinfo)
       if revision:
         revision.prev = None
         revs.append(revision)
     else:
-      history = self._get_history(path, rev, path_type, first + limit, options)
+      history = _get_history(self, path, rev, path_type,
+                             first + limit, options)
       if len(history) < first:
         history = []
       if limit:
         history = history[first:first+limit]
 
       for hist_rev, hist_path in history:
-        revision = self._log_helper(hist_path, hist_rev, lockinfo)
+        revision = _log_helper(self, hist_path, hist_rev, lockinfo)
         if revision:
           # If we have unreadable copyfrom data, obscure it.
           if revision.copy_path is not None:
@@ -537,63 +576,40 @@ class LocalSubversionRepository(vclib.Repository):
     fsroot = self._getroot(rev)
     return fs.node_proplist(fsroot, path)
   
-  def annotate(self, path_parts, rev, include_text=False):
+  def annotate(self, path_parts, rev):
     path = self._getpath(path_parts)
     path_type = self.itemtype(path_parts, rev)  # does auth-check
     if path_type != vclib.FILE:
       raise vclib.Error("Path '%s' is not a file." % path)
     rev = self._getrev(rev)
     fsroot = self._getroot(rev)
-    history = self._get_history(path, rev, path_type, 0,
-                                {'svn_cross_copies': 1})
+    history = _get_history(self, path, rev, path_type, 0,
+                           {'svn_cross_copies': 1})
     youngest_rev, youngest_path = history[0]
     oldest_rev, oldest_path = history[-1]
-    source = BlameSource(_rootpath2url(self.rootpath, path), youngest_rev,
-                         oldest_rev, include_text, self.config_dir)
+    source = BlameSource(_rootpath2url(self.rootpath, path),
+                         youngest_rev, oldest_rev, self.config_dir)
     return source, youngest_rev
 
-  def revinfo(self, rev):
-    return self._revinfo(rev, 1) 
-  
-  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)
-    if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
-      raise vclib.ItemNotFound(path_parts1)
-    if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
-      raise vclib.ItemNotFound(path_parts2)
-    
-    args = vclib._diff_args(type, options)
-
-    def _date_from_rev(rev):
-      date, author, msg, revprops, changes = self._revinfo(rev)
-      return date
-
-    try:
-      temp1 = temp_checkout(self, p1, r1)
-      temp2 = temp_checkout(self, p2, r2)
-      info1 = p1, _date_from_rev(r1), r1
-      info2 = p2, _date_from_rev(r2), r2
-      return vclib._diff_fp(temp1, temp2, info1, info2, self.diff_cmd, args)
-    except core.SubversionException, e:
-      _fix_subversion_exception(e)
-      if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
-        raise vclib.InvalidRevision
-      raise
-
-  def isexecutable(self, path_parts, rev):
-    props = self.itemprops(path_parts, rev) # does authz-check
-    return props.has_key(core.SVN_PROP_EXECUTABLE)
-
-  ##--- helpers ---##
-
   def _revinfo(self, rev, include_changed_paths=0):
     """Internal-use, cache-friendly revision information harvester."""
-
-    def _get_changed_paths(fsroot):
-      """Return a 3-tuple: found_readable, found_unreadable, changed_paths."""
+    
+    def _revinfo_helper(rev, include_changed_paths):
+      # Get the revision property info.  (Would use
+      # editor.get_root_props(), but something is broken there...)
+      revprops = fs.revision_proplist(self.fs_ptr, rev)
+      msg, author, date, revprops = _split_revprops(revprops)
+  
+      # Optimization: If our caller doesn't care about the changed
+      # paths, and we don't need them to do authz determinations, let's
+      # get outta here.
+      if self.auth is None and not include_changed_paths:
+        return date, author, msg, revprops, None
+  
+      # If we get here, then we either need the changed paths because we
+      # were asked for them, or we need them to do authorization checks.
+      # Either way, we need 'em, so let's get 'em.
+      fsroot = self._getroot(rev)
       editor = repos.ChangeCollector(self.fs_ptr, fsroot)
       e_ptr, e_baton = delta.make_editor(editor)
       repos.svn_repos_replay(fsroot, e_ptr, e_baton)
@@ -646,8 +662,7 @@ class LocalSubversionRepository(vclib.Repository):
         if vclib.check_path_access(self, parts, pathtype, rev):
           if is_copy and change.base_path and (change.base_path != path):
             parts = _path_parts(change.base_path)
-            if not vclib.check_path_access(self, parts, pathtype,
-                                           change.base_rev):
+            if not vclib.check_path_access(self, parts, pathtype, change.base_rev):
               is_copy = 0
               change.base_path = None
               change.base_rev = None
@@ -659,108 +674,24 @@ class LocalSubversionRepository(vclib.Repository):
           found_readable = 1
         else:
           found_unreadable = 1
-      return found_readable, found_unreadable, changedpaths.values()
-
-    def _get_change_copyinfo(fsroot, path, change):
-      if hasattr(change, 'copyfrom_known') and change.copyfrom_known:
-        copyfrom_path = change.copyfrom_path
-        copyfrom_rev = change.copyfrom_rev
-      else:
-        copyfrom_rev, copyfrom_path = fs.copied_from(fsroot, path)
-      return copyfrom_path, copyfrom_rev
-      
-    def _simple_auth_check(fsroot):
-      """Return a 2-tuple: found_readable, found_unreadable."""
-      found_unreadable = found_readable = 0
-      if hasattr(fs, 'paths_changed2'):
-        changes = fs.paths_changed2(fsroot)
-      else:
-        changes = fs.paths_changed(fsroot)
-      paths = changes.keys()
-      for path in paths:
-        change = changes[path]
-        pathtype = None
-        if hasattr(change, 'node_kind'):
-          if change.node_kind == core.svn_node_file:
-            pathtype = vclib.FILE
-          elif change.node_kind == core.svn_node_dir:
-            pathtype = vclib.DIR
-        parts = _path_parts(path)
-        if pathtype is None:
-          # Figure out the pathtype so we can query the authz subsystem.
-          if change.change_kind == fs.path_change_delete:
-            # Deletions are annoying, because they might be underneath
-            # copies (make their previous location non-trivial).
-            prev_parts = parts
-            prev_rev = rev - 1
-            parent_parts = parts[:-1]
-            while parent_parts:
-              parent_path = '/' + self._getpath(parent_parts)
-              parent_change = changes.get(parent_path)
-              if not (parent_change and \
-                      (parent_change.change_kind == fs.path_change_add or
-                       parent_change.change_kind == fs.path_change_replace)):
-                del(parent_parts[-1])
-                continue
-              copyfrom_path, copyfrom_rev = \
-                _get_change_copyinfo(fsroot, parent_path, parent_change)
-              if copyfrom_path:
-                prev_rev = copyfrom_rev
-                prev_parts = _path_parts(copyfrom_path) + \
-                             parts[len(parent_parts):]
-                break
-              del(parent_parts[-1])
-            pathtype = self._gettype(self._getpath(prev_parts), prev_rev)
-          else:
-            pathtype = self._gettype(self._getpath(parts), rev)
-        if vclib.check_path_access(self, parts, pathtype, rev):
-          found_readable = 1
-          copyfrom_path, copyfrom_rev = \
-            _get_change_copyinfo(fsroot, path, change)
-          if copyfrom_path and copyfrom_path != path:
-            parts = _path_parts(copyfrom_path)
-            if not vclib.check_path_access(self, parts, pathtype,
-                                           copyfrom_rev):
-              found_unreadable = 1
-        else:
-          found_unreadable = 1
-        if found_readable and found_unreadable:
-          break
-      return found_readable, found_unreadable
-      
-    def _revinfo_helper(rev, include_changed_paths):
-      # Get the revision property info.  (Would use
-      # editor.get_root_props(), but something is broken there...)
-      revprops = fs.revision_proplist(self.fs_ptr, rev)
-      msg, author, date, revprops = _split_revprops(revprops)
   
-      # Optimization: If our caller doesn't care about the changed
-      # paths, and we don't need them to do authz determinations, let's
-      # get outta here.
-      if self.auth is None and not include_changed_paths:
-        return date, author, msg, revprops, None
-  
-      # If we get here, then we either need the changed paths because we
-      # were asked for them, or we need them to do authorization checks.
-      #
-      # If we only need them for authorization checks, though, we
-      # won't bother generating fully populated ChangedPath items (the
-      # cost is too great).
-      fsroot = self._getroot(rev)
-      if include_changed_paths:
-        found_readable, found_unreadable, changedpaths = \
-          _get_changed_paths(fsroot)
-      else:
-        changedpaths = None
-        found_readable, found_unreadable = _simple_auth_check(fsroot)
+        # If our caller doesn't care about changed paths, we must be
+        # here for authz reasons only.  That means the minute we've
+        # found both a readable and an unreadable path, we can bail out.
+        if (not include_changed_paths) and found_readable and found_unreadable:
+          return date, author, None, None, None
         
-      # Filter our metadata where necessary, and return the requested data.
+      # Okay, we've process all our paths.  Let's filter our metadata,
+      # and return the requested data.
       if found_unreadable:
         msg = None
         if not found_readable:
           author = None
           date = None
-      return date, author, msg, revprops, changedpaths
+      if include_changed_paths:
+        return date, author, msg, revprops, changedpaths.values()
+      else:
+        return date, author, msg, revprops, None
 
     # Consult the revinfo cache first.  If we don't have cached info,
     # or our caller wants changed paths and we don't have those for
@@ -773,50 +704,40 @@ class LocalSubversionRepository(vclib.Repository):
       self._revinfo_cache[rev] = cached_info
     return tuple(cached_info)
   
-  def _log_helper(self, path, rev, lockinfo):
-    rev_root = fs.revision_root(self.fs_ptr, rev)
-    copyfrom_rev, copyfrom_path = fs.copied_from(rev_root, path)
-    date, author, msg, revprops, changes = self._revinfo(rev)
-    if fs.is_file(rev_root, path):
-      size = fs.file_length(rev_root, path)
-    else:
-      size = None
-    return Revision(rev, date, author, msg, size, lockinfo, path,
-                    copyfrom_path and _cleanup_path(copyfrom_path),
-                    copyfrom_rev)
+  def revinfo(self, rev):
+    return self._revinfo(rev, 1) 
+  
+  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)
+    if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
+      raise vclib.ItemNotFound(path_parts1)
+    if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
+      raise vclib.ItemNotFound(path_parts2)
+    
+    args = vclib._diff_args(type, options)
 
-  def _get_history(self, path, rev, path_type, limit=0, options={}):
-    if self.youngest == 0:
-      return []
+    def _date_from_rev(rev):
+      date, author, msg, revprops, changes = self._revinfo(rev)
+      return date
 
-    rev_paths = []
-    fsroot = self._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, path)
-      if kind is core.svn_node_file:
-        show_all_logs = 1
-      
-    # Instantiate a NodeHistory collector object, and use it to collect
-    # history items for PATH@REV.
-    history = NodeHistory(self.fs_ptr, show_all_logs, limit)
     try:
-      repos.svn_repos_history(self.fs_ptr, path, history.add_history,
-                              1, rev, options.get('svn_cross_copies', 0))
+      temp1 = temp_checkout(self, p1, r1)
+      temp2 = temp_checkout(self, p2, r2)
+      info1 = p1, _date_from_rev(r1), r1
+      info2 = p2, _date_from_rev(r2), r2
+      return vclib._diff_fp(temp1, temp2, info1, info2, self.diff_cmd, args)
     except core.SubversionException, e:
       _fix_subversion_exception(e)
-      if e.apr_err != _SVN_ERR_CEASE_INVOCATION:
-        raise
+      if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
+        raise vclib.InvalidRevision
+      raise
 
-    # Now, iterate over those history items, checking for changes of
-    # location, pruning as necessitated by authz rules.
-    for hist_rev, hist_path in history:
-      path_parts = _path_parts(hist_path)
-      if not vclib.check_path_access(self, path_parts, path_type, hist_rev):
-        break
-      rev_paths.append([hist_rev, hist_path])
-    return rev_paths
+  def isexecutable(self, path_parts, rev):
+    props = self.itemprops(path_parts, rev) # does authz-check
+    return props.has_key(core.SVN_PROP_EXECUTABLE)
   
   def _getpath(self, path_parts):
     return string.join(path_parts, '/')
@@ -825,11 +746,8 @@ class LocalSubversionRepository(vclib.Repository):
     if rev is None or rev == 'HEAD':
       return self.youngest
     try:
-      if type(rev) == type(''):
-        while rev[0] == 'r':
-          rev = rev[1:]
       rev = int(rev)
-    except:
+    except ValueError:
       raise vclib.InvalidRevision(rev)
     if (rev < 0) or (rev > self.youngest):
       raise vclib.InvalidRevision(rev)
@@ -842,20 +760,7 @@ class LocalSubversionRepository(vclib.Repository):
       r = self._fsroots[rev] = fs.revision_root(self.fs_ptr, rev)
       return r
 
-  def _gettype(self, path, rev):
-    # Similar to itemtype(), but without the authz check.  Returns
-    # None for missing paths.
-    try:
-      kind = fs.check_path(self._getroot(rev), path)
-    except:
-      return None
-    if kind == core.svn_node_dir:
-      return vclib.DIR
-    if kind == core.svn_node_file:
-      return vclib.FILE
-    return None
-  
-  ##--- custom ---##
+  ##--- custom --##
 
   def get_youngest_revision(self):
     return self.youngest

lib/viewvc.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2010 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
@@ -14,7 +14,7 @@
 #
 # -----------------------------------------------------------------------
 
-__version__ = '1.1.14'
+__version__ = '1.1.8'
 
 # this comes from our library; measure the startup time
 import debug
@@ -79,6 +79,10 @@ _sticky_vars = [
   'limit_changes',
   ]
 
+# number of extra pages of information on either side of the current
+# page to fetch (see dir_pagesize/log_pagesize configuration option)
+EXTRA_PAGES = 3
+
 # for reading/writing between a couple descriptors
 CHUNK_SIZE = 8192
 
@@ -703,6 +707,7 @@ _legal_params = {
   'mindate'       : _re_validate_datetime,
   'maxdate'       : _re_validate_datetime,
   'format'        : _re_validate_alpha,
+  'limit'         : _re_validate_number,
 
   # for redirect_pathrev
   'orig_path'     : None,
@@ -1099,29 +1104,6 @@ _re_rewrite_email = re.compile('([-a-zA-Z0-9_.\+]+)@'
 # Matches revision references
 _re_rewrite_svnrevref = re.compile(r'\b(r|rev #?|revision #?)([0-9]+)\b')
 
-class ViewVCHtmlFormatterTokens:
-  def __init__(self, tokens):
-    self.tokens = tokens
-
-  def get_result(self, maxlen=0):
-    """Format the tokens per the registered set of formatters, and
-    limited to MAXLEN visible characters (or unlimited if MAXLEN is
-    0).  Return a 3-tuple containing the formatted result string, the
-    number of visible characters in the result string, and a boolean
-    flag indicating whether or not S was truncated."""
-    out = ''
-    out_len = 0
-    for token in self.tokens:
-      chunk, chunk_len = token.converter(token.match, token.userdata, maxlen)
-      out = out + chunk
-      out_len = out_len + chunk_len
-      if maxlen:
-        maxlen = maxlen - chunk_len
-        if maxlen <= 0:
-          return out, out_len, 1
-    return out, out_len, 0
-
-    
 class ViewVCHtmlFormatter:
   """Format a string as HTML-encoded output with customizable markup
   rules, for example turning strings that look like URLs into anchor links.
@@ -1153,7 +1135,7 @@ class ViewVCHtmlFormatter:
            linkified email address, with no more than MAXLEN characters
            in the non-HTML-tag bits.  If MAXLEN is 0, there is no maximum.
          - the number of non-HTML-tag characters returned.
-    """
+    """    
     s = mobj.group(0)
     trunc_s = maxlen and s[:maxlen] or s
     return '<a href="mailto:%s">%s</a>' % (urllib.quote(s),
@@ -1207,30 +1189,6 @@ class ViewVCHtmlFormatter:
                                     sapi.escape(trunc_s)), \
            len(trunc_s)
 
-  def format_custom_url(self, mobj, userdata, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text represented by MatchObject MOBJ, formatted as an
-           linkified URL created by substituting match groups 0-9 into
-           USERDATA (which is a format string that uses \N to
-           represent the substitution locations) and with no more than
-           MAXLEN characters in the non-HTML-tag portions.  If MAXLEN
-           is 0, there is no maximum.
-         - the number of characters returned.
-    """
-    format = userdata
-    text = mobj.group(0)
-    url = format
-    for i in range(9):
-      try:
-        repl = mobj.group(i)
-      except:
-        repl = ''
-      url = url.replace('\%d' % (i), repl)
-    trunc_s = maxlen and text[:maxlen] or text
-    return '<a href="%s">%s</a>' % (sapi.escape(url),
-                                    sapi.escape(trunc_s)), \
-           len(trunc_s)
-
   def format_text(self, s, unused, maxlen=0):
     """Return a 2-tuple containing:
          - the text S, HTML-escaped, containing no more than MAXLEN
@@ -1263,133 +1221,90 @@ class ViewVCHtmlFormatter:
     """
     out = ''
     out_len = 0
-    tokens = self.tokenize_text(s)
-    return tokens.get_result()
-
-  def tokenize_text(self, s):
-    """Return a ViewVCHtmlFormatterTokens object containing the tokens
-    created when parsing the string S.  Callers can use that object's
-    get_result() function to retrieve HTML-formatted text.
-    """
-    tokens = []
-    # We could just have a "while s:" here instead of "for line: while
-    # line:", but for really large log messages with heavy
-    # tokenization, the cost in both performance and memory
-    # consumption of the approach taken was atrocious.
-    for line in string.split(string.replace(s, '\r\n', '\n'), '\n'):
-      line = line + '\n'
-      while line:
-        best_match = best_conv = best_userdata = None
-        for test in self._formatters:
-          match = test[0].search(line)
-          # If we find and match and (a) its our first one, or (b) it
-          # matches text earlier than our previous best match, or (c) it
-          # matches text at the same location as our previous best match
-          # but extends to cover more text than that match, then this is
-          # our new best match.
-          #
-          # Implied here is that when multiple formatters match exactly
-          # the same text, the first formatter in the registration list wins.
-          if match \
-             and ((best_match is None) \
-                  or (match.start() < best_match.start())
-                  or ((match.start() == best_match.start()) \
-                      and (match.end() > best_match.end()))):
-            best_match = match
-            best_conv = test[1]
-            best_userdata = test[2]
-        # If we found a match...
-        if best_match:
-          # ... add any non-matching stuff first, then the matching bit.
-          start = best_match.start()
-          end = best_match.end()
-          if start > 0:
-            tokens.append(_item(match=line[:start],
-                                converter=self.format_text,
-                                userdata=None))
-          tokens.append(_item(match=best_match,
-                              converter=best_conv,
-                              userdata=best_userdata))
-          line = line[end:]
-        else:
-          # Otherwise, just add the rest of the string.
-          tokens.append(_item(match=line,
-                              converter=self.format_text,
-                              userdata=None))
-          line = ''
-    return ViewVCHtmlFormatterTokens(tokens)
+    for token in self._tokenize_text(s):
+      chunk, chunk_len = token.converter(token.match, token.userdata, maxlen)
+      out = out + chunk
+      out_len = out_len + chunk_len
+      if maxlen:
+        maxlen = maxlen - chunk_len
+        if maxlen <= 0:
+          return out, out_len, 1
+    return out, out_len, 0
 
   def _entity_encode(self, s):
     return string.join(map(lambda x: '&#%d;' % (ord(x)), s), '')
 
+  def _tokenize_text(self, s):
+    tokens = []
+    while s:
+      best_match = best_conv = best_userdata = None
+      for test in self._formatters:
+        match = test[0].search(s)
+        # If we find and match and (a) its our first one, or (b) it
+        # matches text earlier than our previous best match, or (c) it
+        # matches text at the same location as our previous best match
+        # but extends to cover more text than that match, then this is
+        # our new best match.
+        #
+        # Implied here is that when multiple formatters match exactly
+        # the same text, the first formatter in the registration list wins.
+        if match \
+           and ((best_match is None) \
+                or (match.start() < best_match.start())
+                or ((match.start() == best_match.start()) \
+                    and (match.end() > best_match.end()))):
+          best_match = match
+          best_conv = test[1]
+          best_userdata = test[2]
+      # If we found a match...
+      if best_match:
+        # ... add any non-matching stuff first, then the matching bit.
+        start = best_match.start()
+        end = best_match.end()
+        if start > 0:
+          tokens.append(_item(match=s[:start],
+                              converter=self.format_text,
+                              userdata=None))
+        tokens.append(_item(match=best_match,
+                            converter=best_conv,
+                            userdata=best_userdata))
+        s = s[end:]
+      else:
+        # Otherwise, just add the rest of the string.
+        tokens.append(_item(match=s,
+                            converter=self.format_text,
+                            userdata=None))
+        s = ''
+    return tokens
 
-class LogFormatter:
-  def __init__(self, request, log):
-    self.request = request
-    self.log = log or ''
-    self.tokens = None
-    self.cache = {}  # (maxlen, htmlize) => resulting_log
 
-  def get(self, maxlen=0, htmlize=1):
-    cfg = self.request.cfg
-    
-    # Prefer the cache.
-    if self.cache.has_key((maxlen, htmlize)):
-      return self.cache[(maxlen, htmlize)]
-    
-    # If we are HTML-izing...
-    if htmlize:
-      # ...and we don't yet have ViewVCHtmlFormatter() object tokens...
-      if not self.tokens:
-        # ... then get them.
-        lf = ViewVCHtmlFormatter()
+def format_log(request, log, maxlen=0, htmlize=1):
+  if not log:
+    return log
 
-        # Rewrite URLs.
-        lf.add_formatter(_re_rewrite_url, lf.format_url)
-
-        # Rewrite Subversion revision references.
-        if self.request.roottype == 'svn':
-          def revision_to_url(rev):
-            return self.request.get_url(view_func=view_revision,
-                                        params={'revision': rev},
-                                        escape=1)
-          lf.add_formatter(_re_rewrite_svnrevref, lf.format_svnrevref,
-                           revision_to_url)
-
-        # Rewrite email addresses.
-        if cfg.options.mangle_email_addresses == 2:
-          lf.add_formatter(_re_rewrite_email, lf.format_email_truncated)
-        elif cfg.options.mangle_email_addresses == 1:
-          lf.add_formatter(_re_rewrite_email, lf.format_email_obfuscated)
-        else:
-          lf.add_formatter(_re_rewrite_email, lf.format_email)
-
-        # Add custom rewrite handling per configuration.
-        for rule in cfg.options.custom_log_formatting:
-          rule = rule.replace('\\:', '\x01')          
-          regexp, format = map(lambda x: x.strip(), rule.split(':', 1))
-          regexp = regexp.replace('\x01', ':')
-          format = format.replace('\x01', ':')
-          lf.add_formatter(re.compile(regexp), lf.format_custom_url, format)
-
-        # Tokenize the log message.
-        self.tokens = lf.tokenize_text(self.log)
-
-      # Use our formatter to ... you know ... format.
-      log, log_len, truncated = self.tokens.get_result(maxlen)
-      result_log = log + (truncated and '&hellip;' or '')
-
-    # But if we're not HTML-izing...
+  cfg = request.cfg
+  if htmlize:
+    lf = ViewVCHtmlFormatter()
+    lf.add_formatter(_re_rewrite_url, lf.format_url)
+    if request.roottype == 'svn':
+      def revision_to_url(rev):
+        return request.get_url(view_func=view_revision,
+                               params={'revision': rev},
+                               escape=1)
+      lf.add_formatter(_re_rewrite_svnrevref, lf.format_svnrevref,
+                       revision_to_url)
+    if cfg.options.mangle_email_addresses == 2:
+      lf.add_formatter(_re_rewrite_email, lf.format_email_truncated)
+    elif cfg.options.mangle_email_addresses == 1:
+      lf.add_formatter(_re_rewrite_email, lf.format_email_obfuscated)
     else:
-      # ...then do much more simplistic transformations as necessary.
-      if cfg.options.mangle_email_addresses == 2:
-        log = re.sub(_re_rewrite_email, r'\1@...', log)
-      result_log = maxlen and log[:maxlen] or log
-
-    # In either case, populate the cache and return the results.
-    self.cache[(maxlen, htmlize)] = result_log
-    return result_log
-
+      lf.add_formatter(_re_rewrite_email, lf.format_email)
+    log, log_len, truncated = lf.get_result(log, maxlen)
+    return log + (truncated and '&hellip;' or '')
+  else:
+    if cfg.options.mangle_email_addresses == 2:
+      log = re.sub(_re_rewrite_email, r'\1@...', log)
+    return maxlen and log[:maxlen] or log
 
 _time_desc = {
          1 : 'second',
@@ -1616,51 +1531,33 @@ class MarkupPipeWrapper:
     if self.posttext:
       ctx.fp.write(self.posttext)
 
-_re_rewrite_escaped_url = re.compile('((http|https|ftp|file|svn|svn\+ssh)'
-                                     '(://[-a-zA-Z0-9%.~:_/]+)'
-                                     '((\?|\&amp;amp;|\&amp;|\&)'
-                                     '([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*'
-                                     '(#([-a-zA-Z0-9%.~:_]+)?)?)')
-
-def markup_escaped_urls(s):
-  # Return a copy of S with all URL references -- which are expected
-  # to be already HTML-escaped -- wrapped in <a href=""></a>.
-  def _url_repl(match_obj):
-    url = match_obj.group(0)
-    unescaped_url = string.replace(url, "&amp;amp;", "&amp;")
-    return "<a href=\"%s\">%s</a>" % (unescaped_url, url)
-  return re.sub(_re_rewrite_escaped_url, _url_repl, s)
-
-
-def markup_stream(request, cfg, blame_data, file_lines, filename,
-                  mime_type, encoding, colorize):
-  """Return the contents of a versioned file as a list of
-  vclib.Annotation objects, each representing one line of the file's
-  contents.  Use BLAME_DATA as the annotation information for the file
-  if provided.  Use FILE_LINES as the lines of file content text
-  themselves.  MIME_TYPE is the MIME content type of the file;
-  ENCODING is its character encoding.  If COLORIZE is true, attempt to
-  apply syntax coloration to the file contents, and use the
-  HTML-marked-up results as the text in the return vclib.Annotation
-  objects."""
-  
-  # Nothing to mark up?  So be it.
-  if not file_lines:
-    return []
-
-  # Determine if we should (and can) use Pygments to highlight our
-  # output.  Reasons not to include a) being told not to by the
-  # configuration, b) not being able to import the Pygments modules,
-  # and c) Pygments not having a lexer for our file's format.
-  pygments_lexer = None
-  if colorize:
+def markup_stream_pygments(request, cfg, blame_data, fp, filename,
+                           mime_type, encoding):
+  # Determine if we should use Pygments to highlight our output.
+  # Reasons not to include a) being told not to by the configuration,
+  # b) not being able to import the Pygments modules, and c) Pygments
+  # not having a lexer for our file's format.
+  blame_source = []
+  if blame_data:
+    for i in blame_data:
+      i.text = sapi.escape(i.text)
+      i.diff_href = None
+      if i.prev_rev:
+        i.diff_href = request.get_url(view_func=view_diff,
+                                      params={'r1': i.prev_rev,
+                                              'r2': i.rev},
+                                      escape=1, partial=1)
+      blame_source.append(i)
+    blame_data = blame_source
+  lexer = None
+  use_pygments = cfg.options.enable_syntax_coloration
+  try:
     from pygments import highlight
     from pygments.formatters import HtmlFormatter
     from pygments.lexers import ClassNotFound, \
                                 get_lexer_by_name, \
                                 get_lexer_for_mimetype, \
-                                get_lexer_for_filename, \
-                                guess_lexer
+                                get_lexer_for_filename
     if not encoding:
       encoding = 'guess'
       if cfg.options.detect_encoding:
@@ -1669,50 +1566,48 @@ def markup_stream(request, cfg, blame_data, file_lines, filename,
           encoding = 'chardet'
         except (SyntaxError, ImportError):
           pass
-
-    # First, see if there's a Pygments lexer associated with MIME_TYPE.
-    if mime_type:
+    try:
+      lexer = get_lexer_for_mimetype(mime_type,
+                                     encoding=encoding,
+                                     tabsize=cfg.options.tabsize,
+                                     stripnl=False)
+    except ClassNotFound:
       try:
-        pygments_lexer = get_lexer_for_mimetype(mime_type,
-                                                encoding=encoding,
-                                                tabsize=cfg.options.tabsize,
-                                                stripnl=False)
+        lexer = get_lexer_for_filename(filename,
+                                       encoding=encoding,
+                                       tabsize=cfg.options.tabsize,
+                                       stripnl=False)
       except ClassNotFound:
-        pygments_lexer = None
+        use_pygments = 0
+  except ImportError:
+    use_pygments = 0
 
-    # If we've no lexer thus far, try to find one based on the FILENAME.
-    if not pygments_lexer:
-      try:
-        pygments_lexer = get_lexer_for_filename(filename,
-                                                encoding=encoding,
-                                                tabsize=cfg.options.tabsize,
-                                                stripnl=False)
-      except ClassNotFound:
-        pygments_lexer = None
-
-    # Still no lexer?  If we've reason to believe this is a text
-    # file, try to guess the lexer based on the file's content.
-    if not pygments_lexer and is_text(mime_type) and file_lines:
-      try:
-        pygments_lexer = guess_lexer(file_lines[0])
-      except ClassNotFound:
-        pygments_lexer = None
-        
-  # If we aren't highlighting, just return an amalgamation of the
-  # BLAME_DATA (if any) and the FILE_LINES.
-  if not pygments_lexer:
-    lines = []
-    for i in range(len(file_lines)):
-      line = file_lines[i]
-      line = sapi.escape(string.expandtabs(line, cfg.options.tabsize))
-      line = markup_escaped_urls(line)
-      if blame_data:
-        blame_item = blame_data[i]
-        blame_item.text = line
-      else:
-        blame_item = vclib.Annotation(line, i + 1, None, None, None, None)
-        blame_item.diff_href = None
-      lines.append(blame_item)
+  # If we aren't going to be highlighting anything, just return the
+  # BLAME_SOURCE.  If there's no blame_source, we'll generate a fake
+  # one from the file contents we fetch with PATH and REV.
+  if not use_pygments:
+    if blame_source:
+      class BlameSourceTabsizeWrapper:
+        def __init__(self, blame_source, tabsize):
+          self.blame_source = blame_source
+          self.tabsize = cfg.options.tabsize
+        def __getitem__(self, idx):
+          item = self.blame_source.__getitem__(idx)
+          item.text = string.expandtabs(item.text, self.tabsize)
+          return item
+      return BlameSourceTabsizeWrapper(blame_source, cfg.options.tabsize)
+    else:
+      lines = []
+      line_no = 0
+      while 1:
+        line = fp.readline()
+        if not line:
+          break
+        line_no = line_no + 1
+        line = sapi.escape(string.expandtabs(line, cfg.options.tabsize))
+        item = vclib.Annotation(line, line_no, None, None, None, None)
+        item.diff_href = None
+        lines.append(item)
     return lines
 
   # If we get here, we're highlighting something.
@@ -1727,7 +1622,6 @@ def markup_stream(request, cfg, blame_data, file_lines, filename,
       self.line_no = 0
     def write(self, buf):
       ### FIXME:  Don't bank on write() being called once per line
-      buf = markup_escaped_urls(buf)
       if self.has_blame_data:
         self.blame_data[self.line_no].text = buf
       else:
@@ -1736,9 +1630,8 @@ def markup_stream(request, cfg, blame_data, file_lines, filename,
         item.diff_href = None
         self.blame_data.append(item)
       self.line_no = self.line_no + 1
-
-  ps = PygmentsSink(blame_data)
-  highlight(string.join(file_lines, ''), pygments_lexer,
+  ps = PygmentsSink(blame_source)
+  highlight(fp.read(), lexer,
             HtmlFormatter(nowrap=True,
                           classprefix="pygments-",
                           encoding='utf-8'), ps)
@@ -1777,8 +1670,7 @@ def get_itemprops(request, path_parts, rev):
   propnames.sort()
   props = []
   for name in propnames:
-    lf = LogFormatter(request, itemprops[name])
-    value = lf.get(maxlen=0, htmlize=1)
+    value = format_log(request, itemprops[name])
     undisplayable = ezt.boolean(0)
     # skip non-utf8 property names
     try:
@@ -1833,75 +1725,38 @@ def markup_or_annotate(request, is_annotate):
   # Is this a viewable image type?
   if is_viewable_image(mime_type) \
      and 'co' in cfg.options.allowed_views:
-    fp, revision = request.repos.openfile(path, rev, {})
+    fp, revision = request.repos.openfile(path, rev)
     fp.close()
     if check_freshness(request, None, revision, weak=1):
       return
-    if is_annotate:
-      annotation = 'binary'
+    annotation = 'binary'
     image_src_href = request.get_url(view_func=view_checkout,
                                      params={'revision': rev}, escape=1)
 
   # Not a viewable image.
   else:
-    blame_data = None
-
-    # If this was an annotation request, try to annotate this file.
-    # If something goes wrong, that's okay -- we'll gracefully revert
-    # to a plain markup display.
+    blame_source = None
     if is_annotate:
+      # Try to annotate this file, but don't croak if we fail.
       try:
-        blame_source, revision = request.repos.annotate(path, rev, False)
+        blame_source, revision = request.repos.annotate(path, rev)
+        annotation = 'annotated'
         if check_freshness(request, None, revision, weak=1):
           return
-        # Create BLAME_DATA list from BLAME_SOURCE, adding diff_href
-        # items to each relevant "line".
-        blame_data = []
-        for item in blame_source:
-          item.diff_href = None
-          if item.prev_rev:
-            item.diff_href = request.get_url(view_func=view_diff,
-                                             params={'r1': item.prev_rev,
-                                                     'r2': item.rev},
-                                             escape=1, partial=1)
-          blame_data.append(item)
-        annotation = 'annotated'
       except vclib.NonTextualFileContents:
         annotation = 'binary'
       except:
         annotation = 'error'
 
-    # Grab the file contents.
-    fp, revision = request.repos.openfile(path, rev, {'cvs_oldkeywords' : 1})
+    fp, revision = request.repos.openfile(path, rev)
     if check_freshness(request, None, revision, weak=1):
       fp.close()
       return
-    file_lines = fp.readlines()
+    lines = markup_stream_pygments(request, cfg, blame_source, fp,
+                                   path[-1], mime_type, encoding)
     fp.close()
 
-    # Do we have a differing number of file content lines and
-    # annotation items?  That's no good.  Call it an error and don't
-    # bother attempting the annotation display.
-    if blame_data and (len(file_lines) != len(blame_data)):
-      annotation = 'error'
-      blame_data = None
-
-    # Try to markup the file contents/annotation.  If we get an error
-    # and we were colorizing the stream, try once more without the
-    # colorization enabled.
-    colorize = cfg.options.enable_syntax_coloration
-    try:
-      lines = markup_stream(request, cfg, blame_data, file_lines,
-                            path[-1], mime_type, encoding, colorize)
-    except:
-      if colorize:
-        lines = markup_stream(request, cfg, blame_data, file_lines,
-                              path[-1], mime_type, encoding, False)
-      else:
-        raise debug.ViewVCException('Error displaying file contents',
-                                    '500 Internal Server Error')
-
-  data = common_template_data(request, revision, mime_type)
+  data = common_template_data(request, revision)
   data.merge(ezt.TemplateData({
     'mime_type' : mime_type,
     'log' : None,
@@ -1929,12 +1784,10 @@ def markup_or_annotate(request, is_annotate):
     revs = request.repos.itemlog(path, revision, vclib.SORTBY_REV,
                                  0, 1, options)
     entry = revs[-1]
-    lf = LogFormatter(request, entry.log)
-
     data['date'] = make_time_string(entry.date, cfg)
     data['author'] = entry.author
     data['changed'] = entry.changed
-    data['log'] = lf.get(maxlen=0, htmlize=1)
+    data['log'] = format_log(request, entry.log)
     data['size'] = entry.size
 
     if entry.date is not None:
@@ -2050,27 +1903,13 @@ def view_roots(request):
     rootnames = allroots.keys()
     rootnames.sort(icmp)
     for rootname in rootnames:
-      root_path, root_type, lastmod = allroots[rootname]
       href = request.get_url(view_func=view_directory,
                              where='', pathtype=vclib.DIR,
                              params={'root': rootname}, escape=1)
-      if root_type == vclib.SVN:
-        log_href = request.get_url(view_func=view_log,
-                                   where='', pathtype=vclib.DIR,
-                                   params={'root': rootname}, escape=1)
-      else:
-        log_href = None
       roots.append(_item(name=request.server.escape(rootname),
-                         type=root_type,
-                         path=root_path,
-                         author=lastmod and lastmod.author or None,
-                         ago=lastmod and lastmod.ago or None,
-                         date=lastmod and lastmod.date or None,
-                         log=lastmod and lastmod.log or None,
-                         short_log=lastmod and lastmod.short_log or None,
-                         rev=lastmod and lastmod.rev or None,
-                         href=href,
-                         log_href=log_href))
+                         type=allroots[rootname][1],
+                         path=allroots[rootname][0],
+                         href=href))
 
   data = common_template_data(request)
   data.merge(ezt.TemplateData({
@@ -2170,11 +2009,9 @@ def view_directory(request):
       row.date = make_time_string(file.date, cfg)
       row.ago = html_time(request, file.date)
     if cfg.options.show_logs:
-      debug.t_start("dirview_logformat")
-      lf = LogFormatter(request, file.log)
-      row.log = lf.get(maxlen=0, htmlize=1)
-      row.short_log = lf.get(maxlen=cfg.options.short_log_len, htmlize=1)
-      debug.t_end("dirview_logformat")
+      row.log = format_log(request, file.log)
+      row.short_log = format_log(request, file.log,
+                                 maxlen=cfg.options.short_log_len)
     row.lockinfo = file.lockinfo
     row.anchor = request.server.escape(file.name)
     row.name = request.server.escape(file.name)
@@ -2396,11 +2233,10 @@ def paging(data, key, pagestart, local_name, pagesize):
   # Slice
   return data[key][pagestart:pageend]
 
-def paging_sws(data, key, pagestart, local_name, pagesize,
-               extra_pages, offset):
+def paging_sws(data, key, pagestart, local_name, pagesize, offset):
   """Implement sliding window-style paging."""
   # Create the picklist
-  last_requested = pagestart + (extra_pages * pagesize)
+  last_requested = pagestart + (EXTRA_PAGES * pagesize)
   picklist = data['picklist'] = []
   has_more = ezt.boolean(0)
   for i in range(0, len(data[key]), pagesize):
@@ -2529,9 +2365,9 @@ def view_log(request):
   first = last = 0
   if cfg.options.log_pagesize:
     log_pagestart = int(request.query_dict.get('log_pagestart', 0))
-    total = cfg.options.log_pagesextra * cfg.options.log_pagesize
-    first = log_pagestart - min(log_pagestart, total)
-    last = log_pagestart + (total + cfg.options.log_pagesize) + 1
+    first = log_pagestart - min(log_pagestart,
+                                (EXTRA_PAGES * cfg.options.log_pagesize))
+    last = log_pagestart + ((EXTRA_PAGES + 1) * cfg.options.log_pagesize) + 1
   show_revs = request.repos.itemlog(request.path_parts, request.pathrev,
                                     sortby, first, last - first, options)
 
@@ -2551,6 +2387,7 @@ def view_log(request):
     entry.ago = None
     if rev.date is not None:
       entry.ago = html_time(request, rev.date, 1)
+    entry.log = format_log(request, rev.log or '')
     entry.size = rev.size
     entry.lockinfo = rev.lockinfo
     entry.branch_point = None
@@ -2558,9 +2395,6 @@ def view_log(request):
     entry.orig_path = None
     entry.copy_path = None
 
-    lf = LogFormatter(request, rev.log or '')
-    entry.log = lf.get(maxlen=0, htmlize=1)
-
     entry.view_href = None
     entry.download_href = None
     entry.download_text_href = None
@@ -2794,8 +2628,7 @@ def view_log(request):
       request.get_form(params={'log_pagestart': None})
     data['log_pagestart'] = int(request.query_dict.get('log_pagestart',0))
     data['entries'] = paging_sws(data, 'entries', data['log_pagestart'],
-                                 'rev', cfg.options.log_pagesize,
-                                 cfg.options.log_pagesextra, first)
+                                 'rev', cfg.options.log_pagesize, first)
 
   generate_page(request, "log", data)
 
@@ -2806,12 +2639,9 @@ def view_checkout(request):
   if 'co' not in cfg.options.allowed_views:
     raise debug.ViewVCException('Checkout view is disabled',
                                  '403 Forbidden')
-  if request.pathtype != vclib.FILE:
-    raise debug.ViewVCException('Unsupported feature: checkout view on '
-                                'directory', '400 Bad Request')
-
+  
   path, rev = _orig_path(request)
-  fp, revision = request.repos.openfile(path, rev, {})
+  fp, revision = request.repos.openfile(path, rev)
 
   # The revision number acts as a strong validator.
   if not check_freshness(request, None, revision):
@@ -2897,7 +2727,7 @@ def search_file(repos, path_parts, rev, search_re):
 
   # Read in each line of a checked-out file, and then use re.search to
   # search line.
-  fp = repos.openfile(path_parts, rev, {})[0]
+  fp = repos.openfile(path_parts, rev)[0]
   matches = 0
   while 1:
     line = fp.readline()
@@ -3125,8 +2955,7 @@ class DiffSource:
 class DiffSequencingError(Exception):
   pass
 
-def diff_parse_headers(fp, diff_type, path1, path2, rev1, rev2,
-                       sym1=None, sym2=None):
+def diff_parse_headers(fp, diff_type, rev1, rev2, sym1=None, sym2=None):
   date1 = date2 = log_rev1 = log_rev2 = flag = None
   header_lines = []
 
@@ -3155,15 +2984,15 @@ def diff_parse_headers(fp, diff_type, path1, path2, rev1, rev2,
         if match:
           date1 = match.group(1)
           log_rev1 = match.group(2)
-          line = '%s%s\t%s\t%s%s\n' % (f1, path1, date1, log_rev1,
-                                       sym1 and ' ' + sym1 or '')
+        if sym1:
+          line = line[:-1] + ' %s\n' % sym1
       elif line[:len(f2)] == f2:
         match = _re_extract_rev.match(line)
         if match:
           date2 = match.group(1)
           log_rev2 = match.group(2)
-          line = '%s%s\t%s\t%s%s\n' % (f2, path2, date2, log_rev2,
-                                       sym2 and ' ' + sym2 or '')
+        if sym2:
+          line = line[:-1] + ' %s\n' % sym2
         parsing = 0
       elif line[:3] == 'Bin':
         flag = _RCSDIFF_IS_BINARY
@@ -3291,11 +3120,8 @@ def view_patch(request):
     raise debug.ViewVCException('Invalid path(s) or revision(s) passed '
                                  'to diff', '400 Bad Request')
 
-  path_left = _path_join(p1)
-  path_right = _path_join(p2)
-  date1, date2, flag, headers = diff_parse_headers(fp, diff_type,
-                                                   path_left, path_right,
-                                                   rev1, rev2, sym1, sym2)
+  date1, date2, flag, headers = diff_parse_headers(fp, diff_type, rev1, rev2,
+                                                   sym1, sym2)
 
   server_fp = get_writeready_server_file(request, 'text/plain')
   server_fp.write(headers)
@@ -3361,13 +3187,13 @@ def view_diff(request):
     if (cfg.options.hr_intraline and idiff
         and ((human_readable and idiff.sidebyside)
              or (not human_readable and diff_type == vclib.UNIFIED))):
-      f1 = request.repos.openfile(p1, rev1, {})[0]
+      f1 = request.repos.openfile(p1, rev1)[0]
       try:
         lines_left = f1.readlines()
       finally:
         f1.close()
 
-      f2 = request.repos.openfile(p2, rev2, {})[0]
+      f2 = request.repos.openfile(p2, rev2)[0]
       try:
         lines_right = f2.readlines()
       finally:
@@ -3391,7 +3217,6 @@ def view_diff(request):
   changes = []
   if fp:
     date1, date2, flag, headers = diff_parse_headers(fp, diff_type,
-                                                     path_left, path_right,
                                                      rev1, rev2, sym1, sym2)
     if human_readable:
       if flag is not None:
@@ -3409,8 +3234,7 @@ def view_diff(request):
   fvi = get_file_view_info(request, path_left, rev1)
   left = _item(date=make_time_string(log_entry1.date, cfg),
                author=log_entry1.author,
-               log=LogFormatter(request,
-                                log_entry1.log).get(maxlen=0, htmlize=1),
+               log=format_log(request, log_entry1.log),
                size=log_entry1.size,
                ago=ago1,
                path=path_left,
@@ -3426,8 +3250,7 @@ def view_diff(request):
   fvi = get_file_view_info(request, path_right, rev2)
   right = _item(date=make_time_string(log_entry2.date, cfg),
                 author=log_entry2.author,
-                log=LogFormatter(request,
-                                 log_entry2.log).get(maxlen=0, htmlize=1),
+                log=format_log(request, log_entry2.log),
                 size=log_entry2.size,
                 ago=ago2,
                 path=path_right,
@@ -3583,7 +3406,7 @@ def generate_tarball(out, request, reldir, stack, dir_mtime=None):
 
     ### FIXME: Read the whole file into memory?  Bad... better to do
     ### 2 passes.
-    fp = request.repos.openfile(rep_path + [file.name], request.pathrev, {})[0]
+    fp = request.repos.openfile(rep_path + [file.name], request.pathrev)[0]
     contents = fp.read()
     fp.close()
 
@@ -3675,8 +3498,7 @@ def view_revision(request):
   propnames.sort()
   props = []
   for name in propnames:
-    lf = LogFormatter(request, revprops[name])
-    value = lf.get(maxlen=0, htmlize=1)
+    value = format_log(request, revprops[name])
     undisplayable = ezt.boolean(0)
     # skip non-utf8 property names
     try:
@@ -3799,14 +3621,13 @@ def view_revision(request):
                                     escape=1)
   jump_rev_action, jump_rev_hidden_values = \
     request.get_form(params={'revision': None})
-
-  lf = LogFormatter(request, msg)
+    
   data = common_template_data(request)
   data.merge(ezt.TemplateData({
     'rev' : str(rev),
     'author' : author,
     'date' : date_str,
-    'log' : lf.get(maxlen=0, htmlize=1),
+    'log' : format_log(request, msg),
     'properties' : props,
     'ago' : date is not None and html_time(request, date, 1) or None,
     'changes' : changes,
@@ -4164,10 +3985,9 @@ def build_commit(request, files, max_files, dir_strip, format):
     commit.log = None
     commit.short_log = None
   else:
-    lf = LogFormatter(request, desc)
-    htmlize = (format != 'rss')
-    commit.log = lf.get(maxlen=0, htmlize=htmlize)
-    commit.short_log = lf.get(maxlen=cfg.options.short_log_len, htmlize=htmlize)
+    commit.log = format_log(request, desc, 0, format != 'rss')
+    commit.short_log = format_log(request, desc, cfg.options.short_log_len,
+                                  format != 'rss')
   commit.author = request.server.escape(author)
   commit.rss_date = make_rss_time_string(date, request.cfg)
   if request.roottype == 'svn':
@@ -4235,6 +4055,7 @@ def view_query(request):
   mindate = request.query_dict.get('mindate', '')
   maxdate = request.query_dict.get('maxdate', '')
   format = request.query_dict.get('format')
+  limit = int(request.query_dict.get('limit', 0))
   limit_changes = int(request.query_dict.get('limit_changes',
                                              cfg.options.limit_changes))
 
@@ -4304,32 +4125,29 @@ def view_query(request):
       query.SetFromDateObject(mindate)
     if maxdate is not None:
       query.SetToDateObject(maxdate)
-
-  # Set the admin-defined (via configuration) row limits.  This is to avoid
-  # slamming the database server with a monster query.
-  if format == 'rss':
+  if limit:
+    query.SetLimit(limit)
+  elif format == 'rss':
     query.SetLimit(cfg.cvsdb.rss_row_limit)
-  else:
-    query.SetLimit(cfg.cvsdb.row_limit)
 
   # run the query
   db.RunQuery(query)
-  commit_list = query.GetCommitList()
-  row_limit_reached = query.GetLimitReached()
-  
+
+  sql = request.server.escape(db.CreateSQLQueryString(query))
+
   # gather commits
   commits = []
   plus_count = 0
   minus_count = 0
   mod_time = -1
-  if commit_list:
+  if query.commit_list:
     files = []
     limited_files = 0
-    current_desc = commit_list[0].GetDescriptionID()
-    current_rev = commit_list[0].GetRevision()
+    current_desc = query.commit_list[0].GetDescriptionID()
+    current_rev = query.commit_list[0].GetRevision()
     dir_strip = _path_join(repos_dir)
 
-    for commit in commit_list:
+    for commit in query.commit_list:
       commit_desc = commit.GetDescriptionID()
       commit_rev = commit.GetRevision()
 
@@ -4398,7 +4216,7 @@ def view_query(request):
 
   data = common_template_data(request)
   data.merge(ezt.TemplateData({
-    'sql': request.server.escape(db.CreateSQLQueryString(query)),
+    'sql': sql,
     'english_query': english_query(request),
     'queryform_href': request.get_url(view_func=view_queryform, escape=1),
     'backout_href': backout_href,
@@ -4407,7 +4225,6 @@ def view_query(request):
     'show_branch': show_branch,
     'querysort': querysort,
     'commits': commits,
-    'row_limit_reached' : ezt.boolean(row_limit_reached),
     'limit_changes': limit_changes,
     'limit_changes_href': limit_changes_href,
     'rss_link_href': request.get_url(view_func=view_query,
@@ -4450,27 +4267,11 @@ def list_roots(request):
   for root in cfg.general.svn_roots.keys():
     auth = setup_authorizer(cfg, request.username, root)
     try:
-      repos = vclib.svn.SubversionRepository(root, cfg.general.svn_roots[root],
-                                             auth, cfg.utilities,
-                                             cfg.options.svn_config_dir)
-      lastmod = None
-      if cfg.options.show_roots_lastmod:
-        try:
-          repos.open()
-          youngest_rev = repos.youngest
-          date, author, msg, revprops, changes = repos.revinfo(youngest_rev)
-          date_str = make_time_string(date, cfg)
-          ago = html_time(request, date)
-          lf = LogFormatter(request, msg)
-          log = lf.get(maxlen=0, htmlize=1)
-          short_log = lf.get(maxlen=cfg.options.short_log_len, htmlize=1)
-          lastmod = _item(ago=ago, author=author, date=date_str, log=log,
-                          short_log=short_log, rev=str(youngest_rev))
-        except:
-          lastmod = None
+      vclib.svn.SubversionRepository(root, cfg.general.svn_roots[root], auth,
+                                     cfg.utilities, cfg.options.svn_config_dir)
     except vclib.ReposNotFound:
       continue
-    allroots[root] = [cfg.general.svn_roots[root], 'svn', lastmod]
+    allroots[root] = [cfg.general.svn_roots[root], 'svn']
 
   # Add the viewable CVS roots
   for root in cfg.general.cvs_roots.keys():
@@ -4480,7 +4281,7 @@ def list_roots(request):
                                cfg.utilities, cfg.options.use_rcsparse)
     except vclib.ReposNotFound:
       continue
-    allroots[root] = [cfg.general.cvs_roots[root], 'cvs', None]
+    allroots[root] = [cfg.general.cvs_roots[root], 'cvs']
     
   return allroots
 
@@ -4555,35 +4356,14 @@ def locate_root(cfg, rootname):
   return None, None
   
 def load_config(pathname=None, server=None):
-  """Load the ViewVC configuration file.  SERVER is the server object
-  that will be using this configuration.  Consult the environment for
-  the variable VIEWVC_CONF_PATHNAME and VIEWCVS_CONF_PATHNAME (its
-  legacy name) and, if set, use its value as the path of the
-  configuration file; otherwise, use PATHNAME (if provided).  Failing
-  all else, use a hardcoded default configuration path."""
-  
   debug.t_start('load-config')
 
-  # See if the environment contains overrides to the configuration
-  # path.  If we have a SERVER object, consult its environment; use
-  # the OS environment otherwise.
-  env_pathname = None
-  if server is not None:
-    env_pathname = (server.getenv("VIEWVC_CONF_PATHNAME")
-                    or server.getenv("VIEWCVS_CONF_PATHNAME"))
-  else:
-    env_pathname = (os.environ.get("VIEWVC_CONF_PATHNAME")
-                    or os.environ.get("VIEWCVS_CONF_PATHNAME"))
+  if pathname is None:
+    pathname = (os.environ.get("VIEWVC_CONF_PATHNAME")
+                or os.environ.get("VIEWCVS_CONF_PATHNAME")
+                or os.path.join(os.path.dirname(os.path.dirname(__file__)),
+                                "viewvc.conf"))
 
-  # Try to find the configuration pathname by searching these ordered
-  # locations: the environment, the passed-in PATHNAME, the hard-coded
-  # default.
-  pathname = (env_pathname
-              or pathname
-              or os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                              "viewvc.conf"))
-
-  # Load the configuration!
   cfg = config.Config()
   cfg.set_defaults()
   cfg.load_config(pathname, server and server.getenv("HTTP_HOST"))

lib/win32popen.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2012 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 ViewVC

notes/releases.txt

@@ -85,22 +85,17 @@ numbers, and not literal):
 
 14. 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:
+    CHECKSUMS document there accordingly.  Also, drop a copy of the
+    archive files into the root directory of the viewvc.org website
+    (unversioned).
 
-       http://viewvc.tigris.org/servlets/ProjectDocumentList?folderID=6004
+15. On trunk, update the websites (both the viewvc.org/ and www/ ones)
+    to refer to the new release files, and copy the CHANGES for the
+    new release into trunk's CHANGES file.
 
-    Also, drop a copy of the archive files into the root directory of
-    the viewvc.org website (unversioned).
-
-15. Update the Tigris.org website (^/trunk/www/index.html) to refer to
-    the new release files and commit.
-
-       svn ci -m "Bump latest advertised release."
-
-16. Back on the release branch, edit the file 'lib/viewvc.py' again,
-    incrementing the patch number assigned to the __version__
-    variable.  Add a new empty block in the branch's CHANGES file.
-    Commit your changes:
+16. Edit the file 'lib/viewvc.py' again, incrementing the patch number
+    assigned to the __version__ variable.  Add a new empty block in
+    the branch's CHANGES file.  Commit your changes:
 
        svn ci -m "Begin a new release cycle."
 
@@ -109,12 +104,6 @@ numbers, and not literal):
     (and possibly, minor or major) release.  (For the Milestone sort
     key, use a packed integer XXYYZZ:  1.0.3 == 10003, 2.11.4 == 21104.)
 
-       http://viewvc.tigris.org/issues/editversions.cgi?component=viewvc&action=add
-       http://viewvc.tigris.org/issues/editmilestones.cgi?component=viewvc&action=add
-
 18. Send to the announce@ list a message explaining all the cool new
     features, and post similar announcements to other places interested
     in this sort of stuff, such as Freshmeat (http://www.freshmeat.net).
-
-19. Merge CHANGES for this release into the CHANGES file for newer
-    release lines and commit.

templates/docroot/styles.css

@@ -269,14 +269,3 @@ table.vc_idiff tbody th {
 .vc_query_form {
   background-color: #e6e6e6;
 }
-
-
-/*** Warning! ***/
-.vc_warning {
-  border-width: 1px 2px 2px 2px;
-  border-color: black;
-  border-style: solid;
-  background-color: red;
-  color: white;
-  padding: 0.5em;
-}

templates/query.ezt

@@ -158,15 +158,7 @@
 [is query "skipped"]
 [else]
 <p><strong>[num_commits]</strong> matches found.</p>
-[if-any row_limit_reached]
-<p class="vc_warning">WARNING:  These query results have been
-   artificially limited by an administrative threshold value and do
-   <em>not</em> represent the entirety of the data set which matches
-   the query.  Consider modifying your query to be more specific</a>,
-   using your version control tool's query capabilities, or asking
-   your administrator to raise the database response size
-   threshold.</p>
-[end]
+
 [if-any commits]
 <table cellspacing="0" cellpadding="2">
  <thead>

templates/query_results.ezt

@@ -7,15 +7,6 @@
 
 <p><strong>[english_query]</strong></p>
 [# <!-- {sql} --> ]
-[if-any row_limit_reached]
-<p class="vc_warning">WARNING:  These query results have been
-   artificially limited by an administrative threshold value and do
-   <em>not</em> represent the entirety of the data set which matches
-   the query.  Consider <a href="[queryform_href]">modifying your
-   query to be more specific</a>, using your version control tool's
-   query capabilities, or asking your administrator to raise the
-   database response size threshold.</p>
-[end]
 <p><a href="[queryform_href]">Modify query</a></p>
 <p><a href="[backout_href]">Show commands which could be used to back out these changes</a></p>
 

templates/roots.ezt

@@ -9,12 +9,6 @@
 <thead>
 <tr>
   <th class="vc_header_sort">Name</th>
-[is cfg.options.show_roots_lastmod "1"]
-  <th class="vc_header">Revision</th>
-  <th class="vc_header">Age</th>
-  <th class="vc_header">Author</th>
-  <th class="vc_header">Log</th>
-[end]
 </tr>
 </thead>
 
@@ -26,12 +20,6 @@
       <img src="[docroot]/images/dir.png" alt="" class="vc_icon" />
       [roots.name]</a>
     </td>
-[is cfg.options.show_roots_lastmod "1"]
-    <td style="width:20">&nbsp;[if-any roots.log_href]<a href="[roots.log_href]">[roots.rev]</a>[else][roots.rev][end]</td>
-    <td style="width:20">&nbsp;[roots.ago]</td>
-    <td style="width:20">&nbsp;[roots.author]</td>
-    <td style="width:20">&nbsp;[roots.short_log]</td>
-[end]
   </tr>
 [end]
 </tbody>

tools/make-release

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 1999-2012 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 ViewVC

tparse/tparse.cpp

@@ -1,5 +1,5 @@
 /*
-# Copyright (C) 1999-2012 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 ViewVC

tparse/tparse.h

@@ -1,5 +1,5 @@
 /*
-# Copyright (C) 1999-2012 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 ViewVC

tparse/tparsemodule.cpp

@@ -1,5 +1,5 @@
 /*
-# Copyright (C) 1999-2012 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 ViewVC

tparse/tparsemodule.h

@@ -1,5 +1,5 @@
 /*
-# Copyright (C) 1999-2012 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 ViewVC

viewvc-install

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- Mode: python -*-
 #
-# Copyright (C) 1999-2012 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 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
@@ -209,8 +209,6 @@ def install_file(src_path, dst_path, mode, subst_path_vars,
                         temp = raw_input("Do you want to [O]verwrite, [D]o "
                                          "not overwrite, or [V]iew "
                                          "differences? ")
-                    if len(temp) == 0:
-                        continue
                     temp = string.lower(temp[0])
                     if temp == "v" and ext not in BINARY_FILE_EXTS:
                         print """