Also return some lost files back, document 4intra.net modifications
in CHANGES and README files, remove 'union' authorizer and rewritehtml
as the similar functionality is already provided by the core.
Also fix diffs for non-bash (sh/ash/dash) shells.
Fix pointer to Subversion project website.
Found by: Daniel Shahaf <d.s@daniel.shahaf.name>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2609 8cb11bc2-c004-0410-86c3-e597b4017df7
commit allows environmental overrides to trump programmatically
passed-in configuration paths.
* INSTALL
Mention the VIEWVC_CONF_PATHNAME override environment variable.
* lib/viewvc.py
(load_config): Document this function and the order in which it
searches for a configuration path. Use server.getenv() instead of
os.environ.get() where we can so that environmental overrides work
in mod_python.
Patch by: Alon Bar-Lev <alon.barlev@gmail.com>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2597 8cb11bc2-c004-0410-86c3-e597b4017df7
For issue #494 ("allow override config from in mod_python"), use
server.getenv() instead of os.environ.get() to look for the special
VIEWVC_CONF_PATHNAME environment variable.
* INSTALL
Mention the VIEWVC_CONF_PATHNAME override environment variable.
* lib/viewvc.py
(load_config): Use server.getenv() instead of os.environ.get().
Patch by: Alon Bar-Lev <alon.barlev@gmail.com>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2595 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix a mistaken issue reference.
* INSTALL
Add a step allowing access to your ViewVC install directory, and delay the
Apache restart by a step.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2582 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix some formatting, and -- Ooh! Did you see that? Why, yes, I
*did* just pull on some armor-plated underwear in the WSGI
deployment section.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2367 8cb11bc2-c004-0410-86c3-e597b4017df7
Trade the 'mime_types_file' option for 'mime_types_files' -- an
ordered list of MIME mapping files to consult. And provide our own
(empty) mapping file that folks can use to override the mappings
provided by other such files.
* mimetypes.conf.dist
New file.
* viewvc.conf.dist
(mime_types_files): Was mime_types_file, and now accepts multiple values.
* lib/config.py
(Config._force_multi_value): Add "mime_types_files" to the list of
multi-value configuration options.
(Config.set_defaults): Track rename of mime_types_file parameter,
now setting the default to a list containing only "mimetypes.conf".
* lib/viewvc.py
(load_config): Track new name and format of mime_types_files option.
* viewvc-install
(FILE_INFO_LIST): Also install mimetypes.conf.dist as itself and as
mimetypes.conf.
* INSTALL
(INSTALLING VIEWVC): Update reference to renamed configuration option.
* docs/upgrading-howto.html
Update this document.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2101 8cb11bc2-c004-0410-86c3-e597b4017df7
the details of those changes, run:
svn log --stop-on-copy --verbose \
http://viewvc.tigris.org/svn/viewvc/branches/merged-file-views@1917
Basically, this change unifies the annotate and markup views at the
cost of dropping support for all but one of our syntax highlighting
engines -- Pygments. (So, goodbye to 'enscript', 'highlight',
'source-highlight', 'py2html', and 'php'.) By settling on a single
markup engine (and a Python-module-based one with a BSD license, at
that), we:
* added syntax highlighting to the annotate view
* added line numbers to the markup view (prior to this, you
sometimes had 'em and sometimes didn't, depending on which
highlighting engine you used).
* essentially unified the markup and annotate views -- they even
share the same template now.
* can ship ViewVC with Pygments and syntax highighting enabled so
folks don't have to do additional config work to get that feature.
This change may be controversial. Depending on the overlap of
supported syntaxes across the various engines we supported prior to
this change, we may be losing support for some languages. And we're
also losing URL markup-ing (which was, again, partially supported
depending on the markup engine you were using). Somebody is going to
get upset that their pet benefit is now missing. I understand that.
I'm optimistic, though, that we can identify the lossages that really,
really matter, and address them in low-maintenance-hassle ways using
this slimmer, trimmer codebase as the baseline.
Also in this commit (in addition to the merged changes):
* templates/docroot/styles.css
Minor stylation tweaks.
* viewvc.conf.dist
(enable_syntax_coloration): Tweak the comment to indicate that
Pygments is required for syntax coloration to work.
* CHANGES
Note these changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1918 8cb11bc2-c004-0410-86c3-e597b4017df7
Python-based syntax highlighting library.
* lib/config.py
(Config.set_defaults): Add cfg.options.use_pygments option with a
default value of 0.
* viewvc.conf.dist
(use_pygments): Add use_pygments option under [options].
* lib/viewvc.py
(markup_stream_pygments): New.
(markup_or_annotate): Call markup_stream_pygments() before falling
back to the command-line program options.
* templates/docroot/styles.css
Add stylations for Pygments.
* CHANGES
Note this change.
* INSTALL
(TO THE IMPATIENT): Add Pygments to the list of supported
highlighting engines.
(ENABLING SYNTAX COLORATION): Rewrite this.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1906 8cb11bc2-c004-0410-86c3-e597b4017df7
Note that we now expect source-highlight 2.6.
* templates/docroot/styles
Add style definitions to match the style names used by
source-highlight.
* lib/viewvc.py
(MarkupSourceHighlight.__init__): Use the 'xhtml-css' output format,
and pass the --quiet option to suppress any noise that would
wind up on stderr.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1748 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
Add a note about the security implications of the checkout view,
suggested by Moritz Naumann <security@moritz-naumann.com>.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1535 8cb11bc2-c004-0410-86c3-e597b4017df7
now. No, really!
* INSTALL
Okay, no more messing around with lesser version. source-highlight
2.5 it is.
* lib/viewvc.py
(MarkupSourceHighlight.__init__): Use 'sed' to strip unnecessary
leading and close tags generated by source-highlight. Also, pass
a value of "l_" for the line number reference prefix, which makes
this consistent with highlight's line IDs.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1529 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/docroot/styles.css
Remove source-highlight styles. We can't reliably get that program
to generate real style names.
* viewvc.conf.dist
(source_highlight): Fix the sample path.
* lib/viewvc.py
(MarkupSourceHighlight): Rework this to pipe the file contents into
source-highlight on stdin, and don't try to enable CSS output or
anything fancy, because source-highlight has too many bugs in this
area. Use --failsafe mode.
* INSTALL
Change the recommendation for the version of source-highlight.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1528 8cb11bc2-c004-0410-86c3-e597b4017df7
svndbadmin usage.
* INSTALL
(SQL CHECKIN DATABASE): Recommend the use of 'svndbadmin update REV'
in post-commit hooks, and 'svndbadmin update --force REV' in
post-revprop-change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1496 8cb11bc2-c004-0410-86c3-e597b4017df7
(SUBVERSION INTEGRATION): Tweak the example for testing Subversion
Python bindings installation to be useful, showing how to find the
installed version of those bindings.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1479 8cb11bc2-c004-0410-86c3-e597b4017df7
Bump version requirement to Subversion 1.3.1. Also, remove
unnecessary pools from the entirety of the module.
* lib/vclib/svn_ra/__init__.py
Bump version requirement to Subversion 1.3.1.
* INSTALL
Bump Subversion version requirement to Subversion 1.3.1.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1475 8cb11bc2-c004-0410-86c3-e597b4017df7
yesterday and fixes all the issues we had with line numbering. This change
also allows ViewVC to work with old versions of Highlight all the way back
to 2.2.10.
Also, remove "highlight_style" configuration option as suggested by
Andreas Amann (aamann) in issue 126.
* INSTALL
document new version requirements
* lib/viewvc.py
(MarkupHighlight.__init__):
stop passing --style and --line-number-start options to highlight
* lib/config.py
* viewvc.conf.dist
* viewvc.org/upgrading.html
remove "highlight_style" option
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1292 8cb11bc2-c004-0410-86c3-e597b4017df7
GNU Highlight instead of the Highlight program we support. The two
programs have the same name, and do the same things, but are not at
all related. Patch by Wataru Hirayama <hirayama@rr.iij4u.or.jp>
* INSTALL
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1213 8cb11bc2-c004-0410-86c3-e597b4017df7
Patch written by sunjammerx in issue 106.
* lib/config.py
(Config.set_defaults):
set default port
* lib/cvsdb.py
(CheckinDatabase.__init__, ConnectDatabaseReadOnly, ConnectDatabase):
handle port value
* lib/dbi.py
(connect):
same
* INSTALL
* viewcvs.conf.dist
update
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1211 8cb11bc2-c004-0410-86c3-e597b4017df7
of a patch by Andreas Amann (aamann) from issue 126.
* lib/viewcvs.py
(MarkupHighlight):
new EZT callback for invoking highlight
(view_markup):
use MarkupHighlight class when "use_highlight" option enabled
* lib/config.py
* viewcvs.conf.dist
add new configuration options for highlight
* templates/docroot/styles.css
add ".line" style to make highlight line number stand out
* INSTALL
mention highlight required version and home page
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1208 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_revision_svn): Remove.
(view_revision): Eat up view_revision_svn's little bit o' work.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1120 8cb11bc2-c004-0410-86c3-e597b4017df7
Strict. Changes have been made in the EZT templates, the CSS files,
HTML code embedded in the Python files as well as in the help
files. The original code structure and design is the very same. No
other improvements have been made to the browser code and it still
uses the old layout tables to create the page grid.
Apart from the XHTML/CSS code changes, the patch adds an argument (-x
x) for CVSGraph in viewcvs.py in the view_cvsgraph function to tell
CVSGraph to generate XHTML code. For Mozilla/Firefox to recognize the
id attribute in the image map generated, the content-type must be set
to application/xhtml+xml (see
https://bugzilla.mozilla.org/show_bug.cgi?id=109445). This patch does
however not change the content-type, but uses an ugly hack to make the
CVSGraph output work in Mozilla with the current text/html
content-type: a name attribute is merged into the id attribute in the
map_name defined in the cvsgraph.conf.dist file.
The XHTML code does not contain the standard XML declaration, just the
XHTML 1.0 Strict Doctype. This is to keep ViewCVS as encoding agnostic
as before and let the browser decide which encoding to use. An XML
file without the encoding declared must be interpreted as UTF-8 (or
UTF-16 if the byte order mark is included).
* viewcvs/cvsgraph.conf.dist
Add name="" hack to the 'map_name' variable so Mozilla/Firefox will work.
* viewcvs/lib/ezt.py
XHTML-ize sample output.
* viewcvs/lib/viewcvs.py
XHTML-ize hard-coded output.
(view_cvsgraph): Pass "-x x" to cvsgraph to force XHTML production.
* viewcvs/lib/blame.py
* viewcvs/lib/debug.py
* viewcvs/lib/py2html.py
* viewcvs/lib/query.py
* viewcvs/lib/vclib/bincvs/__init__.py
* viewcvs/templates/annotate.ezt
* viewcvs/templates/diff.ezt
* viewcvs/templates/dir_alternate.ezt
* viewcvs/templates/directory.ezt
* viewcvs/templates/error.ezt
* viewcvs/templates/graph.ezt
* viewcvs/templates/log.ezt
* viewcvs/templates/log_table.ezt
* viewcvs/templates/markup.ezt
* viewcvs/templates/query.ezt
* viewcvs/templates/query_form.ezt
* viewcvs/templates/query_results.ezt
* viewcvs/templates/revision.ezt
* viewcvs/templates/roots.ezt
* viewcvs/templates/docroot/help_dirview.html
* viewcvs/templates/docroot/help_log.html
* viewcvs/templates/docroot/help_logtable.html
* viewcvs/templates/docroot/help_query.html
* viewcvs/templates/docroot/help_rootview.html
* viewcvs/templates/docroot/styles.css
* viewcvs/templates/include/branch.ezt
* viewcvs/templates/include/branch_form.ezt
* viewcvs/templates/include/diff_form.ezt
* viewcvs/templates/include/dir_footer.ezt
* viewcvs/templates/include/dir_header.ezt
* viewcvs/templates/include/file_header.ezt
* viewcvs/templates/include/footer.ezt
* viewcvs/templates/include/header.ezt
* viewcvs/templates/include/paging.ezt
* viewcvs/templates/include/sort.ezt
* viewcvs/templates/include/view_tag.ezt
XHTML-ize hard-coded output and templatized data.
* viewcvs/CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1109 8cb11bc2-c004-0410-86c3-e597b4017df7
checkout_magic is disabled by changing the default view for file URLs from
"log" to "checkout"
This causes some URL compatibility to be lost when checkout_magic is disabled.
Bookmarks which pointed to log pages but don't have explicit view=log
parameters will point to checkout pages instead.
* lib/viewcvs.py
(Request.run_viewcvs):
change default view for files from "log" to "checkout" when checkout_magic
is disabled
(Request.get_link):
don't add explicit view=checkout parameters for checkout links when
checkout_magic is disabled
don't drop explicit view=log parameters for log links
* website/upgrading.html
add note about URL compatibility
* INSTALL
update section on access control
* viewcvs.conf.dist
update documentation for "root_as_url_component" and "checkout_magic"
move "checkout_magic" option directly underneath "root_as_url" component
because the two options are related
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1037 8cb11bc2-c004-0410-86c3-e597b4017df7
* INSTALL
update cvsgraph revision number and cgi directory path
* CHANGES
mention "root_as_url_component" and fix the way a date is formatted
* website/upgrading.html
fix stutter
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1027 8cb11bc2-c004-0410-86c3-e597b4017df7
Vitaliy Filippov
cmpilato