(make_html): Not that I think anybody actually cares, but fix this
function to generate HTML properly.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1617 8cb11bc2-c004-0410-86c3-e597b4017df7
(Config.load_config): Stash a reference to the primary
ConfigParser() object.
(Config.overlay_root_options): Use the stashed ConfigParser()
reference instead of re-parsing the configuration file.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1612 8cb11bc2-c004-0410-86c3-e597b4017df7
override groupings and the base configuration section that is being
overridden. Why? Besides revealing a clear heirachy of information
(which seems more intuitive to me, at least), I anticipate it being
helpful for disambiguation later, especially since neither vhosts nor
root names should have forward slashes in them.
* viewvc.conf.dist
(vhosts): Tweak the inline comments in accordance with this new plan.
* lib/config.py
(Config._process_vhost, Config._process_root_options): Expect a
forward slash (/) character where a hyphen (-) was previously
expected.
* docs/upgrading-howto.html
Update upgrade documentation with these changes.
* CHANGES
Note that per-root configuration overrides are now supported.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1609 8cb11bc2-c004-0410-86c3-e597b4017df7
root-ROOTNAME-CONFIGSECTION.
In order to keep the configuration section naming conventions
consistent, change the way virtual host override sections are named
from VHOSTNAME-CONFIGSECTION to vhost-VHOSTNAME-CONFIGSECTION.
* lib/config.py
(Config.load_config): Add optional 'rootname' parameter. Actually
make use of self.conf_path. If there is a rootname provided,
overlay per-root options.
(Config._process_vhost): Now expect vhost section names to begin
with the prefix "vhost-".
(Config._find_canon_vhost): Minimize some logic.
(Config.overlay_root_options, Config._process_root_options): New.
(ViewVCConfigurationError, IllegalOverrideSection): New.
(MalformedRoot): Now inherit from ViewVCConfigurationError.
* lib/viewvc.py
(Request.run_viewvc): Once the rootname is determined, overlay
per-root configuration options.
* viewvc.conf.dist
(vhosts): Update vhosts docs and examples to note the new "vhost-"
section name prefix.
* docs/upgrading-howto.html
Note the change in vhost override section naming expectations.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1607 8cb11bc2-c004-0410-86c3-e597b4017df7
first-listed, cvs_roots-found, CVS repository wins.
* lib/query.py
(run_query): Ensure that in a rootname clash situation, the CVS
repository wins.
* lib/viewvc.py
(list_roots): Ensure that in a rootname clash situation, the CVS
repository wins.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1605 8cb11bc2-c004-0410-86c3-e597b4017df7
* 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.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1604 8cb11bc2-c004-0410-86c3-e597b4017df7
Clean up some more option documentation.
* templates/include/footer.ezt
Stop treating the cfg.general.address like a free-form field. If admins
don't like the way we display the address by default, they need only
tweak the footer.ezt template.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1603 8cb11bc2-c004-0410-86c3-e597b4017df7
That's what I say to the Universe.
"Gaaaaah."
* viewvc.org/license-1.html
Remove symlink.
* viewvc.org/who.html
* viewvc.org/index.html
* viewvc.org/contributing.html
* viewvc.org/download.html
* viewvc.org/faq.html
* viewvc.org/contact.html
Point the "License" nav item to the HEAD version of LICENSE.html.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1598 8cb11bc2-c004-0410-86c3-e597b4017df7
wants to be -- where folks expect to find it -- and be done with it.
* viewvc.org/license-1.html
Moved this...
* LICENSE.html
...to here, and stripped out site branding stuffs...
* viewvc.org/license-1.html
...but re-added a symlink.
* viewvc.org/.htaccess
Add a redirect rule to point license-1.html URLs to the latest
LICENSE.html file.
* tools/make-release
Don't bother copying the LICENSE.html file any more -- it's already
in place.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1597 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix some bugs in this script which prevented the to-be-deleted
directories from actually being deleted.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1586 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/cvsdb.py
(CheckinDatabase.Connect): Issue "SET AUTOCOMMIT=1" so that InnoDB
databases automatically commit changes made to the database.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1579 8cb11bc2-c004-0410-86c3-e597b4017df7
Remove the code which attempts to cache database connection wrapper
objects. That was useful long ago when the ViewVC code was sloppier,
but now the database handles get passed around in the call stack, so
there's a 1-to-1 mapping of ViewVC process to database connection.
The cache is, therefore, entirely unnecessary (and is causing
problems, in fact, for mod_python users).
* lib/cvsdb.py
(gCheckinDatabase, gCheckinDatabaseReadOnly): Remove.
(ConnectDatabase): Add 'readonly' optional parameter. Don't try to
play the connection caching game any more -- nobody cares.
(ConnectDatabaseReadOnly): Reimplement as a wrapper around ConnectDatabase().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1573 8cb11bc2-c004-0410-86c3-e597b4017df7
(common_template_data): Don't forget to take 'pathrev' into account
when calculating the revision for Subversion views.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1572 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(build_commit): Rework the view URLs so that, for Subversion, URLs
related to deleted paths point to the previous revision. And don't
bother generating diff URLs for adds and removes -- only changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1569 8cb11bc2-c004-0410-86c3-e597b4017df7
(install_file): Use os.sep instead of '/' as the trailing slash in the
"created" stdout line.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1564 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/config.py
(Config.set_defaults): Enable options.root_as_url_component by default.
* viewvc.conf.dist
(default_root): Describe this a little better.
(root_as_url_component): Indicate that enabled is the default state.
* docs/upgrading-howto.html
Add a note about the root_as_url_component option default change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1563 8cb11bc2-c004-0410-86c3-e597b4017df7
(install_file): Test e.errno instead of e[0], because on Windows, a
Windows-specific subclass of OSError (WindowsError) is raised, and the
first item of its tuple representation is the Windows-specific
error code. But e.errno seems always to hold the OS-independent
error value.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1561 8cb11bc2-c004-0410-86c3-e597b4017df7
ViewVC to only generate links from a directory's "log view" to its
"directory view" when there's no sticky revision set.
* lib/viewvc.py
(view_log): Always generate a directory's "directory view" link.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1559 8cb11bc2-c004-0410-86c3-e597b4017df7
Update Python for Windows Extensions URL (they now live at SourceForge).
* lib/win32popen.py
Suggest that the Python for Windows Extensions might not be installed
when importing a module from that collection fails.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1557 8cb11bc2-c004-0410-86c3-e597b4017df7
(SvnRev.__init__): Don't use secs_from_timestr() -- it never
learned to accept optional pools. Do the math ourselves.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1556 8cb11bc2-c004-0410-86c3-e597b4017df7
(SECURITY INFORMATION): Update this with the latest information
about the checkout view and how to toggle its enablement.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1554 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/annotate.ezt
Try to make the annotate view stylations look a little more like
those of the markup view.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1553 8cb11bc2-c004-0410-86c3-e597b4017df7
having them populate almost identical data dictionaries, and having
similar template headers.
* docs/upgrading-howto.html
(Upgrading from 1.0.0): Note that 'mime_type', 'log', 'date', 'ago',
'author', 'branches', 'tags', 'branch_points', 'changed', 'size',
'state', 'vendor_branch', and 'prev' were added to annotate.ezt.
* docs/template-authoring-guide.html
(Annotation View): Add 'mime_type', 'log', 'date', 'ago', 'author',
'branches', 'tags', 'branch_points', 'changed', 'size', 'state',
'vendor_branch', and 'prev'.
* templates/annotate.ezt
Basically, replace the top of this thing with a copy of the top of
markup.ezt.
* lib/viewvc.py
(view_annotate): Populate almost an identical data dictionary to
what the markup view uses.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1552 8cb11bc2-c004-0410-86c3-e597b4017df7
of revisions for the 'update' operation.
* bin/svndbadmin
(): Update the script's header comment.
(main): Now accept a 'revs' list instead of a single integer revision.
(_rev2int): New helper function.
(usage): Update usage message.
(__main__): Now allow a revision range to be specified, with support
for the 'HEAD' keyword, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1546 8cb11bc2-c004-0410-86c3-e597b4017df7
checkout view. The former is for sanity, the latter for security.
* viewvc.conf.dist
(allow_tar, allow_annotate, allow_markup): Removed.
(allowed_views): New.
* lib/config.py
(Config._force_multi_value): Add 'allowed_views'.
(Config.set_defaults): Set default for 'allowed_views'; no longer set
defaults for 'allow_tar', 'allow_annotate', 'allow_markup'.
* lib/viewvc.py
(default_view, view_directory, download_tarball, get_file_view_info,
view_annotate, view_diff, build_commit, view_revision, view_markup,
view_checkout): Track changes, adding code to prevent checkout view
URL generation when the view is disabled, and doing the same for
markup views (which should have already been done, since we already
had an allow_markup option!)
* templates/query_results.ezt
* templates/markup.ezt
* templates/directory.ezt
* templates/log.ezt
* templates/log_table.ezt
* templates/annotate.ezt
Don't assume checkout and markup views are present.
* docs/upgrading-howto.html
Update to show the configuration changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1544 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(_views): Rename the 'rev' view to the 'revision' view. (This has
always bugged me.)
(Request.run_viewvc): Redirect old 'view=rev' URLs to 'view=revision'.
* docs/url-reference.html
Update to reflect new URL syntax (and compatability support).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1543 8cb11bc2-c004-0410-86c3-e597b4017df7
(_orig_path, common_template_data, view_directory, view_revision,
setup_diff): Catch vclib.InvalidRevision exceptions from
repos._getrev(), and re-throw them as ViewVCExceptions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1539 8cb11bc2-c004-0410-86c3-e597b4017df7
cmpilato