Merge from trunk r2713 (disallowing relative rootpaths) and r2714

(fixing -- no, really fixing this time -- path-to-url calculation for
annotations on Windows).

git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/1.1.x@2715 8cb11bc2-c004-0410-86c3-e597b4017df7

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. Multiple roots should be separated by commas and can be
-## placed on separate lines.
+## value (where the path is an absolute filesystem path). Multiple roots
+## should be separated by commas and can be placed on separate lines.
 ##
 ## Example:
 ## cvs_roots = cvsroot: /opt/cvs/repos1,
@@ -97,8 +97,13 @@
 
 ## 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. Multiple roots should be separated by commas
-## and can be placed on separate lines.
+## 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.
 ##
 ## Example:
 ## svn_roots = svnrepos: /opt/svn/,
@@ -109,7 +114,8 @@
 ## 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 type is either "cvs" or "svn").
+## form "path: type" (where the type is either "cvs" or "svn", and
+## the path is an absolute filesystem path).
 ##
 ## Rather than force you to add a new entry to 'cvs_roots' or
 ## 'svn_roots' each time you create a new repository, ViewVC rewards

lib/vclib/ccvs/__init__.py

@@ -14,6 +14,7 @@ import os.path
 
 
 def canonicalize_rootpath(rootpath):
+  assert os.path.isabs(rootpath)
   return os.path.normpath(rootpath)
 
 
@@ -22,6 +23,7 @@ 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/svn/__init__.py

@@ -38,6 +38,7 @@ def canonicalize_rootpath(rootpath):
         return os.path.normpath(urllib.unquote(rootpath[7:]))
     if re.search(_re_url, rootpath):
       return rootpath.rstrip('/')
+    assert os.path.isabs(rootpath)
     return os.path.normpath(rootpath)
 
 
@@ -48,6 +49,7 @@ 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_repos.py

@@ -108,8 +108,8 @@ def _rev2optrev(rev):
 
 
 def _rootpath2url(rootpath, path):
-  drive, rootpath = os.path.splitdrive(rootpath)
   rootpath = os.path.abspath(rootpath)
+  drive, rootpath = os.path.splitdrive(rootpath)
   if os.sep != '/':
     rootpath = string.replace(rootpath, os.sep, '/')
   rootpath = urllib.quote(rootpath)