/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/templatefunctions.py

  • Committer: Michael Hudson
  • Date: 2009-05-18 04:06:53 UTC
  • mfrom: (333.1.2 which-mainline-merged)
  • Revision ID: michael.hudson@canonical.com-20090518040653-ht3y1o5xsaky5ybr
show which mainline revision merged a non-mainline revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templatefunctions.py
57
57
 
58
58
 
59
59
@templatefunc
60
 
def revisioninfo(url, branch, entry, file_changes=None, currently_showing=None):
 
60
def revisioninfo(url, branch, entry, file_changes=None, currently_showing=None, merged_in=None):
61
61
    from loggerhead import util
62
62
    return _pt('revisioninfo').expand(
63
63
        url=url, change=entry, branch=branch, util=util,
64
64
        file_changes=file_changes, currently_showing=currently_showing,
65
 
        **templatefunctions)
 
65
        merged_in=merged_in, **templatefunctions)
66
66
 
67
67
 
68
68
@templatefunc