svn commit: r1604 - trunk: . docs lib

Author: cmpilato
Date: 2007-04-13 01:15:05-0700
New Revision: 1604

Modified:
   trunk/docs/upgrading-howto.html
   trunk/lib/config.py
   trunk/lib/viewvc.py
   trunk/viewvc.conf.dist

Log:
Move the 'use_rcsparse' option from 'general' to 'options'.

* viewvc.conf.dist
  (use_rcsparse): Move this from the 'general' section to the
    'options' section.

* lib/config.py
  (Config.set_defaults): Track the move of the 'use_rcsparse' section.

* lib/viewvc.py
  (Request.run_viewvc): Track the move of the 'use_rcsparse' section.

* docs/upgrading-howto.html
  Note the option changes, and re-work the upgrading-from-1.0.0 option
  changes section a little bit while I'm here.



Modified: trunk/docs/upgrading-howto.html
Url: 
http://viewvc.tigris.org/source/browse/viewvc/trunk/docs/upgrading-howto.html?view=diff&rev=1604&p1=trunk/docs/upgrading-howto.html&p2=trunk/docs/upgrading-howto.html&r1=1603&r2=1604
==============================================================================
--- trunk/docs/upgrading-howto.html     (original)
+++ trunk/docs/upgrading-howto.html     2007-04-13 01:15:05-0700
@@ -127,42 +127,56 @@
    viewvc.conf file.  All the options used for configuring the
    locations of various helper applications that ViewVC uses which
    were previously scattered throughout the configuration file are now
-   all centralized in this one new section.</p>
-
-<p>The following options have been added:</p>
+   all centralized in this one new section.  To accomplish this, the
+   following options were added:</p>
 
 <ul>
-  <li>utilities/rcs_dir</li>
+  <li>options/use_py2html</li>
+  <li>utilities/cvsgraph</li>
   <li>utilities/cvsnt</li>
-  <li>utilities/svn</li>
+  <li>utilities/diff</li>
   <li>utilities/enscript</li>
+  <li>utilities/gzip</li>
   <li>utilities/highlight</li>
-  <li>utilities/py2html_dir</li>
   <li>utilities/php</li>
-  <li>utilities/cvsgraph</li>
-  <li>utilities/diff</li>
-  <li>utilities/gzip</li>
+  <li>utilities/py2html_dir</li>
+  <li>utilities/rcs_dir</li>
   <li>utilities/sed</li>
-  <li>options/use_py2html</li>
-  <li>options/allowed_views</li>
+  <li>utilities/svn</li>
 </ul>
 
-<p>The following options have been removed:</p>
+<p>And these were removed:</p>
 
 <ul>
-  <li>general/rcs_path</li>
   <li>general/cvsnt_ext_path</li>
+  <li>general/rcs_path</li>
   <li>general/svn_path</li>
+  <li>options/cvsgraph_path</li>
   <li>options/enscript_path</li>
   <li>options/highlight_path</li>
-  <li>options/py2html_path</li>
   <li>options/php_exe</li>
-  <li>options/cvsgraph_path</li>
+  <li>options/py2html_path</li>
+</ul>
+
+<p>Secondly, all the options which governed which ViewVC views were
+   enabled have been consolidated into a single new option.  This new
+   option:</p>
+
+<ul>
+  <li>options/allowed_views</li>
+</ul>
+
+<p>Replaces these, which have been removed:</p>
+
+<ul>
   <li>options/allow_annotate</li>
   <li>options/allow_markup</li>
   <li>options/allow_tar</li>
 </ul>
 
+<p>The <code>use_rcsparse</code> option was moved from the "general"
+   section to the "options" section.</p>
+
 </div>
 
 <div class="h3">

Modified: trunk/lib/config.py
Url: 
http://viewvc.tigris.org/source/browse/viewvc/trunk/lib/config.py?view=diff&rev=1604&p1=trunk/lib/config.py&p2=trunk/lib/config.py&r1=1603&r2=1604
==============================================================================
--- trunk/lib/config.py (original)
+++ trunk/lib/config.py 2007-04-13 01:15:05-0700
@@ -146,7 +146,6 @@
     self.general.svn_roots = { }
     self.general.root_parents = []
     self.general.default_root = ''
-    self.general.use_rcsparse = 0
     self.general.mime_types_file = ''
     self.general.address = '<a href="mailto:user@xxxxxxxxxxxxxxxxxxxxxxx";>No 
admin address has been configured</a>'
     self.general.forbidden = ()
@@ -196,6 +195,7 @@
     self.options.default_file_view = "log"
     self.options.checkout_magic = 0
     self.options.allowed_views = ['markup', 'annotate']
+    self.options.use_rcsparse = 0
     self.options.sort_by = 'file'
     self.options.sort_group_dirs = 1
     self.options.hide_attic = 1

Modified: trunk/lib/viewvc.py
Url: 
http://viewvc.tigris.org/source/browse/viewvc/trunk/lib/viewvc.py?view=diff&rev=1604&p1=trunk/lib/viewvc.py&p2=trunk/lib/viewvc.py&r1=1603&r2=1604
==============================================================================
--- trunk/lib/viewvc.py (original)
+++ trunk/lib/viewvc.py 2007-04-13 01:15:05-0700
@@ -223,7 +223,7 @@
       if cfg.general.cvs_roots.has_key(self.rootname):
         self.rootpath = os.path.normpath(cfg.general.cvs_roots[self.rootname])
         try:
-          if cfg.general.use_rcsparse:
+          if cfg.options.use_rcsparse:
             import vclib.ccvs
             self.repos = vclib.ccvs.CCVSRepository(self.rootname,
                                                    self.rootpath,

Modified: trunk/viewvc.conf.dist
Url: 
http://viewvc.tigris.org/source/browse/viewvc/trunk/viewvc.conf.dist?view=diff&rev=1604&p1=trunk/viewvc.conf.dist&p2=trunk/viewvc.conf.dist&r1=1603&r2=1604
==============================================================================
--- trunk/viewvc.conf.dist      (original)
+++ trunk/viewvc.conf.dist      2007-04-13 01:15:05-0700
@@ -129,10 +129,6 @@
 # Note: This setting is ignored when root_as_url_component is enabled.
 default_root = cvs
 
-# use rcsparse python module to retrieve cvs repository information instead
-# of invoking rcs utilities. this feature is experimental
-use_rcsparse = 0
-
 #
 # This is a pathname to a MIME types file to help viewvc to guess the
 # correct MIME type on checkout.  If you are having problems with the
@@ -382,6 +378,10 @@
 #   0      Don't generate Etags
 generate_etags = 1
 
+# use the rcsparse Python module to retrieve CVS repository
+# information instead of invoking rcs utilities [EXPERIMENTAL]
+use_rcsparse = 0
+
 # sort_by: File sort order
 #   file   Sort by filename
 #   rev    Sort by revision number