comparison mercurial/hgweb/webcommands.py @ 38136:e4a43d261715

hgweb: wrap {bookmarks} of summary with mappinggenerator

No bare generator of mappings should be put in a template mapping.

38135:5e94d07b290a

                'tag': k,
                'node': hex(n),
                'date': web.repo[n].date(),
            }

    def bookmarks(**map):
        parity = paritygen(web.stripecount)
        marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
        sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
        marks = sorted(marks, key=sortkey, reverse=True)
        for k, n in marks[:10]:  # limit to 10 bookmarks

        'summary',
        desc=desc,
        owner=get_contact(web.config) or 'unknown',
        lastchange=tip.date(),
        tags=templateutil.mappinggenerator(tagentries, name='tagentry'),
        bookmarks=bookmarks,
        branches=webutil.branchentries(web.repo, web.stripecount, 10),
        shortlog=templateutil.mappinggenerator(changelist,
                                               name='shortlogentry'),
        node=tip.hex(),
        symrev='tip',

38136:e4a43d261715

                'tag': k,
                'node': hex(n),
                'date': web.repo[n].date(),
            }

    def bookmarks(context):
        parity = paritygen(web.stripecount)
        marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
        sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
        marks = sorted(marks, key=sortkey, reverse=True)
        for k, n in marks[:10]:  # limit to 10 bookmarks

        'summary',
        desc=desc,
        owner=get_contact(web.config) or 'unknown',
        lastchange=tip.date(),
        tags=templateutil.mappinggenerator(tagentries, name='tagentry'),
        bookmarks=templateutil.mappinggenerator(bookmarks),
        branches=webutil.branchentries(web.repo, web.stripecount, 10),
        shortlog=templateutil.mappinggenerator(changelist,
                                               name='shortlogentry'),
        node=tip.hex(),
        symrev='tip',