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.

--- old-darcsweb/darcsweb.cgi 2013-07-03 16:49:18.000000000 +0000

+++ new-darcsweb/darcsweb.cgi 2013-07-03 16:49:18.000000000 +0000

@@ -1050,6 +1050,9 @@

return annotate

def get_annotate(fname, hash = None):

+ if config.disable_annotate:

+ return None

+

cmd = 'annotate --xml-output'

if hash:

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

@@ -1059,11 +1062,8 @@

# doesn't really care

fname = fname[1:]

cmd += ' "%s"' % fname

- if not config.disable_annotate:

- out = run_darcs(cmd)

- else:

- return None

- return parse_annotate(out)

+

+ return parse_annotate(run_darcs(cmd))