Sun Nov 13 11:23:24 UTC 2011 pinterface <pix@kepibu.org>

* Add support for calling an external program to generate README markup

+ # If you'd like a wider range of README file types than darcsweb

+ # provides, set readme_converter to a program which takes a single

+ # argument--the name of the readme file--and outputs HTML.

+ #readme_converter = 'ruby -rubygems /var/lib/gems/1.8/gems/github-markup-0.5.3/bin/github-markup'

+def get_readme():

+ import glob

+ readmes = glob.glob("README*")

+ if len(readmes) == 0: return False, False

+ import re

+ for p in readmes:

+ file = os.path.basename(p)

+ if re.search('\.(md|markdown)$', p):

+ import codecs

+ import markdown

+ f = codecs.open(p, encoding=config.repoencoding[0])

+ str = f.read()

+ html = markdown.markdown(str, ['extra', 'codehilite(css_class=page_body)'])

+ return file, fixu8(html)

+ elif re.search('README$', p):

+ f = open(p)

+ str = f.read()

+ return file, '<pre>%s</pre>' % fixu8(escape(str))

+ # We can't handle this ourselves, try shelling out

+ if not config.readme_converter: return False, False

+ cmd = '%s "%s"' % (config.readme_converter, readmes[0])

+ inf, outf = os.popen2(cmd, 't')

+ return os.path.basename(readmes[0]), fixu8(outf.read())

-# FIXME: shell out to github-markup to avoid duplicating that effort here?

- real = False

- for p in ["README", "README.md", "README.markdown"]:

- p = realpath(p)

- if p and os.path.isfile(p):

- real = p

- break

- if not real: return

-

- print '<div class="title">%s</div>' % os.path.basename(real)

-

- import re

- if re.search('\.(md|markdown)$', real):

- import codecs

- import markdown

- f = codecs.open(real, encoding=config.repoencoding[0])

- str = f.read()

- html = markdown.markdown(str, ['extra', 'codehilite(css_class=page_body)'])

- print '<section>%s</section>' % fixu8(html)

- else:

- f = open(real)

- str = f.read()

- print '<section><pre>%s</pre></section>' % fixu8(escape(str))

+ head, body = get_readme()

+ if not head: return False

+ print '<div class="title">%s</div>' % head

+ print '<section>%s</section' % body

+ if "readme_converter" in dir(base):

+ config.readme_converter = base.readme_converter

+ else:

+ config.readme_converter = False

+

Sun Nov 13 11:07:41 UTC 2011 pinterface <pix@kepibu.org>

* minidom chokes on form feed character

- s += fixu8(i)

+ s += fixu8(i).replace('[_^L_]', '^L')

Sat Nov 5 10:18:50 UTC 2011 pinterface <pix@kepibu.org>

* Show README in summary view, if it exists

Blatantly stealing the idea from Github, but not as fully implemented.

+# FIXME: shell out to github-markup to avoid duplicating that effort here?

+def print_readme():

+ real = False

+ for p in ["README", "README.md", "README.markdown"]:

+ p = realpath(p)

+ if p and os.path.isfile(p):

+ real = p

+ break

+ if not real: return

+

+ print '<div class="title">%s</div>' % os.path.basename(real)

+

+ import re

+ if re.search('\.(md|markdown)$', real):

+ import codecs

+ import markdown

+ f = codecs.open(real, encoding=config.repoencoding[0])

+ str = f.read()

+ html = markdown.markdown(str, ['extra', 'codehilite(css_class=page_body)'])

+ print '<section>%s</section>' % fixu8(html)

+ else:

+ f = open(real)

+ str = f.read()

+ print '<section><pre>%s</pre></section>' % fixu8(escape(str))

+

+

+ print_readme()

Tue Nov 1 10:19:57 UTC 2011 pinterface <pix@kepibu.org>

* Add Owner and Last Change columns to repo listing

This is a little ugly due to the global config object. Boo.

+<th>Owner</th>

+<th>Last Change</th>

+ try: orig_repodir = config.repodir

+ except: orig_repodir = None

+ config.repodir = c.repodir

+<td>%(owner)s</td>

+<td>%(lastchange)s</td>

- 'desc': shorten_str(desc, 60)

+ 'desc': shorten_str(desc, 60),

+ 'owner': escape(repo_get_owner() or ''),

+ 'lastchange': how_old(os.stat(c.repodir + '/_darcs/patches').st_mtime),

+ config.repodir = orig_repodir

Tue Nov 1 09:54:21 UTC 2011 pinterface <pix@kepibu.org>

* Skip comments and blank lines in the author file

- author = fd.readlines()[0].strip()

+ for line in fd:

+ line = line.strip()

+ if line != "" and line[0] != "#":

+ return line.strip()

- author = None

- return author

+ return None

Tue Nov 1 08:30:12 UTC 2011 pinterface <pix@kepibu.org>

* Add ability to specify a mailing list URL for repositories

+ if config.repolisturl:

+ print ' <tr><td>mailing list url</td>'

+ print ' <td><a href="%(url)s">%(url)s</a></td></tr>' % \

+ { 'url': config.repolisturl }

+ if 'autolisturl' in dir(c) and c.autolisturl:

+ dpath = fulldir + \

+ '/_darcs/third_party/darcsweb/listurl'

+ if os.access(dpath, os.R_OK):

+ listurl = open(dpath).readline().rstrip("\n")

+ elif 'repolisturl' in dir(c):

+ listurl = c.repolisturl % rep_dict

+ else:

+ listurl = None

+ elif 'repolisturl' in dir(c):

+ listurl = c.repolisturl % rep_dict

+ else:

+ listurl = None

+

+ repolisturl = listurl

+ config.repolisturl = None

+ if 'repolisturl' in dir(c):

+ config.repolisturl = c.repolisturl

+

Tue Nov 1 08:12:39 UTC 2011 pinterface <pix@kepibu.org>

* Don't require myurl be specified when cachedir is in use

- if 'myurl' not in dir(base) and 'cachedir' not in dir(base):

+ if 'myurl' not in dir(base):

Wed Nov 24 15:52:33 UTC 2010 Alberto Bertogli <albertito@blitiri.com.ar>

tagged 1.2-rc1

Fri Oct 15 12:55:46 UTC 2010 Dave Love <fx@gnu.org>

* Use diff --quiet.

Prevents `Copying pristine' messages in output with darcs pre-2.5.

- params = 'diff -u --match "hash %s"' % self.hash

+ params = 'diff --quiet -u --match "hash %s"' % self.hash

- return run_darcs('diff -u --match "hash %s"' % hash)

+ return run_darcs('diff --quiet -u --match "hash %s"' % hash)

- return run_darcs('diff -u --match "hash %s" "%s"' % (hash, fname))

+ return run_darcs('diff --quiet -u --match "hash %s" "%s"' % (hash, fname))

- return run_darcs('diff -u --from-match "hash %s" "%s"' % (hash, fname))

+ return run_darcs('diff --quiet -u --from-match "hash %s" "%s"' % (hash, fname))

- return run_darcs('diff -u --from-match "hash %s"' % hash)

+ return run_darcs('diff --quiet -u --from-match "hash %s"' % hash)

Fri Jun 25 00:32:55 UTC 2010 Alberto Bertogli <albertito@blitiri.com.ar>

* Do not use string exceptions

String exceptions are deprecated and will soon no longer be supported at all.

Most of the instances of string exceptions in our code were not meant to be

catched, but just to get meaningful backtraces.

This patch replaces them with appropriate, usually generic, exceptions that

serve the same purpose.

- raise 'FilterFile FAILED'

+ raise Exception, 'FilterFile FAILED'

- raise 'DecodingError', config.repoencoding

+ raise UnicodeDecodeError, config.repoencoding

- raise "RepoNotFound", name

+ raise Exception, "Repo not found: " + repr(name)

Sun Mar 28 18:21:44 UTC 2010 Simon Michael <simon@joyful.com>

* log view: display the patch name just once, tighten up whitespace

- %(desc)s<br/>

- <br/>

Sun Mar 28 16:40:18 UTC 2010 Simon Michael <simon@joyful.com>

* allow custom "last" value in url, eg to view all patches on one page

+PATCHES_PER_PAGE = 50

+

-def print_shortlog(last = 50, topi = 0, fname = None):

+def print_shortlog(last = PATCHES_PER_PAGE, topi = 0, fname = None):

-def print_log(last = 50, topi = 0):

+def print_log(last = PATCHES_PER_PAGE, topi = 0):

-def do_shortlog(topi):

+def do_shortlog(topi, last=PATCHES_PER_PAGE):

- print_shortlog(topi = topi)

+ print_shortlog(topi = topi, last = last)

-def do_filehistory(topi, f):

+def do_filehistory(topi, f, last=PATCHES_PER_PAGE):

- print_shortlog(topi = topi, fname = fname)

+ print_shortlog(topi = topi, fname = fname, last = last)

-def do_log(topi):

+def do_log(topi, last=PATCHES_PER_PAGE):

- print_log(topi = topi)

+ print_log(topi = topi, last = last)

- params = ['r', 'a', 'f', 'h', 'topi']

+ params = ['r', 'a', 'f', 'h', 'topi', 'last']

- do_shortlog(topi)

+ if form.has_key("last"):

+ last = int(filter_num(form["last"].value))

+ else:

+ last = PATCHES_PER_PAGE

+ do_shortlog(topi=topi,last=last)

- do_filehistory(topi, fname)

+ if form.has_key("last"):

+ last = int(filter_num(form["last"].value))

+ else:

+ last = PATCHES_PER_PAGE

+ do_filehistory(topi, fname, last=last)

- do_log(topi)

+ if form.has_key("last"):

+ last = int(filter_num(form["last"].value))

+ else:

+ last = PATCHES_PER_PAGE

+ do_log(topi, last=last)

Sun Mar 28 16:37:55 UTC 2010 Simon Michael <simon@joyful.com>

* hide darcs' Ignore-this: metadata in log view

+def strip_ignore_this(s):

+ """Strip out darcs' Ignore-this: metadata if present."""

+ import re

+ return re.sub(r'^Ignore-this:[^\n]*\n?','',s)

- self.db[self.current].comment = fixu8(self.cur_val)

+ self.db[self.current].comment = fixu8(strip_ignore_this(self.cur_val))

Sun Mar 28 18:57:50 UTC 2010 Simon Michael <simon@joyful.com>

* more robust timestamp parsing

With this, darcsweb can list the full darcs repo log.

- # "Wed May 21 19:39:10 CEST 2003"

- # we can't parse the "CEST" part reliably, so we leave it out

+ # "Wed May 21 19:39:10 CEST 2003" or even:

+ # "Sun Sep 21 07:23:57 Pacific Daylight Time 2003"

+ # we can't parse the time zone part reliably, so we ignore it

- ns = ' '.join(parts[0:4]) + ' ' + parts[5]

+ ns = ' '.join(parts[0:4]) + ' ' + parts[-1]

Thu Mar 26 19:58:42 UTC 2009 gaetan.lehmann@jouy.inra.fr

* add the year in the date field if the patch wasn't made in the current year

- s = time.strftime("%d %b %H:%M", t)

+ currentYear = time.localtime()[0]

+ if t[0] == currentYear:

+ s = time.strftime("%d %b %H:%M", t)

+ else:

+ s = time.strftime("%d %b %Y %H:%M", t)

Tue Oct 28 15:44:36 UTC 2008 Alberto Bertogli <albertito@blitiri.com.ar>

tagged 1.1

Tue Oct 28 15:43:41 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Update my email address

-Alberto Bertogli (albertito@gmail.com)

-----------------------------------------

+Alberto Bertogli (albertito@blitiri.com.ar)

+---------------------------------------------

-Alberto Bertogli (albertito@gmail.com)

+Alberto Bertogli (albertito@blitiri.com.ar)

- Alberto Bertogli (albertito@gmail.com).

+ Alberto Bertogli (albertito@blitiri.com.ar).

- * Alberto Bertogli (albertito@gmail.com)

+ * Alberto Bertogli (albertito@blitiri.com.ar)

Tue Aug 12 09:50:07 UTC 2008 Alexandre Rossi <alexandre.rossi@gmail.com>

* fix pygments disaligned linenos and code when using windows fonts (pygments>0.7 only)

- formatter = pygments.formatters.HtmlFormatter(linenos=True,

+

+ pygments_version = map(int, pygments.__version__.split('.'))

+ if pygments_version >= [0, 7]:

+ linenos_method = 'inline'

+ else:

+ linenos_method = True

+ formatter = pygments.formatters.HtmlFormatter(linenos=linenos_method,

+

Tue Oct 14 21:18:42 UTC 2008 Alberto Bertogli <albertito@gmail.com>

tagged 1.1-rc1

Tue Oct 14 21:18:29 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Update HTML version number

-<!-- darcsweb 1.0

+<!-- darcsweb 1.1

Sun Oct 5 15:53:16 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Import pygments only when needed

Otherwise, we pay for the pygments import (which is noticeable) on every

darcsweb page view.

This follows the lazy module loading that is already being done for other

costly modules (i.e. 're').

-try:

- import pygments

- import pygments.lexers

- import pygments.formatters

-except ImportError:

- pygments = False

-

+ try:

+ import pygments

+ except ImportError:

+ pygments = False

+

+ import pygments

+ import pygments.lexers

+ import pygments.formatters

+

Sun Oct 5 15:48:31 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Ignore broken multidir directories

When a multidir directory is not really a directory or a valid symlink to one,

we want to skip it instead of exploding.

This patch fixes that by doing a simple sanity check while processing the

configured multidirs.

Thanks to Ralph Giles <giles@ghostscript.com> for the report and the patch.

+ if not os.path.isdir(c.multidir):

+ continue

+

Thu Aug 7 05:31:41 UTC 2008 Alexandre Rossi <alexandre.rossi@gmail.com>

* optional source headblob syntax highlighting using python-pygments

+try:

+ import pygments

+ import pygments.lexers

+ import pygments.formatters

+except ImportError:

+ pygments = False

+

- print '<div class="page_body">'

+<div class="page_body">

+ if not pygments:

+ print_blob_simple(fname)

+ return

+ else:

+ try:

+ print_blob_highlighted(fname)

+ except ValueError:

+ # pygments couldn't guess a lexer to highlight the code, try

+ # another method with sampling the file contents.

+ try:

+ print_blob_highlighted(fname, sample_code=True)

+ except ValueError:

+ # pygments really could not find any lexer for this file.

+ print_blob_simple(fname)

+

+def print_blob_simple(fname):

+ print '<div class="page_body">'

+

+def print_blob_highlighted(fname, sample_code=False):

+ code = open(realpath(fname), 'r').read()

+ if sample_code:

+ lexer = pygments.lexers.guess_lexer(code[:200],

+ encoding=config.repoencoding[0])

+ else:

+ lexer = pygments.lexers.guess_lexer_for_filename(fname, code[:200],

+ encoding=config.repoencoding[0])

+ formatter = pygments.formatters.HtmlFormatter(linenos=True,

+ cssclass='page_body')

+ print pygments.highlight(code, lexer, formatter)

+

-a.linenr {

+a.linenr, .linenos {

+/* Syntax highlighting related styles. This is highly dependent on what

+ * python-pygments generates.

+ * This was generated using the following commands in a python interpreter and

+ * slightly modified after.

+ * >>> import pygments

+ * >>> pygments.formatters.HtmlFormatter().get_style_defs('.page_body')

+ */

+.page_body table { margin: 0; padding: 0;}

+.page_body pre { margin : 0; padding: 0; }

+.page_body .c { color: #008800; font-style: italic } /* Comment */

+.page_body .err { border: 1px solid #FF0000 } /* Error */

+.page_body .k { color: #AA22FF; font-weight: bold } /* Keyword */

+.page_body .o { color: #666666 } /* Operator */

+.page_body .cm { color: #008800; font-style: italic } /* Comment.Multiline */

+.page_body .cp { color: #008800 } /* Comment.Preproc */

+.page_body .c1 { color: #008800; font-style: italic } /* Comment.Single */

+.page_body .gd { color: #A00000 } /* Generic.Deleted */

+.page_body .ge { font-style: italic } /* Generic.Emph */

+.page_body .gr { color: #FF0000 } /* Generic.Error */

+.page_body .gh { color: #000080; font-weight: bold } /* Generic.Heading */

+.page_body .gi { color: #00A000 } /* Generic.Inserted */

+.page_body .go { color: #808080 } /* Generic.Output */

+.page_body .gp { color: #000080; font-weight: bold } /* Generic.Prompt */

+.page_body .gs { font-weight: bold } /* Generic.Strong */

+.page_body .gu { color: #800080; font-weight: bold } /* Generic.Subheading */

+.page_body .gt { color: #0040D0 } /* Generic.Traceback */

+.page_body .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */

+.page_body .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */

+.page_body .kp { color: #AA22FF } /* Keyword.Pseudo */

+.page_body .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */

+.page_body .kt { color: #AA22FF; font-weight: bold } /* Keyword.Type */

+.page_body .m { color: #666666 } /* Literal.Number */

+.page_body .s { color: #BB4444 } /* Literal.String */

+.page_body .na { color: #BB4444 } /* Name.Attribute */

+.page_body .nb { color: #AA22FF } /* Name.Builtin */

+.page_body .nc { color: #0000FF } /* Name.Class */

+.page_body .no { color: #880000 } /* Name.Constant */

+.page_body .nd { color: #AA22FF } /* Name.Decorator */

+.page_body .ni { color: #999999; font-weight: bold } /* Name.Entity */

+.page_body .ne { color: #D2413A; font-weight: bold } /* Name.Exception */

+.page_body .nf { color: #00A000 } /* Name.Function */

+.page_body .nl { color: #A0A000 } /* Name.Label */

+.page_body .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */

+.page_body .nt { color: #008000; font-weight: bold } /* Name.Tag */

+.page_body .nv { color: #B8860B } /* Name.Variable */

+.page_body .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */

+.page_body .mf { color: #666666 } /* Literal.Number.Float */

+.page_body .mh { color: #666666 } /* Literal.Number.Hex */

+.page_body .mi { color: #666666 } /* Literal.Number.Integer */

+.page_body .mo { color: #666666 } /* Literal.Number.Oct */

+.page_body .sb { color: #BB4444 } /* Literal.String.Backtick */

+.page_body .sc { color: #BB4444 } /* Literal.String.Char */

+.page_body .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */

+.page_body .s2 { color: #BB4444 } /* Literal.String.Double */

+.page_body .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */

+.page_body .sh { color: #BB4444 } /* Literal.String.Heredoc */

+.page_body .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */

+.page_body .sx { color: #008000 } /* Literal.String.Other */

+.page_body .sr { color: #BB6688 } /* Literal.String.Regex */

+.page_body .s1 { color: #BB4444 } /* Literal.String.Single */

+.page_body .ss { color: #B8860B } /* Literal.String.Symbol */

+.page_body .bp { color: #AA22FF } /* Name.Builtin.Pseudo */

+.page_body .vc { color: #B8860B } /* Name.Variable.Class */

+.page_body .vg { color: #B8860B } /* Name.Variable.Global */

+.page_body .vi { color: #B8860B } /* Name.Variable.Instance */

+.page_body .il { color: #666666 } /* Literal.Number.Integer.Long */

+

Thu Aug 7 04:41:45 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Handle old date formats

Very old darcs commits use a different time format, that leaks out in some

operations like annotate. This patch makes darcsweb able to handle it.

Thanks to Simon Michael <simon@joyful.com> for the report and the help.

+def parse_darcs_time(s):

+ "Try to convert a darcs' time string into a Python time tuple."

+ try:

+ return time.strptime(s, "%Y%m%d%H%M%S")

+ except ValueError:

+ # very old darcs commits use a different format, for example:

+ # "Wed May 21 19:39:10 CEST 2003"

+ # we can't parse the "CEST" part reliably, so we leave it out

+ fmt = "%a %b %d %H:%M:%S %Y"

+ parts = s.split()

+ ns = ' '.join(parts[0:4]) + ' ' + parts[5]

+ return time.strptime(ns, fmt)

+

+

+

- td = time.strptime(attrs.get('date', None),

- "%Y%m%d%H%M%S")

+ td = parse_darcs_time(attrs.get('date', None))

- lastdate = lastpatch.getAttribute("date")

- lastdate = time.strptime(lastdate, "%Y%m%d%H%M%S")

+ lastdate = parse_darcs_time(lastpatch.getAttribute("date"))

- pdate = time.strptime(pdate, "%Y%m%d%H%M%S")

+ pdate = parse_darcs_time(pdate)

Sun Aug 3 15:04:07 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Fix typo in annotate output

-<i>This is a binary file and it's contents will not be displayed.</i>

+<i>This is a binary file and its contents will not be displayed.</i>

-<i>This is a binary file and it's contents will not be displayed.</i>

+<i>This is a binary file and its contents will not be displayed.</i>

Sun Aug 3 15:03:41 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Simplify annotate code

A very simple change, makes the code more straightforward.

+ if config.disable_annotate:

+ return None

+

- if not config.disable_annotate:

- out = run_darcs(cmd)

- else:

- return None

- return parse_annotate(out)

+

+ return parse_annotate(run_darcs(cmd))

Sun Aug 3 15:02:56 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Fix annotate so it works with darcs 2

darcs 2 doesn't like files beginning with / as parameters for annotate. Since

darcs 1 doesn't care, remove the '/' before running darcs.

+

+ if fname.startswith('/'):

+ # darcs 2 doesn't like files starting with /, and darcs 1

+ # doesn't really care

+ fname = fname[1:]

Sun Aug 3 15:00:34 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Use _darcs/patches instead of _darcs/inventory

In darcs 2, there is no _darcs/inventory, so use the patches directory to find

out the last modification time of the repository.

Thanks to Patrick Waugh (ptwaugh@gmail.com) for providing (and testing) this

fix.

- inv = config.repodir + '/_darcs/inventory'

+ inv = config.repodir + '/_darcs/patches'

- inv = config.repodir + '/_darcs/inventory'

+ inv = config.repodir + '/_darcs/patches'

Tue Apr 8 00:11:05 UTC 2008 Alberto Bertogli <albertito@gmail.com>

tagged 1.0

Tue Apr 8 00:10:21 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* Version 1.0

-<!-- darcsweb 0.15

+<!-- darcsweb 1.0

Thu Mar 27 01:06:42 UTC 2008 Alberto Bertogli <albertito@gmail.com>

tagged 1.0-rc2

Thu Mar 27 01:02:58 UTC 2008 Alberto Bertogli <albertito@gmail.com>

* 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.

-# "%(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 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"

+

+ # set the display name at the beginning, so it can be

+ # used by the other replaces

+ if 'displayname' in dir(c):

+ dname = c.displayname % { 'name': name }

+ else:

+ dname = name

+

+ rep_dict = { 'name': name, 'dname': dname }

+

- desc = c.repodesc % { 'name': name }

+ desc = c.repodesc % rep_dict

- desc = c.repodesc % { 'name': name }

+ desc = c.repodesc % rep_dict

- url = c.repourl % { 'name': name }

+ url = c.repourl % rep_dict

- url = c.repourl % { 'name': name }

+ url = c.repourl % rep_dict

- projurl = c.repoprojurl % {'name': name}

+ projurl = c.repoprojurl % rep_dict

- projurl = c.repoprojurl % { 'name': name }

+ projurl = c.repoprojurl % rep_dict

- reponame = name

+ reponame = dname

- config.__setattr__(name, tmp_config)

+ # index by display name to avoid clashes

+ config.__setattr__(dname, tmp_config)

Mon Mar 24 17:31:17 UTC 2008 Miklos Vajna <vmiklos@frugalware.org>

* add support for the DARCSWEB_CONFPATH env var

- useful when hosting multiple darcsweb sites via vhost

+

+# 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'])

Sun Oct 14 15:48:26 UTC 2007 Alberto Bertogli <albertito@gmail.com>

tagged 1.0-rc1

Sun Oct 14 15:42:34 UTC 2007 Alberto Bertogli <albertito@gmail.com>

* 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 <pkern@debian.org> in Debian bug 399751

(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399751).

-# 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')

Fri Jun 22 09:30:21 UTC 2007 Peter Colberg <peterco@gmx.net>

* Adjust URI scheme according to CGI environment variable HTTPS.

This patch fixes RSS feed links when browsing darcsweb via SSL.

- if p == '80':

+ u = os.environ.get('HTTPS', 'off') in ('on', '1')

+ if not u and p == '80' or u and p == '443':

- config.myurl = 'http://%s%s%s' % (n, p, s)

+ config.myurl = 'http%s://%s%s%s' % (u and 's' or '', n, p, s)

Wed May 16 09:48:24 UTC 2007 Jonathan Buchanan <jonathan.buchanan@gmail.com>

* 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.

- s = os.environ['SCRIPT_NAME']

+ s = os.path.dirname(os.environ['SCRIPT_NAME'])

Wed May 16 09:46:25 UTC 2007 Jonathan Buchanan <jonathan.buchanan@gmail.com>

* 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.

+ name = name.replace('\\', '/')

Thu May 3 16:18:30 UTC 2007 VMiklos <vmiklos@frugalware.org>

* display the size of the files in tree view

+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)

+ print '<td style="font-family:monospace">', fsize(realfile),

+ print '</td>'

Mon Apr 16 19:06:18 UTC 2007 Alberto Bertogli <albertito@gmail.com>

* Soften some colors in commitdiff.

- color = 'style="color:#990099; border-top:dashed; border-width:1px;"'

+ color = 'style="color:#990099; '

+ color += 'border: solid #ffe0ff; '

+ color += 'border-width: 1px 0px 0px 0px; '

+ color += 'margin-top: 2px;"'

Mon Apr 16 09:13:34 UTC 2007 Alexandre Rossi <alexandre.rossi@gmail.com>

* only read the first line of _darcs/third_party/darcsweb/* files

- desc = open(dpath).read()

+ desc = open(dpath).readline().rstrip("\n")

- url = open(dpath).read()

+ url = open(dpath).readline().rstrip("\n")

- projurl = open(dpath).read()

+ projurl = open(dpath).readline().rstrip("\n")

Mon Apr 16 09:11:29 UTC 2007 Alexandre Rossi <alexandre.rossi@gmail.com>

* make color commitdiff more readable when parts of a file are skipped

- color = 'style="color:#990099;"'

+ color = 'style="color:#990099; border-top:dashed; border-width:1px;"'

Fri Mar 16 19:27:14 UTC 2007 VMiklos <vmiklos@frugalware.org>

* new optional config varuable: disable_annotate

* the annotate feature is still enabled by default

* this can be useful on slow machines

+

+ # 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

- out = run_darcs(cmd)

+ if not config.disable_annotate:

+ out = run_darcs(cmd)

+ else:

+ return None

+ if not ann:

+ print """

+<i>The annotate feature has been disabled</i>

+</div>

+ """

+ print_footer()

+ return

+ if "disable_annotate" in dir(base):

+ config.disable_annotate = base.disable_annotate

+ else:

+ config.disable_annotate = False

Wed Apr 4 15:09:32 UTC 2007 Alexandre Rossi <alexandre.rossi@gmail.com>

* closing <a> tag in project url link

- print ' <td><a href="%(url)s">%(url)s</td></tr>' % \

+ print ' <td><a href="%(url)s">%(url)s</a></td></tr>' % \

Wed Apr 4 12:15:12 UTC 2007 Alexandre Rossi <alexandre.rossi@gmail.com>

* typo in sample config autoprojurl description

- # file named "_darcs/third_party/darcsweb/extdoc" (one line only), set

+ # file named "_darcs/third_party/darcsweb/projurl" (one line only), set

Thu Feb 1 17:30:50 UTC 2007 VMiklos <vmiklos@frugalware.org>

* new optional config varuable: author_links

it is disabled by default and an example for cia is included

+

+ # 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"

+

+def gen_authorlink(author, shortauthor=None):

+ if not config.author_links:

+ if shortauthor:

+ return shortauthor

+ else:

+ return author

+ if not shortauthor:

+ shortauthor = author

+ return '<a href="' + config.author_links % { 'author': author } + '">%s</a>' % shortauthor

- 'author': shorten_str(p.shortauthor, 26),

+ 'author': gen_authorlink(p.author, shorten_str(p.shortauthor, 26)),

- 'author': p.shortauthor,

+ 'author': gen_authorlink(p.author, p.shortauthor),

- 'author': p.author,

+ 'author': gen_authorlink(p.author),

- 'author': shorten_str(p.shortauthor, 26),

+ 'author': gen_authorlink(p.author, shorten_str(p.shortauthor, 26)),

+ if "author_links" in dir(base):

+ config.author_links = base.author_links

+ else:

+ config.author_links = None

Wed Jan 24 23:38:07 UTC 2007 Alberto Bertogli <albertito@gmail.com>

* 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.

+

+if sys.version_info < (2, 3):

+ print "Sorry, but Python 2.3 or above is required to run darcsweb."

+ sys.exit(1)

Wed Jan 17 23:02:12 UTC 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

- cmd = 'DARCS_DONT_ESCAPE_8BIT=1 ' + config.darcspath + "darcs " + params

+ try:

+ original_8bit_setting = os.environ['DARCS_DONT_ESCAPE_8BIT']

+ except KeyError:

+ original_8bit_setting = None

+ os.environ['DARCS_DONT_ESCAPE_8BIT'] = '1'

+ cmd = config.darcspath + "darcs " + params

+ if original_8bit_setting == None:

+ del(os.environ['DARCS_DONT_ESCAPE_8BIT'])

+ else:

+ os.environ['DARCS_DONT_ESCAPE_8BIT'] = original_8bit_setting

Mon Dec 25 22:18:20 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* 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).

+

+ # 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'<a href="/bugs/show_bug.cgi?id=\1">#\1</a>'),

+ #

+ # Replace hashes with commit-links.

+ #(r'(\d{14}-[0-9a-f]{5}-[0-9a-f]{40}\.gz)',

+ # r'<a href="%(myreponame)s;a=commit;h=\1">\1</a>'),

+ #)

+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

+

+

- comment = escape(p.comment)

+ comment = replace_links(escape(p.comment))

- comment = escape(p.comment)

+ comment = replace_links(escape(p.comment))

- print escape(p.name), '<br/><br/>'

+ print replace_links(escape(p.name)), '<br/><br/>'

+ if "url_links" in dir(base):

+ config.url_links = base.url_links

+ else:

+ config.url_links = ()

+

Thu Nov 30 09:37:41 UTC 2006 Kirill Smelkov <kirr@mns.spb.ru>

* string.join is deprecated

- return string.join(l, "")

+ return ''.join(l)

- return string.join(l, "")

+ return ''.join(l)

- return string.join(l, "")

+ return ''.join(l)

- print string.join(params), '<br/>'

+ print ' '.join(params), '<br/>'

- return string.join(n, '\n')

+ return '\n'.join(n)

- return string.join(s, '')

+ return ''.join(s)

Mon Dec 25 21:43:36 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Change my email address.

-Alberto Bertogli (albertogli@telpin.com.ar)

--------------------------------------------

+Alberto Bertogli (albertito@gmail.com)

+----------------------------------------

-Alberto Bertogli (albertogli@telpin.com.ar)

+Alberto Bertogli (albertito@gmail.com)

- Alberto Bertogli (albertogli@telpin.com.ar).

+ Alberto Bertogli (albertito@gmail.com).

- * Alberto Bertogli (albertogli@telpin.com.ar)

+ * Alberto Bertogli (albertito@gmail.com)

Tue Oct 10 03:04:21 UTC 2006 Alberto Bertogli <albertito@gmail.com>

tagged 0.16

Wed Aug 9 17:54:30 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Handle empty lines in print_darcs_diff().

A "setpref" patch can output empty lines when seen with darcs_diff. Handle

that case by ignoring them.

Thanks to VMiklos from reporting it.

+ if not l:

+ continue

Mon Jul 31 05:29:33 UTC 2006 Alberto Bertogli <albertito@gmail.com>

tagged 0.16-rc1

Mon Jul 31 05:28:34 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Remove some unnecessary newlines in html output.

-</div>

+</div>\

-</div>

+</div>\

Mon Jul 31 05:10:03 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Make browsing files in tree root easier.

This patch makes it easier to browse files in the root of the tree, by making

it simpler to return to the root tree view.

- print """

- <div class="title"><b>

- """

- # and the linked, with links

- parts = filepath.split('/')

- print '/ '

- sofar = '/'

- for p in parts:

- if not p: continue

- sofar += '/' + p

- print '<a href="%s;a=tree;f=%s">%s</a> /' % \

- (config.myreponame, sofar, p)

+ if filepath == '/':

+ print '<div><a class="title" href="%s;a=tree">/</a></div>' % \

+ (config.myreponame)

+ else:

+ print '<div class="title"><b>'

- print '</b></div>'

+ # and the linked, with links

+ parts = filepath.split('/')

+ print '/ '

+ sofar = '/'

+ for p in parts:

+ if not p: continue

+ sofar += '/' + p

+ print '<a href="%s;a=tree;f=%s">%s</a> /' % \

+ (config.myreponame, sofar, p)

+

+ print '</b></div>'

Mon Jul 31 04:54:05 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Allow projects to link to external sites.

Add a 'repoprojurl' configuration option to put a reference to an external

project site. It appears in the project summary, just like url.

It also supports multidir, both automatic detection in the third_party

directory, and static construction.

Thanks to Alexandre Rossi for the idea and preliminary patch.

+ # Each repository may show a link to some website associated with it.

+ # This is typically useful if you've got a website describing the

+ # software in your repository.

+ #repoprojurl = 'http://example.com/projects/repo1/'

+

+ # optional, see above

+ #repoprojurl = 'http://example.com/projects/%(name)s/'

+

+ # if you want the projects urls to be picked up automatically from the

+ # file named "_darcs/third_party/darcsweb/extdoc" (one line only), set

+ # this to True. It defaults to False.

+ #autoprojurl = True

+

+ if config.repoprojurl:

+ print ' <tr><td>project url</td>'

+ print ' <td><a href="%(url)s">%(url)s</td></tr>' % \

+ { 'url': config.repoprojurl }

+ if 'autoprojurl' in dir(c) and c.autoprojurl:

+ dpath = fulldir + \

+ '/_darcs/third_party/darcsweb/projurl'

+ if os.access(dpath, os.R_OK):

+ projurl = open(dpath).read()

+ elif 'repoprojurl' in dir(c):

+ projurl = c.repoprojurl % {'name': name}

+ else:

+ projurl = None

+ elif 'repoprojurl' in dir(c):

+ projurl = c.repoprojurl % { 'name': name }

+ else:

+ projurl = None

+

+ repoprojurl = projurl

+

+

+ config.repoprojurl = None

+ if 'repoprojurl' in dir(c):

+ config.repoprojurl = c.repoprojurl

+

Mon Jul 31 04:24:50 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Convert remaining auriga references to example.com.

- repourl = 'http://auriga.wearlab.de/~alb/repos/repo1/'

+ repourl = 'http://example.com/repos/repo1/'

- repourl = 'http://auriga.wearlab.de/~alb/repos/repo2/'

+ repourl = 'http://example.com/repos/repo2/'

- repourl = 'http://auriga.wearlab.de/~alb/repos/%(name)s/'

+ repourl = 'http://example.com/repos/%(name)s/'

Mon Jul 31 04:10:20 UTC 2006 Alberto Bertogli <albertito@gmail.com>

* Implement url and scriptname autodetection.

This patch implements autodetection of the url and scriptname of darcsweb.

It's based on a suggestion from Tobias Gruetzmacher.

It relies on variables according to the CGI/1.1 standard, and works only if

cache is not enabled. If it is, the variables must be set manually as before.

The problem with the cache is multi-host access: if a page not in the cache is

accesed as http://hosta/dw/..., then the cached page will reference "hosta".

If then it's accessed from hostb, there will be a reference to hosta that it's

possibly broken. It's actually a quite common case when you have localhost and

external access.

- # this script's name, usually just "darcsweb.cgi" unless you rename it

- myname = "darcsweb.cgi"

-

- # our url, used only to generate RSS links, without the script name

- myurl = "http://example.com/darcsweb"

-

+ # this script's name, usually just "darcsweb.cgi" unless you rename

+ # it; if you leave this commented it will be detected automatically

+ #myname = "darcsweb.cgi"

+

+ # our url, used only to generate RSS links, without the script name;

+ # if you leave this commented it will be detected automatically

+ #myurl = "http://example.com/darcsweb"

+

+ # If you use this option you must set the "myname" and "myurl"

+ # variables.

+ expand_multi_config(all_configs)

- expand_multi_config(all_configs)

- 'myname': all_configs.base.myname,

+ 'myname': config.myname,

- config.myname = base.myname

- config.myurl = base.myurl

+ if 'myname' not in dir(base):

+ # SCRIPT_NAME has the full path, we only take the file name

+ config.myname = os.path.basename(os.environ['SCRIPT_NAME'])

+ else:

+ config.myname = base.myname

+

+ if 'myurl' not in dir(base) and 'cachedir' not in dir(base):

+ n = os.environ['SERVER_NAME']

+ p = os.environ['SERVER_PORT']

+ s = os.environ['SCRIPT_NAME']

+ if p == '80':

+ p = ''

+ else:

+ p = ':' + p

+ config.myurl = 'http://%s%s%s' % (n, p, s)

+ else:

+ config.myurl = base.myurl

+

- config.myreponame = base.myname + '?r=' + urllib.quote(name)

+ config.myreponame = config.myname + '?r=' + urllib.quote(name)

Fri Jul 14 19:27:30 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Add autourl support for multidir.

This patch adds a new option for multidir config entries, named "autourl". If

set, it will take the contents of "_darcs/third_party/darcsweb/url" and use it

as repourl.

Thanks to Marco Baringer for suggestion and preliminary patch.

+ # if you want urls to be picked up automatically from the file named

+ # "_darcs/third_party/darcsweb/url" (one line only), set this to

+ # True. It defaults to False.

+ #autourl = True

+ if 'autourl' in dir(c) and c.autourl:

+ dpath = fulldir + \

+ '/_darcs/third_party/darcsweb/url'

+ if os.access(dpath, os.R_OK):

+ url = open(dpath).read()

+ else:

+ url = c.repourl % { 'name': name }

+ else:

+ url = c.repourl % { 'name': name }

+

- url = c.repourl % { 'name': name }

Fri Jul 14 18:09:52 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Use example.com for url examples.

- myurl = "http://albertito.homeip.net:8026/darcsweb"

+ myurl = "http://example.com/darcsweb"

Thu Jul 6 17:04:59 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Put directories in blue on tree view.

To make directories easy to spot, make them blue and with a "/" at the end.

Then they become obvious, but not too distracting.

Thanks to Dan Pescu for all the suggestions.

- <td><a class="list" href="%(myrname)s;a=tree;f=%(fullf)s">%(f)s</a></td>

+ <td>

+ <a class="link" href="%(myrname)s;a=tree;f=%(fullf)s">%(f)s/</a>

+ </td>

Mon May 29 15:04:37 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Escape repository descriptions.

Escape all repository descriptions, because they might contain unfrendly

characters for XML (including HTML, ATOM and RSS).

Thanks to Clive Crous for the report and a slightly different patch.

- print ' <tr><td>description</td><td>%s</td></tr>' % config.repodesc

+ print ' <tr><td>description</td><td>%s</td></tr>' % \

+ escape(config.repodesc)

- 'desc': config.repodesc,

+ 'desc': escape(config.repodesc),

- 'desc': config.repodesc,

+ 'desc': escape(config.repodesc),

Sat May 13 23:23:21 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Support the new pristine directory.

darcs 1.0.7 uses a new name for the pristine directory, "pristine", instead of

the classic "current".

This patch adds support for that directory, without dropping "current" because

it's still heavily used in existing repositories.

+ realf = filter_file(config.repodir + '/_darcs/pristine/' + fname)

+ if os.path.exists(realf):

+ return realf

- if not os.path.exists(realf):

- realf = filter_file(config.repodir + '/' + fname)

+ if os.path.exists(realf):

+ return realf

+ realf = filter_file(config.repodir + '/' + fname)

Wed Mar 8 02:13:19 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.15

Wed Mar 8 02:13:01 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Version 0.15.

-<!-- darcsweb 0.10

+<!-- darcsweb 0.15

Fri Feb 24 01:43:41 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.15-rc1

Fri Feb 24 01:37:00 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix repoencoding, this time for real (I hope).

-

- # repoencoding must be a tuple

- if isinstance(c.repoencoding, str):

- repoencoding = (c.repoencoding, )

- else:

- repoencoding = c.repoencoding

+ repoencoding = c.repoencoding

- config.repoencoding = c.repoencoding

+ # repoencoding must be a tuple

+ if isinstance(c.repoencoding, str):

+ config.repoencoding = (c.repoencoding, )

+ else:

+ config.repoencoding = c.repoencoding

Fri Feb 24 00:54:19 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix to allow having a single repoencoding.

- if c.repoencoding is str:

+ if isinstance(c.repoencoding, str):

Fri Feb 24 00:31:28 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Rewrite encoding handling.

This patch rewrites fixu8() and affects a couple of places where decode() was

used directly.

It has the benefit of removing the ugly previous function, replacing it

with... well, another ugly function, but with a different kind of uglyness.

It also supports multiple encodings, so if the first one fails, a second one

is tried (and so on).

There still are some corner cases with file named in alternative encodings,

but should work much better than the older code.

+ # You can, optionally, specify multiple encodings; they're tried in

+ # order, and if one fails to decode a string, the next one is tried.

+ # Example: repoencoding = "utf8", "latin1"

- openpos = s.find('[_')

- if openpos < 0:

- # small optimization to avoid the conversion to utf8 and

- # entering the loop

- if type(s) == unicode:

- # workaround for python < 2.4

- return s.encode('utf8')

- else:

- return s.decode(config.repoencoding).encode('utf8')

-

- s = s.encode(config.repoencoding).decode('raw_unicode_escape')

- while openpos >= 0:

- closepos = s.find('_]', openpos)

- if closepos < 0:

- # not closed, probably just luck

- break

-

- # middle should be something like 'c3', so we get it by

- # removing the first three characters ("[_\")

- middle = s[openpos + 3:closepos]

- if len(middle) == 2:

- # now we turn middle into the character "\xc3"

- char = chr(int(middle, 16))

+ """Calls _fixu8(), which does the real work, line by line. Otherwise

+ we choose the wrong encoding for big buffers and end up messing

+ output."""

+ n = []

+ for i in s.split('\n'):

+ n.append(_fixu8(i))

+ return string.join(n, '\n')

- # finally, replace s with our new improved string, and

- # repeat the ugly procedure

- char = char.decode(config.repoencoding)

- mn = '[_\\' + middle + '_]'

- s = s.replace(mn, char, 1)

- openpos = s.find('[_', openpos + 1)

+def _fixu8(s):

+ if type(s) == unicode:

+ return s.encode('utf8', 'replace')

+ for e in config.repoencoding:

+ try:

+ return s.decode(e).encode('utf8', 'replace')

+ except UnicodeDecodeError:

+ pass

+ raise 'DecodingError', config.repoencoding

- if config.repoencoding != 'utf8':

- s = s.encode('utf8')

- else:

- s = s.encode('raw_unicode_escape', 'replace')

- return s

- cmd = config.darcspath + "darcs " + params

+ cmd = 'DARCS_DONT_ESCAPE_8BIT=1 ' + config.darcspath + "darcs " + params

+class XmlInputWrapper:

+ def __init__(self, fd):

+ self.fd = fd

+ self.times = 0

+ self._read = self.read

+

+ def read(self, *args, **kwargs):

+ self.times += 1

+ if self.times == 1:

+ return '<?xml version="1.0" encoding="utf-8"?>\n'

+ s = self.fd.read(*args, **kwargs)

+ if not s:

+ return s

+ return fixu8(s)

+

+ def close(self, *args, **kwargs):

+ return self.fd.close(*args, **kwargs)

+

- parser.parse(xmlf)

+ parser.parse(XmlInputWrapper(xmlf))

- l = l.decode(config.repoencoding, 'replace').encode('utf-8')

+ l = fixu8(l)

- l = l.decode(config.repoencoding, 'replace').encode('utf-8')

+ l = fixu8(l)

- repoencoding = c.repoencoding

+

+ # repoencoding must be a tuple

+ if c.repoencoding is str:

+ repoencoding = (c.repoencoding, )

+ else:

+ repoencoding = c.repoencoding

+

Thu Feb 23 19:47:31 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Include the repository in log_times() output.

-def log_times(cache_hit, event = None):

+def log_times(cache_hit, repo = None, event = None):

- s = """\

-%s

+ s = '%s\n' % event

+

+ if repo:

+ s += '\trepo: %s\n' % repo

+

+ s += """\

- imports: %.3f\n""" % (event, time_total, processing, time_imports)

+ imports: %.3f\n""" % (time_total, processing, time_imports)

- log_times(cache_hit = 1)

+ log_times(cache_hit = 1, repo = config.reponame)

-log_times(cache_hit = 0)

+log_times(cache_hit = 0, repo = config.reponame)

Thu Feb 23 18:51:21 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Quote filenames in several places.

There were several places using filenames in URLs without quoting them

properly, this fixes them.

Thanks to VMiklos for the report.

+ f = urllib.quote(f)

- %(file)s</a>

+ %(fname)s</a>

- 'file': f

+ 'file': urllib.quote(f),

+ 'fname': escape(f),

- 'file': f

+ 'file': urllib.quote(f)

- (config.myreponame, escape(sofar), p)

+ (config.myreponame, urllib.quote(sofar), p)

+ fullf = filter_file(dname + '/' + f)

- <td><a class="list" href="%(myrname)s;a=tree;f=%(newf)s">%(f)s</a></td>

+ <td><a class="list" href="%(myrname)s;a=tree;f=%(fullf)s">%(f)s</a></td>

- <a href="%(myrname)s;a=filehistory;f=%(newf)s">history</a> |

- <a href="%(myrname)s;a=tree;f=%(newf)s">tree</a>

+ <a href="%(myrname)s;a=filehistory;f=%(fullf)s">history</a> |

+ <a href="%(myrname)s;a=tree;f=%(fullf)s">tree</a>

- 'newf': filter_file(dname + '/' + f),

+ 'fullf': urllib.quote(fullf),

- 'fullf': filter_file(dname + '/' + f),

+ 'fullf': urllib.quote(fullf),

Thu Feb 23 18:34:51 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Filter '"' in filenames.

For security, don't allow '"' in filenames.

If there is high demand, some alternative workaround could be implemented.

- if '..' in s:

+ if '..' in s or '"' in s:

Thu Feb 23 17:21:30 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Add /etc/darcsweb to the module lookup path.

This allows darcsweb's configuration to be in /etc/darcsweb instead of the

current directory. It's mostly wanted by distributions which want to isolate

the config file to keep things clean.

A similar patch was sent by Gaetan Lehmann (Mandriva), VMiklos (Frugalware)

and Fabian Linzberger (Debian).

+# 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')

+

Wed Feb 22 04:47:15 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Move some one-time used imports to the user location.

As a minor but noticeable optimization to darcsweb's load time, move the

importing of sha and email.Utils modules to the place where they're used (only

one in both cases).

This takes the time spent on imports from 0.027s to 0.021s, which will

probably be slightly noticeable on slower machines, reducing the time taken by

a cache hit from 0.030s to 0.024s (on misses it doesn't make a difference).

-import sha

-import email.Utils

+ import sha

+ import email.Utils

Tue Feb 21 21:24:30 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Begin with alt = True in listings.

I think it looks better if we start a listing with alt = True (the dark one).

- alt = False

+ alt = True

- alt = False

+ alt = True

- alt = False

+ alt = True

- alt = False

+ alt = True

- alt = False

+ alt = True

Mon Feb 20 03:23:19 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement time logging.

This record adds an option to log the time it took darcsweb to present a

page. Unfortunately, because of the way it's implemented, it's impossible to

isolate the time it takes to call darcs; however, every darcs invocation is

logged too, to allow independant measures.

+

+ # If you want to log the times it took darcsweb to present a page,

+ # uncomment this option. The value should be a file writeable by

+ # darcsweb.

+ #logtimes = "/tmp/darcsweb_times"

+import time

+time_begin = time.time()

-import time

+time_imports = time.time() - time_begin

+# list of run_darcs() invocations, for performance measures

+darcs_runs = []

+

+def log_times(cache_hit, event = None):

+ if not config.logtimes:

+ return

+

+ time_total = time.time() - time_begin

+ processing = time_total - time_imports

+ if not event:

+ event = action

+ if cache_hit:

+ event = event + " (hit)"

+ s = """\

+%s

+ total: %.3f

+ processing: %.3f

+ imports: %.3f\n""" % (event, time_total, processing, time_imports)

+

+ if darcs_runs:

+ s += "\truns:\n"

+ for params in darcs_runs:

+ s += '\t\t%s\n' % params

+ s += '\n'

+

+ lf = open(config.logtimes, 'a')

+ lf.write(s)

+ lf.close()

+

+ darcs_runs.append(params)

+ if "logtimes" in dir(base):

+ config.logtimes = base.logtimes

+ else:

+ config.logtimes = None

+

+ log_times(cache_hit = 0, event = 'index')

+ log_times(cache_hit = 1)

+log_times(cache_hit = 0)

+

+

Sun Feb 19 17:42:23 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Change cache file permissions 600.

Change cache file permissions to 600. This should work on Windows too because

the bits are ignored, according to python's documentation.

+ os.chmod(fname, stat.S_IRUSR | stat.S_IWUSR)

Thu Jan 12 23:52:34 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix typos in the BOLA license.

-so I'm placing darcsweb under the following license, so you feel guilty if you

-don't ;)

+so I'm placing darcsweb under the following license, to make you feel guilty

+if you don't ;)

- non-renovable resources. Extra points if you discover or invent something

+ non-renewable resources. Extra points if you discover or invent something