Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/webcommands.py @ 13931:c3372529247f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: set minimum number of revision to display to 1 when revcount is 0 When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).
author Md. O. Shayan <mdoshayan@gmail.com>
date Wed, 13 Apr 2011 07:40:24 +0530
parents ea726c97c1b6
children 1c1e1232abdc
comparison
equal deleted inserted replaced
13930:0b7853aee5ae 13931:c3372529247f
106 106
107 query = req.form['rev'][0] 107 query = req.form['rev'][0]
108 revcount = web.maxchanges 108 revcount = web.maxchanges
109 if 'revcount' in req.form: 109 if 'revcount' in req.form:
110 revcount = int(req.form.get('revcount', [revcount])[0]) 110 revcount = int(req.form.get('revcount', [revcount])[0])
111 revcount = max(revcount, 1)
111 tmpl.defaults['sessionvars']['revcount'] = revcount 112 tmpl.defaults['sessionvars']['revcount'] = revcount
112 113
113 lessvars = copy.copy(tmpl.defaults['sessionvars']) 114 lessvars = copy.copy(tmpl.defaults['sessionvars'])
114 lessvars['revcount'] = revcount / 2 115 lessvars['revcount'] = max(revcount / 2, 1)
115 lessvars['rev'] = query 116 lessvars['rev'] = query
116 morevars = copy.copy(tmpl.defaults['sessionvars']) 117 morevars = copy.copy(tmpl.defaults['sessionvars'])
117 morevars['revcount'] = revcount * 2 118 morevars['revcount'] = revcount * 2
118 morevars['rev'] = query 119 morevars['rev'] = query
119 120
218 yield e 219 yield e
219 220
220 revcount = shortlog and web.maxshortchanges or web.maxchanges 221 revcount = shortlog and web.maxshortchanges or web.maxchanges
221 if 'revcount' in req.form: 222 if 'revcount' in req.form:
222 revcount = int(req.form.get('revcount', [revcount])[0]) 223 revcount = int(req.form.get('revcount', [revcount])[0])
224 revcount = max(revcount, 1)
223 tmpl.defaults['sessionvars']['revcount'] = revcount 225 tmpl.defaults['sessionvars']['revcount'] = revcount
224 226
225 lessvars = copy.copy(tmpl.defaults['sessionvars']) 227 lessvars = copy.copy(tmpl.defaults['sessionvars'])
226 lessvars['revcount'] = revcount / 2 228 lessvars['revcount'] = max(revcount / 2, 1)
227 morevars = copy.copy(tmpl.defaults['sessionvars']) 229 morevars = copy.copy(tmpl.defaults['sessionvars'])
228 morevars['revcount'] = revcount * 2 230 morevars['revcount'] = revcount * 2
229 231
230 count = len(web.repo) 232 count = len(web.repo)
231 pos = ctx.rev() 233 pos = ctx.rev()
628 fctx = web.repo.filectx(f, fl.linkrev(frev)) 630 fctx = web.repo.filectx(f, fl.linkrev(frev))
629 631
630 revcount = web.maxshortchanges 632 revcount = web.maxshortchanges
631 if 'revcount' in req.form: 633 if 'revcount' in req.form:
632 revcount = int(req.form.get('revcount', [revcount])[0]) 634 revcount = int(req.form.get('revcount', [revcount])[0])
635 revcount = max(revcount, 1)
633 tmpl.defaults['sessionvars']['revcount'] = revcount 636 tmpl.defaults['sessionvars']['revcount'] = revcount
634 637
635 lessvars = copy.copy(tmpl.defaults['sessionvars']) 638 lessvars = copy.copy(tmpl.defaults['sessionvars'])
636 lessvars['revcount'] = revcount / 2 639 lessvars['revcount'] = max(revcount / 2, 1)
637 morevars = copy.copy(tmpl.defaults['sessionvars']) 640 morevars = copy.copy(tmpl.defaults['sessionvars'])
638 morevars['revcount'] = revcount * 2 641 morevars['revcount'] = revcount * 2
639 642
640 count = fctx.filerev() + 1 643 count = fctx.filerev() + 1
641 start = max(0, fctx.filerev() - revcount + 1) # first rev on this page 644 start = max(0, fctx.filerev() - revcount + 1) # first rev on this page
729 rev = webutil.changectx(web.repo, req).rev() 732 rev = webutil.changectx(web.repo, req).rev()
730 bg_height = 39 733 bg_height = 39
731 revcount = web.maxshortchanges 734 revcount = web.maxshortchanges
732 if 'revcount' in req.form: 735 if 'revcount' in req.form:
733 revcount = int(req.form.get('revcount', [revcount])[0]) 736 revcount = int(req.form.get('revcount', [revcount])[0])
737 revcount = max(revcount, 1)
734 tmpl.defaults['sessionvars']['revcount'] = revcount 738 tmpl.defaults['sessionvars']['revcount'] = revcount
735 739
736 lessvars = copy.copy(tmpl.defaults['sessionvars']) 740 lessvars = copy.copy(tmpl.defaults['sessionvars'])
737 lessvars['revcount'] = revcount / 2 741 lessvars['revcount'] = max(revcount / 2, 1)
738 morevars = copy.copy(tmpl.defaults['sessionvars']) 742 morevars = copy.copy(tmpl.defaults['sessionvars'])
739 morevars['revcount'] = revcount * 2 743 morevars['revcount'] = revcount * 2
740 744
741 max_rev = len(web.repo) - 1 745 max_rev = len(web.repo) - 1
742 revcount = min(max_rev, revcount) 746 revcount = min(max_rev, revcount)