Mon Apr 7 21:11:05 ART 2008 Alberto Bertogli tagged 1.0 Mon Apr 7 21:10:21 ART 2008 Alberto Bertogli * Version 1.0 Wed Mar 26 22:06:42 ART 2008 Alberto Bertogli tagged 1.0-rc2 Wed Mar 26 22:02:58 ART 2008 Alberto Bertogli * Add an option to change the display name of the repository It can be used to avoid clashes in multidir entries. Thanks to Dan Muller for the idea and alternative implementation. Mon Mar 24 14:31:17 ART 2008 Miklos Vajna * add support for the DARCSWEB_CONFPATH env var - useful when hosting multiple darcsweb sites via vhost Sun Oct 14 12:48:26 ART 2007 Alberto Bertogli tagged 1.0-rc1 Sun Oct 14 12:42:34 ART 2007 Alberto Bertogli * Add /etc/darcsweb after '.' in sys.path. Add it second place, so it goes after '.' but before the normal path. This allows per-directory config files (desirable for multiple darcsweb installations on the same machin), and avoids name clashing if there's a config.py in the standard path. This was reported by Philipp Kern in Debian bug 399751 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399751). Fri Jun 22 06:30:21 ART 2007 Peter Colberg * Adjust URI scheme according to CGI environment variable HTTPS. This patch fixes RSS feed links when browsing darcsweb via SSL. Wed May 16 06:48:24 ART 2007 Jonathan Buchanan * Fixed bad links in RSS feed when darcsweb URL is automatically detected When the darcsweb URL is automatically detected, the script name is included in the URL - this results in bad links in RSS feeds like /darcsweb.cgi/darcsweb.cgi?r=projname. Wed May 16 06:46:25 ART 2007 Jonathan Buchanan * Fixed a path problem when running on Windows Repositories in subdirectories have backslashes in their path when running on Windows, which results in bad URLS - replaced these with forward slashes. Thu May 3 13:18:30 ART 2007 VMiklos * display the size of the files in tree view Mon Apr 16 16:06:18 ART 2007 Alberto Bertogli * Soften some colors in commitdiff. Mon Apr 16 06:13:34 ART 2007 Alexandre Rossi * only read the first line of _darcs/third_party/darcsweb/* files Mon Apr 16 06:11:29 ART 2007 Alexandre Rossi * make color commitdiff more readable when parts of a file are skipped Fri Mar 16 16:27:14 ART 2007 VMiklos * new optional config varuable: disable_annotate * the annotate feature is still enabled by default * this can be useful on slow machines Wed Apr 4 12:09:32 ART 2007 Alexandre Rossi * closing tag in project url link Wed Apr 4 09:15:12 ART 2007 Alexandre Rossi * typo in sample config autoprojurl description Thu Feb 1 14:30:50 ART 2007 VMiklos * new optional config varuable: author_links it is disabled by default and an example for cia is included Wed Jan 24 20:38:07 ART 2007 Alberto Bertogli * Check python version before running darcsweb. This patch adds a check to verify that the python version is >= 2.3, so the user doesn't get strange errors when using older python interpreters. Thanks to Mark Stosberg for the suggestion. Wed Jan 17 20:02:12 ART 2007 jonathan.buchanan@gmail.com * The DARCS_DONT_ESCAPE_8BIT environment variable is now set using os.environ before running darcs and restored to its original state after running darcs - makes darcsweb work on Windows Mon Dec 25 19:18:20 ART 2006 Alberto Bertogli * Add support for regexp-based replacing. Add an option to replace text in the summary, using regexps. This allows you to configure darcsweb to automatically detect and put links to other commits or bug numbers. This patch is heavily based on the one written by Kirill Smelkov (kirr@mns.spb.ru). Thu Nov 30 06:37:41 ART 2006 Kirill Smelkov * string.join is deprecated Mon Dec 25 18:43:36 ART 2006 Alberto Bertogli * Change my email address. Tue Oct 10 00:04:21 ART 2006 Alberto Bertogli tagged 0.16 diff -rN -u old-darcsweb/config.py.sample new-darcsweb/config.py.sample --- old-darcsweb/config.py.sample 2008-04-07 21:11:38.000000000 -0300 +++ new-darcsweb/config.py.sample 2008-04-07 21:11:38.000000000 -0300 @@ -55,6 +55,36 @@ # darcsweb. #logtimes = "/tmp/darcsweb_times" + # If you want darcsweb to automatically detect embedded URLs, + # define them here, using python-style regexps like the examples + # below. They will be replaced in summaries, logs, and commits. + # The following variables are replaced: + # myreponame: repository link (darcsweb.cgi?r=repo) + # reponame: repository name (repo) + # + #url_links = ( + # Format is: (regexp, replacement) + # Some examples: + # + # Detect '#NNN' as a reference to bug database + #(r'#([0-9]+)', + # r'#\1'), + # + # Replace hashes with commit-links. + #(r'(\d{14}-[0-9a-f]{5}-[0-9a-f]{40}\.gz)', + # r'\1'), + #) + + # If you want to generate links from patch author names, define the url + # here. Example for CIA: + #author_links = "http://cia.navi.cx/stats/author/%(author)s" + + # If you want to disable the annotate feature (for performance reasons, + # the http connection will time out on slow machines), uncomment this + # option. + #disable_annotate = True + + # # From now on, every class is a repo configuration, with the same format @@ -114,7 +144,8 @@ # create a configuration entry for each one, you can use a "multidir" entry, # which serves as a "template" for all the repositories in that directory. # The name is taken from the directory, and inside the variables the string -# "%(name)s" gets expanded to the it. +# "%(name)s" gets expanded to the it. If displayname is set, "%(dname)s" gets +# expanded to it; otherwise it's the same as "%(name)s". # # If you set multidir_deep to True (note the capitalization) then all # subdirectories are searched for darcs repositories. Subdirectories starting @@ -130,6 +161,11 @@ repourl = 'http://example.com/repos/%(name)s/' repoencoding = 'latin1' + # if you want to change the display name of the repositories (i.e. the + # name it will have on the listings, urls, etc.), you can set it here. + # You can use "%(name)s" expansion, see above. + #displayname = "local/%(name)s" + # optional, see above #repoprojurl = 'http://example.com/projects/%(name)s/' @@ -153,7 +189,7 @@ #autourl = True # if you want the projects urls to be picked up automatically from the - # file named "_darcs/third_party/darcsweb/extdoc" (one line only), set + # file named "_darcs/third_party/darcsweb/projurl" (one line only), set # this to True. It defaults to False. #autoprojurl = True diff -rN -u old-darcsweb/darcsweb.cgi new-darcsweb/darcsweb.cgi --- old-darcsweb/darcsweb.cgi 2008-04-07 21:11:38.000000000 -0300 +++ new-darcsweb/darcsweb.cgi 2008-04-07 21:11:38.000000000 -0300 @@ -2,7 +2,7 @@ """ darcsweb - A web interface for darcs -Alberto Bertogli (albertogli@telpin.com.ar) +Alberto Bertogli (albertito@gmail.com) Inspired on gitweb (as of 28/Jun/2005), which is written by Kay Sievers and Christian Gierke @@ -25,8 +25,18 @@ # In order to be able to store the config file in /etc/darcsweb, it has to be # added to sys.path. It's mainly used by distributions, which place the -# default configuration there. -sys.path.append('/etc/darcsweb') +# default configuration there. Add it second place, so it goes after '.' but +# before the normal path. This allows per-directory config files (desirable +# for multiple darcsweb installations on the same machin), and avoids name +# clashing if there's a config.py in the standard path. +sys.path.insert(1, '/etc/darcsweb') + +# Similarly, when hosting multiple darcsweb instrances on the same +# server, you can just 'SetEnv DARCSWEB_CONFPATH' in the httpd config, +# and this will have a bigger priority than the system-wide +# configuration file. +if 'DARCSWEB_CONFPATH' in os.environ: + sys.path.insert(1, os.environ['DARCSWEB_CONFPATH']) # empty configuration class, we will fill it in later depending on the repo class config: @@ -50,19 +60,19 @@ def filter_num(s): l = [c for c in s if c in string.digits] - return string.join(l, "") + return ''.join(l) allowed_in_action = string.ascii_letters + string.digits + '_' def filter_act(s): l = [c for c in s if c in allowed_in_action] - return string.join(l, "") + return ''.join(l) allowed_in_hash = string.ascii_letters + string.digits + '-.' def filter_hash(s): l = [c for c in s if c in allowed_in_hash] - return string.join(l, "") + return ''.join(l) def filter_file(s): @@ -83,7 +93,7 @@ def printd(*params): - print string.join(params), '
' + print ' '.join(params), '
' # I _hate_ this. @@ -94,7 +104,7 @@ n = [] for i in s.split('\n'): n.append(_fixu8(i)) - return string.join(n, '\n') + return '\n'.join(n) def _fixu8(s): if type(s) == unicode: @@ -161,6 +171,22 @@ pos = s.find("\t") return s +def replace_links(s): + """Replace user defined strings with links, as specified in the + configuration file.""" + import re + + vardict = { + "myreponame": config.myreponame, + "reponame": config.reponame, + } + + for link_pat, link_dst in config.url_links: + s = re.sub(link_pat, link_dst % vardict, s) + + return s + + def highlight(s, l): "Highlights appearences of s in l" import re @@ -205,8 +231,16 @@ if m & 0001: s.append('x') else: s.append('-') - return string.join(s, '') + return ''.join(s) +def fsize(fname): + s = os.stat(fname)[stat.ST_SIZE] + if s < 1024: + return "%s" % s + elif s < 1048576: + return "%sK" % (s / 1024) + elif s < 1073741824: + return "%sM" % (s / 1048576) def isbinary(fname): import re @@ -269,8 +303,8 @@ -