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.
Удалил изврат, добавив чуть меньший изврат:
Теперь в процессе установки bin-файлы не модифицируются,
а только добавляется рядом с ними файл viewvcinstallpath,
в котором прописываются пути.
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@539 6955db30-a419-402b-8a0d-67ecbb4d7f56
USE SHELL!!!
The bug was probably somewhere in file descriptor cloning + Apache webserver
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@516 6955db30-a419-402b-8a0d-67ecbb4d7f56
Bug 32155
Fix an EVERLASTING error for all RSS generator:
Generating dates via strftime() with non-english LC_TIME
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@271 6955db30-a419-402b-8a0d-67ecbb4d7f56
* lib/viewvc.py
(ViewVCHtmlFormatter.get_result): Remove some unnecessary
statements, and fix the fact that this was disregarding the 'maxlen'
parameter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2905 8cb11bc2-c004-0410-86c3-e597b4017df7
depending on Python version").
* lib/viewvc.py
(transcode_text): Avoid using keyword arguments with unicode() and
.encode(), support for which wasn't added until Python 2.7.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2902 8cb11bc2-c004-0410-86c3-e597b4017df7
(markup_stream, DiffSource._format_text): Fix still more buglets
around tab-to-space conversion.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2895 8cb11bc2-c004-0410-86c3-e597b4017df7
(_is_cvsroot): New helper function.
(expand_root_parent, find_root_in_parent): Rework these to now
use _is_cvsroot().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2892 8cb11bc2-c004-0410-86c3-e597b4017df7
This is a big-time regression in root handling which unfortunately
found its way into the 1.1.19 release.
Reported by: Michael Theys <michael.th90{_AT_}gmail.com>,
olli hauer <ohauer{_AT_}gmx.de>
* lib/vclib/ccvs/__init__.py
(expand_root_parent): Avoid unnecessary convenience variable.
(find_root_in_parent): Don't return a rootpath that we've not
checked for existence!!
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2891 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(markup_stream): Only expand tabs if the tabsize > 0.
(DiffSource._format_text): Only strip EOL stuffs from the ends of
lines -- preserve other whitespace forms. Also, only expand tabs if
the tabsize > 0.
* conf/viewvc.conf.dist
(tabsize): Use the term "horizontal tab character" rather than
"tabstop". The latter is the destination; the former is the
character that tells the text flow to resume there.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2876 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(markup_stream): When transcoding, handle the whole body of file
contents at once rather than trying to go line-by-line. Why?
Because until transcoded, the concept of a "line" is rather
meaningless. (NOTE: There is almost certainly some fallout to
occur in the annotate view as a result of this work, since each VC
system's annotation support also uses the naive concept of a
line.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2873 8cb11bc2-c004-0410-86c3-e597b4017df7
ViewVC").
Use the 'chardet' module where available and enabled by configuration
to detect source file content encoding, and transcode the output to
UTF-8. We supported this already via Pygments when
'enable_syntax_coloration' was set; now we can also support this when
it isn't.
* lib/viewvc.py
(detect_encoding, transcode_text): New helper functions.
(markup_stream): Use the new helper functions to attempt to
transcode text into UTF-8 even when syntax coloration is *not* in
use.
* conf/viewvc.conf.dist
(detect_encoding): Remove notation about this only being used when
'enable_syntax_coloration' is also enabled.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2872 8cb11bc2-c004-0410-86c3-e597b4017df7
allow_compress=1").
* lib/viewvc.py
(get_writeready_server_file): Add 'allow_compress' parameter, and
handling to give callers the power to disable response-level
compression.
(download_tarball): When calling get_writeready_server_file(),
disable compression (if any) since we're doing our own gzipping
herein.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2870 8cb11bc2-c004-0410-86c3-e597b4017df7
into memory when generating tarballs.
* lib/viewvc.py
(generate_tarball): Avoid reading file contents fully into memory.
Rather, query the filesize from the vclib provider and chunk the
output. If the filesize must be calculated, use two chunked
passes over those contents (one to measure, one to write to the
tarball).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2867 8cb11bc2-c004-0410-86c3-e597b4017df7
processed by markup and annotate views"). This introduces a new
'max_filesize_kbytes' configuration option for limiting markup and
annotate operations on really big files (whose contents unfortunately
must be read fully into memory sometimes). By default, a 512-kilobyte
limit will be in place.
* lib/vclib/__init__.py
(Repository.filesize): New.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.filesize): New function.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.filesize): New function.
* lib/vclib/ccvs/bincvs.py
(BaseCVSRepository.filesize): New function (returns -1 aka "not
implemented")
* conf/viewvc.conf.dist
(max_filesize_kbytes): New configuration option.
* lib/config.py
(Config.set_defaults): Set default value for new
'max_filesize_kbytes' configuration option.
* lib/viewvc.py
(assert_viewable_filesize): New helper function.
(markup_or_annotate): Use assert_viewable_filesize() and the new
repos.filesize() API to honor the new 'max_filesize_kbytes'
configuration option.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2866 8cb11bc2-c004-0410-86c3-e597b4017df7
svn_cmdline_create_auth_baton() function via the SWIG Python
bindings. So now use it if it's available!
* lib/vclib/svn/svn_ra.py
(setup_client_ctx): New compatability-sensitive function.
(RemoteSubversionRepository.open): Use setup_client_ctx() now.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2864 8cb11bc2-c004-0410-86c3-e597b4017df7
a potentially costly directory listing within the root parent paths.
This has been shown to reduce the initial ViewVC startup overhead by
400% in some situations where disk I/O is especially sluggish.
* lib/vclib/ccvs/__init__.py
(find_root_in_parent): New function.
* lib/vclib/svn/__init__.py
(find_root_in_parent): New function.
* lib/viewvc.py
(find_root_in_parents): Use the new find_root_in_parent() functions
offered by the vclib implementations rather than the more expensive
full root expansion stuffs.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2862 8cb11bc2-c004-0410-86c3-e597b4017df7
(cat_to_tempfile): Renamed from temp_checkout(). Callers updated.
(RemoteSubversionRepository.openfile): Use cat_to_tempfile() now,
and try to head off a race condition that could leave tempfiles
lying about.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2857 8cb11bc2-c004-0410-86c3-e597b4017df7
for local Subversion repositories.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.get_symlink_target): New function.
* lib/viewvc.py
(generate_tarball_header): Add the ability to generate private
headers for long symlink names, too.
(generate_tarball): Use the Repository object's get_symlink_target()
function (if available) to determine whether a versioned object is a
symlink, and use that information to preserve symlinks in
generated tarballs.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2855 8cb11bc2-c004-0410-86c3-e597b4017df7
Be less sloppy about what this script reports as default behavior
around hostnames and ports. If a hostname isn't supplied,
"localhost" isn't strictly passed to 'mysql'; same for the port.
And on UNIX, the lack of an explicit hostname (or an explicit
"localhost" one) will cause 'mysql' to use a UNIX socket rather than
a TCP/IP one, regardless of what the provided port is. So it's not
strictly accurate to imply that by not providing a hostname and
port, 'make-database' will use "localhost/3306" for that
information.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2844 8cb11bc2-c004-0410-86c3-e597b4017df7
someone has a modified/customized database with additional or
reordered columns.
* lib/cvsdb.py
(CheckinDatabase.CheckCommit, CheckinDatabase.PurgeRepository):
Name columns in SELECT statement rather than using '*'.
Patch by: Grant Bremer <gbremer{__AT__}tigris.org>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2843 8cb11bc2-c004-0410-86c3-e597b4017df7
Use "ENGINE=MyISAM" rather than "TYPE=MyISAM" throughout. The
latter syntax was deprecated in MySQL 5.0 and dropped in 5.5.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2842 8cb11bc2-c004-0410-86c3-e597b4017df7
specified").
* bin/make-database
(__main__): Add a --port option and handling thereof, passing the
value off to 'mysql'.
Patch by: Grant Bremer <gbremer{__AT__}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2841 8cb11bc2-c004-0410-86c3-e597b4017df7
with that of bincvs logic").
* lib/vclib/ccvs/ccvs.py
(InfoSink.define_revision): Tweak the revision matching logic a bit
to include branch points as valid revisions when examining branch
tags.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2839 8cb11bc2-c004-0410-86c3-e597b4017df7
driven CVS backend, fixing an inconsistency between rcsparse-based and
binary-based parsing.
* lib/vclib/ccvs/ccvs.py
(InfoSink.__init__): Init new 'saw_revision' flag.
(InfoSink.define_revision): Set 'saw_revision'.
(InfoSink.parse_completed): If 'saw_revision' is not set, set the
'absent' flag.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2837 8cb11bc2-c004-0410-86c3-e597b4017df7
(markup_stream): Strip EOL characters from the ends of marked-up
lines. Templates can re-add line breaks, but they can't easily
strip them.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2832 8cb11bc2-c004-0410-86c3-e597b4017df7
commit deleted a file or directory").
* lib/vclib/svn/svn_repos.py
(_get_change_copyinfo): Only call svn_fs_copied_from() on "add" and
"replace" change items (which might actually be copies). This
avoids raising an exception caused by running svn_fs_copied_from()
on a missing (via deletion) root/path pair.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2827 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(DiffDescription.__init__): Don't set self.diff_options.
(DiffDescription.get_content_diff, DiffDescription.get_prop_diff):
Rename local variable 'options' to 'diff_options', and actually
populate *it* rather than the otherwise unused (and now removed)
'diff_options' class variable.
(DiffDescription._get_diff, DiffDescription._line_idiff_sidebyside,
DiffDescription._line_idiff_unified, DiffDescription._content_fp,
DiffDescription._prop_fp): Rename 'options' to 'diff_options'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2818 8cb11bc2-c004-0410-86c3-e597b4017df7
diff stuff now if I recall correctly.
* conf/viewvc.conf.dist,
* lib/config.py
Use "templates/default" now for the default templates. Duh.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2815 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/classic/file.ezt,
* templates/default/file.ezt
Set the page's <title> attribute to "Annotation of ..." or "Contents
of ...", depending on whether the output is annotated.
Patch by: John McNally <jmcnally{__AT__}collab.net>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2796 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(DiffSource._get_row): Pass the "extra" line information through the
formatter code so that, at a minimum, it's HTML-escaped.
Patch by: Nicolás Alvarez <nicolas.alvarez{__AT__}gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2792 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_diff): Add 'cfg' convenience variable (to avoid a stack trace
caused by using such a thing a few lines later).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2790 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_log): Preserve the 'log_pagestart' query value when generating
the 'select for diff' links so that clicking the link returns you to
the same page (modulo repagination due to new commits in the race
window ... but let's not think about that). Also, preserve the
'r1' query parameter when generating the paging form.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2788 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/cgi/viewvc.cgi
Add some commented-out logic for renice-ing the ViewVC CGI process.
Inspired by: Karl Berry <karl{__AT__}freefriends.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2786 8cb11bc2-c004-0410-86c3-e597b4017df7
Add a new configuration option 'binary_mime_types' which accepts a
comma-delimited list of MIME content type patterns ('text/plain', or
'image/*', etc.) against which versioned file MIME types are
compared for the purposes of deciding whether to allow their display
in the 'markup', 'annotate', 'diff' and 'patch' views.
* conf/viewvc.conf.dist
(binary_mime_types): Describe new option.
* lib/config.py
(_force_multi_value): Add 'binary_file_types' to the list of
multi-value options.
(Config.set_defaults): Initialize cfg.options.binary_mime_types.
* lib/viewvc.py
(is_binary_file_mime_type): New function.
(get_file_view_info): Use is_binary_file_mime_type() to determine
whether to return links to content-ful views of the input file.
(markup_or_annotate, view_diff): Use is_binary_file_mime_type() to
deny display of so-deemed binary files.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2784 8cb11bc2-c004-0410-86c3-e597b4017df7
(RemoteSubversionRepository.itemlog): Only fetch lock and size
information for files, not directories.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2781 8cb11bc2-c004-0410-86c3-e597b4017df7
New icon file.
* templates/default/directory.ezt,
* templates/default/docroot/styles.css
Add template bits for displaying a lock-icon "overlay" for locked
items in the directory view.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2774 8cb11bc2-c004-0410-86c3-e597b4017df7
(LogFormatter.get): Fix a regression introduced in 1.1.14's handling
of log messages when not HTML-ifying them (for example, when serving
them up via RSS).
Patch by: Christoph Sommer <christoph.sommer{__AT__}uibk.ac.at>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2771 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(markup_or_annotate): Don't forget to cross copies when requesting
the item's log.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.itemlog): Treat 'svn_latest_log' option
specially, as in the svn_repos case. (Ugh.)
(RemoteSubversionRepository.annotate): Pass 'svn_show_all_dir_logs'
option to itemlog(). Also, upgrade to svn_client_blame2() API.
(RemoteSubversionRepository._get_last_history_rev): Now return both
the info-provided create_rev, and the more accurate
last_history_rev. Callers updated.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2770 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository._revinfo_fetch): New. Holds the guts of
the revision info harvesting (plus some bugfixes thereto) from...
(RemoteSubversionRepository._revinfo): ...this, which now calls the
helper function. Also, don't tuple-ize the already-tupled cache
info.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2768 8cb11bc2-c004-0410-86c3-e597b4017df7
unnecessary (and somewhat expensive) work.
* lib/vclib/svn/svn_ra.py
(client_log): Add 'include_changes' parameter, pass to the
Subversion log APIs. Callers updated.
(_revinfo): Was _revinfo_raw(). Add 'include_changed_paths'
parameter. Now handles the revinfo cache, only fetches changed
paths when required, and bails out early of authz checks when
possible. All internal callers of revinfo() have been updated to
use this interface instead.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2765 8cb11bc2-c004-0410-86c3-e597b4017df7
annotate view recently introduced.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.annotate): Pass 'svn_cross_copies'
option to itemlog() so that annotation history isn't unnaturally
truncated.
(RemoteSubversionRepository._blame_cb): Only consult the revinfo
cache when authz checks are required. This improves the speed of
the operation when universal read access is granted to the user.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2763 8cb11bc2-c004-0410-86c3-e597b4017df7
fully honoring authz rules"). In doing so, this makes the svn_ra
module the most accurate it has ever been, hopefully without too
terribly much extra cost.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.listdir): No longer check access here.
That's handled down in _get_dirents() now.
(RemoteSubversionRepository.dirlogs): Don't check dirent access here.
Just ensure that the returned entries are those which are
represented in the (filtered) set return from _get_dirents().
Also, replace the revision metadata stored on each dirent with
values from the revinfo cache (which does authz sanitizing).
(RemoteSubversionRepository._get_dirents): Do authz-checking of
dirents here, and use _get_last_history_rev() to populate a useful
created_rev.
(RemoteSubversionRepository._get_last_history_rev): Because
Subversion's RA layer doesn't consider copy events when
determining an item's last-committed-rev, compensate for this with
a bounded log operation which does. This brings created-rev
parity with the svn_repos module (at the cost of the extra RA
work, but with the benefit of, you know, accuracy.
(RemoteSubversionRepository._revinfo_raw): Leave a TODO about a
future optimization.
(RemoteSubversionRepository._log_cb): Set found_unreadable when
sanitizing an unreadable copyfrom path, too.
(RemoteSubversionRepository.created_rev): Now just a thin wrapper
around the beefed-up _get_last_history_rev() function.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2760 8cb11bc2-c004-0410-86c3-e597b4017df7
(LogCollector.add_log): Allow the access_check_func to be None (and
avoid trying to call it in that case).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2759 8cb11bc2-c004-0410-86c3-e597b4017df7
unreadable one, Subversion will obscure the fact that the operation
was a copy (by removing copyfrom info) and will deem the log message
for the revision in which the copy occurred to be unreadable. ViewVC
was only doing the former bit; now it does the latter, too.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository._get_changed_paths): Set found_unreadable
when we have to hide a copyfrom path, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2758 8cb11bc2-c004-0410-86c3-e597b4017df7
remote SVN repositories.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.annotate): Examine revision logs to
determine the legal annotation range we are allowed to request,
and use the revinfo cache to strip sensitive author/data info from
the annotation data.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2757 8cb11bc2-c004-0410-86c3-e597b4017df7
authz rules"):
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.get_locations): Check authz on the
result of a get_locations lookup (being sure to use the original
path in the error message, if any).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2756 8cb11bc2-c004-0410-86c3-e597b4017df7
log view for remote SVN repositories.
* lib/vclib/svn/svn_ra.py
(LogCollector.__init__): Add 'access_check_func' parameter, stashed
away as a member variable. Initialize 'done' variable to False.
(LogCollector.add_log): Use access_check_func() to test for access.
If access is denied, set 'done' to True and ignore future
invocations.
(RemoteSubversionRepository.itemlog): Add _access_checker inner
function, passed as a callback to LogCollector.__init__().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2755 8cb11bc2-c004-0410-86c3-e597b4017df7
viewer").
NOTE: There are some limitations here, most prominantly that commas
can't be used in the regular expressions which define replacements,
and that only match groupings 0-9 can be used in the replacement
format string.
* conf/viewvc.conf.dist
(custom_log_formatting): New configuration option.
* lib/config.py
(Config._force_multi_value, Config.set_defaults): Add handling of
new 'custom_log_formatting' option.
* lib/viewvc.py
(ViewVCHtmlFormatter.format_custom_url): New formatter callback.
(LogFormatter.get): Register the new formatter callback for rules
found in the 'custom_log_formatting' option value.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2746 8cb11bc2-c004-0410-86c3-e597b4017df7
for better performance").
* lib/viewvc.py
Replace uses of format_log() throughout with calls to LogFormatter()
(to get a formatter "lf") then lf.get() (to get the formatted log
string). Also...
(format_log): Remove as unused.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2741 8cb11bc2-c004-0410-86c3-e597b4017df7
better performance"), make the first step of two in trying to avoid
parsing log messages twice when once will suffice.
* lib/viewvc.py
(ViewVCHtmlFormatterTokens): New class for generating HTML-formatted
text from a set of provided ViewVCHtmlFormatter tokens.
(ViewVCHtmlFormatter.get_result): Track renamed function, and defer
the work of the text generation to the token object's get_result()
method.
(ViewVCHtmlFormatter.tokenize_text): Renamed from _tokenize_text(),
and now return a ViewVCHtmlFormatterTokens object.
(LogFormatter): New class for encapsulating the log formatting logic.
(format_log): Make a wrapper around LogFormatter for now.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2740 8cb11bc2-c004-0410-86c3-e597b4017df7
anonymously").
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer.__init__): Don't try to convert a None username to
lower- or upper-case.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2738 8cb11bc2-c004-0410-86c3-e597b4017df7
time.
* lib/vclib/svn/__init__.py
(_canonicalize_path): New helper function.
(canonicalize_rootpath): Rework this to perform the URL -> absolute
path conversion any time it can, not only when using really old
Subversion versions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2735 8cb11bc2-c004-0410-86c3-e597b4017df7
won't hit AttributeError's on account of svn_path_canonicalize() not
being exposed through Subversion's Python bindings.
* lib/vclib/svn/svn_repos.py
(_canonicalize_path): New helper function.
(_rootpath2url): Use _canonicalize_path() instead of
core.svn_path_canonicalize().
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository._geturl): Use (imported)
_canonicalize_path() instead of core.svn_path_canonicalize().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2733 8cb11bc2-c004-0410-86c3-e597b4017df7
characters in their names"), another in a long string of annotate view
brokennesses. (Is that word?) This time, the problem was a disparity
between Python's urllib encoding and what Subversion deems canonical.
* lib/vclib/svn/svn_repos.py
(_rootpath2url): Canonicalize URLs for use with Subversion.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository._geturl): Canonicalize URLs for use with
Subversion.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2731 8cb11bc2-c004-0410-86c3-e597b4017df7
(update_license): Remove.
(bump_years): Print reminder about amending the change history
section of the LICENSE.html file.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2722 8cb11bc2-c004-0410-86c3-e597b4017df7
(_rootpath2url): Get the absolute path before splitting off the
drive, not afterward. Otherwise, (some) drive letter will just get
tacked back onto the path! As we now verify elsewhere that
rootpaths aren't relative, we needn't worry that .splitdrive() will
return a relative rootpath.
Suggested by: Jens Peters <jp7677{__AT__}gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2714 8cb11bc2-c004-0410-86c3-e597b4017df7
what kind of chaos may ensue otherwise.
* conf/viewvc.conf.dist
Note that paths should be absolute filesystem paths.
* lib/vclib/svn/__init__.py
(canonicalize_rootpath, expand_root_parent): Assert that local
repository paths are absolute.
* lib/vclib/ccvs/__init__.py
(canonicalize_rootpath, expand_root_parent): Assert that local
repository paths are absolute.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2713 8cb11bc2-c004-0410-86c3-e597b4017df7
against the upstream version of this module.
* lib/common.py
(TemplateData): Moved here...
* lib/ezt.py
...from here.
* lib/query.py,
* lib/viewvc.py
Import 'TemplateData' from 'common' now, and update references to this
relocated class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2711 8cb11bc2-c004-0410-86c3-e597b4017df7
(_rootpath2url): Try a different approach that should actually
handle spaces in the "in-repos" path, too, and maybe (if I'm super
lucky) also work on Windows.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2707 8cb11bc2-c004-0410-86c3-e597b4017df7
(): Stop importing the pygments stuff at the module-global scope,
and go back to doing so...
(markup_stream): ...here.
(markup_or_annotate): No longer consider access to Pygments when
making the first pass at colorizing -- if we don't have it,
markup_stream() will fail quickly and we can take the second
(non-colorizing) pass.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2702 8cb11bc2-c004-0410-86c3-e597b4017df7
reintroduces the issue #495 feature ("Syntax highlight/colorize
scripts without extensions") while building much more fault tolerance
into the system.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2699 8cb11bc2-c004-0410-86c3-e597b4017df7
useful improvements to the syntax coloration and annotation codepaths.
First, settle on the file contents as fetched via repos.openfile() as
the canonical source of such. But also, allow any exceptions thrown
while colorizing those file contents to trigger a second attempt
without colorization enabled. This should allow for non-error-ful
display of binary files which lack both an extension and VC content
type hint (those are treated by default as text files).
* lib/viewvc.py
(markup_stream): Add docstring. Replace 'fp' parameter with
'file_lines' parameter. Add 'colorize' parameter. No longer try
to munge 'blame_data' -- expect that callers have done that. Lose
first_line tracking stuff, as fetching the first line of the file
is no longer destructive. Always use 'file_lines' as the source
of file contents; never the text attached to the 'blame-data'.
(markup_or_annotate): Rework this to do more of the cheap work of
annotating and markup up so that markup_stream() can be called
more than once if necessary -- once to attempt colorization, and
again without that feature if the first pass fails.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-495-dev@2698 8cb11bc2-c004-0410-86c3-e597b4017df7
### "annotate view without syntax coloration" codepath. ###
On the 'issue-495-dev' branch: Let vclib API consumers request that
annotation data come with or without the associated text.
* lib/vclib/__init__.py
(Repository.annotate): Add optional 'include_text' parameter.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.annotate): Add 'include_text' parameter
and, if False, have the annotation callback drop the text on the floor.
* lib/vclib/svn/svn_repos.py
(BlameSource.__init__): Add 'include_text' param; squirrel away the value.
(BlameSource._blame_cb): Don't keep text we're asked not to keep.
(LocalSubversionRepository.annotate): Add 'include_text' parameter,
passed to BlameSource.__init__.
* lib/vclib/ccvs/bincvs.py
(BinCVSRepository.annotate): Add 'include_text' parameter, passed to
blame.BlameSource().
* lib/vclib/ccvs/ccvs.py
(CCVSRepository.annotate): Add 'include_text' parameter, passed to
blame.BlameSource().
* lib/vclib/ccvs/blame.py
(BlameSource.__init__): Add 'include_text' param; squirrel away the value.
(BlameSource.__getitem__): Don't keep text we're asked not to keep.
* lib/blame.py
(HTMLBlameSource.__init__): Update call to repos.annotate().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-495-dev@2696 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(): Try to import the pygments code at the global scope instead of...
(markup_stream_pygments): ...here. Add/move some comments, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-495-dev@2693 8cb11bc2-c004-0410-86c3-e597b4017df7
(markup_stream_pygments): Re-make the semantic changes from r2680,
which were (I believe) good ones, even if the lexer guessing stuff
hasn't yet work out entirely.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2686 8cb11bc2-c004-0410-86c3-e597b4017df7
For issue #501 ("Stack trace when trying to 'view' binary files"):
* lib/viewvc.py
(markup_stream_pygments): On second thought, allow guessing to
happen on non-None MIME types iff they appear to be text-y.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2681 8cb11bc2-c004-0410-86c3-e597b4017df7
For issue #501 ("Stack trace when trying to 'view' binary files"):
* lib/viewvc.py
(markup_stream_pygments): Rework the Pygments lexer-choosing logic a
bit. First, don't try any of it when syntax highlighting is
disabled. Secondly, don't guess at a lexer if we know the file's
MIME type and have already failed to get a matching lexer.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2680 8cb11bc2-c004-0410-86c3-e597b4017df7
(markup_or_annotate): Pass 'mime_type' to common_template_data() so
it can properly set the 'prefer_markup' bit. Otherwise, it will
guess without out svn:mime-type at its disposal.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2679 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/default/markup.ezt
Delete as unused.
* templates/default/include/fileview.ezt
Delete, after merging contents into...
* templates/default/file.ezt
...here. Also, port the [hide_binary_garbage] stuff from the classic
templates.
* templates/default/docroot/styles.css
(.vc_notice): New class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2678 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/default/query_results.ezt
Display warning text when query results are superficially truncated.
* templates/default/docroot/styles.css
(.vc_warning): New style.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2676 8cb11bc2-c004-0410-86c3-e597b4017df7
contain non-URI-safe characters (spaces, non-ASCII stuff, etc.)
* lib/vclib/svn/svn_repos.py
(_rootpath2url): Use urllib.pathname2url to URL-encode the path
portion of the URL we are building.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2674 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/svndbadmin
(SvnRev.__init__): Update the logic used to calculate change types
and diff objects to no longer assume that deleted paths have None
for their change.path. (Subversion's 1.7 bindings always populate
change.path.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2671 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/default/docroot/styles.css
Layout/style tweaks to the new default template set.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2660 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(diff_side_item): Pass the option to repos.itemlog() which says to
include directory logs even for revisions in which the directory
itself was not explicitly modified (props changed).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2659 8cb11bc2-c004-0410-86c3-e597b4017df7
Finish issue #495 ("Syntax highlight/colorize scripts without
extensions").
* lib/viewvc.py
(markup_stream_pygments): Failing all else, use the Pygments
guess_lexer() function to guess a file's content type from the
first line of its text. (Most of this patch is compensation for
the first that if this heuristic codepath is traversed, we've eaten
a line of text from the file object that we don't expect to have
been eaten.
Patch by: Chris Mayo <cjmayo{__AT__}tigris.org>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2657 8cb11bc2-c004-0410-86c3-e597b4017df7
(DiffSource): Do not switch to flush state. Such switch causes changes
to be displayed as removal and readdition.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2656 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_roots): Generate a log_href -- the revision log for the root
directory of the repository -- where it makes sense to do so.
* templates/classic/roots.ezt,
* templates/default/roots.ezt
Markup the last-modified-revision as a link to the log view where we can.
* docs/template-authoring-guide.html
Note the additional data dictionary item.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2653 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/default/log.ezt,
* templates/default/docroot/styles.css,
More markup changes to the default templates.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2652 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/default/log.ezt,
* templates/default/graph.ezt,
* templates/default/diff.ezt,
* templates/default/include/diff_display.ezt
Take a stab at updating the new default templates to handle the
property diff stuff.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2651 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/classic/include/diff_display.ezt
* lib/viewvc.py
Rename 'display_as' to 'diff_block_format', as discussed on ML.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2650 8cb11bc2-c004-0410-86c3-e597b4017df7
* conf/viewvc.conf.dist
Use the "classic" templates until the "default" ones can be updated
to reflect recent improvements (such as the property-diff stuff).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2649 8cb11bc2-c004-0410-86c3-e597b4017df7
new default for ViewVC 1.2. We'll keep the old templates around as a
"classic" option.
* lib/config.py,
* conf/viewvc.conf.dist
(Config.set_defaults): Set cfg.options.template_dir to
"templates/default", and make the matching edit in the pristine
configuration file.
* templates/:
Now just a container for...
* templates/classic/,
* templates/classic/*:
...the old default templates (which were 'templates' and 'templates/*'.
* templates/default/,
templates/default/*:
...and the new default, copied from the 'templates-contrib/1.1' area.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2647 8cb11bc2-c004-0410-86c3-e597b4017df7
dictionary item to 'diffs' for consistency with other multi-value
items. Yes, I know it makes the template usage itself weird
... "diffs.changes" instead of "diff.changes", but...
* lib/viewvc.py
(view_diff): Store the desc.changes in the 'diffs' data dictionary
item, not the 'diff' item.
* templates/diff.ezt
* templates/include/diff_display.ezt
Replace uses of 'diff' with 'diffs'. Selectively, of course.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2643 8cb11bc2-c004-0410-86c3-e597b4017df7
(top level) Introduce formatting rules for 4th and 5th levels of variables.
(diff.ezt) Update for the changes on the property-diff branch. Describe
missing parts (intraline diffs, patch_href). Fix some typos and copy-paste
errors.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2642 8cb11bc2-c004-0410-86c3-e597b4017df7
Try to document the creation of new release branches (though it's been a
while since I've done that, so this is all subject to my imperfect memory.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2637 8cb11bc2-c004-0410-86c3-e597b4017df7
Tweak the "from 0.8" section for a bit of consistency with other sections.
(As if anyone is still running 0.8.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2633 8cb11bc2-c004-0410-86c3-e597b4017df7
(Request.run_viewvc): Select diff view for directories if r1/r2 arguments
are provided.
(view_revision): Generate a link to diff view on directories if there was
a change in properties.
* log.ezt
(revision links): Generate 'diff to previous' and 'diff to selected' for
directories as well as files. Check for URL, not revision when determining
if 'diff to previous' link should be created (for consistency with 'diff
to selected')
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2626 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Pass anchor locations to the diff template.
* diff_display.ezt
(top-level): Generate anchors.
* revision.ezt
(path links): Use anchors to point to content and property parts of the diff.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2625 8cb11bc2-c004-0410-86c3-e597b4017df7
(DiffDescription): Add support for property diffs.
(diff_side_item): Store properties hash in the side items.
(view_diff): Generate property diffs.
* diff_display.ezt
(headers): Indicate the property being diffed, if applicable.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2624 8cb11bc2-c004-0410-86c3-e597b4017df7
(DiffDescription): New class. Move the diff format selection and processing
to this new class. Split the processing into "preparation" and actual diff.
The ideas behind this new class are:
1. It will accumulate the diff "blocks". Currently, it will handle content and
properties. In the future, it can be easily reused to accumulate diffs for
recursive ("revision") diff.
2. It separates the diff method from the selection of content to be diffed.
We have two content inputs (content, properties), four formats (raw, traditional
side-by-side, intraline side-by-side, intraline unified). The former two expect
a stream (fp), the latter two expect array of lines. This class makes each of
these chunks separate from each other.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2622 8cb11bc2-c004-0410-86c3-e597b4017df7
(raw): Gracefully handle the case where there are no changes (output
"No changes" instead of not displaying anything).
* viewvc.py
(diff_parse_headers): Detect if there were no input from diff stream,
report RCSDIFF_NO_CHANGES in this case.
(view_diff): If binary/empty changes are detected, relay that information
to the template.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2621 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): In preparation for factoring out the "differ" code, make view_diff
always pass the differences as 'changes' array/stream. The format is now selected
via new 'display_as' argumnet.
* diff_display.ezt
(all formats): Accommodate changes in viewvc.py
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2619 8cb11bc2-c004-0410-86c3-e597b4017df7
(all formats): Remove the use of empty <h3> as spacer, instead add margin-top on tables.
(sidebyside, unified): Specify column widths. Otherwise, files with narrow content
are displayed with line number columns occupying 50% of the screen.
(unified): Remove cut-n-paste "width" attribute specification.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2618 8cb11bc2-c004-0410-86c3-e597b4017df7
(left_header/right_header): Define common left/right side descriptions,
use them in all diff output formats (adding them to raw and unified, which
didn't have headers before)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2616 8cb11bc2-c004-0410-86c3-e597b4017df7
(legend): Remove references to revisions (revisions may be the same, e.g.
if diffing same revision on different branches). There are detailed references
in the headers.
(legend): Mention that colors designate not only affected lines, but also
characters (if intraline diffs are enabled).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2614 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Make diff an iterable (sequence); later property changes will be
added to the sequence. Pass hide_legend, left_rev, right_rev outside of the
diff[] array to untie diff.ezt from include/diff_display.ezt. Rename format
to diff_format for consistency with template name.
* diff.ezt
Same, plus small fixes in legend: capitalize first letter in 'changed',
refer to revision as such, not as 'v.XXX' - such references are not used
anywhere else.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2613 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Factor out common code preparing left/right item information into a new
function, diff_side_item.
(diff_side_item): New function.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2607 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Remove try-except block, exceptions are now handled in
setup_diff with more specific error messages. Merge the 'if fp'
block with the preceding conditional - which is the only way fp
is set to non-None.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2606 8cb11bc2-c004-0410-86c3-e597b4017df7
New file to house common definitions; _item and _RCSDIFF_*
for now. Remove local definitions in the rest of modules.
* idiff.py
(sidebyside, unified): Return _RCSDIFF_NO_CHANGES type if
the generator failed to yield anything else.
(sidebyside): Add type attribute to the returned tuple so
that template can check the type.
* diff_display.ezt
(top-level): Define messages to be used if diffs cannot be
displayed. Use the definitions in all non-raw displays.
(sidebyside,unified): Handle _RCSDIFF_IS_BINARY and
_RCSDIFF_NO_CHANGES; the former is not returned yet - will
be passed to the template once properties are diffed.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2605 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Encapsulate into a single _item parts that would
be repeated when multiple "diffable" items will be passed to diff.ezt.
At that time, diff will be changed to a sequence.
* diff_display.ezt, diff.ezt
Prefix those repeatable parts with 'diff'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/property-diff@2604 8cb11bc2-c004-0410-86c3-e597b4017df7
query, rather than croaking on an empty response.
* viewvc-install
(install_file): If raw_input() return an empty string, re-ask the
question.
Patch by: Alexey Neyman <stilor@att.net>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2599 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
Note the importance of the MIME type maps for syntax coloration, and
point folks to the 'mime_types_files' option.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2593 8cb11bc2-c004-0410-86c3-e597b4017df7
allowed_views, etc.)").
* conf/viewvc.conf.dist
(allowed_views): Add descriptions of the various views.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2591 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository._getrev): Re-raise all exceptions as
InvalidRevision exceptions.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository._getrev): Re-raise all exceptions as
InvalidRevision exceptions.
Found by: Daniel Shahaf <d.s@daniel.shahaf.name>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2586 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
Add code to workaround the fact that in Python 2.6,
fnmatch.translate() stopped returning strings that ended with '$'
(which work fine as MySQL regular expressions) and started instead
returning strings that ended with '\Z(?ms)' (which... don't).
* lib/cvsdb.py
(CheckinDatabase.SQLQueryListString): If the returned regexp ends
with '\Z(?ms)', replace those characters with a single '$'
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2580 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(diff_parse_headers): Add 'path1' and 'path2' parameters, and use
those paths in the returned header lines.
(view_patch, view_diff): Pass paths into diff_parse_headers() now.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2577 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/standalone.py
(usage, badusage): New functions.
(main): Separate the option parsing from the option validation. Add
support for a '--help' option. On bad input, now print a suggestion
to run the script with '--help' for usage hints.
Patch concept by: Prabhu Gnana Sundar <prabhugs@collab.net>
(Heavily, heavily tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2565 8cb11bc2-c004-0410-86c3-e597b4017df7
(main): Use a pristine Options() object when printing the usage
message (so the stated default values of options aren't affected
by what the user provided).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2561 8cb11bc2-c004-0410-86c3-e597b4017df7
(main): Switch to sequence syntax to prevent future headache:
'-h' in ('--help') returns True, which is not what we expect.
'-h' in ['--help'] returns False, which is what we want.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2559 8cb11bc2-c004-0410-86c3-e597b4017df7
sticky tag is specified").
* lib/vclib/ccvs/bincvs.py
(_get_logs): Only try to skip the "rest of the file" if there's
reason to believe there's a "rest of the file". While here,
ensure that the 'tag' variable is defined in all cases (though it
shouldn't matter).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2557 8cb11bc2-c004-0410-86c3-e597b4017df7
#433 ("queries return only partial results"). When a database query
is artificially limited by the 'row_limit' setting, inform the user
that the returned data is incomplete.
* lib/cvsdb.py
(CheckinDatabase.CreateSQLQueryString): Add 'detect_leftover'
parameter, used internally to check for a reached query limit.
(CheckinDatabase.RunQuery): Update call to CreateSQLQueryString(),
and check for leftover query response rows. If any are found, set
the appropriate flag on the query object.
(CheckinDatabaseQuery.__init__): Set initial values for new
'executed' and 'limit_reached' members.
(CheckinDatabaseQuery.SetExecuted,
CheckinDatabaseQuery.SetLimitReached,
CheckinDatabaseQuery.GetLimitReached,
CheckinDatabaseQuery.GetCommitList): New functions.
* lib/viewvc.py
(view_query): Use query.GetCommitList() now instead of poking into
the query object directly. Also, check query.GetLimitReached(),
reporting the findings through the data dictionary (via a new
'row_limit_reached' item) to the templates.
* lib/query.py
(run_query): Use query.GetCommitList() now instead of poking into
the query object directly. Now return a 2-tuple of commits and a
limit-reached flag.
(main): Update expectations of run_query() call. Populate
'row_limit_reached' data dictionary item.
* templates/query_results.ezt,
* templates/query.ezt
Display a warning if the query results are incomplete.
* templates/docroot/styles.css
(.vc_warning): New style definition.
* docs/template-authoring-guide.html
Document the new 'row_limit_reached' template item.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2551 8cb11bc2-c004-0410-86c3-e597b4017df7
While here, add notes to the 'row_limit' and 'rss_row_limit'
configuration option descriptions.
* lib/cvsdb.py
(CheckinDatabase.GetCommitsTable): New helper.
(CheckinDatabase.AddCommit, CheckinDatabase.CreateSQLQueryString,
CheckinDatabase.CheckCommit, CheckinDatabase.sql_delete): Use new
GetCommitsTable() helper instead of hard-coding the version-specific
selection of the commits table.
* conf/viewvc.conf.dist
(row_limit, rss_row_limit): Make it clear what exactly is getting
limited here.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2550 8cb11bc2-c004-0410-86c3-e597b4017df7
mechanisms, namely by removing the largely redundant "global" limit
and allowing the per-query row limit (which already exist, too) to do
its work.
While here, remove a poorly conceived (but thankfully unhighlighted)
mechanism for overriding the administrative limit on database rows
which was accessible via URL CGI params.
* lib/viewvc.py
(_legal_params): Remove 'limit' as a legal parameter.
(view_query): No longer allow an undocumented URL parameter to
override the admin-declared SQL row limit. That should have never
been allowed!
* lib/cvsdb.py
(CheckinDatabase.__init__): Remove 'row_limit' parameter and
associated self._row_limit member.
(CheckinDatabase.CreateSQLQueryString): No longer fuss with
self._row_limit. Let the individual query carry the row limit.
(ConnectDatabase): Update call to CheckinDatabase().
* lib/query.py
(form_to_cvsdb_query): Now accept 'cfg' parameter, and set the
query's row limit from the configured defaults.
(run_query): Update call to form_to_cvsdb_query().
* docs/url-reference.html
Remove reference to the 'limit' parameter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2547 8cb11bc2-c004-0410-86c3-e597b4017df7
CVS-keywords"). This changes causes the checkout of CVS file
contents -- when used as part of the markup/annotate logic -- to not
expand keywords. This helps it to be consistent with the results of
the annotate information query.
* lib/vclib/__init__.py,
* lib/vclib/svn/svn_ra.py,
* lib/vclib/svn/svn_repos.py
* lib/vclib/ccvs/ccvs.py
(openfile): Add 'options' parameter (unused). Callers updated.
* lib/vclib/ccvs/bincvs.py
(openfile): Add 'options' parameter, and look for a 'cvs_oldkeywords'
option to govern the use of -kkv or -ko in the 'co' command.
Callers updated.
* lib/viewvc.py
(markup_or_annotate): Pass 'cvs_oldkeywords' option to repos.openfile().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2545 8cb11bc2-c004-0410-86c3-e597b4017df7
consumption").
* lib/viewvc.py
(ViewVCHtmlFormatter._tokenize_text): Switch to a line-based
approach. This provides a *vast* improvement in performance and
memory usage, especially for large log messages with many
mark-up-able regions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2543 8cb11bc2-c004-0410-86c3-e597b4017df7
dumped") by raising a cleaner error message when asked to display a
"checkout" of a non-file.
* lib/viewvc.py
(view_checkout): If the target isn't a file, raise a
ViewVCException().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2541 8cb11bc2-c004-0410-86c3-e597b4017df7
(main): Fix broken option handling: -d expected an argument, -c
didn't and was doubly associated with both --config-file and
--htpasswd-file.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2538 8cb11bc2-c004-0410-86c3-e597b4017df7
root") and issue #476 ("Stack trace for some users if last commit
deleted a file or folder") by preventing ViewVC from trying to look up
the path type of a deleted path at an invalid location.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository._gettype): New helper function.
(LocalSubversionRepository.itemtype): Now use _gettype() helper.
(_get_change_copyinfo): New helper.
(_simple_auth_check): Rework this function to definitively resolve
the path type of paths it passes through the authz system,
handling the complication of determining the path of a now-deleted
path by consulting its last location prior to deletion.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2531 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/roots.ezt
Also show the last author, and mark only the "Name" header as the
sort choice.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2519 8cb11bc2-c004-0410-86c3-e597b4017df7
roots view").
* lib/viewvc.py
(view_roots): Include revision metadata in the data dictionary.
(list_roots): If configured to do so, calculate some last-modified
metadata for Subversion roots.
* lib/config.py
(Config.set_defaults): Set default value for new show_roots_lastmod
option.
* conf/viewvc.conf.dist
(show_roots_lastmod): New option.
* templates/roots.ezt
Show some roots metadata if configured to do so.
* docs/template-authoring-guide.html
Document new 'roots' view data dictionary items.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2517 8cb11bc2-c004-0410-86c3-e597b4017df7
view").
* lib/viewvc.py
(_re_rewrite_escaped_url): New compiled regexp.
(markup_escaped_urls): New helper function.
(markup_stream_pygments): Use markup_escaped_urls() to wrap URLs in
<a> tags, something Pygments won't do for us.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2514 8cb11bc2-c004-0410-86c3-e597b4017df7
(canonicalize_rootpath): Per the thought found in issue #446
("Specifying repo location using file:// prefix in svn_roots leads
to lack of hyperlinks on revision view"), convert file:/// and
file://localhost/ URLs into local paths.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2512 8cb11bc2-c004-0410-86c3-e597b4017df7
Subversion revision metadata harvesting logic.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository._revinfo): Split this into two logical
codepaths, one that needs changed-path information along with the
revision metadata, one which does not. (Because if we don't need
it, there are faster ways to get what we *do* need.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2509 8cb11bc2-c004-0410-86c3-e597b4017df7
(ViewVCAuthorizer._get_paths_for_root): Trap and return a cleaned-up
error when the authzfile isn't parse-able.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2505 8cb11bc2-c004-0410-86c3-e597b4017df7
Give the 'vcauth' subsystem a way to make universal access
determinations, which can seriously improve performance in situations
where a user has universal read access to a repository.
* lib/vcauth/__init__.py
(GenericViewVCAuthorizer.check_universal_access): New skeletal function.
(ViewVCAuthorizer.check_universal_access): New function.
* lib/vcauth/svnauthz/__init__.py (ViewVCAuthorizer.check_universal_access),
* lib/vcauth/forbidden/__init__.py (ViewVCAuthorizer.check_universal_access),
* lib/vcauth/forbiddenre/__init__.py (ViewVCAuthorizer.check_universal_access)
New functions.
* lib/vclib/ccvs/bincvs.py
(BaseCVSRepository.open): New function.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.open): Now check for universal read access.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.open): Now check for universal read access.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2496 8cb11bc2-c004-0410-86c3-e597b4017df7
Patch by: Craig Leres <leres@tigris.org>
Expanded by: me
The original version of this patch was submitted to cvs2svn issue #141:
http://cvs2svn.tigris.org/issues/show_bug.cgi?id=141
* lib/vclib/ccvs/rcsparse/common.py
(_Parser._parse_rcs_tree_entry): If there is an error when parsing a
CVS timestamp, include the revision number in the exception message.
The calendar.timegm() function is not very picky, but it does emit an
error if the month number is invalid.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2495 8cb11bc2-c004-0410-86c3-e597b4017df7
Subversion client, as ViewVC no longer uses that information.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.__init__): Don't look for svn client path
in the 'utilities' dictionary. We don't use it anyway.
* lib/config.py
(Config.set_defaults): Don't populate utilities.svn any more.
* conf/viewvc.conf.dist
(utilities/svn): Remove as unused.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2493 8cb11bc2-c004-0410-86c3-e597b4017df7
(_path_join): Fix one of my more pathetic coding errors. (How do
you lose track of the proper valid variable name in a two-line
function. Honestly...)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2490 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_markup, view_annotate): Raise a more graceful error message
when asked for markup or annotate view on a non-file.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2480 8cb11bc2-c004-0410-86c3-e597b4017df7
(has_crypt, _check_passwd): If 'crypt' isn't available, look for
'fcrypt' and use it instead.
(main): Always show --htpasswd-file option, but raise an informative
error if someone tries to use it when there's no cryptographic support.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2478 8cb11bc2-c004-0410-86c3-e597b4017df7
'crypt'") by making htpasswd file support optional (based on the
availability of the 'crypt' module).
* bin/standalone.py
(): Conditionally import 'crypt' and define _check_passwd() helper function.
(ViewVCHTTPRequestHandler.validate_password): Use _check_passwd() now.
(main): Conditionally built accepted options list and usage string based
on whether 'crypt' is available.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2473 8cb11bc2-c004-0410-86c3-e597b4017df7
length when compression would skew that.
* lib/viewvc.py
(get_writeready_server_file): Add optional 'content_length'
parameter, and the code to handle it.
(view_doc): Update call to get_writeready_server_file().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2471 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/sapi.py
(WsgiServer.FieldStorage): Don't pass self._headers to
cgi.FieldStorage() -- that parameter is for *input* headers, and
self._headers is a collection of output headers.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2459 8cb11bc2-c004-0410-86c3-e597b4017df7
still generating the same defaults as before.
* conf/viewvc.conf.dist
(query, query.viewvc_base_url): New section and value.
* lib/config.py
(_base_sections): Add 'query'.
(Config.set_defaults): Set default value for cfg.query.viewvc_base_url.
* bin/asp/query.asp,
* bin/cgi/query.cgi,
* bin/mod_python/query.py,
* bin/wsgi/query.fcgi,
* bin/wsgi/query.wsgi,
Ask the configuration for the location of ViewVC before falling back
to old defaults.
* templates/query.ezt
Don't reference unset variables. Do test the log message for
empty-ness, dropping a non-breaking space in place where it is.
* templates/include/footer.ezt
Don't reference unset variables.
* lib/query.py
(build_commit): Allow ob.log to be empty. Don't generate ViewVC
links if we don't have a base URL for ViewVC.
(main): Calculate docroot in light of possible absent viewvc_link.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2458 8cb11bc2-c004-0410-86c3-e597b4017df7
Lose more explicit invocations of 'string' module functions (which
no worky because we aren't importing that module any more).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2457 8cb11bc2-c004-0410-86c3-e597b4017df7
Tweak the release procedure to include pegging the externals
definition which pulls in the 'templates-contrib' subdirectory.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2452 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(_re_rewrite_svnrevref): New regular expression.
(ViewVCHtmlFormatter.format_svnrevref): New.
(format_log): Accept 'request' parameter instead of 'cfg' (which can
be obtained via the request). For Subversion repositories,
register a formatter which marks up revision references as links
to the revision view.
(): Update callers of format_log().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2439 8cb11bc2-c004-0410-86c3-e597b4017df7
of this is aimed at not paying the maintenance price of supporting
Python versions prior to 2.4 any longer, plus a little bit of just
getting dead code out of the way.
* lib/compat.py
Remove as unused.
* bin/cvsdbadmin,
* bin/loginfo-handler,
* bin/make-database,
* bin/svndbadmin,
* lib/accept.py,
* lib/blame.py,
* lib/cvsdb.py,
* lib/popen.py,
* lib/query.py,
* lib/sapi.py,
* lib/vcauth/forbidden/__init__.py
* lib/vcauth/forbiddenre/__init__.py,
* lib/vcauth/svnauthz/__init__.py,
* lib/vclib/__init__.py,
* lib/vclib/ccvs/blame.py,
* lib/win32popen.py,
* tests/timelog.py
Replace explicit import and use of the 'string' module with newer constructs.
* bin/standalone.py,
* lib/viewvc.py
No longer use 'compat' module. Replace explicit import and use of
the 'string' module with newer constructs.
* lib/dbi.py
Use calender.timegm() instead of compat.timegm().
* lib/vcauth/__init__.py
Lose unused module imports.
* lib/config.py,
Replace explicit import and use of the 'string' module with newer
constructs where possible. Lose old ConfigParser patch-up code for
Python 1.5.1.
* lib/vclib/ccvs/ccvs.py
Replace explicit import and use of the 'string' module with newer
constructs where possible. Import _path_join() from bincvs, and use
it instead of a bunch of copy-and-pasted string join() statements
throughout.
* lib/vclib/ccvs/__init__.py
(cvs_strptime): Moved here from the 'compat' module.
* lib/vclib/ccvs/bincvs.py
(): No longer use 'compat' module. Replace explicit import and use
of the 'string' module with newer constructs.
(_path_join): New, used now instead of a bunch of copy-and-pasted
string join() statements throughout.
* viewvc-install
Don't use the 'compat' module any more.
Also, so some rearranging of non-critical bits.
* misc/: New directory.
* misc/py2html.py: Moved from 'lib/py2html.py'.
* misc/PyFontify.py: Moved from 'lib/PyFontify.py'.
* misc/elemx/: Moved from 'elemx/'.
* misc/tparse/: Moved from 'tparse/'.
* tools/make-release
Omit 'misc' directory from releases, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2437 8cb11bc2-c004-0410-86c3-e597b4017df7
(BlameSource.__init__): Use client.create_context() instead of
client.ctx_t() to avoid "NULL proxy object pool" error.
(I should have done this with the changes in r2421, but overlooked it,
I guess.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2435 8cb11bc2-c004-0410-86c3-e597b4017df7
property, and use it to inform Pygments as to the file's encoding in
the markup and annotate views (while still providing that information
to the user agent in the checkout view).
* lib/viewvc.py
(parse_mime_type): New helper function.
(calculate_mime_type): Now also return the encoding as possibly
parsed from the svn:mime-type property. Callers updated.
(get_writeready_server_file): Add 'encoding' parameter.
(markup_stream_pygments): Add 'encoding' parameter which, if
provided, becomes the encoding passed to Pygments.
(view_checkout): Pass the encoding as/if provided by calculate_mime_type()
to get_writeready_server_file().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2430 8cb11bc2-c004-0410-86c3-e597b4017df7
only exception being the freeform [vhost] section values and key-value
file stuffs. In those places, user-defined case could be helpful, and
is certainly not documented as broken. So allow it, per issue #466.
* lib/config.py
(Config.load_config, Config.load_kv_files): Override
ConfigParser.optionxform() to avoid case normalization of option names.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2428 8cb11bc2-c004-0410-86c3-e597b4017df7
(ViewVCHtmlFormatter): Was HtmlFormatter. Which, uh, has the same
name as an object imported from Pygments.
(format_log): Track renamed class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2426 8cb11bc2-c004-0410-86c3-e597b4017df7
display node kind information and, by extension, links to the markup
and diff views for files.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository._revinfo_raw): Tweak _log_cb() inner
function to make use of the svn_log_changed_path2_t information
where available.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2424 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/standalone.py
(Options.htpasswd_file): New variable.
(AuthenticationException): New.
(ViewVCHTTPRequestHandler.handle_request): Handle AuthenticationException.
(ViewVCHTTPRequestHandler.validate_password): New.
(ViewVCHTTPRequestHandler.run_viewvc): If htpasswd authentication is
enabled, then complain about missing authn creds, and validated
any presented creds.
(main): Present and handle the new --htpasswd-file option. Also, do
some rudimentary validation of --htpasswd-file and --config-file values.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2414 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/standalone.py
(NotViewVCLocationException): New exception.
(ViewVCHTTPRequestHandler.do_GET, ViewVCHTTPRequestHandler.do_POST):
Now just thin wrappers around...
(ViewVCHTTPRequestHandler.handle_request): ...this new function.
(ViewVCHTTPRequestHandler.is_viewvc): Allow for the case where the
script alias is empty (a server root deployment).
(ViewVCHTTPRequestHandler.redirect): Remove as unused (the code's
been merged into handle_request()).
(ViewVCHTTPRequestHandler.run_viewvc): Do the is_viewvc() check here
now.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2411 8cb11bc2-c004-0410-86c3-e597b4017df7
simpler, but I've not done it justice in terms of upkeep.
* bin/standalone.py
(__author__, __date__, __version__, __credits__): Removed in favor of a
a simple header comment.
(Options.start_gui): Removed this member variable.
(nogui, gui): Removed.
(main): Was 'cli'. Remove all option handling for, and usage
references to, GUI mode.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2409 8cb11bc2-c004-0410-86c3-e597b4017df7
(Options): Minor formatting and noop logic changes.
(ViewVCHTTPServer): Was ViewVC_Server; move to module scope.
(ViewVCHTTPRequestHandler): Was ViewVC_Handler; move to module scope.
(serve): Track class renames.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2408 8cb11bc2-c004-0410-86c3-e597b4017df7
Reformat this file for consistency with other bits of ViewVC. There
*should* be no meaningful logic changes in this commit. (If there
are, it's probably a mistake.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2407 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_repos.py (LocalSubversionRepository._getrev),
* lib/vclib/svn/svn_ra.py (RemoteSubversionRepository._getrev):
Now accept revision strings that begin with 'r'.
Patch by: Daniel Shahaf <d.s{__AT__}daniel.shahaf.name>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2405 8cb11bc2-c004-0410-86c3-e597b4017df7
without a configuration file.
* lib/config.py
(Config.get_authorizer_and_params_hack): Make sure to always return
a 2-tuple. Callers will be expecting that, ya know?
Reported by: Daniel Shahaf <d.s{__AT__}daniel.shahaf.name>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2403 8cb11bc2-c004-0410-86c3-e597b4017df7
Subversion revision properties.
NOTE: The svn_ra logic attempts to do the right thing when
pre-Subversion 1.5 libraries are install, but I haven't had the
chance to actually test this out myself.
* templates/revision.ezt
Include the props.ezt property handler template fragment for use
with revision props. Also, minor markup change to a header.
* templates/docroot/styles.css
Lose some unnecessary stylation.
* lib/viewvc.py
(get_itemprops): Lose unused variable has_binary_props.
(view_revision): Handle new return value from repos.revinfo(),
processing extra revision props similarly to the way that file/dir
props are processed and passing them to the template data
dictionary.
* lib/vclib/svn/svn_ra.py
Import _split_revprops() from svn_repos.
(client_log): New compatibility wrapper.
(add_log): Reformat as an svn_log_entry_receiver_t callback.
(RemoteSubversionRepository.dirlogs, _date_from_rev): Track changes
to self.revinfo().
(RemoteSubversionRepository.itemlog): Now use client_log().
(RemoteSubversionRepository._revinfo_raw): Now use client_log() and
return revprops dict, too.
(_log_cb): Reformat as an svn_log_entry_receiver_t callback.
* lib/vclib/svn/svn_repos.py
(_split_revprops): New helper.
(_log_helper, LocalSubversionRepository.dirlogs, _date_from_rev):
Track changes to repos._revinfo().
(_revinfo): Use _split_revprops(), and now return revprops, too.
(_revinfo_helper): Now return revprops dict, too.
(_date_from_rev):
* lib/vclib/__init__.py
(Repository.revinfo): Update docstring to indicate that this
interface now returns a revprops dictionary, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2401 8cb11bc2-c004-0410-86c3-e597b4017df7
option.
* conf/viewvc.conf.dist
(root_parents): Rewrite the documentation for this to be more clear
and to note the valid root type strings.
* lib/viewvc.py
(Request.run_viewvc, expand_root_parents): Make some error strings
provide more helpful information.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2399 8cb11bc2-c004-0410-86c3-e597b4017df7
non-existent repository.
* bin/svndbadmin
(main): Do repository existence checking here, like the corresponding
code in cvsdbadmin does. (In fact, structure this function like that
corresponding cvsdbadmin code.)
(__main__): No longer do existence checks here.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2379 8cb11bc2-c004-0410-86c3-e597b4017df7
<title>.
* templates/rss.ezt
Apply the necessary formatting for RSS feed title and description
elements. Too bad so many readers have developed their own
individual ideas about presentation of this under-documented format.
(See also r2376.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2377 8cb11bc2-c004-0410-86c3-e597b4017df7
current only-use-the-most-recently-noticed formatter approach.
* lib/ezt.py
(Template._cmd_format): Rename 'printer' parameter to 'formatter'.
(_print_formatted): New helper function.
(_write_value): Now pop/restore the whole stack of formatters, and
use _print_formatted() to do the real output writing.
(Context.__init__): Rename 'printers' member to 'formatters'.
Consumers updated.
(_raw_formatter, _html_formatter, _uri_formatter): Renamed from
_raw_printer(), _html_printer(), and _uri_printer() respectively.
Consumers updated.
(_xml_formatter): New.
(_formatters): Renamed from _printers. Consumers updated.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2376 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/default.py
(_TokenStream): Convert token_term into a frozenset if the Python
version supports such.
(_TokenStream.get): Remove unnecessary buffer length calculations.
Patch by: Brian Harring <ferringb{_AT_}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2372 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/sapi.py
(escape): Ensure that the input is string-ified before doing string
transformations on it.
Patch by: Michael Henry <drmikehenry{__AT__}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2369 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
(view_revision): Include a self-referential 'revision_href' item in
the template data dictionary.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2362 8cb11bc2-c004-0410-86c3-e597b4017df7
the ViewVC codebase. Simplify, conjoin, remove, etc.
* lib/sapi.py
(escape): New function. *The* preferred HTML-escaping mechanism.
(Server.escape): New common Server object escape mechanism (which
uses the aforementioned escape(), of course).
(CgiServer.escape, WsgiServer.escape, AspServer.escape,
ModPythonServer.escape): Lose as unnecessary.
* lib/viewvc.py
(Request.get_form): Escape hidden form variable names and values.
(htmlify): Remove.
(): Replace all uses of cgi.escape() and htmlify() with (directly or
indirectly) sapi.escape().
* lib/query.py
(main): Use server.escape() instead of cgi.escape().
* lib/blame.py
(HTMLBlameSource.__getitem__): Use sapi.escape() instead of
cgi.escape().
* lib/idiff.py
(_mdiff_split, _differ_split): Use sapi.escape() instead of
cgi.escape().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2344 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_queryform): Escape user-provided input before passing it
directly off to the templates. Can you say "XSS attack vector"?
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2326 8cb11bc2-c004-0410-86c3-e597b4017df7
(query_backup): Switch to using the sapi interface for output file
I/O instead of using 'print'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2325 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_repos.py
(BlameSource.__init__): Add 'config_dig' parameter, and use it to
register the Subversion configuration directory.
(LocalSubversionRepository.__init__): Recognize an empty-string
config_dir as None. (Yay for configuration file nuances!)
(LocalSubversionRepository.annotate): Pass self.config_dir to
BlameSource().
Patch (mostly) by: Jan Parthey <jpar{_AT_}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2320 8cb11bc2-c004-0410-86c3-e597b4017df7
Comment tweaks, primarily to note in the authorizer parameter
sections that those options only apply when 'authorizer' has been
set to the correct respective authorizer name.
Suggested by: Dan Poirier <poirier{_AT_}pobox.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2318 8cb11bc2-c004-0410-86c3-e597b4017df7
of ViewVC users -- for issue #445 (standalone.py throws exception on
root listing after visiting a root).
* conf/viewvc.conf.dist
Add warning about using per-root options with standalone.py.
* lib/config.py
(Config.overlay_root_options): Move the assertion/recording related
to the one-time-only overlay stuffs down to the point where
problems might occur. This gives standalone.py users who don't
use per-root configuration options the requisite mercy to let
their servers continue to function.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2316 8cb11bc2-c004-0410-86c3-e597b4017df7
(docroot): Add admonishment about how this interplays with per-root
configuration of the 'template_dir' option.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2308 8cb11bc2-c004-0410-86c3-e597b4017df7
Make per-root authorizer-related configuration work so that admins can
feel comfortable exposing their root listing views again.
Also, make the query interface require that queried roots be
configured (explicitly or implicitly) to use either the 'forbidden'
authorizer or none at all. This is a security fix, since
administrators might reasonably have thought that if they configured a
root to use another authorizer, the query interface would have honored
that configuration.
* lib/config.py
(Config.__init__): Now track whether root options have been overlayed.
(Config.overlay_root_options): Assert that no root options have been
overlayed (and then noted that they now have).
(Config.get_authorizer_and_params_hack): New function to workaround
our inability to un-overlay root-specific options. It's only the
query interface and root listing views that really need to act on
multiple roots at once, and really only the authorization options
that matter there anyway.
(Config.get_authorizer_params): Remove per-root overlay hacks from
this function.
* lib/viewvc.py
(Request.run_viewvc): Update call to setup_authorizer() (to not
specify the rootname).
(setup_authorizer): Make the rootname parameter option, as a flag
for whether to consult the current configuration or instead use
the hack which manually digs around for per-root overrides of
authorizer stuffs.
* lib/query.py
(is_forbidden): Don't try to apply the 'forbidden' authorizer where
some other (or no) authorizer has been configured for a given
root. But do complain if another authorizer has been configured,
rather than simply letting stuff leak through that an
administrator might reasonably expect to have been hidden.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2300 8cb11bc2-c004-0410-86c3-e597b4017df7
whose primary navigation links aren't preserved on every page.
* viewvc.org/who.html,
* viewvc.org/faq.html,
* viewvc.org/download.html,
* viewvc.org/contact.html
Lose the 'Project Page' and 'Contributing' nav links.
* viewvc.org/index.html
Lose the 'Project Page' and 'Contributing' nav links. Put the
(short) license on this page.
* viewvc.org/contributing.html
Lose the 'Project Page' and 'Contributing' nav links. Put info
about the viewvc.tigris.org site on this page.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2295 8cb11bc2-c004-0410-86c3-e597b4017df7
clear understanding of per-vhost and per-root configuration overrides.
This should resolve issue #411 (Can't override authz-* sections in
virtual host).
* conf/viewvc.conf.dist
Add comments about the scope and permissability of per-vhost and
per-root overrides.
* lib/config.py
(): Add some comments about option layering -- including a fancy
schmancy ASCII art diagram! -- and make some minor comment
formatting tweaks.
(Config._base_sections): Was Config._sections. Add 'authz-*'.
(Config._force_multi_value): Reformat and comment.
(Config._allowed_overrides): New mapping of valid overrides.
(Config.__init__): Track renamed _base_sections member, and avoid
instantiating _sub_config items for non-explicitly-name base
sections found therein.
(Config.load_config): Add docstring. Use _is_allowed_section() to
determine which sections to process.
(Config.load_kv_files): Add docstring.
(Config.path): Minor docstring tweak.
(Config._process_section): Instantiate missing _sub_config() items.
Add a FIXME comment.
(Config._is_allowed_section, Config._is_allowed_override): New
functions.
(Config._process_vhost): Now use _is_allowed_override() for section
filtering.
(Config._process_root_options): Removed, merged with tweaks into...
(Config.overlay_root_options): ...here, which now uses
_is_allowed_override for section filtering.
(Config.get_authorizer_params): Look in the calculated configuration
rather than specific configuration file regions. Add a FIXME
comment.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2292 8cb11bc2-c004-0410-86c3-e597b4017df7
(Config.load_config): Remove 'rootname' parameter that's unused by
callers, and the code that employs it within this function.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2291 8cb11bc2-c004-0410-86c3-e597b4017df7
(common_template_data): Default 'roots_href' to None, and only
populate it if the roots listing is one of the configured allowed
views.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2288 8cb11bc2-c004-0410-86c3-e597b4017df7
Defer validation of certain query-view-related input whose format is
unknown at the time of validation. That includes all the form fields
whose interpretation (as an exact match, a blog, a regular expression,
etc.) changes based on the another field's value. Instead, do that
validation in the view funcs themselves.
* lib/viewvc.py
(_legal_params): Set the validator for the 'branch', 'file', 'who',
and 'comment' parameters to None.
(validate_query_args): New function for more careful query arg validation.
(view_queryform, view_query): Call validate_query_args().
Tested by: Jon Foster <jonfoster{_AT_}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2286 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/config.py
(Config.set_defaults): Make 'options.cross_copies' default to 1. At
a minimum that makes it jive with the commented out default value
shown in viewvc.conf.dist, but I believe that it's also the better
of the two ways to resolve that disparity in terms of user experience.
Noticed by: Tom Throckmorton <throck{_AT_}gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2279 8cb11bc2-c004-0410-86c3-e597b4017df7
values as we do for revision property values.
* lib/viewvc.py
(get_itemprops): Pass property values through format_log().
Patch by: Senthil Kumaran S <senthil@collab.net>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2277 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_diff): Use repos.itemlog() to fetch revision metadata about
the left- and right-hand diff objects and expose 'author', 'log',
'ago', and 'size' to the templates.
* docs/template-authoring-guide.html
Document the newly added template data dictionary items.
* templates/diff.ezt
Display the revision authors in the diff view.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2275 8cb11bc2-c004-0410-86c3-e597b4017df7
a single character.
* lib/viewvc.py
(build_commit): Fix calls to format_log(). It turns out that
parameter ordering is, you know, somewhat important.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2273 8cb11bc2-c004-0410-86c3-e597b4017df7
(LocalSubversionRepository.open): Remove custom SIGTERM handler.
It's causing problems for mod_python deployments, and I can't seem
to make it do anything meaningful for CGI deployments either.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2268 8cb11bc2-c004-0410-86c3-e597b4017df7
(utilities): Clarify what we mean by "the directories in which
certain programs live".
Suggested by: Eric McCarty <emccarty{_AT_}ostendo.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2261 8cb11bc2-c004-0410-86c3-e597b4017df7
(HtmlFormatter._tokenize_text): Give preference to the longer of
overlapping matches that begin at the same point. Add some
comments that better explain what we're doing.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2257 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(HtmlFormatter): Add docstring.
(HtmlFormatter.get_result): Now return the total number of readable
characters, too.
(format_log): Update expected return values from lf.get_result().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2255 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc-install
(TREE_LIST): Add a new field -- a boolean "is-optional" flag.
(install_tree): New parameter 'is_optional', used to avoid whining when
something in the source tree is missing.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2252 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Tweak some logic ordering, and ensure that 'changes' is
initialized as a sequence (instead of None) as some template logic
paths seem to care.
Reported by: Lawrence Cutlip-Mason <rena.larry.cm{_AT_}gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2251 8cb11bc2-c004-0410-86c3-e597b4017df7
* conf/viewvc.conf.dist
(options.tabsize): New.
* lib/config.py
(Config.set_defaults): Set default value for the 'tabsize' option.
* lib/viewvc.py
(markup_stream_pygments): Pass the 'tabsize' parameter to Pygments' lexers.
When not using pygments, use 'string.expandtabs' to do tab-to-space
conversion (possibly with a new object that wraps BlameSource objects
solely for that purpose).
(DiffSource._format_text): Honor the tabsize configuration options when
expanding tabs to spaces.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2249 8cb11bc2-c004-0410-86c3-e597b4017df7
indicate that truncation happened (so callers can tack on an ellipsis
or somesuch).
* lib/viewvc.py
(HtmlFormatter.format_email_truncated): Fix logic to use ellipsis
for mangling but not for truncation. (Also fix an off-by-one
error in the logic.)
(HtmlFormatter.get_result): Now return the result string and a
"was-truncated" flag.
(format_log): Update call to HtmlFormatter.get_result, and tack on
an ellipsis if the log was truncated.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2247 8cb11bc2-c004-0410-86c3-e597b4017df7
userdata along with the log message formatters for use by the
conversion functions. While ViewVC doesn't use this right now, the
feature has proven useful in writing an add-on that allows somewhat
generic highlighting of issue/bug IDs to URLs.
* lib/viewvc.py
(HtmlFormatToken): Remove.
(HtmlFormatter.format_url, HtmlFormatter.format_email_obfuscated,
HtmlFormatter.format_email_truncated, HtmlFormatter.format_email,
HtmlFormatter.format_text): Now accept (unused) 'userdata' parameter.
(HtmlFormatter.add_formatter): Now accept 'userdata' parameter, associated
with the formatter for future use.
(HtmlFormatter.get_result): Pass the 'userdata' from the token to its
converter.
(HtmlFormatter._tokenize_text): Switch to using _item()s instead of
HtmlFormatTokens. Associate with each item the userdata for its converter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2245 8cb11bc2-c004-0410-86c3-e597b4017df7
and I think, actually fix ancient issue #3 ("URL cut off in elipsis")!
Incidentally, this change also makes the email address obfuscation
stuff work as documented. Not sure how I started munging data when
mangle_email_addresses=1 (by substituting " at " for the at-sign), but
no more.
* lib/viewvc.py
(htmlify): Drop 'mangle_email_addresses' parameter, which was mostly
unused, and no longer do anything except very basic HTML encoding.
Callers updated.
(_re_rewrite_url): Tweak to match *non*-HTML-encoded URLs now.
(HtmlFormatToken, HtmlFormatter): New classes for log formatting.
(mangle_email_addresses): Remove as unused.
(format_log): Add 'maxlen' parameter, allowing this function to be used
for both long- and short-form log message formatting.
(copy_stream): Drop unnecessary 'cfg' parameter. Update call to htmlify().
(MarkupPipeWrapper.__init__): Drop 'cfg' parameter as unused.
(MarkupPipeWrapper.__call__): Update call to htmlify().
(markup_or_annotate, view_revision, view_directory, view_log,
build_commit): Use format_log() to format both long- and
short-form log messages.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2244 8cb11bc2-c004-0410-86c3-e597b4017df7
A fix for potential bug when no Subversion repositories are visible
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@206 6955db30-a419-402b-8a0d-67ecbb4d7f56
markup/annotate views.
* templates/file.ezt
Add some customizable template logic to hide the contents of file's with
non-human-readable file formats. Were Greg Stein dead, he'd be rolling
over in his grave right now.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2228 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_error): Settle for simple HTML-escaping of error messages
rather than full htmlification.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2225 8cb11bc2-c004-0410-86c3-e597b4017df7
files.
* lib/viewvc.py
(markup_stream_pygments): Pass stripnl=False to Pygments lexers so
they won't strip out leading blank lines from the files they are
colorizing.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2223 8cb11bc2-c004-0410-86c3-e597b4017df7
like this:
http://localhost/viewvc/subversion/?view=foo%22)%20was%20passed\
%20as%20a%20parameter.20%20Visit%20http://www.baddy.com%20to%20\
figure%20out%20why%20(%22foo
Would result in an error page that read as follows:
An illegal value ("foo") was passed as a parameter. Visit
http://www.baddy.com to figure out why ("foo") was passed as a
parameter.
(where "http://www.baddy.com" was linkified, and could potentially
point to a malicious website.)
With this change, we will avoid printing unknown parameter names, and
will show the parameter name rather its value when a bogus value is
detected. Yes, there's admittedly some information loss here that
might be useful to the well-meaning but fat-fingered user, but the
security aspect is more important.
* lib/viewvc.py
(_validate_param): Don't print illegal parameter names, and show the
(legal) parameter name rather than its value when that value is
illegal.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2217 8cb11bc2-c004-0410-86c3-e597b4017df7
tightening up some other bits.
* lib/viewvc.py
(_validate_view, _validate_mimetype): New validation functions.
(_re_validate_mimetype): Removed as unused.
(_legal_params): Tweak the validation routines for 'view' and
'content-type' to point to _validate_view() and _validate_mimetype(),
respectively.
(_validate_param): Now check for non-zero result from validation
functions as the "valid" indicator, rather than requiring each of
them to raise an exception in troubled times.
(Request.run_viewvc): Lose now-unnecessary validation of
'content-type' parameter -- the normal parameter validation stuff
should catch problems there.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2213 8cb11bc2-c004-0410-86c3-e597b4017df7
(Request.run_viewvc): Move the logic that maps view=rev to
view=revision into the parameter validation loop.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2212 8cb11bc2-c004-0410-86c3-e597b4017df7
(Request.run_viewvc): Use an intermediate variable to simplify some
logic around input parameter validation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2211 8cb11bc2-c004-0410-86c3-e597b4017df7
Comment out all the options here, forcing folks to uncomment the
stuff they want to modify. This allows the parsing of this file to
be optimized toward doing less work, while maintaining a consistent
initial presentation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2207 8cb11bc2-c004-0410-86c3-e597b4017df7
(This doesn't really fix anything, and hopefully doesn't break anything
either, but is merely a "good programming practice" cleanup item.)
* lib/viewvc.py
(Request.run_viewvc): Ensure that server.redirect() is the last
thing this function does (when it does it).
* lib/sapi.py
(CgiServer.redirect): Avoid calling sys.exit(). Also, fix a use of
print() that should be sys.stdout.write() (for consistency).
(AspServer.redirect, ModPythonServer.redirect): Avoid calling sys.exit().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2205 8cb11bc2-c004-0410-86c3-e597b4017df7
* conf/viewvc.conf.dist
(allowed_cvsgraph_useropts): New option.
* lib/config.py
(Config.set_defaults): Set default value for new
'allowed_cvsgraph_useropts' option.
* lib/viewvc.py
(_legal_params): Add new legal parameters: 'gflip', 'gbbox',
'gshow', 'gleft', and 'gmaxtag'.
(cvsgraph_make_reqopt, cvsgraph_normalize_gshow, cvsgraph_extraopts):
New helper functions.
(view_cvsgraph_image): Now pass the -O option set to the cvsgraph
binary.
(view_cvsgraph): Now pass the -O option set to the cvsgraph binary.
Also, add new template data stuff for generating a user-configurable
graph display options form.
* templates/graph.ezt,
* templates/docroot/styles.css
Add template stuff for generating a user-configurable graph display
options form.
* docs/url-reference.html,
* docs/template-authoring-guide.html
Update documentation.
* CHANGES
Note this change.
Patch by: Bertho Stultiens <bertho{_AT_}j.auh.dk> (originally),
Jene Jasper <tigris{_AT_}shadowland.demon.nl> (port to 1.1.x),
me (tweaks for official ViewVC inclusion)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2204 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(_re_validate_boolint): New.
(_legal_params): Switch the validation function to _re_validate_boolint
for the following: 'hideattic', 'makeimage', 'parent', 'tarball',
and 'hidecvsroot'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2199 8cb11bc2-c004-0410-86c3-e597b4017df7
complain about unknown repositories.
* bin/svndbadmin
(main): When rebuilding, ignore the UnknownRepositoryError; when
purging, turn that sucker into something readable.
* bin/cvsdbadmin
(__main__): When rebuilding, ignore the UnknownRepositoryError; when
purging, turn that sucker into something readable.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2195 8cb11bc2-c004-0410-86c3-e597b4017df7
case-handling semantics.
* conf/viewvc.conf.dist
(force_username_case): New option.
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer.__init__): Find and handle new force_username_case
authorizer option.
(ViewVCAuthorizer._get_paths_for_root): Replace ConfigParser.optionxform()
(which does normalization of option names) with an identity function
of sorts.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2192 8cb11bc2-c004-0410-86c3-e597b4017df7
Use "Contents of /path/to/file" instead of "Annotate of /path/to/file" as
the page title.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2181 8cb11bc2-c004-0410-86c3-e597b4017df7
commit/repository info.
* lib/cvsdb.py
(CheckinDatabase.PurgeRepository): Clear all the ID caches after
running a purge operation so that, if the purge is actually part
of a rebuild, the subsequent update doesn't merely pull IDs from
the cache (with the side-effect of not readding them to the database).
Reported by: Naran Babhu <naranbabhu{_AT_}tigris.org
Martin Dessureault <martin{_AT_}austin.rr.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2178 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_queryform): Add 'query_action' and 'query_hidden_values' back
to the data dictionary, as they were accidentally dropped in r2123.
Reported by: Naran Babhu <naranbabhu{_AT_}tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2175 8cb11bc2-c004-0410-86c3-e597b4017df7
into two: 'log_pagesize' and 'dir_pagesize', individually controlling
the size of pages used (if at all) for the revision log and directory
views, respectively.
* conf/viewvc.conf.dist
(use_pagesize): Removed, in favor of...
(dir_pagesize, log_pagesize): ...these.
* lib/viewvc.py,
* lib/config.py,
* bin/standalone.py
Replace the use and tooling around 'use_pagesize' with
'dir_pagesize' and 'log_pagesize' as appropriate.
* templates/include/paging.ezt,
* templates/include/dir_header.ezt
Stop using the option value to determine whether or not to show
pagination UI. Use the presence of some pages instead.
* docs/upgrading-howto.html
Note the changes in options.
Patch by: Lei Zhang <thestig{_AT_}google.com>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2142 8cb11bc2-c004-0410-86c3-e597b4017df7
correctly, and we don't need a toggle for 'enscript' any more.
* bin/standalone.py
(GUI.__init__): Pass the configuration file to handle_config().
Lose 'enscript'-related stuff.
(GUI.toggle_use_enscript): Remove.
(cli): Fix call to gui(), dropping bogus parameter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2140 8cb11bc2-c004-0410-86c3-e597b4017df7
remote Subversion directory view.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.dirlogs): Store the entry's revision as
a string, for consistency with other vclib modules.
Reported by: Wojciech Wróblewski <wojtek{_AT_}elmi.pl>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2137 8cb11bc2-c004-0410-86c3-e597b4017df7
Make this able to build any branch, not just trunk and tag names.
* notes/releases.txt
Update example of using make-release.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2128 8cb11bc2-c004-0410-86c3-e597b4017df7
404 not found on log_href's of removed files
More request.roottype ---> my_repos['roottype']
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@157 6955db30-a419-402b-8a0d-67ecbb4d7f56
(view_directory, view_log): Add some comments explaining the
presence of certain data dictionary dummy values.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2124 8cb11bc2-c004-0410-86c3-e597b4017df7
in all of its templated views. Do this with a custom, dictionary-like
class that prevents the creation of new keys after an initial
instantiation of keys and (possibly dummy) values.
* lib/ezt.py
(TemplateData): New.
* lib/viewvc.py
(common_template_data): Now return an ezt.TemplateData() object.
(make_comma_sep_list_string): New.
(markup_or_annotate): Use new ezt.TemplateData() interface now. Use
make_comma_sep_list_string() where applicable.
(view_roots, view_log, view_cvsgraph, view_diff, view_revision,
view_queryform, view_query): Use new ezt.TemplateData() interface now.
(view_directory): Use new ezt.TemplateData() interface now. Drop
'search_re_form' dictionary item.
* lib/query.py
(main): Use new ezt.TemplateData() interface now. While here, drop
'script_name' calculation (it isn't used).
* templates/include/dir_header.ezt
Display the search form if 'search_re_action' is set, not 'search_re_form'.
* docs/template-authoring-guide.html
Remove 'search_re_form'. Update 'search_re_action' description.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2123 8cb11bc2-c004-0410-86c3-e597b4017df7
Python bindings do not correctly set the .apr_err and .message members
of SubversionException objects by patching up those exceptions using
the exception arguments.
(Unfortunately, I don't have a version of these bindings installed for
testing.)
* lib/vclib/svn/svn_repos.py
(_fix_subversion_exception): New helper function.
(_get_history, BlameSource.__init__, LocalSubversionRepository.rawdiff,
LocalSubversionRepository.get_location, LocalSubversionRepository.last_rev):
Use _fix_subversion_exception().
* lib/vclib/svn/svn_ra.py
(): Import _fix_subversion_exception from svn_repos.
(RemoteSubversionRepository._date_from_rev,
RemoteSubversionRepository.get_location): Use _fix_subversion_exception().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2117 8cb11bc2-c004-0410-86c3-e597b4017df7
(Template._cmd_for): Raise a more useful exception message when the
to-be-looped-over variable ain't a sequence.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2115 8cb11bc2-c004-0410-86c3-e597b4017df7
(Template._cmd_print): Raise a more helpful exception to give some
clues to template authors who tried to, say, print a sequence
reference.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2111 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
coloration to perform character encoding detection (and subsequent
translation to UTF-8).
(Thanks to Jeremy Whitlock <jcscoobyrs@gmail.com> for pointing me in
this direction, if inadvertantly.)
* viewvc.conf.dist
(options.detect_encoding): New.
* lib/config.py
(Config.set_defaults): Initialize the 'detect_encoding' parameter.
* lib/viewvc.py
(markup_stream_pygments): If the configuration asks for character
encoding detection, try to import the 'chardet' module and -- if all
goes well -- tell Pygments to use it.
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2095 8cb11bc2-c004-0410-86c3-e597b4017df7
don't imply that it does in the UI.
* lib/viewvc.py
(view_directory): Don't provide sortby_rev_href to the template.
* templates/directory.ezt
Only offer sort links when those links are provided by ViewVC.
* templates/dir_new.ezt
Only offer sort links when those links are provided by ViewVC. Use
date-based sorting if rev-based sorting isn't available.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2090 8cb11bc2-c004-0410-86c3-e597b4017df7
Look in CVS/SVN/All repos link on query results page
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@121 6955db30-a419-402b-8a0d-67ecbb4d7f56
vclib layer for revision-sorted output rather than "whatever you want
to give me".
* lib/viewvc.py
(markup_or_annotate): Pass vclib.SORTBY_REV instead of vclib.SORTBY_DEFAULT
to the itemlog() interface.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2086 8cb11bc2-c004-0410-86c3-e597b4017df7
from an email response I gave on the dev@ list. Will massage this
into something a little more ready for publicity later.
* docs/release-notes,
* docs/release-notes/1.1.0.html
New.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2085 8cb11bc2-c004-0410-86c3-e597b4017df7
!!previous commit also was related to bug 45675
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@100 6955db30-a419-402b-8a0d-67ecbb4d7f56
to it for line number columns in the diff view.
* templates/docroot/styles.css
(.vc_diff_line_number): New.
* templates/diff.ezt
Use new vc_diff_line_number class.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2083 8cb11bc2-c004-0410-86c3-e597b4017df7
effectively allowing for non-interactive operation.
* bin/make-database
(INTRO_TEXT): Removed, merged into the usage message printed by...
(usage_and_exit): ...this new function.
(__main__): Add new command-line parsing logic, including support of
new options (--username, --hostname, --password, --dbname) and the
replacement of the --bonsai-compatible option with a more generic
--version.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2079 8cb11bc2-c004-0410-86c3-e597b4017df7
'commits' in schema version 1 (so that old version-ignorant code will
croak on a version-1 database).
* lib/cvsdb.py
(CheckinDatabase.AddCommit, CheckinDatabase.CreateSQLQueryString,
CheckinDatabase.CheckCommit, CheckinDatabase.sql_delete,
CheckinDatabase.PurgeRepository): Account for the fact that in
version 1 of the commits database schema, the 'checkins' table has
been renamed to 'commits'.
* bin/make-database
(DATABASE_SCRIPT_VERSION_1): Rename the 'checkins' table to 'commits'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-366-dev@2075 8cb11bc2-c004-0410-86c3-e597b4017df7
commits database schema, and use it (when present) in the 'purge'
operation.
* lib/cvsdb.py
(CheckinDatabase.sql_purge): New function.
(CheckinDatabase.PurgeRepository): If we have a schema version that
supports it, use a much faster approach of purging. Otherwise, we
have to suffer through a slow purge process.
* bin/make-database
(DATABASE_SCRIPT_VERSION_1): Add a new index of 'descid's to the
'checkins' table.
Patch (mostly) by: Larry Shatzer, Jr. <larrys@gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-366-dev@2074 8cb11bc2-c004-0410-86c3-e597b4017df7
schema that includes a `metadata' table (in which may be found the
schema version).
* lib/cvsdb.py
(CVSDB_VERSION): New global variable.
(CheckinDatabase.__init__): Init a new _version variable.
(CheckinDatabase.Connect): Fetch a list of tables and see if the new
`metadata' table is present. If so, use it to query the database
schema version. (Else, assume version 0.)
(CheckinDatabase.GetTableList, CheckinDatabase.GetMetadataValue,
CheckinDatabase.SetMetadataValue): New functions.
* bin/make-database
Rework this to be able to write two different schemas -- the
original, Bonsai-compatible one, and a new one -- triggered by the
presence/absence of a command-line --bonsai-compatible parameter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/issue-366-dev@2073 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_revision): Add new 'num_changes' data dictionary item.
* templates/revision.ezt
Expose new 'num_changes' item as a header on this page, and tweak
the way the more/first changes links appear.
* docs/template-authoring-guide.html
Document num_changes dictionary item.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2067 8cb11bc2-c004-0410-86c3-e597b4017df7
files).
* lib/viewvc.py
(markup_or_annotate): Make the default value for the 'annotation'
data dictionary member 'none' (instead of None) to simplify
template logic.
* docs/template-authoring-guide.html
Update docs for 'annotated'.
* templates/file.ezt
Use simplified logic to avoid missing links. (No, not *that* kind ...)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2064 8cb11bc2-c004-0410-86c3-e597b4017df7
configuration bit.
* lib/viewvc.py
(view_diff, view_patch): Only show diffs if 'diff' is one of the
allowed views.
* lib/config.py
(Config.set_defaults): Add 'diff' to the set of allowed_views (and
sort the values alphabetically where here).
* viewvc.conf.dist
(allowed_views): Add 'diff' to the set of views you can specify, and
include it in the default values. While here, sort the values
alphabetically.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2058 8cb11bc2-c004-0410-86c3-e597b4017df7
and have that mean "use an authorizer". So let's just prevent that
confusion right now, okay?
* lib/config.py
(Config.set_defaults): Set 'authorizer' by default to None.
* viewvc.conf.dist
(authorizer): Update comments for correctness, and don't imply that
"forbidden" is the default authorizer.
* docs/upgrading-howto.html
Stop saying that "forbidden" is the default authorizer.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2053 8cb11bc2-c004-0410-86c3-e597b4017df7
when no authz is in use. Vastly improves performance of
repos.itemlog() for local Subversion repositories *not* protected by
an authorizer.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository._revinfo): Was ._revinfo_raw(). Now
encapsulates the caching logic that used to live in .revinfo(), plus
the old logic of _revinfo_raw() modified to avoid changed-path
processing when that processing isn't strictly required by callers.
(LocalSubversionRepository.revinfo): Make this just a thin wrapper
around ._revinfo() now. Internal callers of this function updated
to use ._revinfo() instead.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2051 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/debug.py
(t_dump): Was dump(). Now accepts an output file handle, and sorts
the output in a predictable fashion.
* lib/viewvc.py
(main): Track changes to debug.dump().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2048 8cb11bc2-c004-0410-86c3-e597b4017df7
use an ad-hoc class to hold all that stuff instead.
* lib/viewvc.py
(get_file_view_info): Now return an object with interesting member variables
instead of a nasty long list of values in an easy-to-goof-up order.
(common_template_data, view_directory, view_log, view_diff): Update
uses of get_file_view_info to track new calling semantics.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2047 8cb11bc2-c004-0410-86c3-e597b4017df7
Ability to connect to MySQL through UNIX socket
diff links in query.py are shown now (moved expand_root_parents to config.py)
full-text comment searches in query and query_form are supported using MySQL FULLTEXT indexes
<select> for repository selection in query
git-svn-id: svn://svn.office.custis.ru/3rdparty/viewvc.org/trunk@5 6955db30-a419-402b-8a0d-67ecbb4d7f56
* viewvc.org/index.html
Lose 'Future Plans' section, and overhaul the feature and requirements lists.
* viewvc.org/contributing.html
Fix the link to the Template Authoring Guide.
* viewvc.org/download.html
Add a section for upgrading existing ViewVC installations.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2044 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vcauth/svnauthz/__init__.py
(_userspec_matches_user): New, abstracted from _process_access_section(),
but now with support for the inversion indicator (~).
(_process_access_section): Use new _userspec_matches_user().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2032 8cb11bc2-c004-0410-86c3-e597b4017df7
(ViewVCAuthorizer._process_access_section): Add support for the
"$anonymous" and "$authenticated" magic user specifications
introduced in Subversion 1.5.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2028 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_roots): Check to see if the root listing view is an allowed
one before serving it up.
* viewvc.conf.dist
Add 'roots' to the description of, and default value of, allowed_views.
* lib/config.py
(Config.set_defaults): Add 'roots' to the default value of
cfg.options.allowed_views.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2026 8cb11bc2-c004-0410-86c3-e597b4017df7
this feature in viewvc.conf.
NOTE: Root listing views still currently suffer a bit here. We can't
just overlay per-root options as we loop over roots because each root
will wind up with the union of the overrides for roots previously
handled in the loop. We either need to find a way to clone the Config
object before overriding its values with per-root options (so the
original Config object is untouched) or find an elegant way to
*unoverlay* per-root options. I suspect we'll have better luck with
the former approach.
* lib/viewvc.py
(Request.run_viewvc): Overlap per-root options *before* setting up
the authorizer for the root because, you know, the authorizer or
its configuration might be what's being overridden.
* viewvc.conf.dist
Note the existence of (and way to use) the per-root configuration overrides.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2025 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/docroot/styles.css
(#vc_nav_header): Drop 'font-weight: bold'.
* templates/include/header.ezt
Convert vc_nav_header contents into a 1-row, 2-column table
featuring the nav path and (if present) the authenticated username.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2024 8cb11bc2-c004-0410-86c3-e597b4017df7
Content-type: text/plain header.
* lib/viewvc.py
(Request.run_viewvc): Add 'text/plain' to the list of content types
allowed to be specified via the CGI query params.
(view_checkout): Revert the change from r1978 which caused this to
ignore the content-type query param; we'll go back to paying
attention to that, and simply trust that Request.run_viewvc() has
sanitized it.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2016 8cb11bc2-c004-0410-86c3-e597b4017df7
(setup_authorizer): Use the prescribed mechanism for dynamically loading a
submodule.
Patch by: Bernd Kuemmerlen <bkuemmer {at} gmx.net>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2011 8cb11bc2-c004-0410-86c3-e597b4017df7
(setup_authorizer): Avoid try/except/finally syntax, which isn't
supported by some older Python versions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2002 8cb11bc2-c004-0410-86c3-e597b4017df7
No longer recommend that folks set use_enscript (since it has been
removed) and use_cvsgraph (since it seems most folks these days are
using Subversion anyway).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2001 8cb11bc2-c004-0410-86c3-e597b4017df7
(setup_authorizer): Use the 'imp' module instead of exec() commands
to load a dynamically-determined (and arbitrarily named module).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@2000 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.conf.dist
(hide_errorful_entries): New.
* lib/config.py
(Config.set_defaults): Init cfg.options.hide_errorful_entries to 0.
* lib/viewvc.py
(view_directory): If cfg.options.hide_errorful_entries is enabled,
skip any directory entries that carry errors.
* docs/upgrading-howto.html
Note the new option.
* CHANGES
Note this (and the previous) change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1998 8cb11bc2-c004-0410-86c3-e597b4017df7
the requested tag as 'absent', rather than calling such a situation an
error. This is for issue #105 (add option hide_not_readable).
* lib/vclib/ccvs/bincvs.py
(CVSDirEntry.__init__): Add 'absent' parameter and handling.
(_get_logs): Rather than raise such as an error, not files which
have no revs on the selected branch/tag as "absent" (a
non-error-ful state).
* lib/vclib/ccvs/ccvs.py
(CCVSRepository.dirlogs): Init the .entry member of the dirent.
(InfoSink.admin_completed): If we found nothing for a particular
tag, and we're looking at a file, mark the entry as absent.
* lib/viewvc.py
(view_directory): If a CVS file is marked as absent (meaning, "No
revisions found on the requested branch"), don't show it at all.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1996 8cb11bc2-c004-0410-86c3-e597b4017df7
modules were renamed), and merge r1933 (in which the 'imp' module is
used to more directly deal with the import cycle problem).
* docs/upgrading-howto.html
Remove upgrading notes about renamed modules since, now, they aren't
renamed any more.
* viewvc-install
Note re-renamed paths.
* bin/mod_python/viewvc_mp.py,
* bin/mod_python/query_mp.py
Rename these back ...
* bin/mod_python/viewvc.py,
* bin/mod_python/query.py
... to these, and use the 'imp' module to load libraries from
specific locations.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1994 8cb11bc2-c004-0410-86c3-e597b4017df7
(build_commit): Ahem. And then commit the fixes necessary to make
r1991 actually work.
NOTE TO SELF: Be sure to test the right version of the software before
committing.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1992 8cb11bc2-c004-0410-86c3-e597b4017df7
(build_commit): Remove duplicated authz checks, and try to tighten
up the path/rev used in those checks. While here, fix issue #368's
complaint about the RSS feeds throwing an exception due to use of a
non-existent variable.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1991 8cb11bc2-c004-0410-86c3-e597b4017df7
(calculate_mime_type): Gracefully handle exceptions returned from
.itemprops(), and fall back to guessing based on path name.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1990 8cb11bc2-c004-0410-86c3-e597b4017df7
(LocalSubversionRepository._revinfo_raw): Fix a logic-o. It's if
a copy source path is *not* authorized for read that we want to say
the original path was not copied.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1989 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/include/header.ezt
Collapse the EZT logic for the navpath into a single line[1], and
wrap the path separators (/) with custom styles.
* templates/docroot/styles.css
(.vc_navheader .pathdiv): Define custom style with some left-right padding.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1987 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(Request.run_viewvc): No longer set the request's mime_type member.
(calculate_mime_type): New helper function.
(common_template_data): Add optional 'mime_type' parameter, passed
to get_file_view_info().
(get_file_view_info): Use guess_mime() as the MIME type fallback,
instead of consulting the now-absent request.mime_type.
(markup_or_annotate, view_log, view_checkout, build_commit): Use
calculate_mime_type().
* templates/file.ezt
Display a file's MIME type.
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1982 8cb11bc2-c004-0410-86c3-e597b4017df7
For security purposes (because spoofing Content-type headers can have
undesirable side effects), no longer recognize 'content-type' CGI
parameters whose values aren't one of the magic MIME types ViewVC uses
for its own (non-MIME-type-setting) purposes.
* lib/viewvc.py
(Request.run_viewvc): Ignore content-type CGI parameters whose
values aren't one of the magic ViewVC MIME types used to indicate
that folks want the markup view.
(view_checkout): No longer consult the query parameters for a MIME type.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1978 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/cvsdb.py
(CheckinDatabase.sql_delete): Add keep_fkey parameter, used to
prevent deletion of keys that are still in use in the 'checkins'
table.
(CheckinDatabase.PurgeRepository): Pass keep_fkey parameter when
deleting rows from tables other than 'checkins'.
* bin/cvsdbadmin,
* bin/svndbadmin
Update script usage messages to indicate that rebuilding includes
purging.
Patch by: Larry Shatzer (larrys {at} gmail.com)
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1974 8cb11bc2-c004-0410-86c3-e597b4017df7
Subversion 1.5. (This was filed as issue #359.)
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer._get_paths_for_root): Parse the 'aliases' section,
and fix username checks to include aliases, too.
Patch by: Thom May <thom {at} clearairturbulence.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1973 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(date_from_rev): Removed as unused.
(LogCollector): Leave an authz-related TODO comment.
(RemoteSubversionRepository.rawdiff): Hook into the authz-aware code.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1971 8cb11bc2-c004-0410-86c3-e597b4017df7
inconsistencies (versus local SVN repository views) in the revision
returned from openfile().
* lib/vclib/svn/svn_ra.py
(LastHistoryCollector): Removed. The main logic of this class now
lives (with major tweaks) in RemoteSubversionRepository._revinfo_raw().
(_get_rev_details): Removed.
(RemoteSubversionRepository.open): Init _revinfo_cache member.
(RemoteSubversionRepository.openfile): Use _get_last_history_rev()
for the returned revision.
(RemoteSubversionRepository.dirlogs): Use self.revinfo() now.
(RemoteSubversionRepository.revinfo): Rework as a wrapper around
_revinfo_raw().
(RemoteSubversionRepository.rawdiff): Add some comments.
(RemoteSubversionRepository._get_last_history_rev): New.
(RemoteSubversionRepository._revinfo_raw): New, taking from old
LastHistoryCollector interface, but reworked toward the goal of
some authz interaction.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1970 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_repos.py
(_path_parts): New, and now used throughout for path-to-parts
conversions.
(_cleanup_path): Rewrite as a wrapper around _path_parts().
(_fs_path_join): Rewrite as a wrapper around _cleanup_path().
(LocalSubversionRepository._revinfo_raw): Fix an authz check made
against the wrong path.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1969 8cb11bc2-c004-0410-86c3-e597b4017df7
to be displayed for certain rev != rev-in-which-item-was-changed
Subversion markup and annotate displays.
* lib/viewvc.py
(common_template_data): Add optional 'revision' argument, used to
override other automated revision-figuring-outin' mechanisms.
(markup_or_annotate): Use the revision returned by the openfile() or
annotate() interfaces in the call to common_template_data().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1968 8cb11bc2-c004-0410-86c3-e597b4017df7
behavior optional (since the penalty otherwise could be deemed too
high to be worth paying).
* viewvc.conf.dist
(check_database_for_root): New.
* lib/config.py
(Config.set_defaults): Populate default cvsdb.check_database_for_root value.
* lib/viewvc.py
(is_querydb_nonempty_for_root): Only do database root checks if
cfg.cvsdb.check_database_for_root is set.
Patch by: Larry Shatzer <larrys {at} gmail.com>
(Tweaked by me.)
* lib/cvsdb.py
(GetCommitListFromRCSFile): Update call to Repository.itemlog().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1966 8cb11bc2-c004-0410-86c3-e597b4017df7
some path is forbidden. We want it to claim the path doesn't exist at
all! So remove some unused cruft from a previous manifestation of the
authz support.
* lib/debug.py
(ViewVCNotAuthorizedException): Remove as unused.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1964 8cb11bc2-c004-0410-86c3-e597b4017df7
(ViewVCNotAuthorizedException.__init__): Use "403 Forbidden" instead
of the bogus "501 Not Authorized" status.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1963 8cb11bc2-c004-0410-86c3-e597b4017df7
(cli): Add 'host' to the list of accepted long options.
Patch by: Larry Shatzer, Jr. <larrys {at} gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1962 8cb11bc2-c004-0410-86c3-e597b4017df7
Only populate rss_href and queryform_href if query support is enabled
*and* the current root has a presence in the commits database.
* lib/viewvc.py
(common_template_data): Use is_querydb_nonempty_for_root() to
conditionally set rss_href and queryform_href.
(is_querydb_nonempty_for_root): New.
Patch partially by: Larry Shatzer, Jr. <larrys {at} gmail.com>
(I butchered it.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1960 8cb11bc2-c004-0410-86c3-e597b4017df7
Import 'vclib' so bad stuff doesn't happen. (Such as referencing a
non-imported module.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1959 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix example use of 'svn_dir' to 'svn'.
Patch by: Larry Shatzer, Jr. <larrys {at} gmail.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1958 8cb11bc2-c004-0410-86c3-e597b4017df7
(hide_cvsroot): Move closer to 'authorizer', and note that someday
it may go away.
(diff_format): Document the 'f' option.
(hr_breakable): Tweak description.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1956 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(Request.run_viewvc): Special-case the handling of self.where,
self.pathtype, and self.path_parts when we're looking at the
revision or root-listing views.
(common_template_data): Take the current directory revision into
account when generating a revision view link from the directory view.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1954 8cb11bc2-c004-0410-86c3-e597b4017df7
configured template directory now.
* lib/viewvc.py
(get_view_template): Rework this to interpret per-template overrides
as relative to the template-dir, which itself is relative to the
configuration location.
* viewvc.conf.dist
(templates): Strip 'templates/' from the sample template locations,
and note that these paths are relative to the configured template
directory.
* docs/upgrading-howto.html
Note this change of interpretation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1953 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.annotate): Keep the return value from
self.itemtype() so we can pass it to _get_history().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1952 8cb11bc2-c004-0410-86c3-e597b4017df7
routines (and use them).
Background: I had delusions of adding root-parent expansion for remote
Subversion repositories, but I lacked the requisite motivation.
Still, these are good changes which further move VC-specific knowledge
out of ViewVC's core moddules and back into the vclib abstraction
layer, which such knowledge belongs.
* lib/viewvc.py
(Request.run_viewvc): Use vclib.*.canonicalize_rootpath() to get
version-control-specific rootpath canonicalization.
(expand_root_parents, find_root_in_parents): Rework to use the
expand_root_parent() vclib implementations.
(locate_root): Docstring typo fix.
* lib/vclib/ccvs/__init__.py
(canonicalize_rootpath, expand_root_parent): New.
(CVSRepository): Use canonicalize_rootpath().
* lib/vclib/svn/__init__.py
(_re_url): Make module-global.
(canonicalize_rootpath, expand_root_parent): New.
(SubversionRepository): Use canonicalize_rootpath().
* bin/cvsdbadmin
(__main__): Use canonicalize_rootpath() before passing the root path
to vclib.ccvs.CVSRepository().
* bin/svndbadmin
(__main__): Use canonicalize_rootpath().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1950 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix a syntax error. (This is what I get for testing a fix on one
machine, but trying to commit an untested duplicate change from
another.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1943 8cb11bc2-c004-0410-86c3-e597b4017df7
improves upon things to boot (finishing issue #339)!
This implements support for a configuration Subversion runtime config
directory location, which is useful for employing cached authn
credentials against remote repositories that require them, as well as
avoiding complaints the Subversion library might make when trying to
ensure the existence of a runtime configuration directory.
* viewvc.conf.dist
(options.svn_config_dir): New.
* lib/config.py
(Config.set_defaults): Initialize options.svn_config_dir variable.
* lib/viewvc.py
(Request.run_viewvc): Update call to vclib.svn.SubversionRepository().
(list_roots): Update call to vclib.svn.SubversionRepository().
* lib/vclib/svn/__init__.py
(SubversionRepository): Add 'config_dir' parameter, passed to
updated calls to RemoteSubversionRepository() and
LocalSubversionRepository()
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.__init__): Add 'config_dir' parameter,
and squirrel it away in a member variable.
(RemoteSubversionRepository.open): Add the key thing I've been
missing for years to make custom runtime config directories work:
setting the configuration directory location in the auth baton!
God bless Eric Gillespie <epg@pretzelnet.org>.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.__init__): Add 'config_dir' parameter,
and squirrel it away in a member variable (currenty unused).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1940 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.dirlogs): Don't try to do
string-to-number conversion of the entry date -- we already have
the numeric value.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1938 8cb11bc2-c004-0410-86c3-e597b4017df7
(check_freshness): Move a comment closer to the code it addresses.
(markup_or_annotate): Restore cache control header checks
inadvertantly lost in a recent commit.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1937 8cb11bc2-c004-0410-86c3-e597b4017df7
preserve executability.
* lib/vclib/__init__.py
(Repository.isexecutable): New.
* lib/vclib/ccvs/bincvs.py
(BaseCVSRepository.isexecutable): New.
* lib/vclib/svn/svn_repos.py
(LocalSubversionRepository.isexecutable): New.
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.isexecutable): New.
* lib/viewvc.py
(generate_tarball): Use repos.isexecutable() to get the executable
bit for file tarball members. (This loses old code which directly
consulted the ,v file in the CVS case.)
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1936 8cb11bc2-c004-0410-86c3-e597b4017df7
(_get_diff_path_parts): Store the result of _path_parts() in
'parts', not 'path', to avoid raising an exception when
deferencing the former.
Found by: Jay Chang <Jay.Chang {at} intrado.com>
(Folks who test nightly builds rawwwwwk.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1935 8cb11bc2-c004-0410-86c3-e597b4017df7
Begin adding authz checks where necessary. Still need to take care
of rev metadata filtering and history truncation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1934 8cb11bc2-c004-0410-86c3-e597b4017df7
(LocalSubversionRepository): Throughout, don't clobber 'rev'
variables before passing them off to .itemtype(), and ensure there
*is* a local 'path' variable in case the .itemtype() failure case
(which expects one) is raised
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1933 8cb11bc2-c004-0410-86c3-e597b4017df7
(BaseCVSRepository, BinCVSRepository): Use Repository.itemtype()
throughout as a combination authz check and file type sanity check.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1931 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/include/dir_footer.ezt,
* templates/directory.ezt
Move search box to metadata header section, and eliminate redundant "Current
Search" header. Make properties show up for dir_new.ezt, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1928 8cb11bc2-c004-0410-86c3-e597b4017df7
(svn_client_ls3): New helper (to deal with brokenness in Subversion
1.4.x Python bindings).
(RemoteSubversionRepository.itemlog,
RemoteSubversionRepository._get_dirents): Use svn_client_ls3 helper.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1927 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(SVN_INVALID_REVNUM): Try to set from core.SVN_INVALID_REVNUM, but
fallback to an explicit -1.
(RemoteSubversionRepository.created_rev): Use SVN_INVALID_REVNUM
compatability value.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1926 8cb11bc2-c004-0410-86c3-e597b4017df7
(markup_stream_pygments): CGI-escape the original blame text lines
so that if they wind up getting used, the output is valid.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1925 8cb11bc2-c004-0410-86c3-e597b4017df7
* notes/logo
New directory.
* notes/logo/viewvc-logo.svg,
* notes/logo/viewvc-logo.odg,
* notes/logo/viewvc-logo.pdf
Moved (with some margin tweaks) from ...
* notes/logo-ideas
... this directory, which is now deleted.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1922 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/docroot/images/logo.png
Removed.
* templates/docroot/images/viewvc-logo.png,
* templates/docroot/images/favicon.ico
New.
* templates/docroot/help_dirview.html,
* templates/docroot/help_log.html,
* templates/docroot/help_query.html,
* templates/docroot/help_rootview.html
Update icon references to point to viewvc-logo.png.
* templates/include/header.ezt
Update icon reference to point to viewvc-logo.png, and add reference
to new favicon.ico.
* templates/docroot/styles.css
Use sans-serif fonts. Serifs are so 1993.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1921 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
contents in memory at once. One is bad enough, but will have to do
for now.
* lib/viewvc.py
(MarkupPygments): New, constructed from the primary logic that used
to live in ...
(markup_stream_pygments): ... this function, which is now just a thin
wrapper around MarkupPygments().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1909 8cb11bc2-c004-0410-86c3-e597b4017df7
number generation to the Pygments integration logic.
* viewvc.conf.dist,
* lib/config.py
(Config.set_defaults): Collapse 'source_highlight_line_numbers' and
'highlight_line_numbers' into just markup_line_numbers.
* lib/viewvc.py
(MarkupHighlight.__init__, MarkupSourceHighlight.__init__): Trace
option renames.
(markup_stream_pygments): Recognize the markup_line_numbers option,
and when set, use a custom LineNoHtmlFormatter class to generate
line numbers similar to the way 'highlight' does.
* templates/docroot/styles.css
(.line, .linenum): Tweak comment.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1908 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
(__main__): Add some comments, and don't use the --host option with
'mysql' if you don't have to.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1904 8cb11bc2-c004-0410-86c3-e597b4017df7
handle Control-C more cleanly.
* bin/make-database
(INTRO_TEXT): Update this text for accuracy and clarity.
(__main__): Prompt the user for the database server hostname
(defaulting to 'localhost'), and use the result with the --host
argument to 'mysql'. While here, catch the KeyboardInterrupt
exception and silently terminate rather than raising a stacktrace.
Patch partially by Philip M. Gollucci <pgollucci {at} p6m7g8.com>.
Also:
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1902 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_directory): Always show the search form if enabled. (If
templates want to hide it when there are no files to search, they
can.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1899 8cb11bc2-c004-0410-86c3-e597b4017df7
(common_template_data): Generate RSS hrefs for files, too, by using
a directory search of its parent limited to the specified file.
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1898 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix an old reference to a long-since-renamed data dictionary object,
and while here, make the regex search form look mo' betta.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1896 8cb11bc2-c004-0410-86c3-e597b4017df7
ViewVC's core libraries, turn the form hidden-values objects from HTML
strings to iterable objects that templates can use to *make* HTML strings.
* lib/viewvc.py
(Request.get_form): Now prepare hidden values as an iterable list of
objects with .name and .value attributes.
(common_template_data): Don't add 'change_root_action' and
'change_root_hidden_values' data dictionary items.
(prepare_hidden_values): Remove as unused.
* templates/include/diff_form.ezt,
* templates/include/dir_footer.ezt,
* templates/include/dir_header.ezt,
* templates/include/paging.ezt,
* templates/include/pathrev_form.ezt,
* templates/include/sort.ezt,
* templates/diff.ezt,
* templates/log_table.ezt,
* templates/query_form.ezt,
* templates/revision.ezt
Iterate over hidden-values items to generate <input type="hidden"
.../> output.
* docs/upgrading-howto.html,
* docs/template-authoring-guide.html
Note these changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1894 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(common_template_data): Add request.username to the common template
data as 'username'.
* docs/template-authoring-guide.html
Document the addition.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1893 8cb11bc2-c004-0410-86c3-e597b4017df7
"special" lines of output.
Previously, output like the following would choke because the code was
able to deal with the first "special" line (the warning about unknown
phrases), but then wasn't able to handle the second "special" line
(about no side branches).
$ co -pTAG_NAME /cvs/repos/some-file,v
/cvs/repos/some-file,v --> standard output
co: /cvs/repos/some-file,v: warning: Unknown phrases like `commitid ...;' are present.
co: /cvs/repos/some-file,v: no side branches present for 1.1
If either of these lines had been the only special ones, stuff worked
fine. But in concert, it all fell apart.
* lib/vclib/ccvs/bincvs.py
(_parse_co_header): Use a line-reading loop instead of trying to
expect certain output on specific lines.
Verified by: Ross Becker <ross {at} trapezenetworks.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1888 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.itemprops): Use svn_client_proplist2()
instead of the RA interfaces.
(RemoteSubversionRepository.created_rev): Rework this a little to
handle the missing path case, and add some comments about the
implementation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1887 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/config.py
(Config._get_parser_items): New.
(Config.get_authorizer_params): Use _get_parser_items() instead of
the parser's items() function directly.
Reported by: Michael Leib <michael.leib {at} hypermediasystems.com>
(and even better...)
Verified by: Michael Leib <michael.leib {at} hypermediasystems.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1886 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_directory): Do search-based filtering before filtering on dead
files (while still avoiding searches on dead files)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1883 8cb11bc2-c004-0410-86c3-e597b4017df7
that don't exist in that tag by doing tag-based filtering first, then
fulltext searching. I think this fixes issue #346.
* lib/viewvc.py
(search_file): New function, cored from the guts of ...
(search_files): ... this now-removed function.
(view_directory): Narrow the file field down by tag selection first
before doing fulltext searches.
Reported by: Ross Becker <ross {at} trapezenetworks.com>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1882 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_revision): Tell browsers not to cache the view of the youngest
revision in a Subversion repository.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1878 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.conf.dist
Update description of mangle_email_addresses option.
* lib/viewvc.py
(mangle_email_addresses): New helper function. Now supports a level of
obfuscation without data loss.
(htmlify): Use mangle_email_addresses() for address mangling.
(format_log): Test for an explicit mangling level.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1877 8cb11bc2-c004-0410-86c3-e597b4017df7
Noticed (and partial patch) by Jeffrey Klein <Jeffrey.Klein {at}
priorityhealth.com>.
* lib/vclib/svn/svn_ra.py
Import urllib.
(RemoteSubversionRepository._geturl): New helper function.
(temp_checkout, RemoteSubversionRepository.openfile,
RemoteSubversionRepository.itemlog, RemoteSubversionRepository.annotate,
RemoteSubversionRepository._get_dirents): Use the new .geturl() helper
function.
(RemoteSubversionRepository.itemprops): Wrap svn_ra_get_dir() in a
try/except block to deal with older, busted versions of that AI.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1875 8cb11bc2-c004-0410-86c3-e597b4017df7
(RemoteSubversionRepository.created_rev): Rename 'full_name'
parameter to 'path' for consistency with other interfaces.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1874 8cb11bc2-c004-0410-86c3-e597b4017df7
allow_compress option do something useful.
. o O ( What other dead code exists in this software? )
* lib/viewvc.py
Import the 'gzip' module unconditionally.
(Request.__init__): Determine if gzip output encoding is allowed.
(get_writeready_server_file): New.
(download_tarball): Lose the code that falls back to using a gzip
binary. Use get_writeready_server_file()
(generate_page, view_checkout, view_cvsgraph_image, view_doc,
view_patch): Use get_writeready_server_file(), allowing it to do
server header output finalization.
* lib/config.py
(Config.set_defaults): No longer initialize self.utilities.gzip.
Now initialize cfg.option.allow_compress to 0.
* viewvc.conf.dist
(utilities.gzip): Lose.
(options.allow_compress): Lose note that indicates that 'gzip' must
be installed and accessible in the program path.
* docs/upgrading-howto.html
Don't note the addition of cfg.utilities.gzip ... because I just
un-added it.
* CHANGES
Note support for gzip-encoded output.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1873 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_revision): Use repos.get_youngest_revision() instead of
peeking at repos.youngest directly.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1872 8cb11bc2-c004-0410-86c3-e597b4017df7
dictionary stuffs. It can be expensive to generate (especially when
authorization is in place) and brings little value considering we have
a roots listing view. The sole known casualty in this change is the
little drop-down roots listing box, which is often one of the first
customizations (removing this) that folks make to their ViewVC
instances anyway.
* lib/viewvc.py
(find_root_in_parents, locate_root): New functions.
(common_template_data): Move the root listing data dictionary stuff ...
(view_roots): ... to here. Now uses expand_root_parents().
(load_config): This, however, no longer uses expand_root_parents.
(Request.run_viewvc): Use locate_root() to find a requested root
name rather than expecting cvs_roots and svn_roots to be fully
populated.
* templates/include/header.ezt
Lose the root listing drop-down box, and de-table-ize the breadcrumbs.
* templates/docroot/styles.css
(.vc_navheader): Add some padding.
* docs/template-authoring-guide.html
Move the 'roots' stuff from the COMMON template data collection to
the section specific to the root listing view.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1865 8cb11bc2-c004-0410-86c3-e597b4017df7
referred to when root_as_url_component is disabled.
* lib/viewvc.py
(Request.run_viewvc): Only assume the default rootname if we're not
in root_as_url_component mode *and* we're aren't being asked to view
the root listing.
(common_template_data): Always calculate a roots_href. Also,
gracefully deal with request.rootname being None.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1863 8cb11bc2-c004-0410-86c3-e597b4017df7
(CCVSRepository.rawdiff): Update calls to itemlog() overlooked in r1857.
Found by: Daniel Berlin <danielberlin {at} tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1862 8cb11bc2-c004-0410-86c3-e597b4017df7
(RemoteSubversionRepository.itemprops): Pass the relative path to
svn_ra_get_dir(), not the full URL.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1851 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_directory): Init the DirEntry.lockinfo field. (moral: The
problem with cheating is that you eventually get caught.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1846 8cb11bc2-c004-0410-86c3-e597b4017df7
location on the command-line.
* bin/standalone.py
(handle_config): Add 'config_file' parameter.
(serve): Update call to handle_config().
(cli): Parse the -c / --config-file argument, and describe it in the
usage message. Also, disallow it when asked to be in GUI mode.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1840 8cb11bc2-c004-0410-86c3-e597b4017df7
confusing folks upgrading from ViewVC 1.0.x.
* lib/vcauth/forbiddenre/__init__.py
(ViewVCAuthorizer.__init__): Look for a configuration option called
"forbiddenre" instead of "forbidden".
* lib/config.py
(_force_multi_value): Remove "forbidden" from this list, as we don't parse
its value directly any more.
* docs/upgrading-howto.html
Update the section about migrating forbiddenness settings.
* viewvc.conf.dist
Rename the authz-forbidden.forbidden option to authz-forbidden.forbiddenre.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1836 8cb11bc2-c004-0410-86c3-e597b4017df7
repository with which they are associated, and use the Content-Disposition
HTTP header to suggest names for tarball downloads.
* lib/viewvc.py
(Request.get_link): No longer generate tarball URLs with the .tar.gz
magic suffix. We'll stick with explicit view=tar from now on.
(download_tarball): Use the Content-Disposition HTTP header to
dictate the recommended tarball name to browser agents.
Patch by: Martijn Ras <Martijn.Ras {at} gmail.com>
me
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1835 8cb11bc2-c004-0410-86c3-e597b4017df7
ago), I inadvertantly cross namespaces with the log view's use of
those variables as links to the HEAD versions of files. Disambiguate
the head versions by renaming the data dictionary variables with head_
prefixes.
* lib/viewvc.py
(view_log): Store HEAD href stuff in variables with "head_" prefixes
so we don't clobber the global href variables.
* docs/upgrading-howto.html
Note renames of annotate_href, download_href, download_text_href,
prefer_markup, and view_href to head_annotate_href, head_download_href,
head_download_text_href, head_prefer_markup, and head_view_href
(respectively).
* docs/template-authoring-guide.html,
* templates/include/log_header.ezt
Track template variable renames.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1833 8cb11bc2-c004-0410-86c3-e597b4017df7
(authz-wise) territory. This should also filter unreadable revisions
from the annotate view, but I'm not as confident about that change.
* lib/vclib/svn/svn_repos.py
(_get_history): Add 'path_type' parameter, rename 'full_name'
parameter to 'path', and truncate history at the first unreadable
location (if any).
(BlameSource.__init__): Pass 'first_rev' as the starting revision to
the Subversion annotate logic, but leave a comment here questioning
whether it was the right thing to do.
(LocalSubversionRepository.itemlog): Update call to _get_history(),
and filter unreadable copyfrom paths.
(LocalSubversionRepository.annotate): Update call to _get_history().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1832 8cb11bc2-c004-0410-86c3-e597b4017df7
optimizations to the way history is crawled in Subversion backends.
* lib/vclib/svn/svn_repos.py
(NodeHistory): Make this into an iterable object instead of relying
on a peek into a member variable.
(NodeHistory.__init__): Make histories a list instead of
dictionary. We need the ordering.
(NodeHistory.add_history): Validate the order in which revision info
is received -- order matters now.
(NodeHistory.__getitem__): New.
(_get_history): Return the NodeHistory object, which is now iterable.
(_log_helper): Swap the order of the 'path' and 'rev' parameters
(for consistency).
(_fetch_log): Merged into its only caller, which was ...
(LocalSubversionRepository.itemlog): ...this. Update the use of
NodeHistory here to avoid unnecessary sorts and reverses and such.
(LocalSubversionRepository.annotate): Update the use of NodeHistory here.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1831 8cb11bc2-c004-0410-86c3-e597b4017df7
(LocalSubversionRepository.openfile, LocalSubversionRepository.listdir,
LocalSubversionRepository.dirlogs, LocalSubversionRepository.annotate):
Use self.itemtype() to pull off both an authz check as well as
kind-in-light-of-operation validation.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1830 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vcauth/forbiddenre/__init__.py
(ViewVCAuthorizer._check_root_path_access): Lose 'rootname' and
'path_parts' parameters and logic to combine them; just accept the
combined form as a new 'root_path' parameter.
(ViewVCAuthorizer.check_root_access): Update call to
_check_root_path_access().
(ViewVCAuthorizer.check_path_access): Do root and path combination
here, and Update call to _check_root_path_access().
* viewvc.conf.dist
(forbiddenre.forbidden): Update documentation and examples.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1818 8cb11bc2-c004-0410-86c3-e597b4017df7
Fix the plus/minus line change counting in query results to ignore
values from unreadable files.
* lib/viewvc.py
(build_commit): Calculate total plus/minus line change count for a
given commit item (based on the sums of those values in
non-forbidden file commits associated with it).
(view_query): Update plus/minus line change count totals only
*after* trimming unauthorized files
* docs/template-authoring-guide.html
(query_results): Note new commits.plus and commits.minus items; fix
description of the plus_count and minus_count items.
While here, also:
* lib/viewvc.py
(build_commit): Fix the authz check to use vclib.check_path_access,
and feel vindicated by the fact that I actually found a use for
that function.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1816 8cb11bc2-c004-0410-86c3-e597b4017df7
message read thusly:
On the 1.0.x branch:
Fix buglets (and minor security leak) related to the files attached
to commit items in the query view and query.cgi script results. These
views still returned commit objects with all attached metadata even
when all the files associated with that commit were blocked due to
configured forbiddenness. The generic query.ezt template masked this
bug (because it was keyed on the files more so than on the commit
items), but query_results.ezt revealed it. Also, we were doing change
limiting at the wrong time, so you'd get results that showed 2 files
but read "Only first 5 files shown...".
* lib/viewvc.py
(build_commit): Trade the 'limited_files' parameter for a
'max_files' parameter, and change the way file counting and
filtering happens so we get accurate file counts and the maximum
number of allowed files when limiting changes. Now returns None
if the would-be-returned commit item has no associated allowed
files, and defers building of the commit item until necessary.
(view_query): Don't do file limiting here, defer it to
build_commit(). Also, watch for (and ignore) None returns from
build_commit(), too.
* lib/query.py
(run_query): Strip out commits which have no associated files.
Since commits in the query view are file-driven, the only way we
could have a commit that has no files is if the files were
stripped by forbiddenness checks.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1804 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(_strip_suffix): If no path_parts are provided, return None.
(Request.run_viewvc): Tweak the 404 error to, among other things,
always have a leading slash on the path (so the empty path doesn't
look so odd).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1799 8cb11bc2-c004-0410-86c3-e597b4017df7
(LocalSubversionRepository.dirlogs): Oops! Fix a buglet caused by
looking at the wrong revision-holding variable.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1791 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/__init__.py
(Repository.dirlogs): Update comment.
(Revision.__init__): Add 'lockinfo' parameter, used to populate
similarly named class member.
* lib/vclib/svn/svn_repos.py
(Revision.__init__): Add 'lockinfo' parameter, and update call to
vclib.Revision().
(_log_helper): Update call to Revision(), and lose custom lockinfo handling.
(LocalSubversionRepository.dirlogs): Populate entry lockinfo with a
call to svn_fs_get_lock() for each entry.
* lib/vclib/svn/svn_ra.py
(LogCollector.__init__): Add 'lockinfo' parameter, used to populate
similarly named class member.
(LogCollector.add_log): Pass self.lockinfo to updated call to Revision().
(RemoteSubversionRepository.itemlog): Pass lock info to
LogCollector(), and lose custom lockinfo handling.
(RemoteSubversionRepository.itemtype, RemoteSubversionRepository.listdir):
Update expected return value from _get_dirents().
(RemoteSubversionRepository.dirlogs): Populate entry lockinfo from
updated return value from _get_dirents().
(RemoteSubversionRepository._get_dirents): Rework to trade in
dirents and locks instead of only dirents.
* lib/vclib/ccvs/bincvs.py
(Revision.__init__): Update call to vclib.Revision().
(_get_logs): Add 'lockinfo' member to DirEntry() items.
* lib/vclib/ccvs/ccvs.py
(InfoSink.__init__): Init lockinfo dictionary.
(InfoSink.set_locker): New.
(InfoSink.define_revision): Set lockinfo on Revision item.
(InfoSink.set_revision_info): Populate DirEntry lockinfo from
Revision lockinfo data.
* lib/viewvc.py
(view_directory): Populate entry lockinfo.
(common_template_data): Populate the 'lockinfo' data dictionary item.
* templates/directory.ezt,
* templates/dir_new.ezt
* templates/annotate.ezt,
* templates/markup.ezt
Tweak to show lock status.
* docs/template-authoring-guide.html
Note new data dictionary items.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1787 8cb11bc2-c004-0410-86c3-e597b4017df7
* docs/template-authoring-guide.html
Document the new appearances of the lockinfo data.
* templates/log.ezt,
* templates/log_table.ezt
Show lock status information.
* templates/docroot/images/lock.png
New icon.
* lib/viewvc.py
(view_log): Populate the log revision entry's new "lockinfo" member.
* lib/vclib/svn/svn_repos.py
(_log_helper): Accept 'lockinfo' parameter, used to populate the
similarly named member of the Revision() object.
(_fetch_log): Query the lock status of the input path, and update
calls to _log_helper().
* lib/vclib/ccvs/ccvs.py
(CCVSRepository.itemlog): Update call to _file_log(), passing lockinfo.
(TreeSink.__init__): Init new lockinfo dictionary.
(TreeSink.set_locker): New.
* lib/vclib/ccvs/bincvs.py
(_parse_log_header): Now parse and return lock information, too.
(_file_log): Add 'lockinfo' parameter, used to populate the
similarly named Revision() object members.
(BinCVSRepository._get_tip_revision, BinCVSRepository.itemlog):
Expect lockinfo back from _parse_log_header(), and pass to updated
calls to _file_log().
(_get_logs): Expect lockinfo back from _parse_log_header().
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.itemlog): Use svn_client_ls3() to fetch
lock information.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1783 8cb11bc2-c004-0410-86c3-e597b4017df7
format mode.
* lib/viewvc.py
(format_log): Now accept optional 'htmlize' parameter.
(build_commit): Accept 'format' parameter, and use it to determine
what value to pass for the 'htmlize' parameter of an updated call
to format_log().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1779 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/cvsdbadmin
Update calls to vclib.ccvs.CVSRepository() to account for new
'authorizer' parameter.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1778 8cb11bc2-c004-0410-86c3-e597b4017df7
(Config.get_authorizer_params): Rework this to avoid Python 2.4-ism
(dict.update() able to accept an iterable key/value sequence) and
to favor root-specific parameters over general ones.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1777 8cb11bc2-c004-0410-86c3-e597b4017df7
file view. This causes less-than-perfectly-compact URL generation in
some cases, but frankly, we'd have fewer URL-compatibility issues if
we hadn't been trying to discard information in the first place.
* lib/viewvc.py
(Request.run_viewvc, Request.get_link): Honor "markup" as a valid value for
default_file_view.
* viewvc.conf.dist
(default_file_view): Note that "markup" is now a valid option here.
* CHANGES
Record this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1775 8cb11bc2-c004-0410-86c3-e597b4017df7
unify the views themselves; just the code that generates them.
* lib/viewvc.py
(markup_or_annotate): New, carved from the guts of ...
(view_markup, view_annotate): ... these, which are now just thin
wrappers around markup_or_annotate().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1772 8cb11bc2-c004-0410-86c3-e597b4017df7
(BlameSource._blame_cb): Increment the line number by 1;
Subversion's annotate APIs are 0-based.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1771 8cb11bc2-c004-0410-86c3-e597b4017df7
consistently returns a date, *not* a date string.
* lib/viewvc.py
(_get_diff_path_parts): Fix the call to _path_parts to, you know,
not reference bogus variables and actually use the value returned.
* lib/vclib/svn/svn_ra.py
(LastHistoryCollector.add_history): Convert the date string to a real date.
(temp_checkout): Keep a handle on the name of the temporary file
created, since that's what is returned by this function.
(rawdiff): Look for Subversion exceptions in the proper namespace.
* lib/vclib/svn/svn_repos.py
(_date_from_rev): Make this an inner function of rawdiff(), its only
consumer.
(_log_helper, LocalSubversionRepository.dirlogs): Don't convert the
returned date.
(LocalSubversionRepository._revinfo_raw): Return a date, not a date string.
(BlameSource.__init__): Expect exceptions in the right namespace.
(LocalSubversionRepository.rawdiff): Update call to _date_from_rev;
expect exceptions in the right namespace.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1770 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/svn_ra.py
(RemoteSubversionRepository.open): Use self.ctx.*, not just ctx.*
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1769 8cb11bc2-c004-0410-86c3-e597b4017df7
checking all roots and paths against regular expressions.
* viewvc.conf.dist
(forbidden): New authz-forbiddenre section.
* lib/vcauth/forbiddenre,
* lib/vcauth/forbiddenre/__init__.py
New authorizer based on simple regular expressions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1763 8cb11bc2-c004-0410-86c3-e597b4017df7
(Request.__init__): Stop calculating and storing the 'may_compress'
and 'no_file_links' values -- we don't use them anywhere!
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1749 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
reducing the list of binary dependencies by one for users of ... well,
any Python version that I could find as of at least 1.5.2.
TODO: Are there any versions of Python supported by ViewVC in general
that don't provide the 'gzip' module? Should we just rip out the use
of the external binary altogether?
(This was tracked in issue #319.)
* lib/viewvc.py
(download_tarball): Use Python's gzip module if available, only
falling back to a pipe through the gzip binary if it isn't.
* viewvc.conf.dist
(cfg.utilities.gzip): Note that this setting is optional if Python
provides the 'gzip' module.
Patch by: Gabriel Genellina <ggenellina@tigris.org>
(Tweaked by me.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1747 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(common_template_data): Calculate and add 'roots_href' to the dictionary.
* templates/include/header.ezt
Use new 'roots_href' data dictionary item.
* docs/template-authoring-guide.html
Note this new dictionary member.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1746 8cb11bc2-c004-0410-86c3-e597b4017df7
branch. This reduces the number of vclib plugins to two -- one for
each of CVS and Subversion.
* lib/viewvc.py
(): Update callers of vclib.svn.created_rev(), vclib.svn.get_location(),
vclib.svn.get_youngest_revision(), and vclib.svn.last_rev() to use
request.repos.* instead.
(Request.run_viewvc): For CVS, invoke only
vclib.ccvs.CVSRepository(), but pass the use_rcsparse setting to
it. For Subversion, invoke only vclib.svn.SubversionRepository().
* lib/vclib/ccvs/ccvs.py
Renamed from lib/vclib/ccvs/__init__.py, and tweaked to look for
stuff common to the bincvs implementation in the sibling 'bincvs'
module.
* lib/vclib/ccvs/__init__.py
New, a replacement by a new stub file with a factory function
that selects which CVS implementation to use.
* lib/vclib/ccvs/bincvs.py
Moved from lib/vclib/bincvs/__init__.py.
* lib/vclib/bincvs
Removed (it's now empty).
* lib/vclib/svn/svn_repos.py
Renamed from lib/vclib/svn/__init__.py.
(LocalSubversionRepository.created_rev,
LocalSubversionRepository.get_location,
LocalSubversionRepository.get_youngest_revision,
LocalSubversionRepository.last_rev): Moved into the class from outside.
* lib/vclib/svn/svn_ra.py
Moved from lib/vclib/svn_ra/__init__.py.
(RemoteSubversionRepository.created_rev,
RemoteSubversionRepository.get_location,
RemoteSubversionRepository.get_youngest_revision,
RemoteSubversionRepository.last_rev): Moved into the class from outside.
* lib/vclib/svn/__init__.py
New, replacing previous incarnation with a file that contains only a
single factory function.
* lib/vclib/svn_ra/
Removed (it's now empty).
* bin/loginfo-handler
(ProcessLoginfo): Now use vclib.ccvs.CVSRepository(), disabling use_rcsparse.
* bin/cvsdbadmin
(__main__): Now use vclib.ccvs.CVSRepository(), disabling use_rcsparse.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1739 8cb11bc2-c004-0410-86c3-e597b4017df7
The new method will work even if the contents of the "rcsparse"
directory are stored to a directory with a different name (as is the
case, for example, in cvs2svn).
* lib/vclib/ccvs/rcsparse/run-tests.py: Change how rcsparse.parse()
and parse_rcs_file.LoggingSink are imported.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1734 8cb11bc2-c004-0410-86c3-e597b4017df7
The new method will work even if the contents of the "rcsparse"
directory are stored to a directory with a different name (as is the
case, for example, in cvs2svn).
* lib/vclib/ccvs/rcsparse/parse_rcs_file.py: Change how
rcsparse.parse() is imported.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1733 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._read_until_semicolon):
New method.
(_Parser._parse_admin_access, _Parser._parse_rcs_tree_entry): Use
the new method.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1732 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_rcs_tree_entry):
Adjust the handling of dates to conform more strictly to
rcsparse(5), and simplify logic a bit.
* lib/vclib/ccvs/rcsparse/test-data/default,v,
lib/vclib/ccvs/rcsparse/test-data/default.out: Change test case to
include dates before the year 2000.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1731 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_rcs_tree_entry):
Append zeros to the end of the date tuple only when they are needed.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1730 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_rcs_tree_entry):
New method, extracted from parse_rcs_tree().
(_Parser.parse_rcs_tree): Use new method.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1728 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_admin_access):
Simplify logic and use list.append(x) instead of "list = list +
[x]".
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1727 8cb11bc2-c004-0410-86c3-e597b4017df7
This simplifies the code without a measureable performance cost.
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_admin_head,
_Parser._parse_admin_branch, _Parser._parse_admin_comment,
_Parser._parse_admin_expand): Use the token scanner's match() method
to handle semicolons.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1725 8cb11bc2-c004-0410-86c3-e597b4017df7
Previously, they raised a naked RuntimeError. This change should be
harmless because nobody seems to catch these exceptions specifically.
* lib/vclib/ccvs/rcsparse/default.py (_TokenStream.match): Raise
RCSExpected exception in the case of a mismatch.
* lib/vclib/ccvs/rcsparse/texttools.py (_mxTokenStream.match): Raise
RCSExpected exception in the case of a mismatch.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1724 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (RCSExpected.__init__): Improve
the error message passed to the base class constructor. Also
improve spacing around the exception class definitions.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1723 8cb11bc2-c004-0410-86c3-e597b4017df7
According to rcsfile(5), there don't have to be any deltas in an RCS
file. File without deltas can be created using "rcs -i -t- foofile".
This change allows rcsparse to handle such files.
This change might help fix cvs2svn Issue #80:
http://cvs2svn.tigris.org/issues/show_bug.cgi?id=80
* lib/vclib/ccvs/rcsparse/common.py (_Parser.admin_token_map): Add an
entry for "desc" (because if the tree is empty, the next thing
encountered after the administrative information is "desc").
(_Parser.parse_rcs_admin): Terminate loop if "desc" is seen.
* lib/vclib/ccvs/rcsparse/test-data/empty-file,v,
lib/vclib/ccvs/rcsparse/test-data/empty-file.out: Add a test RCS
file with no contents to test data, and the results expected when
parsing the file.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1721 8cb11bc2-c004-0410-86c3-e597b4017df7
According to rcsfile(5), this is allowed. In this situation, don't
invoke the set_head_revision() callback at all.
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_admin_head): Handle
the case that the "head" keyword doesn't list a revision.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1720 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser.parse_rcs_admin): Remove
dead code (the only way to escape from the loop is via "return").
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1719 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/ccvs/rcsparse/common.py (_Parser._parse_admin_head,
_Parser._parse_admin_branch, _Parser._parse_admin_access,
_Parser._parse_admin_symbols, _Parser._parse_admin_locks,
_Parser._parse_admin_strict, _Parser._parse_admin_comment,
_Parser._parse_admin_expand): New methods (one for each keyword that
can appear in the admin section).
(_Parser.admin_token_map): A map from keyword name to the method
used to handle that keyword.
(_Parser.parse_rcs_admin): Look up the keyword tokens in the map
instead of using a big "if" statement.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1718 8cb11bc2-c004-0410-86c3-e597b4017df7
This makes the keyword handling more uniform.
* lib/vclib/ccvs/rcsparse/common.py (_Parser.parse_rcs_admin):
Separate handling of the "strict" keyword into a separate "if"
branch.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1717 8cb11bc2-c004-0410-86c3-e597b4017df7
Order the callbacks in Sink and the "if" branched in parse_rcs_admin()
in the approximate order that they will be encountered.
* lib/vclib/ccvs/rcsparse/common.py (Sink): Reorder method definitions.
(_Parser.parse_rcs_admin): Reorder "if" statement branches.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1716 8cb11bc2-c004-0410-86c3-e597b4017df7
Submitted by: Michael Haggerty <mhagger@alum.mit.edu>
* lib/vclib/ccvs/rcsparse/run-tests.py: New file.
* lib/vclib/ccvs/rcsparse/test-data/default,v,
* lib/vclib/ccvs/rcsparse/test-data/default.out
Test data for a simple test.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1712 8cb11bc2-c004-0410-86c3-e597b4017df7
Add a FAQ entry for the "...but none match the current selection
criteria" error. Suggested by user "brasko" in IRC today.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1710 8cb11bc2-c004-0410-86c3-e597b4017df7
* bin/svndbadmin
(usage): Make it clear that the REPOSITORY command-line argument
is a path to a repository (as opposed to a ViewVC rootname or
relative URL or something else).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1703 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_diff): Rework the data dictionary: provide 'left' and 'right'
container objects with members for stuff related to the files on
the left and right side of the diff. Also, add the usual
per-file-revision view links to those containers, too.
* templates/diff.ezt
Track the data dictionary changes, and add links to the preferred
file views for each revision.
* docs/template-authoring-guide.html,
* docs/upgrading-howto.html
Note template changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1701 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(Request.get_url): Add new 'prefix' parameter, used to toggle
whether or not the generated URL has the protocol and server name
portions of the URL. Move code from build_commit() to handle the
prefix-inclusive case.
(build_commit): Move URL prefix-generating code to
Request.get_url(), and simply call that function with the new
'prefix' option set.
(view_query): Add new 'rss_link_href' data dictionary item.
* templates/rss.ezt
Add <channel><link> bit to the output stream, populated with the new
'rss_link_href' data dictionary item.
* docs/template-authoring-guide.html
Add documentation for the new 'rss_link_href' data dictionary item,
and note that query results also use rss.ezt.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1699 8cb11bc2-c004-0410-86c3-e597b4017df7
(standalone-only): New question and answer about why stuff sometimes
works under standalone.py but not under Apache with the same
configuration.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1694 8cb11bc2-c004-0410-86c3-e597b4017df7
(faq-section): New style name.
* viewvc.org/faq.html
Make h3's bear the new faq-section style.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1690 8cb11bc2-c004-0410-86c3-e597b4017df7
vclib.Repository interface, and adapt the Subversion vclib modules to
implement it.
* lib/vclib/__init__.py
(ADDED, DELETED, REPLACED, MODIFIED): New static variables.
(Repository.revinfo): New function.
(ChangedPath): New class.
(UnsupportedFeature): New exception type.
* lib/vclib/bincvs/__init__.py
(BinCVSRepository.revinfo): New (just raises vclib.UnsupportedFeature).
* lib/vclib/ccvs/__init__.py
(CCVSRepository.revinfo): New (just raises vclib.UnsupportedFeature).
* lib/vclib/svn/__init__.py
(SVNChangedPath): Was ChangedPath, now is a subclass of vclib.ChangedPath.
(SubversionRepository.revinfo): Was get_revision_info(). Rework to
use SVNChangedPath items.
* lib/vclib/svn_ra/__init__.py
(): Import SVNChangedPath instead of ChangedPath.
(LastHistoryCollector.add_history): Rework to use SVNChangedPath items.
(SubversionRepository.revinfo): Was get_revision_info().
* lib/viewvc.py
(view_revision): Rework this to use Repository.revinfo()
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1685 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn_ra/__init__.py
(SubversionRepository.__init__): Trade a bunch of list.append() calls for
a static initializition of the list.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1682 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/config.py
Re-sync (and re-order) the options listed in the sample configuration file
and the Config object.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1681 8cb11bc2-c004-0410-86c3-e597b4017df7
code from view_cvsgraph() into view_cvsgraph_image(), too, and
cross-reference them in the surrounding comments.
* lib/viewvc.py
(view_cvsgraph_image): Add commented-out LD_LIBRARY_PATH set, just
like what's in view_cvsgraph().
(view_cvsgraph): Update comment and example.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1678 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.org/styles.css
Tweak (and add) styles.
* viewvc.org/who.html
* viewvc.org/index.html
* viewvc.org/contributing.html
* viewvc.org/download.html
* viewvc.org/contact.html
* viewvc.org/nightly/build-viewvc-snapshot
Add some more CSS-able <div>'s, and add links to the FAQ page.
* viewvc.org/faq.html
Flesh out a little more the layout of this document, and add our first
answer!
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1674 8cb11bc2-c004-0410-86c3-e597b4017df7
convention of ViewVC into a tizzy, so rework the way the auth handling
stuff works there. We'll get root-specific handling of 'forbidden'
out of this as a result.
* lib/query.py
(is_forbidden): New.
(build_commit): Lose the 'auth' parameter, and call is_forbidden to
determine if a given result may be displayed.
(run_query): No longer grab an Authorizer object. Update calls to
build_commit().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1673 8cb11bc2-c004-0410-86c3-e597b4017df7
prevent mangling inside file contents. Why? Because file contents
should be sancred, and besides, we can't control what our various
syntax highlighting programs will do with such addresses anyway.
* lib/viewvc.py
(htmlify): Lose 'cfg' parameter; add 'mangle_email_addrs'.
(format_log, view_markup, view_log, view_annotate, view_revision,
build_commit): Update call to htmlify, using the configured value
for mangle_email_addresses.
(copy_stream, view_diff, english_query, view_error): Update call to
htmlify, with email address mangling disabled.
(DiffSource._format_text): Was spaced_html_text(). Update call to
htmlify(), with email address mangling disabled.
* viewvc.conf.dist
(mangle_email_addresses): Note that this doesn't affect the display
of file contents.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1672 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.conf.dist
(mangle_email_addresses): New option.
* lib/config.py
(Config.set_defaults): Set defaults for new 'mangle_email_addresses'
option.
* lib/viewvc.py
In various functions, use 'cfg = request.cfg' to enhance readability.
(htmlify): Add 'cfg' parameter. Callers updated. Honor the new cfg
option 'mangle_email_addresses', showing only "username@..." when
mangling.
(copy_stream, MarkupPipeWrapper.__init__, MarkupShell.__init__): Add
'cfg' parameter. All callers updated.
(MarkupEnscript.__init__, MarkupHighlight.__init__): Squirrel away
the 'cfg' parameter.
* docs/upgrading-howto.html
Note the new mangle_email_addresses option.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1670 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(setup_authorizer): Rework this for tighter exception handling.
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer.__init__): Don't reveal server paths in the
file-not-found exception.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1668 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(generate_tarball): Check every path -- not just top-level
subdirectories -- for authorization.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1667 8cb11bc2-c004-0410-86c3-e597b4017df7
check_file_access() functions into a single check_path_access(). Most
authorizers won't need to care about the distinction.
* lib/vcauth/__init__.py
(GenericViewVCAuthorizer.check_path_access): New, replaces ...
(GenericViewVCAuthorizer.check_file_access,
GenericViewVCAuthorizer.check_directory_access): ...these
now-removed functions.
(ViewVCAuthorizer.check_path_access): New.
(ViewVCAuthorizer.check_file_access,
ViewVCAuthorizer.check_directory_access): Removed.
* lib/vcauth/forbidden/__init__.py
(ViewVCAuthorizer.__init__): Squirrel away 'root' so we can use it ...
(ViewVCAuthorizer.check_path_access): ...here. Was
check_directory_access(), and now optionally checks the path's type
before making the access determination.
(ViewVCAuthorizer.check_file_access): Removed.
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer.check_path_access): Was _check_path_access(). Add
'rev' parameter.
(ViewVCAuthorizer.check_file_access,
ViewVCAuthorizer.check_directory_access): Removed.
* lib/viewvc.py
(Request.run_viewvc, view_directory, _get_diff_path_parts,
generate_tarball, view_revision, build_commit): Use the
authorizor's check_path_access() instead of the now-removed
check_directory_access() and check_file_access() functions.
* lib/query.py
(build_commit): Use check_path_access() instead of
check_directory_access().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1661 8cb11bc2-c004-0410-86c3-e597b4017df7
easily query the repository for information.
* lib/vcauth/__init__.py
(GenericViewVCAuthorizer.__init__): Lose 'rootpath', 'roottype', and
'rootname' for just 'root', so the authz modules can make queries
of the backing VC system as necessary.
* lib/vcauth/forbidden/__init__.py
(ViewVCAuthorizer.__init__): Lose 'rootpath', 'roottype', and
'rootname' for just 'root'.
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer.__init__): Lose 'rootpath', 'roottype', and
'rootname' for just 'root'.
* lib/viewvc.py
(Request.run_viewvc): Update call to setup_authorizer().
(setup_authorizer): Lose 'rootpath', 'roottype', and 'rootname' for
just 'root'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1655 8cb11bc2-c004-0410-86c3-e597b4017df7
and type by forcing them to implement functions which query those
pieces of information.
* lib/vclib/__init__.py
(Repository.rootname, Repository.rootpath, Repository.roottype): New.
* lib/vclib/bincvs/__init__.py
(CVSRepository.rootname, CVSRepository.rootpath,
CVSRepository.roottype): New.
* lib/vclib/svn/__init__.py
(SubversionRepository.rootname, SubversionRepository.rootpath,
SubversionRepository.roottype): New.
* lib/vclib/svn_ra/__init__.py
(SubversionRepository.rootname, SubversionRepository.rootpath,
SubversionRepository.roottype): New.
* lib/viewvc.py
(Request.run_viewvc): Ask the Repository object for its roottype(),
and translate the vclib value into a string. (It would be nice to
use the vclib value throughout the codebase, but not today.)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1654 8cb11bc2-c004-0410-86c3-e597b4017df7
(ViewVCAuthorizer.__init__): Look for the read ('r') code instead
of trying to match specific permission strings ('r', 'rw', ...).
Hopefully this gives us a little better resilience if Subversion grows
more authz codes. Suggested by Jan Grant <jan.grant@bristol.ac.uk>.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1653 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vcauth/svnauthz/__init__.py
(ViewVCAuthorizer._process_group): Fix a usage of string.strip()
where string.split() was intended. Noticed by
Jan Grant <jan.grant@bristol.ac.uk>.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1650 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_directory): Move the tarball_href calculation from here...
(common_template_data): ...to here (which I thought I'd already done...)
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1633 8cb11bc2-c004-0410-86c3-e597b4017df7
subsystem go mainstream!
* notes/authz-dev-TODO
* lib/vcauth/*
New, copied from the authz-dev branch.
* viewvc.conf.dist
* lib/viewvc.py
* lib/query.py
* lib/debug.py
Merge changes from the authz-dev branch.
* lib/config.py
Merge changes from the authz-dev branch. Also, make 'forbidden' the
default value for 'authorizer'.
* docs/upgrading-howto.html
Add sections about handling forbidden modules.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1623 8cb11bc2-c004-0410-86c3-e597b4017df7
(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
* lib/vclib/svn/__init__.py
(_datestr_to_date): Make this function more robust in the face of
bogus datestamps.
* lib/viewvc.py
(htmlify, format_log, make_time_string, make_rss_time_string,
build_commit, view_directory): Make this functions more gracefully
handle "None" revision metadata, and not generate data like
"Unknown date" or " ".
* templates/log.ezt,
* templates/markup.ezt,
* templates/rss.ezt,
* templates/revision.ezt,
* templates/log_table.ezt
Handle empty revision metadata more gracefully.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1533 8cb11bc2-c004-0410-86c3-e597b4017df7
the output stream.
* lib/viewvc.py
(copy_stream): Don't supply a default value for 'dst', and don't
special-case a value of None for it, either.
(view_checkout, view_cvsgraph_image, view_doc): Pass
request.server.file() as the 'dst' parameter to copy_stream().
(view_patch): Pass request.server.file() as the 'dst' parameter to
copy_stream(). Also, use request.server.file() instead of
sys.stdout.
(download_tarball): Use request.server.flush() instead of
sys.stdout.flush().
(view_error): Use server.file() instead of sys.stdout.
* lib/query.py
(main): Use server.file() instead of sys.stdout.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1532 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
(created_rev): Because the way ra.svn_ra_get_dir() seems to work
differently across versions of the Subversion Python bindings,
build in some fault tolerance.
Tested by Eric Hanchrow <offby1@blarg.net>.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1525 8cb11bc2-c004-0410-86c3-e597b4017df7
Add some more debugging, and consume stdin so CVS's pipe doesn't
back up (which causes an abort()).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1518 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/__init__.py
(NonTextualFileContents): New Exception.
* lib/vclib/svn/__init__.py
(BlameSource.__init__): Translate the Subversion error
SVN_ERR_CLIENT_IS_BINARY_FILE in the new vclib.NonTextualFileContents
exception.
* lib/viewvc.py
(view_annotate): Catch the new vclib.NonTextualFileContents exception.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1514 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/vclib/svn/__init__.py
(_rootpath2url): New helper, cored from BlameSource.__init__().
(BlameSource): Rework this class to use the Subversion client Python
bindings, specifically a call to svn_client_blame2().
(SubversionRepository.annotate): Use new _rootpath2url(), and
update the called to BlameSource().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1512 8cb11bc2-c004-0410-86c3-e597b4017df7
(_rev2optrev): Moved here from the svn_ra module.
* lib/vclib/svn_ra/__init__.py
(_rev2optrev): Moved to the svn module (now pulled in indirectly).
(SubversionRepository.__init__): Fix a leftover instance of a pool.
Also, add a comment about svn_cmdline_setup_auth_baton().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1511 8cb11bc2-c004-0410-86c3-e597b4017df7
Add the ability to query the commit database by log message comment in
addition to the existing query parameters.
Patch by: David Skyba <davidskyba@users.sourceforge.net>
* lib/cvsdb.py
(CheckinDatabase.CreateSQLQueryString): Add support for filtering
query results by log message.
(CheckinDatabaseQuery.__init__): Add new comment_list member.
(CheckinDatabaseQuery.SetComment): New.
* lib/viewvc.py
(_legal_params): Add 'comment' and 'comment_match' as valid query
parameters.
(view_queryform): Populate new 'comment' and 'comment_match' data
dictionary items.
(english_query, view_query): Handle the new 'comment' and
'comment_match' query items.
* templates/query_form.ezt
Add UI for filtering queries by log message.
* docs/url-reference.html
(Query View): Note new comment= and comment_match= URL parameters.
* docs/template-authoring-guide.html
(variables-query_form): Note new comment and comment_match data
dictionary items.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1509 8cb11bc2-c004-0410-86c3-e597b4017df7
Use a GNU tar extension when path names longer than 100 characters are
being packaged in our tarball output.
Patch by: Klaus Rennecke <marion@users.sourceforge.net>
I tested this on a Solaris box that had both the native tar program
and GNU tar. Without the patch, but the native and GNU tar programs
created files with truncated filenames. With the patch, GNU tar worked as
expected; the native tar program created a '././@LongLink' file
whose contents were the long path, and additionally created the
file with the truncated path.
* lib/viewvc.py
(generate_tarball_header): For paths longer than 100 characters, use
a GNU tar extension which allows arbitrary path links. Also, fix
the "version" header item to be '00', not \0.
* templates/include/dir_footer.ezt
Change the "download tarball" link text to indicate that we are
now generating GNU tarballs.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1507 8cb11bc2-c004-0410-86c3-e597b4017df7
(mkdtemp): Fix the compatibility implementation's use of mktemp(),
which prior to Python 2.3 (the same release that mkdtemp() shows
up) only supported a single "suffix" argument.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1506 8cb11bc2-c004-0410-86c3-e597b4017df7
filename by first sorting, then only fetching the extended revision
metadata information for the items that would survive the page
filtering.
Patch by: Gustavo De Nardin <gustavodn@mandriva.com>
(Tweaked by me.)
* lib/viewvc.py
(view_directory): Only fetch dirlogs for directory entries that will be
on "this page".
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1504 8cb11bc2-c004-0410-86c3-e597b4017df7
Drop a skeletal FAQ page into place, but don't hook it into the rest
of the site, seein' as how there's no real content here yet.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1503 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/cvsdb.py
(CheckinDatabase.AddCommit): Set plus_count and minus_count
explicitly to '0', which seems to be required for some folks'
MySQL installations.
* bin/make-database
Explicitly declare that we want tables of type "MyISAM".
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1500 8cb11bc2-c004-0410-86c3-e597b4017df7
(CheckinDatabase.AddCommit): Add some more information to any Exceptions
received while adding commits to the database.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1498 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
NOTE: This is not currently used in ViewVC. I needed it in another
piece of software, but wanted the tweaks to be publicly available
somewhere.
* lib/ezt.py
(FORMAT_URI, _uri_printer): New.
(_printers): Add mapping for new URI-formatting code.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1495 8cb11bc2-c004-0410-86c3-e597b4017df7
svndbadmin. Teach the 'rebuild' commands to first purge existing data
and then crawl the repository. Also, drop support for the 'rev'
parameter to 'svndbadmin rebuild', adding instead a '--force' option
to 'svndbadmin update'.
Suggested, and SQL commands offered, by Mark <mark@mitsein.net>.
* lib/cvsdb.py
(CheckinDatabase.sql_delete, CheckinDatabase.PurgeRepository): New.
* bin/svndbadmin
(handle_revision): Add 'force' parameter, used to force update of
commits already recorded in the database.
(main): Add 'force' parameter, passed on to handle_revision().
Handle the new 'purge' command, and teach 'rebuild' to also purge.
(usage): Update usage info.
(__main__): Add support for 'update --force' and 'purge', and drop
support for 'rebuild rev'. Add a KeyboardInterrupt handler.
* bin/cvsdbadmin
(usage): Add 'purge' usage info.
(__main__): Rework command-line parameter handling. Add support for
'purge' command, and make 'rebuild' first do a purge.
* CHANGES
Note this change.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1493 8cb11bc2-c004-0410-86c3-e597b4017df7
extension and contents.
Patch by: Christophe Delmon <cdelmon@tigris.org>
(Now, if only we could make highlight stop telling us via Apache's
error_log every time it doesn't recognize a filetype...)
* lib/viewvc.py
(MarkupHighlight.__init__): No longer calculate the file extension,
and drop the --syntax argument to highlight.
(MarkupHighlight.__call__): New.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1491 8cb11bc2-c004-0410-86c3-e597b4017df7
of requiring that you run it while sitting in its containing directory).
* viewvc-install
(_actual_src_path): New helper function.
(replace_file): Move this functionality into...
(install_file): ...here. Also, normalize some variable names for
consistency with...
(install_tree): ...this.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1488 8cb11bc2-c004-0410-86c3-e597b4017df7
directory where that file resides, instead of being relative to the
grandparent directory of viewvc.py.
This change lets you set up multiple installations of ViewVC that
share a common library directory, but are otherwise independent. It
also allows ViewVC to work more nicely with Gentoo's webapp-config.
Warning: This change may break ViewVC installations that use
VIEWVC_CONF_PATHNAME settings pointing at configuration files outside
the ViewVC install directory.
* lib/config.py
(Config.path): new method returning paths relative to config file
* lib/viewvc.py
(_install_path): removed function
(get_view_template, view_cvsgraph_image, view_cvsgraph, view_doc):
call cfg.path instead of _install_path
(load_config): replace call to _install_path with equivalent inline
code
* viewvc.conf.dist
update comments referring to ViewVC install directory
* CHANGES
document this change
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1487 8cb11bc2-c004-0410-86c3-e597b4017df7
the following warning in Python 2.5:
Warning: 'with' will become a reserved keyword in Python 2.6
Reported by: Philip M. Gollucci <pgollucci@p6m7g8.com>
* lib/PyFontify.py
(replace): Removed. Callers now use string.replace().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1486 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(view_doc): Lose newline characters in exception messages.
(Request.run_viewvc): Rewrite the unfound root exception messages to
be a little less cryptic.
* templates/error.ezt
No longer wrap exception messages in <pre> tags. Also, pad error
output with a bunch of space characters to IE's "Friend Error
Messages" don't show up.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1485 8cb11bc2-c004-0410-86c3-e597b4017df7
(install_file, install_tree): Replace '/' with the OS-specific
directory separator character in the destination path before processing.
This is follow-up to r1458.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1483 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(common_template_data): Accept the 'annotate' parameter as a valid source
for the 'rev' data item.
Noticed by: Marco Colombo <marcol@tigris.org>
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1480 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
Remove dependency on compat. It's time for rcsparse to be free, and by
golly, it's okay if it requires Python 2.0 now to do it.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1471 8cb11bc2-c004-0410-86c3-e597b4017df7
introduced in CVS's 1.12 line.
Issue number(s): 257
Patch mostly by: Mark <mark@mitsein.net>, tweaked by me.
* bin/loginfo-handler
(Cvs1Dot12ArgParse): New.
(HeuristicArgParse): Update comment -- the problems is no longer
with "current" CVS, but with "older" ones.
(__main__): Detect the use of newer CVS loginfo formatting, and
parse the arguments accordingly. Also, clean up some indentation
inconsistency.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1463 8cb11bc2-c004-0410-86c3-e597b4017df7
cvsdbadmin script.
* bin/cvsdbadmin
(UpdateFile, RecurseUpdate, RootPath): Add new 'quiet_level'
argument. Callers updated.
(usage): Rewrite to indicate the existence of the new -q flag, and
to look more like the svndbadmin usage message.
(__main__): Parse the new -q argument.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1462 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/debug.py
(SHOW_TIMES, SHOW_CHILD_PROCESSES): Add some explanatary comments.
(TARFILE_PATH): New.
* lib/viewvc.py
(download_tarball): When tarball debugging is enabled, generate the tarfile
at the configured location, and deliver either a cheap success message
or an error view to the browser.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1461 8cb11bc2-c004-0410-86c3-e597b4017df7
(install_file, install_tree): Replace '/' with the OS-specific
directory separator character in src_path before processing.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1458 8cb11bc2-c004-0410-86c3-e597b4017df7
addresses.
The ultimate problem here was that email address recognition banks on
the final component of addresses "server" only have 2-4 characters in
it. But the query code was doing a little more here than necessary
anyway, mistakenly using htmlify() instead of its subset, server.escape().
* lib/viewvc.py
(view_query, english_query, build_commit): Use
request.server.escape() instead of its superset, htmlify(), to
format stuff that needs to be HTML-escaped, but doesn't
necessarily need to try to recognize URLs and email addresses.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1456 8cb11bc2-c004-0410-86c3-e597b4017df7
Dictate UTF-8 as the output character set for all ViewVC
template-driven views.
* lib/sapi.py
(CgiServer.header, ModPythonServer.header): Add "; charset=UTF-8" to
the Content-type header in ViewVC output.
(AspServer.header): If no content type is specified, set the content
type to 'text/html; charset=UTF-8'.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1450 8cb11bc2-c004-0410-86c3-e597b4017df7
(get_revision_info): Removing some debugging code accidentally
committed in r1443. Because life would be too easy if cmpilato
weren't a sloppy coder, and we certainly can't have *that*.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1444 8cb11bc2-c004-0410-86c3-e597b4017df7
fixing issue #265. Sheesh.
* viewvc/lib/vclib/svn/__init__.py
(get_revision_info): Store ChangedPath items in a different hash
than the one we get from the Subversion bindings so replacement
detection works. While here, add support for Subversion 1.4.0's
new 'action' changed item member.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1443 8cb11bc2-c004-0410-86c3-e597b4017df7
Finish issue #265 - ViewVC shows wrong path for items deleted from a
parent dir copied in the same revision
* lib/vclib/svn/__init__.py
(ChangedPathSet): Remove.
(get_revision_info): Stop using the streamy callback reporting form
of repos.ChangeCollector(), because its got some ... deficiencies.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1440 8cb11bc2-c004-0410-86c3-e597b4017df7
immediately preceded by a call to request.server.header(), to just
make that call itself.
* lib/viewvc.py
(generate_page): Add 'content_type' parameter, and handle the call
to request.server.header() here instead of it always preceding
calls to this function.
(view_markup, view_roots, view_directory, view_log, view_annotate,
view_cvsgraph, view_diff, view_revision, view_queryform): Lose
calls to request.server.header() -- generate_page() does this for
us now.
(view_query): Update calls to generate_page(), and lose calls to
request.server.header().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1439 8cb11bc2-c004-0410-86c3-e597b4017df7
overlooked in that revision. This fixes issue #264, reported against
the nightly build.
* bin/loginfo-handler
(ProcessLoginfo): Pass cfg.utilities instead of cfg.general to
BinCVSRepository().
* bin/cvsdbadmin
(usage): Pass cfg.utilities instead of cfg.general to
BinCVSRepository()
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1431 8cb11bc2-c004-0410-86c3-e597b4017df7
Make some tweaks recommended in IRC by user "[1]tony" to help folks
better understand the configuration file format and usage.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1430 8cb11bc2-c004-0410-86c3-e597b4017df7
out the CLI/CGI distinction. Thanks to Mark <mark@mitsein.net> and
Brian G. Peterson <brian@braverock.com> for bringing this issue up
on the users' list.
* lib/viewvc.py
(markup_stream_php): update the cgi hack
* viewvc.conf.dist
(utilities.php): add comment
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1428 8cb11bc2-c004-0410-86c3-e597b4017df7
having the Repository.annotate() implementations return lists of them
(instead of lists of those cool-but-overused-_item-thingies).
* lib/vclib/__init__.py
(Repository.annotate): Note that this interface now returns
Annotation objects.
(Annotation): New.
Also, do some docstring addition/modification elsewhere in this file.
* lib/vclib/ccvs/blame.py
(BlameSource.__getitem__): Return vclib.Annotation objects now.
(_item): Remove as unneeded.
* lib/vclib/svn/__init__.py
(BlameSource.__getitem__): Return vclib.Annotation objects now.
(_item): Remove as unneeded.
* lib/vclib/svn_ra/__init__.py
(SubversionRepository._blame_cb): Store vclib.Annotation objects now.
(_item): Remove as unneeded.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1427 8cb11bc2-c004-0410-86c3-e597b4017df7
object, again with the same warnings applied to [rootpath] in r1425.
* lib/viewvc.py
(common_template_data): Expose the path for each root in the "roots"
data item.
* docs/upgrading-howto.html,
* docs/template-authoring-guide.html
Update the docs.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1426 8cb11bc2-c004-0410-86c3-e597b4017df7
(common_template_data): Expose request.rootpath as "rootpath".
* docs/upgrading-howto.html,
* docs/template-authoring-guide.html
Note this new exposition, though with a warning about its use in an
insecure environment.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1425 8cb11bc2-c004-0410-86c3-e597b4017df7
(mkdtemp): Flesh out the parameter list for mkdtemp(), passing those
params to mktemp().
* viewvc/lib/viewvc.py
(MarkupEnscript.__call__): Give the temporary directory a "viewvc"
prefix so it is more easily identifiable in the case of a
problem. Also, fix a minor indentation inconsistency.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1424 8cb11bc2-c004-0410-86c3-e597b4017df7
file formats covered by custom "streamer" syntax highlighters to not
be passed through escript or highlight when their respective custom
stream was disabled.
* lib/viewvc.py
(view_markup): Correct the syntax highlighter choosing logic.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1422 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(download_tarball): Don't reference non-existant variable cfg until
creating it as a reference to request.cfg.
(MarkupPHP.__init__): Drop the 'php_exe_path' variable, and add
'cfg'. Use 'cfg' to get at the 'php_path' configury.
(markup_stream_php): Update call to MarkupPHP().
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1421 8cb11bc2-c004-0410-86c3-e597b4017df7
* www/index.html
Note the new IRC channel.
* viewvc.org/contact.html
Note the new IRC channel, reorganize the text a bit, and provide a
handy-dandy contact summary.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1420 8cb11bc2-c004-0410-86c3-e597b4017df7
scheme-wise with the URL used to access ViewVC. Patch by Troels Arvin
<tarvin@tigris.org>, tweaked by cmpilato.
* lib/viewvc.py
(build_commit): If the environment variable HTTPS is set to "on", then
construct the rss_url data dictionary item with an "https" method instead
of an "http" one.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1417 8cb11bc2-c004-0410-86c3-e597b4017df7
(BlameSource.__init__): Pass the --non-interactive flag to 'svn blame'
so it doesn't wedge when cache authstuffs aren't available or
sufficient.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1416 8cb11bc2-c004-0410-86c3-e597b4017df7
more or less by Russell Yanofsky.
* lib/blame.py
(link_includes): Calculate include paths in such a way that '.' is
dropped and '..' is normalized. This should prevent us from
sending paths through Subversion's APIs that aren't legal (and
cause assertions to fire).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1414 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.org/who.html,
* viewvc.org/license-1.html,
* viewvc.org/download.html,
* viewvc.org/contributing.html,
* viewvc.org/index.html,
* viewvc.org/contact.html
Add the cutesy, "Hey, we're valid XHTML" logo; remove the group email
address (that's what the Contact page is for); fix XHTML validation issues;
add a working DOCTYPE marker; add <meta> definitions of a UTF-8 character
set.
* viewvc.org/styles.css
Minor tweaks to font sizes and margins, mostly. Nothing altogether
interesting.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1412 8cb11bc2-c004-0410-86c3-e597b4017df7
Fill in the remaining blanks in the template authoring guide, and fix
one erroneous "depth" indicator in the markup.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1410 8cb11bc2-c004-0410-86c3-e597b4017df7
Bring this, I think, up-to-date with the 1.1.0 work-in-progress.
Also, fix some colors to avoid using green save for "added" variables.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1409 8cb11bc2-c004-0410-86c3-e597b4017df7
creating a new section of the configuration file strictly for defining
the locations of these helper applications.
This closes issue #229 (configurable path to sed) and issue #62
(configurable path to diff), and perhaps others I failed to find.
* viewvc.conf.dist
Add a new "utilities" section for corraling all the various
tool-location configurations, and relocate (with some tweaks) a
bunch of options:
general.rcs_path => utilities.rcs_dir
general.cvsnt_ext_path = utilities.cvsnt
general.svn_path => utilities.svn
options.enscript_path => utilities.enscript
options.highlight_path => utilities.highlight
options.py2html_path => utilities.py2html_dir
options.php_exe => utilities.php
options.cvsgraph_path => utilities.cvsgraph
utilities.diff (new)
utilities.gzip (new)
utilities.sed (new)
options.use_py2html (new)
* lib/config.py
(_sections): Add 'utilities' section.
(Config.set_defaults): Reflect options tweaks made to
viewvc.conf.dist in the code here.
* lib/viewvc.py
(Request.run_viewvc): Track renamed utilities.svn option. Now pass
cfg.utilities into BinCVSRepository(), CCVSRepository(), and
SubversionRepository(). Collapse now-identical
SubversionRepository() calls.
(markup_stream_python): Return immediately if options.use_py2html
isn't set. Track renamed utilities.py2html_dir option.
(view_cvsgraph_image, view_cvsgraph): Track renamed
utilities.cvsgraph option.
(MarkupPHP.__init__): Track renamed utilities.php option, and allow
for 'php' as a fallback value.
(MarkupHighlight.__init__): Track renamed utilities.highlight option.
(MarkupEnscript.__init__): Track renamed utilities.enscript option,
and honor new utilities.sed option.
(download_tarball): Use new utilities.gzip option.
* lib/vclib/__init__.py
(_diff_fp.__init__): Add 'diff_cmd' parameter.
* lib/vclib/svn/__init__.py
(SubversionRepository.__init__): Drop 'svn_path' parameter, and now
accept 'utilities'.
(SubversionRepository.rawdiff): Pass self.diff_cmd to _diff_fp().
* lib/vclib/svn_ra/__init__.py
(SubversionRepository.rawdiff): Pass self.diff_cmd to _diff_fp().
* lib/vclib/ccvs/__init__.py
(CCVSRepository.rawdiff): Pass self.utilities.diff or 'diff' to _diff_fp().
* lib/vclib/bincvs/__init__.py
(CVSRepository.__init__): Add 'utilities' parameter.
(BinCVSRepository.__init__): Lose as no-longer-necessary.
(BinCVSRepository.rcs_popen): Track renamed options, and renamed
member variable that hold those options.
* docs/upgrading-howto.html
Note these options changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1407 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.org/contributing.html,
* viewvc.org/index.html,
* viewvc.org/contact.html
Oops. Forgot to commit these removed nav references to upgrading.html.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1403 8cb11bc2-c004-0410-86c3-e597b4017df7
now. Get stuff that's aimed at regular developers off our website,
get the website out of our release tarballs, while letting the docs/
that ViewVC admins need remain in the tarballs.
* docs/
New directory.
* docs/url-reference.html,
* docs/template-authoring-guide.html
Moved these documents, which hardly need to live on our public website, here ...
* viewvc.org/url-reference.html,
* viewvc.org/template-authoring-guide.html
... from here.
* docs/upgrading-howto.html
Move (and renamed, and de-website-ized) this...
* viewvc.org/upgrading.html
... from here.
* notes/
New directory for developer notes.
* notes/releases.txt
New, cored out of the contributing.html file, and greatly updated to
track the reality of our new Subversion-land release process.
* notes/TODO
Move here ...
* TODO
... from here.
* viewvc.org/who.html,
* viewvc.org/license-1.html
Lose references to upgrading.html.
* viewvc.org/contributing.html
Lose references to upgrading.html, and move the release rolling
instructions out to notes/releases.txt.
* tools/make-release
Also delete viewvc.org/ and notes/ from the distribution.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1401 8cb11bc2-c004-0410-86c3-e597b4017df7
Thanks to Hernán Martínez Foffani <hernan.martinez@ecc.es> for testing
this patch on Windows.
* lib/vclib/svn/__init__.py
(BlameSource.__init__): Patch up the URLs passed to 'svn blame' on
systems that don't use forward-slashes for path separators.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1396 8cb11bc2-c004-0410-86c3-e597b4017df7
Complete rework this script for uniform code formatting, more readable
output, support for a fully non-interactive install mode, installation
of the unmodified configuration files (so folks can see their customizations
well after they make them), and any other cleanups I could get my hands on.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1394 8cb11bc2-c004-0410-86c3-e597b4017df7
preserve empty directories.
* lib/viewvc.py
(generate_tarball): Add new (optional) dir_mtime parameter, used to specify
the modification time of the current directory while generating tarball
data. Now, allow empty directories in Subversion tarballs (while
preserving the "pruning" behavior for CVS tarballs).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1384 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/query.py
(main): Add 'rss_href' to the data dictionary so the template
doesn't freak out.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1382 8cb11bc2-c004-0410-86c3-e597b4017df7
(cli): Tweak the layout of the usage message, print it to stderr,
and report error details.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1379 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(get_file_view_info): Fix an oops which caused some whack URL
generation for download-as-text links on files whose path has changed
over time.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1377 8cb11bc2-c004-0410-86c3-e597b4017df7
* viewvc.conf.dist
Add a skeletal glossary of sorts, and warn that "forbidden" is only for
modules, not roots.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1374 8cb11bc2-c004-0410-86c3-e597b4017df7
Incidentally, this avoids initializing the cin/cout/cerr/clog
infrastructure - which is good, because that's somehow triggering a
platform-specific bug on Cygwin, at the moment!
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1372 8cb11bc2-c004-0410-86c3-e597b4017df7
colons, which has an impact on symbols and locks.
Fixes a bug where the texttools backend would fail to parse RCS files
containing locks.
Fixes inelegance in the default backend, which no longer needs to override a
rather large chunk of the common code.
* lib/vclib/ccvs/rcsparse/default.py
(_TokenStream.token_term): Add colon to set.
(_TokenStream.get): Handle colon as a discrete token, just like semicolon.
(Parser.parse_rcs_admin): Remove override definition entirely.
* lib/vclib/ccvs/rcsparse/common.py
(_Parser.parse_rcs_admin): Fix "locks" clause to be consistent with colon
being a token.
Lastly, the tparse backend: the changes made here are roughly congruent to
those made to the default backend, however they are completely untested, since
the current tparse in the repository seems broken - it dies due to memory
corruption.
* tparse/tparse.cpp (Token_term): Add colon to set.
(TokenParser::get): Handle colon as a discrete token, just like semicolon.
(tparseParser::parse_rcs_admin): Remove bizarre code which attempted to
handle both the case of being, and not being, a discrete token via runtime
detection.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1371 8cb11bc2-c004-0410-86c3-e597b4017df7
* templates/include/footer.ezt
Fix an XHTML validation error caused by not closing an <A> tag.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1367 8cb11bc2-c004-0410-86c3-e597b4017df7
(DiffSource.__init__, DiffSource._get_row, DiffSource._flush_row):
Add support for tracking the left-hand line numbers, too.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1366 8cb11bc2-c004-0410-86c3-e597b4017df7
(view_diff): Fix call to common_template_data(), and avoid a path-from-parts
reconstruction that's already been performed.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1365 8cb11bc2-c004-0410-86c3-e597b4017df7
commit, the change was supposed to be for the trunk
* www/index.html
update latest release section
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1355 8cb11bc2-c004-0410-86c3-e597b4017df7
intended for trunk anyway).
* viewcvs.sourceforge.net/
Remove this tree. It really doesn't need to persist in HEAD, and
the SourceForge publishing directory isn't even a working copy of
this location (because at the time, SF didn't support Subversion).
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1350 8cb11bc2-c004-0410-86c3-e597b4017df7
Jacob Nevins (sourceforge user "jtn") in issue 153.
* lib/vclib/__init__.py
(_diff_args): perform full diff when "context" option is None
* lib/viewvc.py
(view_diff): add logic for full diffs
* templates/diff.ezt
* templates/include/diff_form.ezt
add option for full diffs
* viewvc.org/template-authoring-guide.html
* viewvc.org/url-reference.html
update documentation for "diff_format" template variable and url param
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1346 8cb11bc2-c004-0410-86c3-e597b4017df7
cvs 1.12.9. Based on bug report and patch from sourceforge user
"grubert" in issue 151
* bin/loginfo-handler
(HeuristicArgParse): accept alternate command lines for
commits of new and imported directories
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1345 8cb11bc2-c004-0410-86c3-e597b4017df7
Thomas Güttler points out that apparently tigris.org's new "guest"
user password is the empty string.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1341 8cb11bc2-c004-0410-86c3-e597b4017df7
* lib/viewvc.py
(Request.run_viewvc): Translate 'rev' parameter to 'revision'
(instead of to 'pathrev') in the revision view.
* templates/revision.ezt
Use "revision" instead of "rev" for the jump_rev form input box.
Patch by fengxj <fengxiangjun@neusoft.com>.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1339 8cb11bc2-c004-0410-86c3-e597b4017df7
Use pixels instead of percentages for the first column. Also, make sure all
the *_icon_link items are defined for all path types.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1338 8cb11bc2-c004-0410-86c3-e597b4017df7
Followup to r1335. Drop whitespace from the icon column, and stop setting
the font-size to 0 there.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1337 8cb11bc2-c004-0410-86c3-e597b4017df7
can fix on the screen, and have a fixed layout (which promotes rapid
navigation).
* lib/viewvc.py
(view_directory): Don't truncate rows.log any more, but provide a
new member rows.short_log that is truncate.
* viewvc.org/upgrading.html
Note rename of directory entries' "log" variable to "short_log".
* viewvc.org/template-authoring-guide.html
Describe entries.log and (new) entries.short_log.
* templates/docroot/styles.css
(table.fixed, table.fixed td): New fixed table styles, for use with
the dir_new template.
* templates/dir_new.ezt
Use new fixed table styles, and display as much of the log messages
as screen-real-estate-ily possible (with ellipsis for truncation on
IE, even).
* templates/directory.ezt
Use entries.short_log now instead of entries.log.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1335 8cb11bc2-c004-0410-86c3-e597b4017df7
RCS package, which outputs CVS commit ids when present. Change
based on patch Olivier 'zer0' MATZ <zer0@droids-corp.org>
sent to the issues list.
* lib/vclib/bincvs/__init__.py
(_re_log_info): update to match lines with commit ids
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1333 8cb11bc2-c004-0410-86c3-e597b4017df7
<p>This document describes the format of URLs accepted by ViewVC 1.0 and is intended to be useful to users and outside software developers who want to create links to ViewVC pages. It should also be useful to ViewVC developers as a way of tracking and documenting the many quirks of ViewVC's URL handling logic.</p>
<p>This document describes the format of URLs accepted by ViewVC 1.1
and is intended to be useful to users and outside software
developers who want to create links to ViewVC pages. It should also
be useful to ViewVC developers as a way of tracking and documenting
the many quirks of ViewVC's URL handling logic.</p>
<p>Future releases of ViewVC will support the URL formats described in this document. Certain URLs currently accepted by ViewVC, such as redirecting URLs that result from the submission of form elements on ViewVC pages, are not documented here and therefore may not be supported by future releases of ViewVC.</p>
<p>Future releases of ViewVC will support the URL formats described in
this document. Certain URLs currently accepted by ViewVC, such as
redirecting URLs that result from the submission of form elements
on ViewVC pages, are not documented here and therefore may not be
<li><ahref="#compat-content_type">'<code>content_type=text/vnd.viewcvs-markup</code>' and '<code>content_type=text/x-cvsweb-markup</code>' Parameters⇒ '<code>view=markup</code>'
<li><ahref="#compat-content_type">'<code>content-type=text/vnd.viewcvs-markup</code>' and '<code>content-type=text/x-cvsweb-markup</code>' Parameters⇒ '<code>view=markup</code>'
<p>A ViewVC URL consists of 3 components: a <ahref="#script-component">Script Location</a>, a <ahref="#path-component">Repository Path</a>, and some optional <ahref="#query-component">Query Parameters</a>. Some examples:</p>
<p>A ViewVC URL consists of 3 components: a <a
href="#script-component">Script Location</a>, a <a
href="#path-component">Repository Path</a>, and some optional <a
href="#query-component">Query Parameters</a>. Some examples:</p>
<p>The script location is a common base for all ViewVC URL's pertaining to a particular installation. It's whatever location the web server is configured to serve ViewVC pages from.</p>
<p>The script location is a common base for all ViewVC URL's
pertaining to a particular installation. It's whatever location the
web server is configured to serve ViewVC pages from.</p>
<h3id="path-component">Repository Path</h3>
<p>Since ViewVC is essentially a file system browser for repositories, repository paths referring to the files and directories being browsed get their own section in ViewVC URLs immediately following the script location. Repository paths are always case sensitive and separated by forward slashes, regardless of the underlying filesystem.</p>
<p>Repository paths can be given certain "magic" prefixes and suffixes. For example, a "/*checkout*" prefix can be added to file views to force a checkout even without an explicit "view=co" query parameter. And a ".tar.gz" suffix is added to download tarball URLs so downloaded tarballs will be saved with sensible default names.</p>
<p>Since ViewVC is essentially a file system browser for repositories,
repository paths referring to the files and directories being
browsed get their own section in ViewVC URLs immediately following
the script location. Repository paths are always case sensitive and
separated by forward slashes, regardless of the underlying
filesystem.</p>
<p>Repository paths can be given certain "magic" prefixes and
suffixes. For example, a "/*checkout*" prefix can be added to file
views to force a checkout even without an explicit "view=co" query
parameter. And a ".tar.gz" suffix is added to download tarball URLs
so downloaded tarballs will be saved with sensible default
names.</p>
<p>If the <code>root_as_url_component</code> configuration option is enabled, the first directory name in a repository path (after any magic prefix) is taken to be the name (from the ViewVC configuration) of the repository to browse rather than the name of an actual directory. The repository name can also be specified in a "root=" query parameter instead (see <ahref="#root-param"><code>root</code> parameter</a> below).</p>
<p>If the <code>root_as_url_component</code> configuration option is
enabled, the first directory name in a repository path (after any
magic prefix) is taken to be the name (from the ViewVC
configuration) of the repository to browse rather than the name of
an actual directory. The repository name can also be specified in a
<p>Paths beginning with "/*docroot*/" are an exception the rules above. These paths are used to provide access to files in the ViewVC template directory: image files, static HTML pages, and the ViewVC stylesheet. For more information, see the <ahref="#docroot-view">Docroot View</a> syntax below.</p>
<p>Paths beginning with "/*docroot*/" are an exception the rules
above. These paths are used to provide access to files in the
ViewVC template directory: image files, static HTML pages, and the
ViewVC stylesheet. For more information, see the <a
<p>Following the ViewVC and repository locations in URLs is an optional query string, a list of parameter/value pairs written like "?param1=value1&param2=value2..." Some parameters, like "revision", "pathrev", and "root", augment repository path information, specifying revisions and repositories. Other parameters like "logsort" and "diff_format" control ViewVC display options. Some parameters are also "sticky" and get embedded into links inside the generated pages, sticking around for future page views.</p>
<p>Following the ViewVC and repository locations in URLs is an
optional query string, a list of parameter/value pairs written like
"?param1=value1&param2=value2..." Some parameters, like
"revision", "pathrev", and "root", augment repository path
information, specifying revisions and repositories. Other
parameters like "logsort" and "diff_format" control ViewVC display
options. Some parameters are also "sticky" and get embedded into
links inside the generated pages, sticking around for future page
views.</p>
<p>ViewVC provides a number of different views of repository data including a directory listing view, a log view, a file diff view, and others. (The views are listed and described in the <code>help_rootview.html</code> ViewVC help page). URLs for each of these views accept specific parameters described in the <ahref="#syntax">URL Syntax</a> section, but some parameters are used by multiple views and they are described below:</p>
<p>ViewVC provides a number of different views of repository data
including a directory listing view, a log view, a file diff view,
and others. (The views are listed and described in the
<code>help_rootview.html</code> ViewVC help page). URLs for each of
these views accept specific parameters described in the <a
href="#syntax">URL Syntax</a> section, but some parameters are used
by multiple views and they are described below:</p>
<table>
<thead>
@@ -161,19 +212,34 @@ th.caption {
<tbody>
<tr>
<tdid="view-param"><code>view</code></td>
<td>The name of the view to display, does not need to be explicitly specified in many URLs. Possible values are shown in the <ahref="#url-syntax">URL Syntax</a> section below.</td>
<td>The name of the view to display, does not need to be
explicitly specified in many URLs. Possible values are shown
in the <ahref="#url-syntax">URL Syntax</a> section
below.</td>
</tr>
<tr>
<tdid="revision-param"><code>revision</code></td>
<td>The revision or tag to display information about, used by several different views.</td>
<td>The revision or tag to display information about, used by
several different views.</td>
</tr>
<tr>
<tdid="pathrev-param"><code>pathrev</code></td>
<td>The current sticky revision (Subversion) or sticky tag (CVS), as described in the <code>help_rootview.html</code> ViewVC help page. In Subversion, because path information is revision controlled, this value is also used to look up paths in the repository, providing a means of accessing paths that no longer exist in HEAD.</td>
<td>The current sticky revision (Subversion) or sticky tag (CVS),
as described in the <code>help_rootview.html</code> ViewVC
help page. In Subversion, because path information is revision
controlled, this value is also used to look up paths in the
repository, providing a means of accessing paths that no
longer exist in HEAD.</td>
</tr>
<tr>
<tdid="root-param"><code>root</code></td>
<td>The name of the repository to browse. When the<code>default_root</code> configuration option is set or the <code>root_as_url_component</code> option is enabled, it is not neccessary to to specify this parameter. When the <code>root_as_url_component</code> option is enabled, ViewVC URLs with <code>root</code> parameters redirect to locations with the root values embedded in the repository paths.</td>
<td>The name of the repository to browse. When the
<code>default_root</code> configuration option is set or the
<code>root_as_url_component</code> option is enabled, it is
not neccessary to to specify this parameter. When the
<code>root_as_url_component</code> option is enabled, ViewVC
URLs with <code>root</code> parameters redirect to locations
with the root values embedded in the repository paths.</td>
</tr>
</tbody>
</table>
@@ -181,7 +247,9 @@ th.caption {
<divclass="h2">
<h2id="syntax">URL Syntax</h2>
<p>This section lists URL syntax for each ViewVC view. Parts of URLs which may vary shown as variables in <var>UPPERCASE</var>.</p>
<p>This section lists URL syntax for each ViewVC view. Parts of URLs
which may vary shown as variables in <var>UPPERCASE</var>.</p>
<h3id="annotate-view">Annotate View</h3>
<table>
@@ -220,7 +288,9 @@ th.caption {
<tr>
<td><code>view=annotate</code></td>
<td>depends</td>
<td><ahref="#view-param"><code>view</code> parameter</a>. Not required when an <code>annotate</code> parameter is present</td>
<td><ahref="#view-param"><code>view</code> parameter</a>. Not
required when an <code>annotate</code> parameter is
<td>magic prefix. If specified when the<code>checkout_magic</code> configuration option is disabled, ViewVC will redirect to a URL without the prefix.</td>
<td>magic prefix. If specified when the
<code>checkout_magic</code> configuration option is disabled,
ViewVC will redirect to a URL without the prefix.</td>
</tr>
<tr>
<td><code><var>/PATH</var></code></td>
@@ -282,12 +354,18 @@ th.caption {
<tr>
<td><code>view=co</code></td>
<td>depends</td>
<td><ahref="#view-param"><code>view</code> parameter</a>, not needed if the <code>default_file_view</code> configuration variable is set to <code>co</code>, since that makes the checkout view the default view for file paths. Also not needed if the <code>/*checkout*</code> magic prefix or the <code>revision</code> parameter is present.
<td><ahref="#view-param"><code>view</code> parameter</a>, not
needed if the <code>default_file_view</code> configuration
variable is set to <code>co</code>, since that makes the
checkout view the default view for file paths. Also not needed
if the <code>/*checkout*</code> magic prefix or the
<td>value specifying the type of diff to display. Can be "u" for unified diff, "c" for context diff, "s" for side by side diff, "h" for human readable diff, "l" for long human readable diff. If no value is specified the default depends on the <code>diff_format</code> configuration option.
</td>
<td>value specifying the type of diff to display. Can be "u" for
unified diff, "c" for context diff, "s" for side by side diff, "h"
for human readable diff, "l" for long human readable diff, and "f"
for a full human readable diff. If no value is specified the
default depends on the <code>diff_format</code> configuration
option.</td>
</tr>
<tr>
<td><code>pathrev=<var>PATHREV</var></code></td>
@@ -410,7 +502,8 @@ th.caption {
<tr>
<td><code><var>/PATH/</var></code></td>
<td>required</td>
<td>directory path to view. If the trailing slash is omitted, ViewVC will redirect to a URL that has a trailing slash.</td>
<td>directory path to view. If the trailing slash is omitted,
ViewVC will redirect to a URL that has a trailing slash.</td>
<td>"0" to show dead files in CVS directory listings or "1" to hide dead files. Default depends on the <code>hide_attic</code> configuration value.</td>
<td>"0" to show dead files in CVS directory listings or "1" to
hide dead files. Default depends on the <code>hide_attic</code>
configuration value.</td>
</tr>
<tr>
<td><code>search=<var>SEARCH</var></code></td>
<td>optional</td>
<td>regular expression to search files in the directory with if<code>use_re_search</code> configuration option is enabled</td>
<td>regular expression to search files in the directory with if
<code>use_re_search</code> configuration option is enabled</td>
</tr>
<tr>
<td><code>sortby=<var>SORTBY</var></code></td>
<td>optional</td>
<td>"file" "rev" "date" "author" or "log" to indicate how the directory listing should be sorted. Default depends on <code>sortby</code> configuration option.</td>
<td>"file" "rev" "date" "author" or "log" to indicate how the
directory listing should be sorted. Default depends on
<code>sortby</code> configuration option.</td>
</tr>
<tr>
<td><code>sortdir=<var>SORTBY</var></code></td>
<td>optional</td>
<td>"up" to sort directory in ascending order or "down" for descending order. Default is "up".</td>
<td>"up" to sort directory in ascending order or "down" for
<td>file path to retrieve. ViewVC will return the contents of the file located at <code>PATH</code>, relative to the <code>docroot</code> subdirectory of the directory specified in the <code>template_dir</code> configuration option.</td>
<td>file path to retrieve. ViewVC will return the contents of the
file located at <code>PATH</code>, relative to the
<code>docroot</code> subdirectory of the directory specified in
the <code>template_dir</code> configuration option.</td>
<td>"1" if the revision graph should contain branch boxes at the
tip of each branch; "0" otherwise</td>
</tr>
<tr>
<td><code>gleft=<var>GLEFT</var></code></td>
<td>optional</td>
<td>"1" if the revision graph should be orientated left-to-right;
"0" otherwise</td>
</tr>
<tr>
<td><code>gmaxtag=<var>GMAXTAG</var></code></td>
<td>optional</td>
<td>maximum number of per-revision tags to show in the revision graph</td>
</tr>
<tr>
<td><code>gshow=<var>GSHOW</var></code></td>
<td>optional</td>
<td>"all", "inittagged", or "tagged" — user-selected classes
of revision to show in the graph</td>
</tr>
</table>
<h3id="log-view">Log View</h3>
@@ -637,12 +797,20 @@ th.caption {
<tr>
<td><code>view=log</code></td>
<td>depends</td>
<td><ahref="#view-param"><code>view</code> parameter</a>, does not need to be specified for file paths when the <code>default_file_view</code> configuration option is set to <code>log</code>. However it is recommended that the parameter be passed anyway for consistency with directory log URLs and compatibility with ViewVC installations that set <code>default_file_view</code> to <code>co</code>.</td>
<td><ahref="#view-param"><code>view</code> parameter</a>, does
not need to be specified for file paths when the
<code>default_file_view</code> configuration option is set to
<code>log</code>. However it is recommended that the parameter be
passed anyway for consistency with directory log URLs and
compatibility with ViewVC installations that set
<code>default_file_view</code> to <code>co</code>.</td>
</tr>
<tr>
<td><code>logsort=<var>SORT</var></code></td>
<td>optional</td>
<td>"rev" to sort log entries by revision number or "date" to sort by date. Default depends on the <code>log_sort</code> configuration value.</td>
<td>"rev" to sort log entries by revision number or "date" to sort
by date. Default depends on the <code>log_sort</code>
<td>value specifying the type of patch to display. Can be "u" for unified diff or "c" for context diff. If no value is specified the default depends on the <code>diff_format</code> configuration option.
<td>value specifying the type of patch to display. Can be "u" for
unified diff or "c" for context diff. If no value is specified the
default depends on the <code>diff_format</code> configuration
option.
</td>
</tr>
<tr>
@@ -859,7 +1040,8 @@ th.caption {
<tr>
<td><code>branch_match=BRANCH_MATCH</code></td>
<td>optional</td>
<td>"exact" "like" "glob" "regex" or "notregex" determining type of branch match</td>
<td>"exact" "like" "glob" "regex" or "notregex" determining type
<td>maximum number of files to list per commit. Default is value of <code>limit_changes</code> configuration option</td>
<td>maximum number of files to list per commit. Default is value
of <code>limit_changes</code> configuration option</td>
</tr>
<tr>
<td><code>root=<var>ROOT</var></code></td>
@@ -1130,7 +1349,10 @@ th.caption {
<tr>
<td><code>view=roots</code></td>
<td>depends</td>
<td><ahref="#view-param"><code>view</code> parameter</a>. Not required if the <code>root_as_url_component</code> configuration is enabled or the <code>default_root</code> option is not set. </td>
<td><ahref="#view-param"><code>view</code> parameter</a>. Not
required if the <code>root_as_url_component</code> configuration
is enabled or the <code>default_root</code> option is not
set. </td>
</tr>
</table>
@@ -1157,7 +1379,11 @@ th.caption {
<tr>
<td><code>.tar.gz</code></td>
<td>depends</td>
<td>magic suffix. Only required when the name of the directory being downloaded ends in ".tar.gz" and the <code>parent</code> parameter not is present. But it is recommended to add the magic suffix to all tarball URLs to avoid this special case and give the downloaded files sensible default names.</td>
<td>magic suffix. Only required when the name of the directory
being downloaded ends in ".tar.gz" and the <code>parent</code>
parameter not is present. But it is recommended to add the magic
suffix to all tarball URLs to avoid this special case and give the
downloaded files sensible default names.</td>
</tr>
</table>
<br/>
@@ -1181,7 +1407,12 @@ th.caption {
<tr>
<td><code>parent=1</code></td>
<td>optional</td>
<td>If the <code>parent</code> parameter is specified, the last component of the <code><var>PATH</var></code> is discarded before it is ever looked up in the repository. This feature is used when the <code>root_as_url_component</code> configuration option is disabled to allow root tarball URLs to be saved with names like "ROOT-root.tar.gz".</td>
<td>If the <code>parent</code> parameter is specified, the last
component of the <code><var>PATH</var></code> is discarded before
it is ever looked up in the repository. This feature is used when
the <code>root_as_url_component</code> configuration option is
disabled to allow root tarball URLs to be saved with names like
"ROOT-root.tar.gz".</td>
</tr>
<tr>
<td><code>pathrev=<var>PATHREV</var></code></td>
@@ -1198,46 +1429,111 @@ th.caption {
<divclass="h2">
<h2id="compat">Backwards Compatibility</h2>
<p>ViewVC's URL format has changed a lot over time, but ViewVC goes out of its way to support URLs using older formats so there aren't broken links when an installation of ViewVC is upgraded. The support is implemented as a set of URL transformations that recognize elements of old-style URLs and convert them to newer equivalents. If any transformations are applied (with some exceptions, mentioned below), ViewVC will issue a single redirect to the transformed URL. Descriptions of the transformations follow.</p>
<p>ViewVC's URL format has changed a lot over time, but ViewVC goes
out of its way to support URLs using older formats so there aren't
broken links when an installation of ViewVC is upgraded. The
support is implemented as a set of URL transformations that
recognize elements of old-style URLs and convert them to newer
equivalents. If any transformations are applied (with some
exceptions, mentioned below), ViewVC will issue a single redirect
to the transformed URL. Descriptions of the transformations
<p>URLs with a <code>~checkout~</code> path prefix get interpreted just like URLs with a '*checkout*' prefix. There is currently no redirect, but there could be in the future.</p>
<p>URLs with a <code>~checkout~</code> path prefix get interpreted
just like URLs with a '*checkout*' prefix. There is currently no
<p>When the <code>checkout_magic</code> configuration option is disabled, URLs with a <code>*checkout*</code> magic prefix will redirect to an equivalent URL that does not use the prefix.</p>
<p>When the <code>checkout_magic</code> configuration option is
disabled, URLs with a <code>*checkout*</code> magic prefix will
redirect to an equivalent URL that does not use the prefix.</p>
<p>When the <code>root_as_url_component</code> configuration option is enabled, URLs with a <code>root</code> parameter will redirect to an equivalent URL with the root name embedded in the path.</p>
<p>When the <code>root_as_url_component</code> configuration option is
enabled, URLs with a <code>root</code> parameter will redirect to
an equivalent URL with the root name embedded in the path.</p>
<h3id="compat-rev">'<code>rev</code>' Parameter ⇒ '<code>revision</code>' and '<code>pathrev</code>'</h3>
<p>CVS URLs with a <code>rev</code> parameter will redirect to URLs with a <code>revision</code> parameter instead. Subversion URLs with a <code>rev</code> parameter will redirect to URLs with a <code>pathrev</code> parameter, in order to account for the how the Subversion backend used to look up paths before <code>pathrev</code> was introduced.</p>
<p>CVS URLs with a <code>rev</code> parameter will redirect to URLs
with a <code>revision</code> parameter instead. Subversion URLs
with a <code>rev</code> parameter will redirect to URLs with a
<code>pathrev</code> parameter, in order to account for the how the
<p>When ViewVC encounters a invalid repository path that ends in <code>.diff</code>, and stripping that ending yields a valid file path, it will redirect to a diff view of the file.</p>
<p>When ViewVC encounters a invalid repository path that ends in
<code>.diff</code>, and stripping that ending yields a valid file
path, it will redirect to a diff view of the file.</p>
<p>When ViewVC encounters a invalid repository path that ends in <code>.tar.gz</code>, <code>/root.tar.gz</code>, or <code>/REPOS-root.tar.gz</code>, and stripping the ending yields a valid directory path, it will redirect to a URL to download a tarball of the directory.</p>
<p>When ViewVC encounters a invalid repository path that ends in
<code>.tar.gz</code>, <code>/root.tar.gz</code>, or
<code>/REPOS-root.tar.gz</code>, and stripping the ending yields a
valid directory path, it will redirect to a URL to download a
<p>A <code>tarball=1</code> parameter is treated pretty much like a <code>view=tar</code> parameter. There is no redirect when it is encountered, but there could be in the future.</p>
<p>A <code>tarball=1</code> parameter is treated pretty much like a
<code>view=tar</code> parameter. There is no redirect when it is
encountered, but there could be in the future.</p>
<p>A <code>graph=1</code> parameter is treated like a <code>view=graph</code> parameter. There is currently no redirect when it is encountered, but there could be one in the future.</p>
<p>A <code>graph=1</code> parameter is treated like a
<code>view=graph</code> parameter. There is currently no redirect
when it is encountered, but there could be one in the future.</p>
<p>A <code>graph=1&makeimage=1</code> parameter is treated like a <code>view=graph</code> parameter. There is currently no redirect when it is encountered, but there could be one in the future.</p>
<p>A <code>graph=1&makeimage=1</code> parameter is treated like a
<code>view=graph</code> parameter. There is currently no redirect
when it is encountered, but there could be one in the future.</p>
<h3id="compat-content_type">'<code>content_type=text/vnd.viewcvs-markup</code>' and '<code>content_type=text/x-cvsweb-markup</code>' Parameters⇒ '<code>view=markup</code>'</h3>
<p><code>content_type=text/vnd.viewcvs-markup</code> and <code>content_type=text/x-cvsweb-markup</code> parameters are treated like a <code>view=markup</code> parameter. There is currently no redirect when it is encountered, but there could be one in the future.</p>
<p><code>content-type=text/vnd.viewcvs-markup</code> and
<code>content-type=text/x-cvsweb-markup</code> parameters are
treated like a <code>view=markup</code> parameter. There is
currently no redirect when it is encountered, but there could be
one in the future. Other values of the <code>content-type</code>
parameter, which were used to dictate the MIME type of files
displayed in the checkout/download view prior to ViewVC 1.0.6, are
<p>When ViewVC encounters an invalid repository path whose last or second-to-last component is named <code>Attic</code>, and stripping the component yields a valid path, it will redirect to a URL with that path.</p>
<p>When ViewVC encounters an invalid repository path whose last or
second-to-last component is named <code>Attic</code>, and stripping
the component yields a valid path, it will redirect to a URL with
set_revision_info('1.2', 'Second commit to proj, affecting all 7 files.\n', "This is the file `default' in the top level of the project.\n\nEvery directory in the `proj' project has a file named `default'.\n\nThis line was added in the second commit (affecting all 7 files).\n")
set_revision_info('1.2.4.1', 'First change on branch B_SPLIT.\n\nThis change excludes sub3/default, because it was not part of this\ncommit, and sub1/subsubB/default, which is not even on the branch yet.\n', 'a5 2\n\nFirst change on branch B_SPLIT.\n')
set_revision_info('1.2.2.1', 'Modify three files, on branch B_MIXED.\n', 'a5 2\n\nThis line was added on branch B_MIXED only (affecting 3 files).\n')
Some files were not shown because too many files have changed in this diff
Show More
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
