Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/webcommands.py @ 20095:1c46b18b0e1c
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 22 Nov 2013 17:26:58 -0600 |
| parents | 2771e59afac4 77acd8ce01ce |
| children | 7d40e706412c |
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py Tue Nov 12 16:23:52 2013 +0900 +++ b/mercurial/hgweb/webcommands.py Fri Nov 22 17:26:58 2013 -0600 @@ -228,9 +228,12 @@ 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 + try: + revcount = int(req.form.get('revcount', [revcount])[0]) + revcount = max(revcount, 1) + tmpl.defaults['sessionvars']['revcount'] = revcount + except ValueError: + pass lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars['revcount'] = max(revcount / 2, 1) @@ -307,9 +310,12 @@ revcount = shortlog and web.maxshortchanges or web.maxchanges if 'revcount' in req.form: - revcount = int(req.form.get('revcount', [revcount])[0]) - revcount = max(revcount, 1) - tmpl.defaults['sessionvars']['revcount'] = revcount + try: + revcount = int(req.form.get('revcount', [revcount])[0]) + revcount = max(revcount, 1) + tmpl.defaults['sessionvars']['revcount'] = revcount + except ValueError: + pass lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars['revcount'] = max(revcount / 2, 1) @@ -822,9 +828,12 @@ revcount = web.maxshortchanges if 'revcount' in req.form: - revcount = int(req.form.get('revcount', [revcount])[0]) - revcount = max(revcount, 1) - tmpl.defaults['sessionvars']['revcount'] = revcount + try: + revcount = int(req.form.get('revcount', [revcount])[0]) + revcount = max(revcount, 1) + tmpl.defaults['sessionvars']['revcount'] = revcount + except ValueError: + pass lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars['revcount'] = max(revcount / 2, 1) @@ -944,9 +953,12 @@ bg_height = 39 revcount = web.maxshortchanges if 'revcount' in req.form: - revcount = int(req.form.get('revcount', [revcount])[0]) - revcount = max(revcount, 1) - tmpl.defaults['sessionvars']['revcount'] = revcount + try: + revcount = int(req.form.get('revcount', [revcount])[0]) + revcount = max(revcount, 1) + tmpl.defaults['sessionvars']['revcount'] = revcount + except ValueError: + pass lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars['revcount'] = max(revcount / 2, 1)