From patchwork Wed Sep 18 18:03:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1, of, 2] hgweb: always compute all entries and latestentry in changelog From: Alexander Plavin X-Patchwork-Id: 2517 Message-Id: To: mercurial-devel@selenic.com Date: Wed, 18 Sep 2013 22:03:53 +0400 # HG changeset patch # User Alexander Plavin # Date 1378459857 -14400 # Fri Sep 06 13:30:57 2013 +0400 # Node ID cb1c62872a8aa8f03a0353d6432614a922aa786c # Parent 305568814dbd7e196d116c07e2939db917a32e48 hgweb: always compute all entries and latestentry in changelog Get the whole list of entries before rendering instead of using lazy evaluation. This doesn't affect the performance for usual case when the entries are shown anyway. When both entries and latestentry are used, this performs unnoticeably faster, and for pages which use only latestentry (quite uncommon case) it would be a bit slower. This change will make it possible to get the first entry of the next page easily without computing the list twice. diff -r 305568814dbd -r cb1c62872a8a mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Fri Sep 06 13:30:57 2013 +0400 +++ b/mercurial/hgweb/webcommands.py Fri Sep 06 13:30:57 2013 +0400 @@ -275,12 +275,10 @@ else: ctx = web.repo['tip'] - def changelist(latestonly): + def changelist(): revs = [] if pos != -1: revs = web.repo.changelog.revs(pos, 0) - if latestonly: - revs = (revs.next(),) curcount = 0 for i in revs: ctx = web.repo[i] @@ -325,10 +323,13 @@ changenav = webutil.revnav(web.repo).gen(pos, revcount, count) + entries = list(changelist()) + latestentry = entries[:1] + return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav, node=ctx.hex(), rev=pos, changesets=count, - entries=lambda **x: changelist(latestonly=False), - latestentry=lambda **x: changelist(latestonly=True), + entries=entries, + latestentry=latestentry, archives=web.archivelist("tip"), revcount=revcount, morevars=morevars, lessvars=lessvars, query=query)