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

Mon Jan 9 22:25:04 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.14

Mon Jan 9 05:58:01 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix cache behaviour on uncaught exceptions.

This patch make darcsweb cancel the cache when there is an uncaught exception,

avoiding leaving dot-files around the cache directory.

Also minimize DoS by not taking into account unused form parameters, and make

the hash independant of the position. This doesn't eliminate all the

opportunities for DoS, but reduces them significatively.

+# exception handling

+def exc_handle(t, v, tb):

+ try:

+ cache.cancel()

+ except:

+ pass

+ cgitb.handler((t, v, tb))

+sys.excepthook = exc_handle

- self.fname = sha.sha(url).hexdigest()

+ self.fname = sha.sha(repr(url)).hexdigest()

+ # create a string representation of the request, ignoring all the

+ # unused parameters to avoid DoS

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

+ params = [ x for x in form.keys() if x in params ]

+ url_request = [ (x, form[x].value) for x in params ]

+ url_request.sort()

Mon Jan 9 05:27:44 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Replace the darcs logo with a smaller one.

Now that we have a search box, the logo becomes really big and distractive.

Replace it with a smaller version, only with the ball.

Mon Jan 9 05:24:26 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement a search box.

This implements a small search box that appears on the right top besides the

logo (which will be changed to a small version in a following patch).

+

+ # By default, darcsweb's search looks in the last 100 commits; you can

+ # change that number by specifying it here.

+ # Note that search are not cached, so if you have tons of commits and

+ # set the limit to a very high number, they will take time.

+ #searchlimit = 100

+def highlight(s, l):

+ "Highlights appearences of s in l"

+ import re

+ # build the regexp by leaving "(s)", replacing '(' and ') first

+ s = s.replace('\\', '\\\\')

+ s = s.replace('(', '\\(')

+ s = s.replace(')', '\\)')

+ s = '(' + escape(s) + ')'

+ try:

+ pat = re.compile(s, re.I)

+ repl = '<span style="color:#e00000">\\1</span>'

+ l = re.sub(pat, repl, l)

+ except:

+ pass

+ return l

+

-<a href="http://darcs.net" title="darcs">

-<img src="%(logo)s" alt="darcs logo" style="float:right; border-width:0px;"/>

-</a>

+ <div class="search_box">

+ <form action="%(myname)s" method="get"><div>

+ <input type="hidden" name="r" value="%(reponame)s"/>

+ <input type="hidden" name="a" value="search"/>

+ <input type="text" name="s" size="20" class="search_text"/>

+ <input type="submit" value="search" class="search_button"/>

+ <a href="http://darcs.net" title="darcs">

+ <img src="%(logo)s" alt="darcs logo" class="logo"/>

+ </a>

+ </div></form>

+ </div>

+ <a href="%(myname)s">repos</a> /

+ <a href="%(myreponame)s;a=summary">%(reponame)s</a> /

+ %(action)s

+</div>

+ 'myname': config.myname,

+ 'myreponame': config.myreponame,

+ 'action': action

- print '<a href="%s">repos</a> /' % config.myname

- print '<a href="%s;a=summary">%s</a>' % (config.myreponame,

- config.reponame),

- print '/ ' + action

- print "</div>"

+ def matches(self, s):

+ "Defines if the patch matches a given string"

+ if s.lower() in self.comment.lower():

+ return self.comment

+ elif s.lower() in self.name.lower():

+ return self.name

+ elif s.lower() in self.author.lower():

+ return self.author

+ elif s == self.hash:

+ return self.hash

+

+ s = s.lower()

+ for l in (self.adds, self.removes, self.modifies,

+ self.diradds, self.dirremoves,

+ self.replaces.keys(), self.moves.keys(),

+ self.moves.keys() ):

+ for i in l:

+ if s in i.lower():

+ return i

+ return ''

+

+def do_search(s):

+ print_header()

+ print_navbar()

+ ps = get_last_patches(config.searchlimit)

+

+ print '<div class="title">Search last %d commits for "%s"</div>' \

+ % (config.searchlimit, escape(s))

+ print '<table cellspacing="0">'

+

+ alt = False

+ for p in ps:

+ match = p.matches(s)

+ if not match:

+ continue

+

+ if alt:

+ print '<tr class="dark">'

+ else:

+ print '<tr class="light">'

+ alt = not alt

+

+ print """

+ <td><i>%(age)s</i></td>

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

+ <td>

+ <a class="list" title="%(fullname)s" href="%(myrname)s;a=commit;h=%(hash)s">

+ <b>%(name)s</b>

+ </a><br/>

+ %(match)s

+ </td>

+ <td class="link">

+ <a href="%(myrname)s;a=commit;h=%(hash)s">commit</a> |

+ <a href="%(myrname)s;a=commitdiff;h=%(hash)s">commitdiff</a>

+ </td>

+ """ % {

+ 'age': how_old(p.local_date),

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

+ 'myrname': config.myreponame,

+ 'hash': p.hash,

+ 'name': escape(shorten_str(p.name)),

+ 'fullname': escape(p.name),

+ 'match': highlight(s, shorten_str(match)),

+ }

+ print "</tr>"

+

+ print '</table>'

+ print_footer()

+

+

+ if "searchlimit" in dir(base):

+ config.searchlimit = base.searchlimit

+ else:

+ config.searchlimit = 100

+

+elif action == 'search':

+ if form.has_key('s'):

+ s = form["s"].value

+ else:

+ s = ''

+ do_search(s)

+ if config.cachedir:

+ cache.cancel()

+

+div.search_box {

+ float:right;

+ text-align:right;

+}

+

+input.search_text {

+ font-size:xx-small;

+ background-color: #edece6;

+ vertical-align: top;

+}

+

+input.search_button {

+ font-size:xx-small;

+ vertical-align: top;

+}

+

- clear:both;

+ /*clear:both;*/

+

+img.logo {

+ border-width:0px;

+ vertical-align:top;

+ margin-left:12pt;

+ margin-right:5pt;

+}

Sun Jan 8 01:45:32 UTC 2006 Alberto Bertogli <albertogli@telpin.com.ar>

* Add the BOLA license.

darcsweb has been too long without an explicit license, it's time to add one.

Enjoy!

+

+I don't like licenses, because I don't like having to worry about all this

+legal stuff just for a simple piece of software I don't really mind anyone

+using. But I also believe that it's important that people share and give back;

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

+don't ;)

+

+

+BOLA - Buena Onda License Agreement

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

+

+This work is provided 'as-is', without any express or implied warranty. In no

+event will the authors be held liable for any damages arising from the use of

+this work.

+

+To all effects and purposes, this work is to be considered Public Domain.

+

+

+However, if you want to be "Buena onda", you should:

+

+1. Not take credit for it, and give proper recognition to the authors.

+2. Share your modifications, so everybody benefits from them.

+4. Do something nice for the authors.

+5. Help someone who needs it: sign up for some volunteer work or help your

+ neighbour paint the house.

+6. Don't waste. Anything, but specially energy that comes from natural

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

+ to replace them.

+7. Be tolerant. Everything that's good in nature comes from cooperation.

+

+The order is important, and the further you go the more "Buena onda" you are.

+Make the world a better place: be "Buena onda".

+

+

Sat Dec 31 04:16:51 UTC 2005 Leandro Lucarella <luca@llucax.hn.org>

* Silly changes to avoid HTTP redirects.

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

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

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

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

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

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

Fri Dec 30 23:44:19 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add autodesc and autoexclude options.

This patch implements two optional options for multidir repos: autodesc and

autoexclude.

If autodesc is enabled, the description will be taken from the file named

"_darcs/third_party/darcsweb/desc", inside the repository. If it doesn't

exist, the default will be used.

If autoexclude is enabled, only repositories with a directory named

"_darcs/third_party/darcsweb/" will be listed.

The path "_darcs/third_party/darcsweb/" for darcsweb-exclusive preferences was

chosen following a suggestion by David Roundy in the mail with Subject

"[darcs-users] darcsweb 0.12 and some questions", Message-ID

20051109123238.GB17288@abridgegame.org, date "9 Nov 2005 07:32:44".

+

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

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

+ # this to True. It defaults to False

+ #autodesc = True

+

+ # if you want to exclude all the repositories which do NOT have a

+ # directory named "_darcs/third_party/darcsweb/" inside, set this to

+ # True. It defaults to False.

+ #autoexclude = True

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

+ dpath = fulldir + \

+ '/_darcs/third_party/darcsweb'

+ if not os.path.isdir(dpath):

+ continue

+

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

+ dpath = fulldir + \

+ '/_darcs/third_party/darcsweb/desc'

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

+ desc = open(dpath).read()

+ else:

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

+ else:

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

+

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

Fri Dec 30 21:08:43 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Escape filenames, just in case.

In the same spirit as the last patch, add escape() around prints of file

names. It's highly improbable, but it could happen for weird cases and it

seems worth the effort.

- s = "-s " + fname

+ s = '-s "%s"' % fname

- cmd += ' %s' % fname

+ cmd += ' "%s"' % fname

- title += 'History for path %s' % fname

+ title += 'History for path %s' % escape(fname)

- print '<div class="page_path"><b>%s</b></div>' % fname

+ print '<div class="page_path"><b>%s</b></div>' % escape(fname)

- 'fname': fname,

+ 'fname': escape(fname),

- 'fname': fname,

+ 'fname': escape(fname),

- 'fname': fname,

+ 'fname': escape(fname),

- 'fname': fname,

+ 'fname': escape(fname),

- c = p.comment.replace('\n', '<br/>\n')

+ comment = escape(p.comment)

+ c = comment.replace('\n', '<br/>\n')

- (config.myreponame, sofar, p)

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

- 'f': f,

+ 'f': escape(f),

- 'f': f,

+ 'f': escape(f),

Tue Dec 27 03:19:14 UTC 2005 Michael Allan <mike@zelea.com>

* Escape patch names.

When patch names used in HTML, escape characters like '<'.

- 'name': shorten_str(p.name),

+ 'name': escape(shorten_str(p.name)),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- 'name': p.name,

+ 'name': escape(p.name),

- print p.name, '<br/><br/>'

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

Sat Dec 24 15:06:57 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Move the mimetypes import to the function.

While it's a nice practise to put all imports above, in darcsweb's case it

also increases startup latency.

Because the mimetypes module is only used inside print_binary_header(), move

the import inside the function.

-import mimetypes

+ import mimetypes

Wed Dec 21 22:24:47 UTC 2005 gaetan.lehmann@jouy.inra.fr

* enhance mime type for binary files

+import mimetypes

- print "Content-type: application/octet-stream"

+ if fname :

+ (mime, enc) = mimetypes.guess_type(fname)

+ else :

+ mime = None

+ if mime :

+ print "Content-type: %s" % mime

+ else :

+ print "Content-type: application/octet-stream"

Wed Dec 21 15:00:33 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Identify binary files in plainblob.

If we want to do a plainblob of a binary file, it's better to offer a proper

download than to display it as text/plain.

This patch identifies binary files (looking at darcs' information) and offers

them for download with the proper name.

+def print_binary_header(fname = None):

+ print "Content-type: application/octet-stream"

+ if fname:

+ print "Content-Disposition:attachment;filename=%s" % fname

+ print

- print_plain_header()

- for l in f:

- sys.stdout.write(fixu8(l))

+

+ if isbinary(fname):

+ print_binary_header(os.path.basename(fname))

+ for l in f:

+ sys.stdout.write(l)

+ else:

+ print_plain_header()

+ for l in f:

+ sys.stdout.write(fixu8(l))

Wed Dec 21 14:29:46 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Indentation and comment changes to multidir_deep.

-# If you set multidir_deep to True then all subdirectories are searched

-# for darcs repositories. Subdirectories starting with a dot (.) are not

-# searched. This may be slow, if huge directory trees must be searched.

+# If you set multidir_deep to True (note the capitalization) then all

+# subdirectories are searched for darcs repositories. Subdirectories starting

+# with a dot (.) are not searched. This may be slow, if huge directory trees

+# must be searched. It's unnecesary unless you have a multidir with several

+# nested repositories. It defaults to False, and it's optional.

- multidir_deep = False

+ #multidir_deep = False

- for (root, dirs, files) in os.walk(c.multidir):

- # do not visit hidden directories

- dirs[:] = [d for d in dirs if not d.startswith('.')]

- if '_darcs' in dirs:

- entries.append(root[1+len(c.multidir):])

+ for (root, dirs, files) in os.walk(c.multidir):

+ # do not visit hidden directories

+ dirs[:] = [d for d in dirs \

+ if not d.startswith('.')]

+ if '_darcs' in dirs:

+ p = root[1 + len(c.multidir):]

+ entries.append(p)

- entries = os.listdir(c.multidir)

+ entries = os.listdir(c.multidir)

Tue Dec 20 16:30:22 UTC 2005 nils@ndecker.de

* Add deep recursion option to multidir configuration

+# If you set multidir_deep to True then all subdirectories are searched

+# for darcs repositories. Subdirectories starting with a dot (.) are not

+# searched. This may be slow, if huge directory trees must be searched.

+#

+ multidir_deep = False

- entries = os.listdir(c.multidir)

+

+ entries = []

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

+ for (root, dirs, files) in os.walk(c.multidir):

+ # do not visit hidden directories

+ dirs[:] = [d for d in dirs if not d.startswith('.')]

+ if '_darcs' in dirs:

+ entries.append(root[1+len(c.multidir):])

+ else:

+ entries = os.listdir(c.multidir)

+

Wed Dec 21 13:47:50 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Indentation changes to the uncompression patch.

- file = open(realf, 'rb')

- if file.read(2) == '\x1f\x8b':

- # file begins with gzip magic

- file.close()

- dsrc = gzip.open(realf)

- else:

- file.seek(0)

- dsrc = file

+ file = open(realf, 'rb')

+ if file.read(2) == '\x1f\x8b':

+ # file begins with gzip magic

+ file.close()

+ dsrc = gzip.open(realf)

+ else:

+ file.seek(0)

+ dsrc = file

Tue Dec 20 11:36:01 UTC 2005 nils@ndecker.de

* show raw for noncompressed patches

- dsrc = gzip.open(realf)

+ file = open(realf, 'rb')

+ if file.read(2) == '\x1f\x8b':

+ # file begins with gzip magic

+ file.close()

+ dsrc = gzip.open(realf)

+ else:

+ file.seek(0)

+ dsrc = file

Mon Dec 19 17:42:02 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.13

Mon Dec 19 17:30:50 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Shorten the author string in shortlog.

- 'author': p.shortauthor,

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

Tue Dec 13 14:12:44 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Small changes to do_atom(), make it validate.

+import email.Utils

+<link rel="alternate" title="%(reponame)s" href="%(url)s;a=atom"

+ type='application/atom+xml'/>

- print """<feed xmlns="http://www.w3.org/2005/Atom">

+ str_lastmod = time.strftime(iso_datetime,

+ time.localtime(repo_lastmod))

+

+ print """

+<feed xmlns="http://www.w3.org/2005/Atom">

- <link rel="self" type="application/atom+xml" href="%(url)s/%(reponame)s;a=atom"/>

+ <link rel="self" type="application/atom+xml" href="%(url)s;a=atom"/>

- 'lastmod': time.strftime(iso_datetime, time.localtime(repo_lastmod))}

+ 'lastmod': str_lastmod,

+ }

+

+ addr, author = email.Utils.parseaddr(p.author)

+ if not addr:

+ addr = "unknown_email@example.com"

+ if not author:

+ author = addr

+

- <author><name>%(author)s</name><!-- TODO: parse it to get the email. Not obvious, darcs authors can be anything --></author>

+ <author>

+ <name>%(author)s</name>

+ <email>%(email)s</email>

+ </author>

- <id>%(url)s/%(pname)s</id> <!-- TODO: find a better <id>, see RFC 4151 -->

+ <id>%(link)s</id>

+ <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>

- 'author': p.author,

+ 'author': author,

+ 'email': addr,

+ 'myrname': config.myreponame,

+ 'hash': p.hash,

+

- print ' <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>'

-[_^I_][_$_]

+

Thu Dec 1 22:07:08 UTC 2005 stephane@sources.org

* ATOM support for syndication

+iso_datetime = '%Y-%m-%dT%H:%M:%SZ'

+def do_atom():

+ print "Content-type: application/atom+xml; charset=utf-8\n"

+ print '<?xml version="1.0" encoding="utf-8"?>'

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

+ repo_lastmod = os.stat(inv).st_mtime

+ print """<feed xmlns="http://www.w3.org/2005/Atom">

+ <title>%(reponame)s darcs repository</title>

+ <link rel="alternate" type="text/html" href="%(url)s"/>

+ <link rel="self" type="application/atom+xml" href="%(url)s/%(reponame)s;a=atom"/>

+ <id>%(url)s</id> <!-- TODO: find a better <id>, see RFC 4151 -->

+ <author><name>darcs repository (several authors)</name></author>

+ <generator>darcsweb.cgi</generator>

+ <updated>%(lastmod)s</updated> [_$_]

+ <subtitle>%(desc)s</subtitle>

+ """ % {

+ 'reponame': config.reponame,

+ 'url': config.myurl + '/' + config.myreponame,

+ 'desc': config.repodesc,

+ 'lastmod': time.strftime(iso_datetime, time.localtime(repo_lastmod))}

+ ps = get_last_patches(20)

+ for p in ps:

+ title = time.strftime('%d %b %H:%M', time.localtime(p.date))

+ title += ' - ' + p.name

+ pdate = time.strftime(iso_datetime,

+ time.localtime(p.date))

+ link = '%s/%s;a=commit;h=%s' % (config.myurl,

+ config.myreponame, p.hash)

+ print """

+ <entry>

+ <title>%(title)s</title>

+ <author><name>%(author)s</name><!-- TODO: parse it to get the email. Not obvious, darcs authors can be anything --></author>

+ <updated>%(pdate)s</updated>

+ <id>%(url)s/%(pname)s</id> <!-- TODO: find a better <id>, see RFC 4151 -->

+ <link rel="alternate" href="%(link)s"/>

+ <summary>%(desc)s</summary>

+ """ % {

+ 'title': escape(title),

+ 'author': p.author,

+ 'url': config.myurl + '/' + config.myreponame,

+ 'pdate': pdate,

+ 'pname': escape(p.name),

+ 'link': link,

+ 'desc': escape(p.name),

+ }

+ # TODO: allow to get plain text, not HTML?

+ print ' <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>'

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

+ if p.comment:

+ print '<br/>'

+ print escape(p.comment).replace('\n', '<br/>\n')

+ print '<br/>'

+ print '<br/>'

+ changed = p.adds + p.removes + p.modifies.keys() + \

+ p.moves.keys() + p.diradds + p.dirremoves + \

+ p.replaces.keys()

+ for i in changed: # TODO: link to the file [_$_]

+ print '<code>%s</code><br/>' % i

+ print '</p></div>'

+ print '</content></entry>'

+ print '</feed>'

+[_^I_][_$_]

+

+elif action == 'atom':

+ do_atom()

Tue Dec 13 13:28:49 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Use darcsweb.cgi's modification time to invalidate cache entries.

Besides the repository inventory modification time, we also want to check the

script's modification time, so if we make changes to darcsweb (updating it,

for instance), there's no possibility of serving stale pages if the user

forgets to clean the cache. You still need to clean it for configuration

changes.

+ dw_lastmod = os.stat(sys.argv[0]).st_mtime

- if repo_lastmod > cache_lastmod:

+ if repo_lastmod > cache_lastmod or dw_lastmod > cache_lastmod:

Wed Nov 30 11:36:26 UTC 2005 Kirill Smelkov <kirr@mns.spb.ru>

* fixu8: honour config.repoencoding when decoding characters like [_\e3]

- char = char.decode('raw_unicode_escape')

+ char = char.decode(config.repoencoding)

Sat Nov 12 23:59:16 UTC 2005 Alexandre Rossi <niol@sousmonlit.dyndns.org>

* another basic validation issue

The issue was that there was an empty line before the XML declaration, which

is not valid.

- print "Content-type: text/html; charset=utf-8\n"

+ print "Content-type: text/html; charset=utf-8"

Thu Nov 17 14:41:33 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Make how_old() return a fixed date when caching is enabled.

how_old() becomes a problem when we have a cache, because the relative dates

will get stalled in the cache.

This is makes a workaround by making how_old() return a string containing the

fixed date, which isn't quite nice but it will do the trick until a better

solution comes up.

+ if config.cachedir:

+ # when we have a cache, the how_old() becomes a problem since

+ # the cached entries will have old data; so in this case just

+ # return a nice string

+ t = time.localtime(epoch)

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

+ return s

Thu Nov 17 14:40:27 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Don't close the file in a cache miss.

- close(self.file)

Thu Nov 17 03:27:57 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Call cache.cancel() only if we have a cache.

- cache.cancel()

+ if config.cachedir:

+ cache.cancel()

Thu Nov 17 03:10:28 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement a simple cache.

This patch implements a very simple but effective cache, so darcsweb can avoid

regenerating everything all the time.

Based on an idea from Alexandre Rossi.

+ # It is possible to have a cache where darcsweb will store the pages

+ # it generates; entries are automatically updated when the repository

+ # changes. This will speed things up significatively, specially for

+ # popular sites.

+ # It's recommended that you clean the directory with some regularity,

+ # to avoid having too many unused files. A simple rm will do just

+ # fine.

+ # If you leave the entry commented, no cache will be ever used;

+ # otherwise the directory is assumed to exist and be writeable.

+ #cachedir = '/tmp/darcsweb-cache'

+

+import sha

+

+

+

+#

+# basic caching

+#

+

+class Cache:

+ def __init__(self, basedir, url):

+ self.basedir = basedir

+ self.url = url

+ self.fname = sha.sha(url).hexdigest()

+ self.file = None

+ self.mode = None

+ self.real_stdout = sys.stdout

+

+ def open(self):

+ "Returns 1 on hit, 0 on miss"

+ fname = self.basedir + '/' + self.fname

+

+ if not os.access(fname, os.R_OK):

+ # the file doesn't exist, direct miss

+ pid = str(os.getpid())

+ fname = self.basedir + '/.' + self.fname + '-' + pid

+ self.file = open(fname, 'w')

+ self.mode = 'w'

+

+ # step over stdout so when "print" tries to write

+ # output, we get it first

+ sys.stdout = self

+ return 0

+

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

+ cache_lastmod = os.stat(fname).st_mtime

+ repo_lastmod = os.stat(inv).st_mtime

+

+ if repo_lastmod > cache_lastmod:

+ # the entry is too old, remove it and return a miss

+ close(self.file)

+ os.unlink(fname)

+

+ pid = str(os.getpid())

+ fname = self.basedir + '/.' + self.fname + '-' + pid

+ self.file = open(fname, 'w')

+ self.mode = 'w'

+ sys.stdout = self

+ return 0

+

+ # the entry is still valid, hit!

+ self.file = open(fname, 'r')

+ self.mode = 'r'

+ return 1

+

+

+ def dump(self):

+ for l in self.file:

+ self.real_stdout.write(l)

+

+ def write(self, s):

+ # this gets called from print, because we replaced stdout with

+ # ourselves

+ self.file.write(s)

+ self.real_stdout.write(s)

+

+ def close(self):

+ if self.file:

+ self.file.close()

+ sys.stdout = self.real_stdout

+ if self.mode == 'w':

+ pid = str(os.getpid())

+ fname1 = self.basedir + '/.' + self.fname + '-' + pid

+ fname2 = self.basedir + '/' + self.fname

+ os.rename(fname1, fname2)

+ self.mode = 'c'

+

+ def cancel(self):

+ "Like close() but don't save the entry."

+ if self.file:

+ self.file.close()

+ sys.stdout = self.real_stdout

+ if self.mode == 'w':

+ pid = str(os.getpid())

+ fname = self.basedir + '/.' + self.fname + '-' + pid

+ os.unlink(fname)

+ self.mode = 'c'

- sys.exit(1)

+

+ if "cachedir" in dir(base):

+ config.cachedir = base.cachedir

+ else:

+ config.cachedir = None

+

+

+# check if we have the page in the cache

+if config.cachedir:

+ url_request = os.environ['QUERY_STRING']

+ cache = Cache(config.cachedir, url_request)

+ if cache.open():

+ # we have a hit, dump and run

+ cache.dump()

+ cache.close()

+ sys.exit(0)

+ # if there is a miss, the cache will step over stdout, intercepting

+ # all "print"s and writing them to the cache file automatically

+ cache.cancel()

+if config.cachedir:

+ cache.close()

Thu Nov 10 15:22:39 UTC 2005 Leandro Lucarella <luca@llucax.hn.org>

* Use a more human-friendly format por list configuration variables.

- #exclude = [ 'dir1', 'dir2' ]

+ #exclude = 'dir1', 'dir2'

Thu Nov 10 00:34:34 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Highlight tags in the shortlog/summary.

- if alt:

+ if p.name.startswith("TAG "):

+ print '<tr class="tag">'

+ elif alt:

+.tag {

+ background-color:#f0f0ff;

+}

+

+.tag:hover {

+ background-color:#e0e0ff;

+}

+

Wed Nov 9 23:59:47 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add exclusion lists to multidir configuration.

+ # if you want to exclude some directories, add them to this list (note

+ # they're relative to multidir, not absolute)

+ #exclude = [ 'dir1', 'dir2' ]

+

+ if 'exclude' not in dir(c):

+ c.exclude = []

+ continue

+ if name in c.exclude:

Wed Nov 9 01:10:31 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.12

Wed Nov 9 00:57:34 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Consider only directories with "_darcs" inside for multidir entries.

In multidir configuration entries, skip all the directories that don't have a

"_darcs" inside.

- if not os.path.isdir(fulldir):

+ if not os.path.isdir(fulldir + '/_darcs'):

Wed Nov 9 00:43:55 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Extend escape() to escape '"' too.

-from xml.sax.saxutils import escape

+from xml.sax.saxutils import escape as xml_escape

+def escape(s):

+ s = xml_escape(s)

+ s = s.replace('"', '&quot;')

+ return s

- 'fullname': p.name,

+ 'fullname': escape(p.name),

Wed Nov 9 00:30:02 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Don't show the owner if there is none

- author = "Unknown owner <unknown@example.org>"

+ author = None

- print ' <tr><td>owner</td><td>%s</td></tr>' % escape(owner)

+ if owner:

+ print ' <tr><td>owner</td><td>%s</td></tr>' % escape(owner)

Wed Nov 9 00:23:06 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add some checks to the multidir handling.

Check if the entry is a directory and doesn't begin with a dot.

Besides, sort it so the listing appears in predictable order.

+ entries.sort()

- rdir = c.multidir + '/' + name

+ if name.startswith('.'):

+ continue

+ fulldir = c.multidir + '/' + name

+ if not os.path.isdir(fulldir):

+ continue

+

+ rdir = fulldir

Wed Nov 9 00:17:31 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement "multidir" configuration entries.

This patch implements a special configuration entry called "multidir" that can

be useful when you have a lot of repositories in the same directory and don't

want to create an entry for each one.

+#

+# If you have several repositories in a single directory and don't want to

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

+#

+

+class multi1:

+ multidir = '/usr/local/src'

+ repodesc = 'Repository for %(name)s'

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

+ repoencoding = 'latin1'

+

+

+ expand_multi_config(all_configs)

+def expand_multi_config(config):

+ """Expand configuration entries that serve as "template" to others;

+ this make it easier to have a single directory with all the repos,

+ because they don't need specific entries in the configuration anymore.

+ """

+

+ for conf in dir(config):

+ if conf.startswith('__'):

+ continue

+ c = config.__getattribute__(conf)

+ if 'multidir' not in dir(c):

+ continue

+

+ entries = os.listdir(c.multidir)

+ for name in entries:

+ rdir = c.multidir + '/' + name

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

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

+ class tmp_config:

+ reponame = name

+ repodir = rdir

+ repodesc = desc

+ repourl = url

+ repoencoding = c.repoencoding

+ if 'footer' in dir(c):

+ footer = c.footer

+ config.__setattr__(name, tmp_config)

+

+ expand_multi_config(all_configs)

Mon Oct 31 10:24:23 UTC 2005 Michal Sojka <sojkam1@fel.cvut.cz>

* Fix for an error that appears when run on empty repository.

- print ' <tr><td>last change</td><td>%s</td></tr>' % \

+ if len(ps) > 0:

+ print ' <tr><td>last change</td><td>%s</td></tr>' % \

Sun Nov 6 23:48:38 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Show the patch name in the description in do_commit().

- c = p.comment.replace('\n', '<br/>')

- print '<div class="page_body">', c, '</div>'

+ c = p.comment.replace('\n', '<br/>\n')

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

+ print p.name, '<br/><br/>'

+ print c

+ print '</div>'

Mon Oct 31 00:11:03 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Simplify the "Verbose Annotate Sidebar" patch.

This patch makes it simpler, because it skips displaying the full author name

and how long ago the changes were made; besides some simple fixes.

The rationale behind this is purely aesthetic: the author is already available

in the tooltip (and you should be able to tell anyway by its nickname), and

the "how long ago" was a bit distracting. All this is completely subjective, I

know, but I think these are "safe" settings.

- if (style == "shade" or style == "zebra") and line == 1:

- ptime = " " + time.strftime("%H:%M:%S", l.pdate)

- newblock = False

- desc = "%12.12s" % how_old(time.mktime(l.pdate)) [_$_]

- date = "%-10.10s" % ptime

- line = 2

- elif line == 2:

- desc = "%22.22s" % l.pauthor

- date = ""

- line = 3

- elif line == 3:

- desc = "%12.12s" % ""

- date = "%-10.10s" % ""

+ if line == 1 and style in ["shade", "zebra"]:

+ t = "%s " % time.strftime("%H:%M:%S", l.pdate)

+ desc = "%12.12s" % "'"

+ date = "%-10.10s" % t

+ line += 1

Thu Sep 29 22:09:49 UTC 2005 Max Battcher <me@worldmaker.net>

* Verbose Annotate Sidebar

In shade or zebra annotate modes, this patch displays a second

and third line of information in a contiguous single patch code block.

:First Line: ``DATE AUTHOR_SHORT_NAME`` (Same as before)

:Second Line: ``TIME RELATIVE_TIME``

:Third Line: ``FULL_AUTHOR_EMAIL``

All following lines in the code block are blank.

- desc = "%12.12s" % escape(shortau)

+ desc = "%12.12s" % shortau

+ line = 1

- desc = "%12.12s" % "'"

- date = "%-10.10s" % ""

+ if (style == "shade" or style == "zebra") and line == 1:

+ ptime = " " + time.strftime("%H:%M:%S", l.pdate)

+ newblock = False

+ desc = "%12.12s" % how_old(time.mktime(l.pdate)) [_$_]

+ date = "%-10.10s" % ptime

+ line = 2

+ elif line == 2:

+ desc = "%22.22s" % l.pauthor

+ date = ""

+ line = 3

+ elif line == 3:

+ desc = "%12.12s" % ""

+ date = "%-10.10s" % ""

+ else:

+ desc = "%12.12s" % "'"

+ date = "%-10.10s" % ""

- 'desc': desc,

+ 'desc': escape(desc),

Sun Oct 30 23:23:47 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Include a list of changed files in each RSS description.

+ print '<br/>'

+ print '<br/>'

+ changed = p.adds + p.removes + p.modifies.keys() + \

+ p.moves.keys() + p.diradds + p.dirremoves + \

+ p.replaces.keys()

+ for i in changed:

+ print '%s<br/>' % i

Sun Oct 30 21:54:41 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add full name as a tooltip in shortlog.

- <a class="list" href="%(myrname)s;a=commit;h=%(hash)s"><b>%(name)s</b></a>

+ <a class="list" title="%(fullname)s" href="%(myrname)s;a=commit;h=%(hash)s">

+ <b>%(name)s</b>

+ </a>

+ 'fullname': p.name,

Thu Oct 27 10:02:09 UTC 2005 Alexandre Rossi <niol@sousmonlit.dyndns.org>

* css: cleared table to avoid cell wrap due to logo

+ clear:both;

Wed Oct 26 12:28:15 UTC 2005 Alexandre Rossi <niol@sousmonlit.dyndns.org>

* fixed small validation issue in XML header

+ print '<?xml version="1.0" encoding="utf-8"?>'

-<?xml version="1.0" encoding="utf-8"?>

Mon Oct 3 04:57:19 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Put a '/' after the path in do_tree().

- path = realpath(dname)

+ path = realpath(dname) + '/'

Mon Oct 3 04:51:44 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Make shade the default annotate style.

-| <a href="%(myreponame)s;a=annotate;f=%(fname)s;h=%(hash)s">annotate</a>

+| <a href="%(myreponame)s;a=annotate_shade;f=%(fname)s;h=%(hash)s">annotate</a>

-| <a href="%(myreponame)s;a=annotate;f=%(fname)s">annotate</a>

+| <a href="%(myreponame)s;a=annotate_shade;f=%(fname)s">annotate</a>

-<a href="%(myreponame)s;a=annotate;f=%(fname)s;h=%(hash)s">normal</a>

+<a href="%(myreponame)s;a=annotate_normal;f=%(fname)s;h=%(hash)s">normal</a>

- <a href="%(myreponame)s;a=annotate;h=%(hash)s;f=%(file)s">annotate</a>

+ <a href="%(myreponame)s;a=annotate_shade;h=%(hash)s;f=%(file)s">annotate</a>

- <a href="%(myrname)s;a=annotate;f=%(fullf)s">annotate</a>

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

-elif action == "annotate":

+elif action == "annotate_normal":

Mon Oct 3 04:47:34 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Use the real file if there's no pristine directory available.

+def realpath(fname):

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

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

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

+ return realf

+

+| <a href="%(myreponame)s;a=tree">tree</a>

- if os.path.isdir(config.repodir + '/_darcs/current/'):

- # the current directory is missing if the --no-pristine-tree

- # option was used in darcs get, so we only show the link if

- # the directory exists

- print '| <a href="%s;a=tree">tree</a>' % config.myreponame

-

- realf = filter_file(config.repodir + '/_darcs/current/' + f)

+ realf = realpath(f)

- f = open(config.repodir + '/_darcs/current/' + fname, 'r')

+ f = open(realpath(fname), 'r')

- realpath = config.repodir + '/_darcs/current/' + dname + '/'

+ path = realpath(dname)

+

- files = os.listdir(realpath)

+ files = os.listdir(path)

- realfile = realpath + f

+ if f == "_darcs":

+ continue

+ realfile = path + f

- realfile = realpath + f

+ realfile = path + f

- f = open(config.repodir + '/_darcs/current/' + fname, 'r')

+ f = open(realpath(fname), 'r')

Wed Sep 21 18:36:17 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Handle plain emails in annotate's author parsing.

+ elif right != -1:

+ shortau = l.pauthor[:right]

Wed Sep 21 18:24:58 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Shade and zebra styles for annotate.

This patch adds two more annotate styles: zebra and shade.

Zebra alternates the line background colour according to the patch, just like

most CVS viewers do.

Shade is a lot more fun: it gives each patch a shade of a colour, the newer

the brighter, so newer patches (which are often the ones you're intrested in)

are easier to spot. It could use a little tuning on some constants to make it

look better, but it's pretty usable as is, and it can be done later if needed.

Thanks to Max Battcher for the idea.

- elif f and h and action == "annotate":

+

+ elif f and h and action.startswith("annotate"):

-<a href="%(myreponame)s;a=annotate_plain;f=%(fname)s;h=%(hash)s">plain</a>

+<a href="%(myreponame)s;a=annotate;f=%(fname)s;h=%(hash)s">normal</a>

+| <a href="%(myreponame)s;a=annotate_plain;f=%(fname)s;h=%(hash)s">plain</a>

+| <a href="%(myreponame)s;a=annotate_shade;f=%(fname)s;h=%(hash)s">shade</a>

+| <a href="%(myreponame)s;a=annotate_zebra;f=%(fname)s;h=%(hash)s">zebra</a>

-def print_annotate(ann):

+def print_annotate(ann, style):

+ if style == 'shade':

+ # here's the idea: we will assign to each patch a shade of

+ # color from its date (newer gets darker)

+ max = 0xff

+ min = max - 80

+

+ # to do that, we need to get a list of the patch hashes

+ # ordered by their dates

+ l = [ (date, hash) for (hash, date) in ann.patches.items() ]

+ l.sort()

+ l = [ hash for (date, hash) in l ]

+

+ # now we have to map each element to a number in the range

+ # min-max, with max being close to l[0] and min l[len(l) - 1]

+ lenn = max - min

+ lenl = len(l)

+ shadetable = {}

+ for i in range(0, lenl):

+ hash = l[i]

+ n = float(i * lenn) / lenl

+ n = max - int(round(n))

+ shadetable[hash] = n

+ elif style == "zebra":

+ lineclass = 'dark'

+

+ if style == "shade":

+ linestyle = 'style="background-color:#ffff%.2x"' % \

+ shadetable[l.phash]

+ lineclass = ''

+ elif style == "zebra":

+ linestyle = ''

+ if l.phash != prevhash:

+ if lineclass == 'dark':

+ lineclass = 'light'

+ else:

+ lineclass = 'dark'

+ else:

+ linestyle = ''

+ lineclass = ''

+

-<div class="pre">\

+<div class="pre %(class)s" %(style)s>\

+ 'class': lineclass,

+ 'style': linestyle,

-def do_annotate(fname, phash):

+def do_annotate(fname, phash, style):

- print_annotate(ann)

+ print_annotate(ann, style)

- do_annotate(fname, phash)

+ do_annotate(fname, phash, "normal")

+elif action == "annotate_zebra":

+ fname = filter_file(form["f"].value)

+ if form.has_key("h"):

+ phash = filter_hash(form["h"].value)

+ else:

+ phash = None

+ do_annotate(fname, phash, "zebra")

+elif action == "annotate_shade":

+ fname = filter_file(form["f"].value)

+ if form.has_key("h"):

+ phash = filter_hash(form["h"].value)

+ else:

+ phash = None

+ do_annotate(fname, phash, "shade")

-tr.light:hover {

+.light:hover {

-tr.dark {

+.dark {

-tr.dark:hover {

+.dark:hover {

Wed Sep 21 05:51:22 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Gather more information from annotate parsing.

Add a list of patches with their dates to the annotate object, because we'll

want to use them in patches to come. Also store the date in tuple format and

let the users do the conversion to text as they need to.

+ self.lastchange_date = None

+ self.firstdate = None

+ self.lastdate = None

+ self.patches = {}

+ self.pdate = None

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

- annotate.lastchange_date = fixu8(lastdate)

+ annotate.lastchange_date = lastdate

+

+ annotate.patches[annotate.lastchange_hash] = annotate.lastchange_date

+

+ # these will be overriden by the real dates later

+ annotate.firstdate = lastdate

+ annotate.lastdate = 0

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

- line.pdate = fixu8(pdate)

+ line.pdate = pdate

+ annotate.patches[line.phash] = line.pdate

+

+ if pdate > annotate.lastdate:

+ annotate.lastdate = pdate

+ if pdate < annotate.firstdate:

+ annotate.firstdate = pdate

- title = "%s by %s" % (l.pdate, escape(l.pauthor) )

+ plongdate = time.strftime("%Y-%m-%d %H:%M:%S", l.pdate)

+ title = "%s by %s" % (plongdate, escape(l.pauthor) )

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

- pdate = time.strftime("%Y-%m-%d", pdate)

+ pdate = time.strftime("%Y-%m-%d", l.pdate)

Tue Sep 20 18:46:54 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.11

Tue Sep 20 18:13:33 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Indent a comment.

Yeah, I feel stupid creating a patch just for this, but my 80-column terminal

just hurts when I look at this line.

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

- # the ugly procedure

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

+ # repeat the ugly procedure

Tue Sep 20 07:40:25 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add patch description to print_annotate().

Add a column to the left of the annotate output, just before the line number,

to show the date (but not time) and author (in a short form).

+ prevhash = None

+

+ if l.phash != prevhash:

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

+ pdate = time.strftime("%Y-%m-%d", pdate)

+

+ left = l.pauthor.find('<')

+ right = l.pauthor.find('@')

+ if left != -1 and right != -1:

+ shortau = l.pauthor[left + 1:right]

+ elif l.pauthor.find(" ") != -1:

+ shortau = l.pauthor[:l.pauthor.find(" ")]

+ else:

+ shortau = l.pauthor

+

+ desc = "%12.12s" % escape(shortau)

+ date = "%-10.10s" % pdate

+ prevhash = l.phash

+ else:

+ desc = "%12.12s" % "'"

+ date = "%-10.10s" % ""

+

+<a href="%(link)s" title="%(title)s" class="annotate_desc">%(date)s %(desc)s</a> \

+ 'date': date,

+ 'desc': desc,

- right:12px

+ right:12px;

- text-decoration:none

+ text-decoration:none;

+}

+

+a.annotate_desc {

+ color:#999999;

+ text-decoration:none;

+ font-size:11px;

+}

+

+a.annotate_desc:hover {

+ color:#880000;

Tue Sep 20 07:31:31 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Replace tabs in annotate output.

+ text = replace_tabs(text)

Tue Sep 20 07:01:50 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Replace tabs with spaces for nicer output.

Tabs need to be replaced with spaces to avoid problems displaying lines that

begin with tabs.

This patch implements a very simple function to do so, and modifices

print_blob() to use it.

+def replace_tabs(s):

+ pos = s.find("\t")

+ while pos != -1:

+ count = 8 - (pos % 8)

+ if count:

+ spaces = ' ' * count

+ s = s.replace('\t', spaces, 1)

+ pos = s.find("\t")

+ return s

+

+ l = replace_tabs(l)

Mon Sep 19 06:30:38 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Use UTF8 for plain output.

Make the plain outputs use UTF8 too, as it's the only sane option.

- print "Content-type: text/plain\n"

+ print "Content-type: text/plain; charset=utf-8\n"

- sys.stdout.write(l)

+ sys.stdout.write(fixu8(l))

- sys.stdout.write(l)

+ sys.stdout.write(fixu8(l))

- sys.stdout.write(l)

+ sys.stdout.write(fixu8(l))

- sys.stdout.write(l)

+ sys.stdout.write(fixu8(l))

- sys.stdout.write(l)

+ sys.stdout.write(fixu8(l))

Mon Sep 19 06:20:23 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix some UTF8 handling in annotate, and add tooltips.

This patch fixes some of the UTF8 handling in different annotate parts.

Accidentally, it also includes a small modification to show for each line of

the annotate the last modification time, date and author as a tooltip. It'd be

nice to put this in a different patch.

- annotate.fname = file.getAttribute("name")

+ annotate.fname = fixu8(file.getAttribute("name"))

- annotate.created_as = createinfo.getAttribute("original_name")

+ annotate.created_as = fixu8(createinfo.getAttribute("original_name"))

- annotate.creator_hash = creator.getAttribute("hash")

+ annotate.creator_hash = fixu8(creator.getAttribute("hash"))

- annotate.lastchange_hash = lastpatch.getAttribute("hash")

- annotate.lastchange_author = lastpatch.getAttribute("author")

+ annotate.lastchange_hash = fixu8(lastpatch.getAttribute("hash"))

+ annotate.lastchange_author = fixu8(lastpatch.getAttribute("author"))

- annotate.lastchange_name = lastname

+ annotate.lastchange_name = fixu8(lastname)

+

+ lastdate = lastpatch.getAttribute("date")

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

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

+ annotate.lastchange_date = fixu8(lastdate)

+ pdate = patch.getAttribute("date")

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

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

+ pdate = annotate.lastchange_date

- line.text = text

- line.phash = phash

- line.pauthor = pauthor

+ line.text = fixu8(text)

+ line.phash = fixu8(phash)

+ line.pauthor = fixu8(pauthor)

+ line.pdate = fixu8(pdate)

- text = fixu8(escape(l.text))

+ text = escape(l.text)

+ title = "%s by %s" % (l.pdate, escape(l.pauthor) )

-<a href="%(link)s" class="linenr">%(c)4d</a> \

-<a href="%(link)s" class="line">%(text)s</a>\

+<a href="%(link)s" title="%(title)s" class="linenr">%(c)4d</a> \

+<a href="%(link)s" title="%(title)s" class="line">%(text)s</a>\

+ 'title': title,

-

- 'name': ann.lastchange_name,

- 'fname': fname,

+ 'name': escape(ann.lastchange_name),

+ 'fname': escape(fname),

Mon Sep 19 03:19:14 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Convert the annotate source to UTF8 before parsing.

- dom = xml.dom.minidom.parse(src)

+

+ # FIXME: convert the source to UTF8; it _has_ to be a way to let

+ # minidom know the source encoding

+ s = ""

+ for i in src:

+ s += fixu8(i)

+

+ dom = xml.dom.minidom.parseString(s)

Mon Sep 12 13:13:54 UTC 2005 Toni Timonen <ttimonen@movial.fi>

* Fix validity problem with rss feeds and unknown email addresses.

- author = "%s <unknown@email>" % p.author

+ author = "%s &lt;unknown@email&gt;" % p.author

Mon Sep 19 02:50:04 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement annotate.

Finally!

+ if f and h:

+ print """

+| <a href="%(myreponame)s;a=annotate;f=%(fname)s;h=%(hash)s">annotate</a>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': h,

+ 'fname': f

+ }

+ elif f:

+ print """

+| <a href="%(myreponame)s;a=annotate;f=%(fname)s">annotate</a>

+ """ % { "myreponame": config.myreponame, 'fname': f }

+

- # TODO: annotate, when it's implemented

+ elif f and h and action == "annotate":

+ # same for annotate

+ print """

+<a href="%(myreponame)s;a=annotate_plain;f=%(fname)s;h=%(hash)s">plain</a>

+ """ % {

+ "myreponame": config.myreponame,

+ "fname": f,

+ "hash": h

+ }

+

+class Annotate:

+ def __init__(self):

+ self.fname = ""

+ self.creator_hash = ""

+ self.created_as = ""

+ self.lastchange_hash = ""

+ self.lastchange_author = ""

+ self.lastchange_name = ""

+ self.lines = []

+

+ class Line:

+ def __init__(self):

+ self.text = ""

+ self.phash = None

+ self.pauthor = None

+

+def parse_annotate(src):

+ import xml.dom.minidom

+

+ annotate = Annotate()

+ dom = xml.dom.minidom.parse(src)

+

+ file = dom.getElementsByTagName("file")[0]

+ annotate.fname = file.getAttribute("name")

+

+ createinfo = dom.getElementsByTagName("created_as")[0]

+ annotate.created_as = createinfo.getAttribute("original_name")

+

+ creator = createinfo.getElementsByTagName("patch")[0]

+ annotate.creator_hash = creator.getAttribute("hash")

+

+ mod = dom.getElementsByTagName("modified")[0]

+ lastpatch = mod.getElementsByTagName("patch")[0]

+ annotate.lastchange_hash = lastpatch.getAttribute("hash")

+ annotate.lastchange_author = lastpatch.getAttribute("author")

+

+ lastname = lastpatch.getElementsByTagName("name")[0]

+ lastname = lastname.childNodes[0].wholeText

+ annotate.lastchange_name = lastname

+

+ file = dom.getElementsByTagName("file")[0]

+

+ for l in file.childNodes:

+ # we're only intrested in normal and added lines

+ if l.nodeName not in ["normal_line", "added_line"]:

+ continue

+ line = Annotate.Line()

+

+ if l.nodeName == "normal_line":

+ patch = l.getElementsByTagName("patch")[0]

+ phash = patch.getAttribute("hash")

+ pauthor = patch.getAttribute("author")

+ else:

+ # added lines inherit the creation from the annotate

+ # patch

+ phash = annotate.lastchange_hash

+ pauthor = annotate.lastchange_author

+

+ text = ""

+ for node in l.childNodes:

+ if node.nodeType == node.TEXT_NODE:

+ text += node.wholeText

+

+ # strip all "\n"s at the beginning; because the way darcs

+ # formats the xml output it makes the DOM parser to add "\n"s

+ # in front of it

+ text = text.lstrip("\n")

+

+ line.text = text

+ line.phash = phash

+ line.pauthor = pauthor

+ annotate.lines.append(line)

+

+ return annotate

+

+def get_annotate(fname, hash = None):

+ cmd = 'annotate --xml-output'

+ if hash:

+ cmd += ' --match="hash %s"' % hash

+ cmd += ' %s' % fname

+ out = run_darcs(cmd)

+ return parse_annotate(out)

+

+

+

+def print_annotate(ann):

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

+ if isbinary(ann.fname):

+ print """

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

+</div>

+ """

+ return

+

+ count = 1

+ for l in ann.lines:

+ text = fixu8(escape(l.text))

+ text = text.rstrip()

+

+ link = "%(myrname)s;a=commit;h=%(hash)s" % {

+ 'myrname': config.myreponame,

+ 'hash': l.phash

+ }

+ print """\

+<div class="pre">\

+<a href="%(link)s" class="linenr">%(c)4d</a> \

+<a href="%(link)s" class="line">%(text)s</a>\

+</div>

+ """ % {

+ 'c': count,

+ 'text': text,

+ 'link': link

+ }

+

+ count += 1

+

+ print '</div>'

+

- <a href="%(myreponame)s;a=filehistory;f=%(file)s">history</a>

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

+ <a href="%(myreponame)s;a=annotate;h=%(hash)s;f=%(file)s">annotate</a>

- <a href="%(myrname)s;a=headblob;f=%(fullf)s">headblob</a>

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

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

- # TODO: when we have annotate, put some links around here.

+

+

+def do_annotate(fname, phash):

+ print_header()

+ ann = get_annotate(fname, phash)

+ print_navbar(f = fname, h = ann.lastchange_hash)

+

+

+ print """

+<div>

+ <a class="title" href="%(myreponame)s;a=commit;h=%(hash)s">%(name)s</a>

+</div>

+<div class="page_path"><b>

+ Annotate for file %(fname)s

+</b></div>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': ann.lastchange_hash,

+ 'name': ann.lastchange_name,

+ 'fname': fname,

+ }

+

+ print_annotate(ann)

+ print_footer()

+

+def do_annotate_plain(fname, phash):

+ print_plain_header()

+ ann = get_annotate(fname, phash)

+ for l in ann.lines:

+ sys.stdout.write(l.text)

+elif action == "annotate":

+ fname = filter_file(form["f"].value)

+ if form.has_key("h"):

+ phash = filter_hash(form["h"].value)

+ else:

+ phash = None

+ do_annotate(fname, phash)

+elif action == "annotate_plain":

+ fname = filter_file(form["f"].value)

+ if form.has_key("h"):

+ phash = filter_hash(form["h"].value)

+ else:

+ phash = None

+ do_annotate_plain(fname, phash)

+

+a.line {

+ text-decoration:none;

+ color:#000000;

+}

+

+a.line:hover {

+ text-decoration:none;

+ color:#880000;

+}

+

Wed Sep 7 16:59:52 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Support replaces.

+ self.replaces = {}

+ elif name == 'replaced_tokens':

+ if self.cur_val:

+ self.cur_file = fixu8(self.cur_val.strip())

+ cf = self.cur_file

+ p = self.db[self.current]

+ if not p.replaces.has_key(cf):

+ p.replaces[cf] = 0

+ p.replaces[cf] = int(attrs.get('num', None))

+ if name == 'replaced_tokens':

+ return

- p.diradds + p.dirremoves

+ p.diradds + p.dirremoves + p.replaces.keys()

+ print '</span></td>'

+ elif p.replaces.has_key(f):

+ print '<td><span style="color:#800000">',

+ print '[replaced %d tokens]' % p.replaces[f],

Wed Sep 7 16:59:10 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Show the raw format in all commitdiff variants.

- if action == "commitdiff" and os.path.isfile(realf):

+ if efaction == "commitdiff" and os.path.isfile(realf):

Wed Sep 7 16:58:43 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Show the patch formats in the commit view too.

- if efaction in ("commitdiff", "filediff", "headdiff", "headfilediff"):

- # show the alternative patch formats

+ if efaction in ("commit", "commitdiff", "filediff", "headdiff",

+ "headfilediff"):

+

+ # in order to show the small bar in the commit page too, we

+ # accept it here and change efaction to commitdiff, because

+ # that's what we're really intrested in

+ if efaction == "commit":

+ efaction = "commitdiff"

+

Wed Sep 7 06:40:50 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Pass the filename to the navigation bar where it's missing.

- print_navbar(h = phash)

+ print_navbar(h = phash, f = fname)

- print_navbar(h = phash)

+ print_navbar(h = phash, f = fname)

Wed Sep 7 06:25:28 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Support darcs-style diff output.

- if action in ("commitdiff", "filediff", "headdiff", "headfilediff"):

+ efaction = action

+ if '_' in action:

+ # action is composed as "format_action", like

+ # "darcs_commitdiff"; so we get the "effective action" to

+ # decide if we need to present the "alternative formats" menu

+ pos = action.find('_')

+ fmt = action[:pos]

+ efaction = action[pos + 1:]

+ if efaction in ("commitdiff", "filediff", "headdiff", "headfilediff"):

- # plain first

+ # normal (unified)

+ print """

+<a class="link" href="%(myreponame)s;a=%(act)s;%(params)s">unified</a>

+ """ % { "myreponame": config.myreponame, "act": efaction,

+ "params": params }

+

+ # plain

-<a class="link" href="%(myreponame)s;a=plain_%(act)s;%(params)s">plain</a>

- """ % { "myreponame": config.myreponame, "act": action,

+| <a class="link" href="%(myreponame)s;a=plain_%(act)s;%(params)s">plain</a>

+ """ % { "myreponame": config.myreponame, "act": efaction,

- # TODO: not yet

-# print """

-#| <a class="link" href="%(myreponame)s;a=darcs_%(act)s;%(params)s">darcs</a>

-# """ % { "myreponame": config.myreponame, "act": action,

-# "params": params }

+ print """

+| <a class="link" href="%(myreponame)s;a=darcs_%(act)s;%(params)s">darcs</a>

+ """ % { "myreponame": config.myreponame, "act": efaction,

+ "params": params }

- "act": action, "params": params }

+ "act": efaction, "params": params }

+

+def get_darcs_diff(hash, fname = None):

+ cmd = 'changes -v --matches "hash %s"' % hash

+ if fname:

+ cmd += ' "%s"' % fname

+ return run_darcs(cmd)

+def get_darcs_headdiff(hash, fname = None):

+ cmd = 'changes -v --from-match "hash %s"' % hash

+ if fname:

+ cmd += ' "%s"' % fname

+ return run_darcs(cmd)

- print '<div class="diff_info">%s</div>' % l

+ print '<div class="diff_info">%s</div>' % escape(l)

+

+

+def print_darcs_diff(dsrc):

+ for l in dsrc:

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

+

+ if not l.startswith(" "):

+ # comments and normal stuff

+ print '<div class="pre">' + escape(l) + "</div>"

+ continue

+

+ l = l.strip()

+

+ if l[0] == '+':

+ cl = 'class="pre" style="color:#008800;"'

+ elif l[0] == '-':

+ cl = 'class="pre" style="color:#cc0000;"'

+ else:

+ cl = 'class="diff_info"'

+ print '<div %s>' % cl + escape(l) + '</div>'

- print_plain_header()

- print "Not yet implemented"

+ print_header()

+ print_navbar(h = phash)

+ p = get_patch(phash)

+ print """

+<div>

+ <a class="title" href="%(myreponame)s;a=commit;h=%(hash)s">%(name)s</a>

+</div>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': p.hash,

+ 'name': p.name,

+ }

+

+ dsrc = get_darcs_diff(phash)

+ print_darcs_diff(dsrc)

+ print_footer()

+ print_header()

+ print_navbar(h = phash)

+ p = get_patch(phash)

+ print """

+<div>

+ <a class="title" href="%(myreponame)s;a=commit;h=%(hash)s">

+ %(name)s --&gt; to head</a>

+</div>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': p.hash,

+ 'name': p.name,

+ }

+

+ dsrc = get_darcs_headdiff(phash)

+ print_darcs_diff(dsrc)

+ print_footer()

+

+def do_raw_headdiff(phash):

- print "Not yet implemented"

+ dsrc = get_darcs_headdiff(phash)

+ for l in dsrc:

+ sys.stdout.write(l)

- print_plain_header()

- print "Not yet implemented"

+ print_header()

+ print_navbar(h = phash)

+ p = get_patch(phash)

+ print """

+<div>

+ <a class="title" href="%(myreponame)s;a=commit;h=%(hash)s">%(name)s</a>

+</div>

+<div class="page_path"><b>%(fname)s</b></div>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': p.hash,

+ 'name': p.name,

+ 'fname': fname,

+ }

+

+ dsrc = get_darcs_diff(phash, fname)

+ print_darcs_diff(dsrc)

+ print_footer()

+ print_header()

+ print_navbar(h = phash)

+ p = get_patch(phash)

+ print """

+<div>

+ <a class="title" href="%(myreponame)s;a=commit;h=%(hash)s">

+ %(name)s --&gt; to head</a>

+</div>

+<div class="page_path"><b>%(fname)s</b></div>

+ """ % {

+ 'myreponame': config.myreponame,

+ 'hash': p.hash,

+ 'name': p.name,

+ 'fname': fname,

+ }

+

+ dsrc = get_darcs_headdiff(phash, fname)

+ print_darcs_diff(dsrc)

+ print_footer()

+

- do_darcs_filediff(phash)

+ fname = filter_file(form["f"].value)

+ do_darcs_filediff(phash, fname)

- do_darcs_fileheaddiff(phash)

+ fname = filter_file(form["f"].value)

+ do_darcs_fileheaddiff(phash, fname)

Fri Aug 26 14:32:13 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Specify that the popen4 is text and not binary.

popen4 call takes a mode parameter that should specify if the fds are text or

binary. Thanks to Gordon Heydon for reporting it.

- inf, outf = os.popen4(cmd, 'r')

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

Fri Aug 26 01:27:11 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Change some calls to darcs so it runs properly under Windows.

This small changes makes darcsweb run properly under Windows.

Thanks to Gordon Heydon who reported the bug and tested the fix.

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

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

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

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

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

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

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

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

Wed Aug 24 18:38:04 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add support for specification of summary and footer.

This patch adds support to allow you to specify the summary shown in the repo

list, as well as changing the default footer; all optional.

This is based on the patches sent by Zachary P. Landau and Remko Troncon.

+ # the text to appear in the top of repo list; this is also optional,

+ # and html-formatted

+ #summary = "I love darcs!"

+

+ # in case you want to change the beautiful default, you can specify an

+ # alternative footer here; it's optional, of course

+ #footer = "I don't like shoes"

+

+

+ # as with the base configuration, the footer is also optional, and it

+ # affects only this repository; if you don't specify, the one

+ # specified in base is used (and if you don't specify one there

+ # either, a default one is used)

+ #footer = "I don't like being cold"

-<div class="page_footer_text">Crece desde el pueblo el futuro /

- crece desde el pie</div>

- """

+<div class="page_footer_text">%s</div>

+ """ % config.footer

-This is the repository index for a darcsweb site.<br/>

-These are all the available repositories.<br/>

+%(summary)s

- 'myname': all_configs.base.myname,

- 'css': all_configs.base.cssfile,

- 'fav': all_configs.base.darcsfav,

- 'logo': all_configs.base.darcslogo

+ 'myname': config.myname,

+ 'css': config.cssfile,

+ 'fav': config.darcsfav,

+ 'logo': config.darcslogo,

+ 'summary': config.summary

-def fill_config(name):

+def fill_config(name = None):

- for conf in dir(all_configs):

- if conf.startswith('__'):

- continue

- c = all_configs.__getattribute__(conf)

- if 'reponame' not in dir(c):

- continue

- if c.reponame == name:

- break

- else:

- # not found

- raise "RepoNotFound", name

+

+ if name:

+ # we only care about setting some configurations if a repo was

+ # specified; otherwise we only set the common configuration

+ # directives

+ for conf in dir(all_configs):

+ if conf.startswith('__'):

+ continue

+ c = all_configs.__getattribute__(conf)

+ if 'reponame' not in dir(c):

+ continue

+ if c.reponame == name:

+ break

+ else:

+ # not found

+ raise "RepoNotFound", name

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

- config.reponame = c.reponame

- config.repodesc = c.repodesc

- config.repodir = c.repodir

- config.repourl = c.repourl

- config.repoencoding = c.repoencoding

+ if name:

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

+ config.reponame = c.reponame

+ config.repodesc = c.repodesc

+ config.repodir = c.repodir

+ config.repourl = c.repourl

+ config.repoencoding = c.repoencoding

+

+ if "summary" in dir(base):

+ config.summary = base.summary

+ else:

+ config.summary = """

+This is the repository index for a darcsweb site.<br/>

+These are all the available repositories.<br/>

+ """

+

+ if name and "footer" in dir(c):

+ config.footer = c.footer

+ elif "footer" in dir(base):

+ config.footer = base.footer

+ else:

+ config.footer = "Crece desde el pueblo el futuro / " \

+ + "crece desde el pie"

+ fill_config()

Wed Aug 24 08:51:58 UTC 2005 Remko Troncon <remko.troncon@cs.kuleuven.be>

* Made darcspath example correcter and less easy to confuse.

The darcspath example now ends in 'bin/', to indicate that the path

is prepended to the 'darcs' command name.

- #darcspath = "/home/me/bin/darcs"

+ #darcspath = "/home/me/bin/"

Wed Aug 24 00:31:14 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Remove the TODO file, it doesn't belong here.

-

-* export plains (done, needs to be added to the interface)

-* be able to see a file tree at any point of time/patchflow

- * we need darcs support for this, which is currently not available

- * when this is done, show tags and allow displaying of blobs

-* annotate

-

Wed Aug 24 00:20:18 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

tagged 0.10

Wed Aug 24 00:08:54 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix RSS title timestamp.

- title = time.strftime('%d %b %H:%S', time.localtime(p.date))

+ title = time.strftime('%d %b %H:%M', time.localtime(p.date))

Fri Aug 12 01:56:59 UTC 2005 Mark Stosberg <mark@summersault.com>

* typo fix

-# "base" (because it's the name of the one avobe).

+# "base" (because it's the name of the one above).

Tue Aug 23 23:54:36 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add author information in the RSS feed.

Thanks to Remko Troncon for the initial implementation; this is basically the

same with the logic simplified a bit.

+

+ # the author field is tricky because the standard requires it

+ # has an email address; so we need to check that and lie

+ # otherwise; there's more info at

+ # http://feedvalidator.org/docs/error/InvalidContact.html

+ if "@" in p.author:

+ author = p.author

+ else:

+ author = "%s <unknown@email>" % p.author

+

+ <author>%(author)s</author>

+ 'author': author,

Tue Aug 23 23:16:47 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Add "darcspath" to the config file.

This patch adds an optional "darcspath" parameter to the configuration,

allowing people with darcs in non-standard locations to specify it by simply

editing the config file.

Thanks to ale@bomberstudios.com who sent a patch to do this (although I did it

in a slightly different way).

+ # optionally, you can specify the path to the darcs executable; if you

+ # leave this commented, the one on $PATH will be used (this is

+ # normally what you want)

+ #darcspath = "/home/me/bin/darcs"

+

- cmd = "darcs " + params

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

+

+ # optional parameters

+ if "darcspath" in dir(base):

+ config.darcspath = base.darcspath + '/'

+ else:

+ config.darcspath = ""

Tue Aug 23 23:04:30 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement alternative views.

This patch adds support for alternative patch views for all the different

patch displays (commitdiff, filediff, headdiff and headfilediff), supporting

currently a plain output and, for commitdiff, a raw one.

A darcs output is included but commented out, since I'm not familiar with

darcs' native output enough to make a syntax highlighter for it.

Besides, it also includes an alternative view for headblob (I was too lazy to

split up the patch =). Thanks to Zachary P. Landau who sent a patch to do this

(although I did it in a slightly different way).

- print '<br/><br/></div>'

+ print "<br/>"

+

+ if action in ("commitdiff", "filediff", "headdiff", "headfilediff"):

+ # show the alternative patch formats

+ params = 'h=%s;' % h

+ if f:

+ params += 'f=%s;' % f

+

+ # plain first

+ print """

+<a class="link" href="%(myreponame)s;a=plain_%(act)s;%(params)s">plain</a>

+ """ % { "myreponame": config.myreponame, "act": action,

+ "params": params }

+

+ # darcs, htmlized

+ # TODO: not yet

+# print """

+#| <a class="link" href="%(myreponame)s;a=darcs_%(act)s;%(params)s">darcs</a>

+# """ % { "myreponame": config.myreponame, "act": action,

+# "params": params }

+

+ # darcs, raw, if available; and only for commitdiff

+ realf = filter_file(config.repodir + '/_darcs/patches/' + h)

+ if action == "commitdiff" and os.path.isfile(realf):

+ print """

+| <a class="link" href="%(myreponame)s;a=raw_%(act)s;%(params)s">raw</a>

+ """ % { "myreponame": config.myreponame,

+ "act": action, "params": params }

+

+ elif f and action == "headblob":

+ # show the only alternative format: plain

+ print """

+<a class="link" href="%(myreponame)s;a=plainblob;f=%(fname)s">plain</a>

+ """ % { "myreponame": config.myreponame, "fname": f }

+

+ print '<br/>'

+ print '</div>'

+

+def get_diff(hash):

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

+

+def get_raw_diff(hash):

+ import gzip

+ realf = filter_file(config.repodir + '/_darcs/patches/' + hash)

+ if not os.path.isfile(realf):

+ return None

+ dsrc = gzip.open(realf)

+ return dsrc

+

+def do_plain_commitdiff(phash):

+ print_plain_header()

+ dsrc = get_diff(phash)

+ for l in dsrc:

+ sys.stdout.write(l)

+

+def do_darcs_commitdiff(phash):

+ print_plain_header()

+ print "Not yet implemented"

+

+def do_raw_commitdiff(phash):

+ print_plain_header()

+ dsrc = get_raw_diff(phash)

+ if not dsrc:

+ print "Error opening file!"

+ return

+ for l in dsrc:

+ sys.stdout.write(l)

+

+def do_plain_headdiff(phash):

+ print_plain_header()

+ dsrc = get_patch_headdiff(phash)

+ for l in dsrc:

+ sys.stdout.write(l)

+

+def do_darcs_headdiff(phash):

+ print_plain_header()

+ print "Not yet implemented"

+

+def do_plain_filediff(phash, fname):

+ print_plain_header()

+ dsrc = get_file_diff(phash, fname)

+ for l in dsrc:

+ sys.stdout.write(l)

+

+def do_darcs_filediff(phash, fname):

+ print_plain_header()

+ print "Not yet implemented"

-

-def do_plainfilediff(phash, fname):

+def do_plain_fileheaddiff(phash, fname):

- dsrc = get_file_diff(phash, fname)

+ dsrc = get_file_headdiff(phash, fname)

+

+def do_darcs_fileheaddiff(phash, fname):

+ print_plain_header()

+ print "Not yet implemented"

+

+elif action == "plain_commitdiff":

+ phash = filter_hash(form["h"].value)

+ do_plain_commitdiff(phash)

+elif action == "darcs_commitdiff":

+ phash = filter_hash(form["h"].value)

+ do_darcs_commitdiff(phash)

+elif action == "raw_commitdiff":

+ phash = filter_hash(form["h"].value)

+ do_raw_commitdiff(phash)

+

+elif action == "plain_headdiff":

+ phash = filter_hash(form["h"].value)

+ do_plain_headdiff(phash)

+elif action == "darcs_headdiff":

+ phash = filter_hash(form["h"].value)

+ do_darcs_headdiff(phash)

+

+elif action == "plain_filediff":

+ phash = filter_hash(form["h"].value)

+ fname = filter_file(form["f"].value)

+ do_plain_filediff(phash, fname)

+elif action == "darcs_filediff":

+ phash = filter_hash(form["h"].value)

+ do_darcs_filediff(phash)

+

-elif action == "plainfilediff":

+elif action == "plain_headfilediff":

- do_plainfilediff(phash, fname)

+ do_plain_fileheaddiff(phash, fname)

+elif action == "darcs_headfilediff":

+ phash = filter_hash(form["h"].value)

+ do_darcs_fileheaddiff(phash)

+

+

+

+

+

+

+

+

+

Tue Aug 23 22:20:18 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Allow underscores in action names.

-allowed_alphanum = string.ascii_letters + string.digits

-def filter_an(s):

- l = [c for c in s if c in allowed_alphanum]

+allowed_in_action = string.ascii_letters + string.digits + '_'

+def filter_act(s):

+ l = [c for c in s if c in allowed_in_action]

- action = filter_an(form["a"].value)

+ action = filter_act(form["a"].value)

Thu Jul 28 15:39:50 UTC 2005 Remko Troncon <remko.troncon@cs.kuleuven.be>

* Corrected 'month' to 'months'.

- s += " month ago"

+ s += " months ago"

Mon Jul 25 04:41:00 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Skip showing the tree link if there is no pristine tree.

If the repository was get with the --no-pristine-tree option, there won't be a

current directory; we only show the tree option if the directory is there.

The other related option that accesses the pristine tree directly is the

headblob, but there is already a check in place that takes care of it.

Thanks to Stephane Popinet for reporting it.

-| <a href="%(myreponame)s;a=tree">tree</a>

+

+ if os.path.isdir(config.repodir + '/_darcs/current/'):

+ # the current directory is missing if the --no-pristine-tree

+ # option was used in darcs get, so we only show the link if

+ # the directory exists

+ print '| <a href="%s;a=tree">tree</a>' % config.myreponame

Sun Jul 24 03:47:10 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Capitalize "History" on filehistory's title.

- title += 'history for path %s' % fname

+ title += 'History for path %s' % fname

Sun Jul 24 01:05:22 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Ignore created_as tag in changes' xml output.

+ # When you ask for changes to a given file, the xml output

+ # begins with the patch that creates it is enclosed in a

+ # "created_as" tag; then, later, it gets shown again in its

+ # usual place. The following two "if"s take care of ignoring

+ # everything inside the "created_as" tag, since we don't care.

+ if name == 'created_as':

+ self.cur_elem = 'created_as'

+ return

+ if self.cur_elem == 'created_as':

+ return

+

+ # now parse the tags normally

+ # See the comment in startElement()

+ if name == 'created_as':

+ self.cur_elem = None

+ self.cur_val = ''

+ return

+ if self.cur_elem == 'created_as':

+ return

+

Sat Jul 23 23:12:59 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Say "path" instead of "file" in history title.

- title += 'history for file %s' % fname

+ title += 'history for path %s' % fname

Sat Jul 23 23:11:32 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Mark td tags with link class for output consistency

-<td>

- <a class="link" href="%(myreponame)s;a=filediff;h=%(hash)s;f=%(file)s">

- diff</a> |

- <a class="link" href="%(myreponame)s;a=filehistory;f=%(file)s">history</a>

+<td class="link">

+ <a href="%(myreponame)s;a=filediff;h=%(hash)s;f=%(file)s">diff</a> |

+ <a href="%(myreponame)s;a=filehistory;f=%(file)s">history</a>

- <td>

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

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

+ <td class="link">

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

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

- <td>

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

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

+ <td class="link">

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

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

Sat Jul 23 22:54:35 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Implement file history (a "focused" version of shortlog).

+ if f:

+ print """

+| <a class="link" href="%(myreponame)s;a=filehistory;f=%(fname)s">filehistory</a>

+ """ % { "myreponame": config.myreponame, 'fname': f }

+

-

-def get_last_patches(last = 15, topi = 0):

+def get_last_patches(last = 15, topi = 0, fname = None):

- simple. FIXME: there's probably a more efficient way of doing this."""

+ simple. You can optionally pass a filename and only changes that

+ affect it will be returned. FIXME: there's probably a more efficient

+ way of doing this."""

+

+ # darcs calculate last first, and then filters the filename,

+ # so it's not so simple to combine them; that's why we do so much

+ # special casing here

- handler = get_changes_handler("-s --last=%d" % toget)

+ if fname:

+ if fname[0] == '/': fname = fname[1:]

+ s = "-s " + fname

+ else:

+ s = "-s --last=%d" % toget

+

+ handler = get_changes_handler(s)

+

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

- ps = get_last_patches(last, topi)

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

- % config.myreponame

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

+ ps = get_last_patches(last, topi, fname)

+

+ if fname:

+ title = '<a class="title" href="%s;a=filehistory;f=%s">' % \

+ (config.myreponame, fname)

+ title += 'history for file %s' % fname

+ title += '</a>'

+ else:

+ title = '<a class="title" href="%s;a=shortlog">shortlog</a>' \

+ % config.myreponame

+

+ print '<div>%s</div>' % title

- print '<td><a href="%s;a=shortlog;topi=%d">...</a></td>' % \

- (config.myreponame, ntopi)

+ print '<tr><td>'

+ if fname:

+ print '<a href="%s;a=filehistory;topi=%d;f=%s">...</a>' \

+ % (config.myreponame, ntopi, fname)

+ else:

+ print '<a href="%s;a=shortlog;topi=%d">...</a>' \

+ % (config.myreponame, ntopi)

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

- print """

-<tr><td>

- <a href="%s;a=shortlog;topi=%d">...</a>

-</td></tr>

- """ % (config.myreponame, topi + last)

+ print '<tr><td>'

+ if fname:

+ print '<a href="%s;a=filehistory;topi=%d;f=%s">...</a>' \

+ % (config.myreponame, topi + last, fname)

+ else:

+ print '<a href="%s;a=shortlog;topi=%d">...</a>' \

+ % (config.myreponame, topi + last)

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

-<td><a class="link" href="%(myreponame)s;a=filediff;h=%(hash)s;f=%(file)s">

- diff

-</a></td>

+<td>

+ <a class="link" href="%(myreponame)s;a=filediff;h=%(hash)s;f=%(file)s">

+ diff</a> |

+ <a class="link" href="%(myreponame)s;a=filehistory;f=%(file)s">history</a>

+</td>

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

+ <td>

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

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

+ </td>

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

+ <td>

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

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

+ </td>

+def do_filehistory(topi, f):

+ print_header()

+ print_navbar(f = fname)

+ print_shortlog(topi = topi, fname = fname)

+ print_footer()

+elif action == "filehistory":

+ if form.has_key("topi"):

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

+ else:

+ topi = 0

+ fname = filter_file(form["f"].value)

+ do_filehistory(topi, fname)

Sat Jul 23 21:47:55 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Escape comments properly in the log view.

- fmt_comment = p.comment.replace('\n', '<br/>') + '\n'

+ comment = escape(p.comment)

+ fmt_comment = comment.replace('\n', '<br/>') + '\n'

- 'comment': escape(fmt_comment)

+ 'comment': fmt_comment

Fri Jul 22 06:15:21 UTC 2005 Alberto Bertogli <albertogli@telpin.com.ar>

* Fix fixu8 to support Python 2.3.

Some unicode stuff has changed in Python 2.4, so this change is needed to make

fixu8 work with older versions. It's not nice, but it does the trick and it

takes only a couple of self-contained lines.

Many people reported the problem and potential fixes, this one is by Markus

Keller <markus.keller@gmx.com>.

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

+ if type(s) == unicode:

+ # workaround for python < 2.4

+ return s.encode('utf8')

+ else:

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