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,14 +1,3 @@
-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
-  * handle file:/// Subversion rootpaths as local roots (issue #446)
-  * 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,7 +30,7 @@ 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)

LICENSE.html

@@ -15,7 +15,7 @@
 
 <blockquote>
 
-<p><strong>Copyright &copy; 1999-2011 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,7 +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>
 </ul>
 
 </body>

conf/viewvc.conf.dist

@@ -572,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
@@ -657,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

docs/template-authoring-guide.html

@@ -2144,32 +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.name</td>
   <td>String</td>
@@ -2183,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>
 

lib/config.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 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
@@ -420,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
@@ -434,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/vcauth/__init__.py

@@ -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

@@ -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

@@ -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-2011 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
@@ -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/ccvs/bincvs.py

@@ -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
 

lib/vclib/svn/__init__.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 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,7 +15,6 @@
 import os
 import os.path
 import re
-import urllib
 
 _re_url = re.compile('^(http|https|file|svn|svn\+[^:]+)://')
 
@@ -24,20 +23,8 @@ def canonicalize_rootpath(rootpath):
     import svn.core
     return svn.core.svn_path_canonicalize(rootpath)
   except:
-    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/'):
-        return os.path.normpath(urllib.unquote(rootpath[16:]))
-      elif rootpath_lower.startswith('file:///'):
-        return os.path.normpath(urllib.unquote(rootpath[7:]))
     if re.search(_re_url, rootpath):
-      return rootpath.rstrip('/')
+      return rootpath[-1] == '/' and rootpath[:-1] or rootpath
     return os.path.normpath(rootpath)
 
 

lib/vclib/svn/svn_ra.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 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
@@ -57,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):
@@ -203,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

lib/vclib/svn/svn_repos.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 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
@@ -204,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)
@@ -374,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
 
@@ -493,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:
@@ -533,56 +583,33 @@ class LocalSubversionRepository(vclib.Repository):
       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, 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)
@@ -635,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
@@ -648,76 +674,24 @@ class LocalSubversionRepository(vclib.Repository):
           found_readable = 1
         else:
           found_unreadable = 1
-      return found_readable, found_unreadable, changedpaths.values()
-
-    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 vclib.check_path_access(self, parts, pathtype, rev):
-          found_readable = 1
-          if hasattr(change, 'copyfrom_path'):
-            copyfrom_path = change.copyfrom_path
-            copyfrom_rev = change.copyfrom_rev
-          else:
-            copyfrom_rev, copyfrom_path = fs.copied_from(fsroot, path)
-          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
@@ -730,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, '/')
@@ -796,7 +760,7 @@ class LocalSubversionRepository(vclib.Repository):
       r = self._fsroots[rev] = fs.revision_root(self.fs_ptr, rev)
       return r
 
-  ##--- custom ---##
+  ##--- custom --##
 
   def get_youngest_revision(self):
     return self.youngest

lib/viewvc.py

@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 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.9'
+__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
 
@@ -1527,21 +1531,6 @@ 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%.~:_/]+)'
-                                     '((\?|\&|\&|\&)'
-                                     '([-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_pygments(request, cfg, blame_data, fp, filename,
                            mime_type, encoding):
   # Determine if we should use Pygments to highlight our output.
@@ -1605,7 +1594,6 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename,
         def __getitem__(self, idx):
           item = self.blame_source.__getitem__(idx)
           item.text = string.expandtabs(item.text, self.tabsize)
-          item.text = markup_escaped_urls(item.text)
           return item
       return BlameSourceTabsizeWrapper(blame_source, cfg.options.tabsize)
     else:
@@ -1617,7 +1605,6 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename,
           break
         line_no = line_no + 1
         line = sapi.escape(string.expandtabs(line, cfg.options.tabsize))
-        line = markup_escaped_urls(line)
         item = vclib.Annotation(line, line_no, None, None, None, None)
         item.diff_href = None
         lines.append(item)
@@ -1635,7 +1622,6 @@ def markup_stream_pygments(request, cfg, blame_data, fp, 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:
@@ -1920,16 +1906,9 @@ def view_roots(request):
       href = request.get_url(view_func=view_directory,
                              where='', pathtype=vclib.DIR,
                              params={'root': rootname}, escape=1)
-      lastmod = allroots[rootname][2]
       roots.append(_item(name=request.server.escape(rootname),
                          type=allroots[rootname][1],
                          path=allroots[rootname][0],
-                         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))
 
   data = common_template_data(request)
@@ -2254,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):
@@ -2387,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)
 
@@ -2650,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)
 
@@ -4290,26 +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)
-          log = format_log(request, msg)
-          short_log = format_log(request, msg, maxlen=cfg.options.short_log_len)
-          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():
@@ -4319,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
 

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;[roots.rev]</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>