/loggerhead/trunk

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/controllers/annotate_ui.py

Committer: Martin Albisetti
Date: 2008-06-18 04:08:52 UTC
mfrom: (160 trunk)
mto: (159.2.41 wsgi-ify) (128.8.11 loggerhead.zpt.clean_urls)
mto: This revision was merged to the branch mainline in revision 163.
Revision ID: argentina@gmail.com-20080618040852-qess1m7633apk3h5

Merge from trunk

files removed:
loggerhead/textindex.py

files modified:
README.txt

loggerhead.conf.example

loggerhead/branchview.py

loggerhead/changecache.py

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/history.py

loggerhead/util.py

start-loggerhead.py

Show diffs side-by-side

added added

removed removed

loggerhead/controllers/annotate_ui.py

93

93

'url': self._branch.context_url,

94

94

}

95

95

vals.update(templatefunctions)

96

h.flush_cache()

97

96

self.log.info('/annotate: %r secs' % (time.time() - z,))

98

97

return vals

99

98

finally:

Older »