From patchwork Sun Jul 14 21:45:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1, of, 4, RFC] hgweb: move local changelist function to the beginning of the parent one From: Alexander Plavin X-Patchwork-Id: 1893 Message-Id: <28d3d31e969f8e539455.1373838326@debian-alexander.dolgopa> To: mercurial-devel@selenic.com Date: Mon, 15 Jul 2013 01:45:26 +0400 # HG changeset patch # User Alexander Plavin # Date 1373835942 -14400 # Mon Jul 15 01:05:42 2013 +0400 # Node ID 28d3d31e969f8e539455963953962c87a1025066 # Parent e146f595973442ae97cb6fdbe6f9d37ebf95cb34 hgweb: move local changelist function to the beginning of the parent one diff -r e146f5959734 -r 28d3d31e969f mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Sun Jul 14 05:35:04 2013 +0400 +++ b/mercurial/hgweb/webcommands.py Mon Jul 15 01:05:42 2013 +0400 @@ -110,20 +110,6 @@ def _search(web, req, tmpl): - query = req.form['rev'][0] - revcount = web.maxchanges - if 'revcount' in req.form: - revcount = int(req.form.get('revcount', [revcount])[0]) - revcount = max(revcount, 1) - tmpl.defaults['sessionvars']['revcount'] = revcount - - lessvars = copy.copy(tmpl.defaults['sessionvars']) - lessvars['revcount'] = max(revcount / 2, 1) - lessvars['rev'] = query - morevars = copy.copy(tmpl.defaults['sessionvars']) - morevars['revcount'] = revcount * 2 - morevars['rev'] = query - def changelist(**map): count = 0 lower = encoding.lower @@ -176,6 +162,20 @@ if count >= revcount: break + query = req.form['rev'][0] + revcount = web.maxchanges + if 'revcount' in req.form: + revcount = int(req.form.get('revcount', [revcount])[0]) + revcount = max(revcount, 1) + tmpl.defaults['sessionvars']['revcount'] = revcount + + lessvars = copy.copy(tmpl.defaults['sessionvars']) + lessvars['revcount'] = max(revcount / 2, 1) + lessvars['rev'] = query + morevars = copy.copy(tmpl.defaults['sessionvars']) + morevars['revcount'] = revcount * 2 + morevars['rev'] = query + tip = web.repo['tip'] parity = paritygen(web.stripecount)